Skip to content
This repository was archived by the owner on Feb 9, 2023. It is now read-only.

Commit 779b793

Browse files
daxtensdavem330
daxtens
authored and
davem330
committed
net: rename skb_gso_validate_mtu -> skb_gso_validate_network_len
If you take a GSO skb, and split it into packets, will the network length (L3 headers + L4 headers + payload) of those packets be small enough to fit within a given MTU? skb_gso_validate_mtu gives you the answer to that question. However, we recently added to add a way to validate the MAC length of a split GSO skb (L2+L3+L4+payload), and the names get confusing, so rename skb_gso_validate_mtu to skb_gso_validate_network_len Signed-off-by: Daniel Axtens <[email protected]> Reviewed-by: Marcelo Ricardo Leitner <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 4e00f5d commit 779b793

9 files changed

Lines changed: 14 additions & 13 deletions

File tree

‎include/linux/skbuff.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3286,7 +3286,7 @@ void skb_split(struct sk_buff *skb, struct sk_buff *skb1, const u32 len);
32863286
int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen);
32873287
void skb_scrub_packet(struct sk_buff *skb, bool xnet);
32883288
unsigned int skb_gso_transport_seglen(const struct sk_buff *skb);
3289-
bool skb_gso_validate_mtu(const struct sk_buff *skb, unsigned int mtu);
3289+
bool skb_gso_validate_network_len(const struct sk_buff *skb, unsigned int mtu);
32903290
bool skb_gso_validate_mac_len(const struct sk_buff *skb, unsigned int len);
32913291
struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features);
32923292
struct sk_buff *skb_vlan_untag(struct sk_buff *skb);

‎net/core/skbuff.c‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4955,19 +4955,20 @@ static inline bool skb_gso_size_check(const struct sk_buff *skb,
49554955
}
49564956

49574957
/**
4958-
* skb_gso_validate_mtu - Return in case such skb fits a given MTU
4958+
* skb_gso_validate_network_len - Will a split GSO skb fit into a given MTU?
49594959
*
49604960
* @skb: GSO skb
49614961
* @mtu: MTU to validate against
49624962
*
4963-
* skb_gso_validate_mtu validates if a given skb will fit a wanted MTU
4964-
* once split.
4963+
* skb_gso_validate_network_len validates if a given skb will fit a
4964+
* wanted MTU once split. It considers L3 headers, L4 headers, and the
4965+
* payload.
49654966
*/
4966-
bool skb_gso_validate_mtu(const struct sk_buff *skb, unsigned int mtu)
4967+
bool skb_gso_validate_network_len(const struct sk_buff *skb, unsigned int mtu)
49674968
{
49684969
return skb_gso_size_check(skb, skb_gso_network_seglen(skb), mtu);
49694970
}
4970-
EXPORT_SYMBOL_GPL(skb_gso_validate_mtu);
4971+
EXPORT_SYMBOL_GPL(skb_gso_validate_network_len);
49714972

49724973
/**
49734974
* skb_gso_validate_mac_len - Will a split GSO skb fit in a given length?

‎net/ipv4/ip_forward.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static bool ip_exceeds_mtu(const struct sk_buff *skb, unsigned int mtu)
5555
if (skb->ignore_df)
5656
return false;
5757

58-
if (skb_is_gso(skb) && skb_gso_validate_mtu(skb, mtu))
58+
if (skb_is_gso(skb) && skb_gso_validate_network_len(skb, mtu))
5959
return false;
6060

6161
return true;

‎net/ipv4/ip_output.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ static int ip_finish_output_gso(struct net *net, struct sock *sk,
248248

249249
/* common case: seglen is <= mtu
250250
*/
251-
if (skb_gso_validate_mtu(skb, mtu))
251+
if (skb_gso_validate_network_len(skb, mtu))
252252
return ip_finish_output2(net, sk, skb);
253253

254254
/* Slowpath - GSO segment length exceeds the egress MTU.

‎net/ipv4/netfilter/nf_flow_table_ipv4.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ static bool __nf_flow_exceeds_mtu(const struct sk_buff *skb, unsigned int mtu)
186186
if ((ip_hdr(skb)->frag_off & htons(IP_DF)) == 0)
187187
return false;
188188

189-
if (skb_is_gso(skb) && skb_gso_validate_mtu(skb, mtu))
189+
if (skb_is_gso(skb) && skb_gso_validate_network_len(skb, mtu))
190190
return false;
191191

192192
return true;

‎net/ipv6/ip6_output.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ static bool ip6_pkt_too_big(const struct sk_buff *skb, unsigned int mtu)
412412
if (skb->ignore_df)
413413
return false;
414414

415-
if (skb_is_gso(skb) && skb_gso_validate_mtu(skb, mtu))
415+
if (skb_is_gso(skb) && skb_gso_validate_network_len(skb, mtu))
416416
return false;
417417

418418
return true;

‎net/ipv6/netfilter/nf_flow_table_ipv6.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ static bool __nf_flow_exceeds_mtu(const struct sk_buff *skb, unsigned int mtu)
178178
if (skb->len <= mtu)
179179
return false;
180180

181-
if (skb_is_gso(skb) && skb_gso_validate_mtu(skb, mtu))
181+
if (skb_is_gso(skb) && skb_gso_validate_network_len(skb, mtu))
182182
return false;
183183

184184
return true;

‎net/mpls/af_mpls.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ bool mpls_pkt_too_big(const struct sk_buff *skb, unsigned int mtu)
122122
if (skb->len <= mtu)
123123
return false;
124124

125-
if (skb_is_gso(skb) && skb_gso_validate_mtu(skb, mtu))
125+
if (skb_is_gso(skb) && skb_gso_validate_network_len(skb, mtu))
126126
return false;
127127

128128
return true;

‎net/xfrm/xfrm_device.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ bool xfrm_dev_offload_ok(struct sk_buff *skb, struct xfrm_state *x)
217217
if (skb->len <= mtu)
218218
goto ok;
219219

220-
if (skb_is_gso(skb) && skb_gso_validate_mtu(skb, mtu))
220+
if (skb_is_gso(skb) && skb_gso_validate_network_len(skb, mtu))
221221
goto ok;
222222
}
223223

0 commit comments

Comments
 (0)