[PATCH net-next] net: skb_share_check() should use consume_skb()

Subsystems: networking [general], the rest

STALE5111d

2 messages, 2 authors, 2012-08-04 · open the first message on its own page

[PATCH net-next] net: skb_share_check() should use consume_skb()

From: Eric Dumazet <hidden>
Date: 2012-08-04 06:54:19

From: Eric Dumazet <edumazet@google.com>

In order to avoid false drop_monitor indications, we should
call consume_skb() if skb_clone() was successful.

Signed-off-by: Eric Dumazet <edumazet@google.com>
---
 include/linux/skbuff.h |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 7632c87..b33a3a1 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -846,13 +846,16 @@ static inline int skb_shared(const struct sk_buff *skb)
  *
  *	NULL is returned on a memory allocation failure.
  */
-static inline struct sk_buff *skb_share_check(struct sk_buff *skb,
-					      gfp_t pri)
+static inline struct sk_buff *skb_share_check(struct sk_buff *skb, gfp_t pri)
 {
 	might_sleep_if(pri & __GFP_WAIT);
 	if (skb_shared(skb)) {
 		struct sk_buff *nskb = skb_clone(skb, pri);
-		kfree_skb(skb);
+
+		if (likely(nskb))
+			consume_skb(skb);
+		else
+			kfree_skb(skb);
 		skb = nskb;
 	}
 	return skb;

Re: [PATCH net-next] net: skb_share_check() should use consume_skb()

From: David Miller <davem@davemloft.net>
Date: 2012-08-04 08:28:07

From: Eric Dumazet <redacted>
Date: Sat, 04 Aug 2012 08:54:15 +0200
From: Eric Dumazet <edumazet@google.com>

In order to avoid false drop_monitor indications, we should
call consume_skb() if skb_clone() was successful.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Applied.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help