1 files changed, 22 insertions, 0 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index e5e2111a397d..6acbf9e79eb1 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -65,6 +65,7 @@
 #include <asm/uaccess.h>
 #include <asm/system.h>
+#include <trace/skb.h>
 #include "kmap_skb.h"
@@ -442,11 +443,32 @@ void kfree_skb(struct sk_buff *skb)
                smp_rmb();
        else if (likely(!atomic_dec_and_test(&skb->users)))
                return;
+        trace_kfree_skb(skb, __builtin_return_address(0));
        __kfree_skb(skb);
 }
 EXPORT_SYMBOL(kfree_skb);
 /**
+ *      consume_skb - free an skbuff
+ *      @skb: buffer to free
+ *
+ *      Drop a ref to the buffer and free it if the usage count has hit zero
+ *      Functions identically to kfree_skb, but kfree_skb assumes that the frame
+ *      is being dropped after a failure and notes that
+ */
+void consume_skb(struct sk_buff *skb)
+{
+        if (unlikely(!skb))
+                return;
+        if (likely(atomic_read(&skb->users) == 1))
+                smp_rmb();
+        else if (likely(!atomic_dec_and_test(&skb->users)))
+                return;
+        __kfree_skb(skb);
+}
+EXPORT_SYMBOL(consume_skb);
+/**
 *      skb_recycle_check - check if skb can be reused for receive
 *      @skb: buffer
 *      @skb_size: minimum receive buffer size

diff --git a/net/core/skbuff.c b/net/core/skbuff.c index e5e2111a397d..6acbf9e79eb1 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c
@@ -65,6 +65,7 @@
65		65
66	#include <asm/uaccess.h>	66	#include <asm/uaccess.h>
67	#include <asm/system.h>	67	#include <asm/system.h>
		68	#include <trace/skb.h>
68		69
69	#include "kmap_skb.h"	70	#include "kmap_skb.h"
70		71
@@ -442,11 +443,32 @@ void kfree_skb(struct sk_buff *skb)
442	smp_rmb();	443	smp_rmb();
443	else if (likely(!atomic_dec_and_test(&skb->users)))	444	else if (likely(!atomic_dec_and_test(&skb->users)))
444	return;	445	return;
		446	trace_kfree_skb(skb, __builtin_return_address(0));
445	__kfree_skb(skb);	447	__kfree_skb(skb);
446	}	448	}
447	EXPORT_SYMBOL(kfree_skb);	449	EXPORT_SYMBOL(kfree_skb);
448		450
449	/**	451	/**
		452	* consume_skb - free an skbuff
		453	* @skb: buffer to free
		454	*
		455	* Drop a ref to the buffer and free it if the usage count has hit zero
		456	* Functions identically to kfree_skb, but kfree_skb assumes that the frame
		457	* is being dropped after a failure and notes that
		458	*/
		459	void consume_skb(struct sk_buff *skb)
		460	{
		461	if (unlikely(!skb))
		462	return;
		463	if (likely(atomic_read(&skb->users) == 1))
		464	smp_rmb();
		465	else if (likely(!atomic_dec_and_test(&skb->users)))
		466	return;
		467	__kfree_skb(skb);
		468	}
		469	EXPORT_SYMBOL(consume_skb);
		470
		471	/**
450	* skb_recycle_check - check if skb can be reused for receive	472	* skb_recycle_check - check if skb can be reused for receive
451	* @skb: buffer	473	* @skb: buffer
452	* @skb_size: minimum receive buffer size	474	* @skb_size: minimum receive buffer size