diff mbox

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

Message ID 1364783861-3363-1-git-send-email-roy.qing.li@gmail.com
State RFC, archived
Delegated to: David Miller
Headers show

Commit Message

Li RongQing April 1, 2013, 2:37 a.m. UTC 
From: Li RongQing <roy.qing.li@gmail.com>

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.

Cc: Cong Wang <amwang@redhat.com>
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
---
 net/core/dev.c |   16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

Comments

Amerigo Wang April 2, 2013, 12:32 p.m. UTC | #1 
On Mon, 2013-04-01 at 10:37 +0800, roy.qing.li@gmail.com wrote:
> From: Li RongQing <roy.qing.li@gmail.com>
> 
> 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.
> 

Did you see any bogus warning triggered by it?

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


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Li RongQing April 3, 2013, 12:51 a.m. UTC | #2 
No, I just read and analyze it, and think it is bogus.

2013/4/2 Cong Wang <amwang@redhat.com>:
> On Mon, 2013-04-01 at 10:37 +0800, roy.qing.li@gmail.com wrote:
>> From: Li RongQing <roy.qing.li@gmail.com>
>>
>> 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.
>>
>
> Did you see any bogus warning triggered by it?
>
> BTW, please Cc all the people involved in the original commit you
> mentioned above.
>
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Eric Dumazet April 3, 2013, 1:19 a.m. UTC | #3 
On Wed, 2013-04-03 at 08:51 +0800, RongQing Li wrote:
> 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.




--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Li RongQing April 3, 2013, 1:44 a.m. UTC | #4 
OK.

2013/4/3 Eric Dumazet <eric.dumazet@gmail.com>:
> On Wed, 2013-04-03 at 08:51 +0800, RongQing Li wrote:
>> 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.
>
>
>
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/core/dev.c b/net/core/dev.c
index de930b7..bf0e586 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -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)))