FAILED: patch "[PATCH] net: correctly handle tunneled traffic on IPV6_CSUM GSO" failed to apply to 6.1-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x c4336a07eb6b2526dc2b62928b5104b41a7f81f5
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026033031-retreat-facility-1b68@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From c4336a07eb6b2526dc2b62928b5104b41a7f81f5 Mon Sep 17 00:00:00 2001
From: Willem de Bruijn <[email protected]>
Date: Fri, 20 Mar 2026 15:01:46 -0400
Subject: [PATCH] net: correctly handle tunneled traffic on IPV6_CSUM GSO
fallback
NETIF_F_IPV6_CSUM only advertises support for checksum offload of packets without IPv6 extension headers. Packets with extension headers must fall back onto software checksumming. Since TSO depends on checksum offload, those must revert to GSO.
The below commit introduces that fallback. It always checks network header length. For tunneled packets, the inner header length must be checked instead. Extend the check accordingly.
A special case is tunneled packets without inner IP protocol. Such as RFC 6951 SCTP in UDP. Those are not standard IPv6 followed by transport header either, so also must revert to the software GSO path.
net/core/dev.c +17 -5
@@ -3769,6 +3769,22 @@ static netdev_features_t dflt_features_check(struct sk_buff *skb,return vlan_features_check (skb, features); } +static bool skb_gso_has_extension_hdr (const struct sk_buff *skb) +{ +if (!skb->encapsulation) +return ((skb_shinfo (skb)->gso_type &SKB_GSO_TCPV6 || + (skb_shinfo (skb)->gso_type &SKB_GSO_UDP_L4 && +vlan_get_protocol (skb) ==htons (ETH_P_IPV6 ))) && +skb_transport_header_was_set (skb) && +skb_network_header_len (skb) !=sizeof (struct ipv6hdr )); +else +return (!skb_inner_network_header_was_set (skb) || + ((skb_shinfo (skb)->gso_type &SKB_GSO_TCPV6 || + (skb_shinfo (skb)->gso_type &SKB_GSO_UDP_L4 && +inner_ip_hdr (skb)->version ==6 )) && +skb_inner_network_header_len (skb) !=sizeof (struct ipv6hdr ))); +} +static netdev_features_t gso_features_check (const struct sk_buff *skb,struct net_device *dev,netdev_features_t features)
@@ -3816,11 +3832,7 @@ static netdev_features_t gso_features_check(const struct sk_buff *skb,* so neither does TSO that depends on it. */ if (features &NETIF_F_IPV6_CSUM && - (skb_shinfo (skb)->gso_type &SKB_GSO_TCPV6 || - (skb_shinfo (skb)->gso_type &SKB_GSO_UDP_L4 && -vlan_get_protocol (skb) ==htons (ETH_P_IPV6 ))) && -skb_transport_header_was_set (skb) && -skb_network_header_len (skb) !=sizeof (struct ipv6hdr )) +skb_gso_has_extension_hdr (skb)) features &= ~(NETIF_F_IPV6_CSUM |NETIF_F_TSO6 |NETIF_F_GSO_UDP_L4 );return features;
Sasha Levin
maintainerPATCH 1/1 net: correctly handle tunneled traffic on IPV6_CSUM GSO fallback
From: Willem de Bruijn <[email protected]>
[ Upstream commit c4336a07eb6b2526dc2b62928b5104b41a7f81f5 ]
NETIF_F_IPV6_CSUM only advertises support for checksum offload of packets without IPv6 extension headers. Packets with extension headers must fall back onto software checksumming. Since TSO depends on checksum offload, those must revert to GSO.
The below commit introduces that fallback. It always checks network header length. For tunneled packets, the inner header length must be checked instead. Extend the check accordingly.
A special case is tunneled packets without inner IP protocol. Such as RFC 6951 SCTP in UDP. Those are not standard IPv6 followed by transport header either, so also must revert to the software GSO path.
--- net/core/dev.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
net/core/dev.c +17 -5
@@ -3586,6 +3586,22 @@ static netdev_features_t dflt_features_check(struct sk_buff *skb,return vlan_features_check (skb, features); } +static bool skb_gso_has_extension_hdr (const struct sk_buff *skb) +{ +if (!skb->encapsulation) +return ((skb_shinfo (skb)->gso_type &SKB_GSO_TCPV6 || + (skb_shinfo (skb)->gso_type &SKB_GSO_UDP_L4 && +vlan_get_protocol (skb) ==htons (ETH_P_IPV6 ))) && +skb_transport_header_was_set (skb) && +skb_network_header_len (skb) !=sizeof (struct ipv6hdr )); +else +return (!skb_inner_network_header_was_set (skb) || + ((skb_shinfo (skb)->gso_type &SKB_GSO_TCPV6 || + (skb_shinfo (skb)->gso_type &SKB_GSO_UDP_L4 && +inner_ip_hdr (skb)->version ==6 )) && +skb_inner_network_header_len (skb) !=sizeof (struct ipv6hdr ))); +} +static netdev_features_t gso_features_check (const struct sk_buff *skb,struct net_device *dev,netdev_features_t features)
@@ -3627,11 +3643,7 @@ static netdev_features_t gso_features_check(const struct sk_buff *skb,* so neither does TSO that depends on it. */ if (features &NETIF_F_IPV6_CSUM && - (skb_shinfo (skb)->gso_type &SKB_GSO_TCPV6 || - (skb_shinfo (skb)->gso_type &SKB_GSO_UDP_L4 && -vlan_get_protocol (skb) ==htons (ETH_P_IPV6 ))) && -skb_transport_header_was_set (skb) && -skb_network_header_len (skb) !=sizeof (struct ipv6hdr ) && +skb_gso_has_extension_hdr (skb) && !ipv6_has_hopopt_jumbo (skb)) features &= ~(NETIF_F_IPV6_CSUM |NETIF_F_TSO6 |NETIF_F_GSO_UDP_L4 );
Signature · 1 line
2.53.0