Skip to contentSkip to conversation

net: fix the features flag in sctp_gso_segment

PATCH Superseded Xin Long 1 participant 4 messages Jan 15, 2021

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Xin Long

author maintainer
#0 lore raw

v2 cover net: fix the features flag in sctp_gso_segment

Patch 1/2 is to improve the code in skb_segment(), and it is needed by Patch 2/2.

v1->v2:
- see Patch 1/2.

Xin Long (2):
net: move the hsize check to the else block in skb_segment
udp: remove CRC flag from dev features in __skb_udp_tunnel_segment

 net/core/skbuff.c      | 11 ++++++-----
 net/ipv4/udp_offload.c |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)
Signature · 1 line
2.1.0
author maintainer
#1 lore raw

PATCH v2 1/2 net: move the hsize check to the else block in skb_segment

After commit 89319d3801d1 ("net: Add frag_list support to skb_segment"), it goes to process frag_list when !hsize in skb_segment(). However, when using skb frag_list, sg normally should not be set. In this case, hsize will be set with len right before !hsize check, then it won't go to frag_list processing code.

So the right thing to do is move the hsize check to the else block, so that it won't affect the !hsize check for frag_list processing.

v1->v2:
- change to do "hsize <= 0" check instead of "!hsize", and also move "hsize < 0" into else block, to save some cycles, as Alex suggested.

---
 net/core/skbuff.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
net/core/skbuff.c +6 -5
index 6039069..e835193 100644
@@ -3894,12 +3894,8 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
 		}
 
 		hsize = skb_headlen(head_skb) - offset;
-		if (hsize < 0)
-			hsize = 0;
-		if (hsize > len || !sg)
-			hsize = len;
 
-		if (!hsize && i >= nfrags && skb_headlen(list_skb) &&
+		if (hsize <= 0 && i >= nfrags && skb_headlen(list_skb) &&
 		    (skb_headlen(list_skb) == len || sg)) {
 			BUG_ON(skb_headlen(list_skb) > len);
 
@@ -3942,6 +3938,11 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
 			skb_release_head_state(nskb);
 			__skb_push(nskb, doffset);
 		} else {
+			if (hsize > len || !sg)
+				hsize = len;
+			else if (hsize < 0)
+				hsize = 0;
+
 			nskb = __alloc_skb(hsize + doffset + headroom,
 					   GFP_ATOMIC, skb_alloc_rx_flag(head_skb),
 					   NUMA_NO_NODE);
Signature · 1 line
2.1.0
author maintainer
#2 lore raw

PATCH v2 2/2 udp: remove CRC flag from dev features in __skb_udp_tunnel_segment

---
 net/ipv4/udp_offload.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv4/udp_offload.c +2 -2
index ff39e94..1168d18 100644
@@ -68,8 +68,8 @@ static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb,
 				      (NETIF_F_HW_CSUM | NETIF_F_IP_CSUM))));
 
 	features &= skb->dev->hw_enc_features;
-	/* CRC checksum can't be handled by HW when it's a UDP tunneling packet. */
-	features &= ~NETIF_F_SCTP_CRC;
+	if (need_csum)
+		features &= ~NETIF_F_SCTP_CRC;
 
 	/* The only checksum offload we care about from here on out is the
 	 * outer one so strip the existing checksum feature flags and
Signature · 1 line
2.1.0
author maintainer
#3 lore raw
In reply to Xin Long

Please drop this patchset, the second one is incorrect. I will post v3, thanks.

Quoted 18 lines · Xin Long

Patch 1/2 is to improve the code in skb_segment(), and it is needed by Patch 2/2.

v1->v2:
- see Patch 1/2.

Xin Long (2):
net: move the hsize check to the else block in skb_segment
udp: remove CRC flag from dev features in __skb_udp_tunnel_segment

 net/core/skbuff.c      | 11 ++++++-----
 net/ipv4/udp_offload.c |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

--
2.1.0