The bounded resegmentation added by the next patch splits an oversized TCP GSO skb into several GSO skbs which fit the device limits. That needs the GSO engine to group several MSS segments into one output skb, so let callers bound the number of MSS segments each output skb carries and pass the bound through the existing __skb_gso_segment() entry point. Ordinary callers use zero for no limit.
Without a bound, skb_segment() groups several MSS into one output skb only for a device which advertises NETIF_F_GSO_PARTIAL or for a skb with a frag_list which can be split into uniform pieces, and falls back to one segment per skb otherwise. A caller which passes a bound asks for the grouping regardless, so the block which makes that decision is skipped when max_segs is set. Callers which pass no bound keep it, and the bounded path only runs for skbs which carry no frag_list. The output stays a GSO skb: gso_size is the original MSS and gso_segs is the number of MSS it holds, so a downstream device can still perform ordinary TSO. Store the bound in the existing skb_gso_cb scratch context, alongside the call-local data_offset and mac_offset fields, so that the segmentation methods keep their signature. A zero max_segs value means that no bound is active; it is not a persistent skb flag. Assisted-by: LLM Signed-off-by: Wang Zhan <[email protected]> --- v3: - drop the tcp_gso_segment() exception: the caller keeps the features - cap the bound with GSO_MAX_SEGS instead of U16_MAX - drop the reset of the field in the output skbs: every caller initializes it - note in the kernel-doc that a bound is for TCP GSO skbs only - note at the frag_list gate that a bound must not go with a frag_list skb v2: https://lore.kernel.org/[email protected]/ v1: https://lore.kernel.org/[email protected]/ --- drivers/net/tap.c | 3 ++- include/net/gso.h | 6 ++++-- include/net/udp.h | 2 +- net/core/gso.c | 6 +++++- net/core/skbuff.c | 14 ++++++++++++-- net/openvswitch/datapath.c | 2 +- 6 files changed, 25 insertions(+), 8 deletions(-) diff --git a/drivers/net/tap.c b/drivers/net/tap.c index ff67d99deb39e..bc111495ebbce 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -278,9 +278,10 @@ rx_handler_result_t tap_handle_frame(struct sk_buff **pskb) if (q->flags & IFF_VNET_HDR) features |= tap->tap_features; if (netif_needs_gso(skb, features)) { - struct sk_buff *segs = __skb_gso_segment(skb, features, false); + struct sk_buff *segs; struct sk_buff *next; + segs = __skb_gso_segment(skb, features, false, 0); if (IS_ERR(segs)) { drop_reason = SKB_DROP_REASON_SKB_GSO_SEG; goto drop; diff --git a/include/net/gso.h b/include/net/gso.h index 29975440cad51..fccb37889965f 100644 --- a/include/net/gso.h +++ b/include/net/gso.h @@ -19,6 +19,7 @@ struct skb_gso_cb { int encap_level; __wsum csum; __u16 csum_start; + __u16 max_segs; /* Max MSS segs per output skb, 0 = no limit */ }; #define SKB_GSO_CB_OFFSET 32 #define SKB_GSO_CB(skb) ((struct skb_gso_cb *)((skb)->cb + SKB_GSO_CB_OFFSET)) @@ -75,12 +76,13 @@ static inline __sum16 gso_make_checksum(struct sk_buff *skb, __wsum res) } struct sk_buff *__skb_gso_segment(struct sk_buff *skb, - netdev_features_t features, bool tx_path); + netdev_features_t features, bool tx_path, + unsigned int max_segs); static inline struct sk_buff *skb_gso_segment(struct sk_buff *skb, netdev_features_t features) { - return __skb_gso_segment(skb, features, true); + return __skb_gso_segment(skb, features, true, 0); } struct sk_buff *skb_eth_gso_segment(struct sk_buff *skb, diff --git a/include/net/udp.h b/include/net/udp.h index 1fee17274745f..5bc25dcf25fba 100644 --- a/include/net/udp.h +++ b/include/net/udp.h @@ -613,7 +613,7 @@ static inline struct sk_buff *udp_rcv_segment(struct sock *sk, /* the GSO CB lays after the UDP one, no need to save and restore any * CB fragment */ - segs = __skb_gso_segment(skb, features, false); + segs = __skb_gso_segment(skb, features, false, 0); if (IS_ERR_OR_NULL(segs)) { drop_count = skb_shinfo(skb)->gso_segs; goto drop; diff --git a/net/core/gso.c b/net/core/gso.c index bcd156372f4df..42fbce17b508c 100644 --- a/net/core/gso.c +++ b/net/core/gso.c @@ -77,6 +77,8 @@ static bool skb_needs_check(const struct sk_buff *skb, bool tx_path) * @skb: buffer to segment * @features: features for the output path (see dev->features) * @tx_path: whether it is called in TX path + * @max_segs: maximum MSS segments per output GSO skb, 0 means no limit; + * must only be set for TCP GSO skbs * * This function segments the given skb and returns a list of segments. * @@ -86,7 +88,8 @@ static bool skb_needs_check(const struct sk_buff *skb, bool tx_path) * Segmentation preserves SKB_GSO_CB_OFFSET bytes of previous skb cb. */ struct sk_buff *__skb_gso_segment(struct sk_buff *skb, - netdev_features_t features, bool tx_path) + netdev_features_t features, bool tx_path, + unsigned int max_segs) { struct sk_buff *segs; @@ -117,6 +120,7 @@ struct sk_buff *__skb_gso_segment(struct sk_buff *skb, SKB_GSO_CB(skb)->mac_offset = skb_headroom(skb); SKB_GSO_CB(skb)->encap_level = 0; + SKB_GSO_CB(skb)->max_segs = min(max_segs, GSO_MAX_SEGS); skb_reset_mac_header(skb); skb_reset_mac_len(skb); diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 8912a66cd9097..b16a6843f3192 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4793,6 +4793,7 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, struct sk_buff *segs = NULL; struct sk_buff *tail = NULL; struct sk_buff *list_skb = skb_shinfo(head_skb)->frag_list; + unsigned int max_segs = SKB_GSO_CB(head_skb)->max_segs; unsigned int mss = skb_shinfo(head_skb)->gso_size; bool gso_by_frags = mss == GSO_BY_FRAGS; unsigned int doffset = head_skb->data - skb_mac_header(head_skb); @@ -4839,7 +4840,13 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, csum = !!can_checksum_protocol(features, proto); if (sg && csum && !gso_by_frags) { - if (!(features & NETIF_F_GSO_PARTIAL)) { + /* + * A call with max_segs set groups the MSS segments below, + * and the frag_list split in this block does not carry the + * bound, so a bound must not be passed for a skb with a + * frag_list. + */ + if (!max_segs && !(features & NETIF_F_GSO_PARTIAL)) { struct sk_buff *iter; unsigned int frag_len; @@ -4874,7 +4881,10 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, * now. */ DEBUG_NET_WARN_ON_ONCE(len / mss > GSO_MAX_SEGS); - partial_segs = min(len / mss, GSO_MAX_SEGS); + if (max_segs) + partial_segs = min(len / mss, max_segs); + else + partial_segs = min(len / mss, GSO_MAX_SEGS); if (partial_segs > 1) mss *= partial_segs; else diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 2187034143255..e793aead68372 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -375,7 +375,7 @@ static int queue_gso_packets(struct datapath *dp, struct sk_buff *skb, int err; BUILD_BUG_ON(sizeof(*OVS_CB(skb)) > SKB_GSO_CB_OFFSET); - segs = __skb_gso_segment(skb, NETIF_F_SG, false); + segs = __skb_gso_segment(skb, NETIF_F_SG, false, 0); if (IS_ERR(segs)) return PTR_ERR(segs); if (segs == NULL) -- 2.47.3 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
