Skip to contentSkip to conversation

core: should call pskb_expand_head if skb header is cloned in skb_gso_segment in rx path

PATCH RESEND In review [email protected] 3 participants 5 messages Apr 1, 2013 – Apr 3, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 core: should call pskb_expand_head if skb header is cloned in skb_gso_segment in rx path

From: Li RongQing <[email protected]>

12b0004d1d1 (adjust skb_gso_segment() for calling in rx path) tries to kill warnings by checking if ip_summed is CHECK_NONE or not in rx path, since if skb_gso_segment() is called on rx path, and ->ip_summed has different meaning.

but this maybe break skb if skb header is cloned, and not expand the header, since when step into skb_mac_gso_segment(), which will still check ip_summed with CHECKSUM_PARTIAL, then do gso_send_check(). and after __skb_gso_segment() in queue_gso_packets() of openvswitch, queue_userspace_packet() still checks ip_summed with CHECKSUM_PARTIAL, and do checksum.

so I think it is enough to ignore the warning in rx path.

---
 net/core/dev.c |   16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)
net/core/dev.c +3 -13
index de930b7..bf0e586 100644
@@ -2269,17 +2269,6 @@ struct sk_buff *skb_mac_gso_segment(struct sk_buff *skb,
 }
 EXPORT_SYMBOL(skb_mac_gso_segment);
 
-
-/* openvswitch calls this on rx path, so we need a different check.
- */
-static inline bool skb_needs_check(struct sk_buff *skb, bool tx_path)
-{
-	if (tx_path)
-		return skb->ip_summed != CHECKSUM_PARTIAL;
-	else
-		return skb->ip_summed == CHECKSUM_NONE;
-}
-
 /**
  *	__skb_gso_segment - Perform segmentation on skb.
  *	@skb: buffer to segment
@@ -2294,10 +2283,11 @@ static inline bool skb_needs_check(struct sk_buff *skb, bool tx_path)
 struct sk_buff *__skb_gso_segment(struct sk_buff *skb,
 				  netdev_features_t features, bool tx_path)
 {
-	if (unlikely(skb_needs_check(skb, tx_path))) {
+	if (unlikely(skb->ip_summed != CHECKSUM_PARTIAL)) {
 		int err;
 
-		skb_warn_bad_offload(skb);
+		if (tx_path)
+			skb_warn_bad_offload(skb);
 
 		if (skb_header_cloned(skb) &&
 		    (err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC)))
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 6 lines · On Mon, 2013-04-01 at 10:37 +0800, [email protected] wrote:

From: Li RongQing <[email protected]>

12b0004d1d1 (adjust skb_gso_segment() for calling in rx path) tries to kill warnings by checking if ip_summed is CHECK_NONE or not in rx path, since if skb_gso_segment() is called on rx path, and ->ip_summed has different meaning.

Quoted 8 lines

but this maybe break skb if skb header is cloned, and not expand the header, since when step into skb_mac_gso_segment(), which will still check ip_summed with CHECKSUM_PARTIAL, then do gso_send_check(). and after __skb_gso_segment() in queue_gso_packets() of openvswitch, queue_userspace_packet() still checks ip_summed with CHECKSUM_PARTIAL, and do checksum.

so I think it is enough to ignore the warning in rx path.

Did you see any bogus warning triggered by it?

BTW, please Cc all the people involved in the original commit you mentioned above.

#2 lore raw

No, I just read and analyze it, and think it is bogus.

2013/4/2 Cong Wang <[email protected]>:

Quoted 22 lines · On Mon, 2013-04-01 at 10:37 +0800, [email protected] wrote:
Quoted 6 lines

From: Li RongQing <[email protected]>

12b0004d1d1 (adjust skb_gso_segment() for calling in rx path) tries to kill warnings by checking if ip_summed is CHECK_NONE or not in rx path, since if skb_gso_segment() is called on rx path, and ->ip_summed has different meaning.

Quoted 8 lines

but this maybe break skb if skb header is cloned, and not expand the header, since when step into skb_mac_gso_segment(), which will still check ip_summed with CHECKSUM_PARTIAL, then do gso_send_check(). and after __skb_gso_segment() in queue_gso_packets() of openvswitch, queue_userspace_packet() still checks ip_summed with CHECKSUM_PARTIAL, and do checksum.

so I think it is enough to ignore the warning in rx path.

Did you see any bogus warning triggered by it?

BTW, please Cc all the people involved in the original commit you mentioned above.

#3 lore raw
Quoted 1 line · RongQing Li

No, I just read and analyze it, and think it is bogus.

Please rewrite the changelog, because I read it several times and could not understand it.

#4 lore raw

OK.

2013/4/3 Eric Dumazet <[email protected]>:

Quoted 9 lines · RongQing Li
Quoted 1 line

No, I just read and analyze it, and think it is bogus.

Please rewrite the changelog, because I read it several times and could not understand it.