Commit 7faef054 authored by Menglong Dong's avatar Menglong Dong Committed by David S. Miller
Browse files

net: dev: add skb drop reasons to __dev_xmit_skb() 



Add reasons for skb drops to __dev_xmit_skb() by replacing
kfree_skb_list() with kfree_skb_list_reason(). The drop reason of
SKB_DROP_REASON_QDISC_DROP is introduced for qdisc enqueue fails.

Signed-off-by: default avatarMenglong Dong <imagedong@tencent.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 215b0f19

include/linux/skbuff.h

+4 −0
Original line number Diff line number Diff line
@@ -395,6 +395,10 @@ enum skb_drop_reason { 
						 */

	SKB_DROP_REASON_NEIGH_DEAD,	/* neigh entry is dead */

	SKB_DROP_REASON_TC_EGRESS,	/* dropped in TC egress HOOK */

	SKB_DROP_REASON_QDISC_DROP,	/* dropped by qdisc when packet

					 * outputting (failed to enqueue to

					 * current qdisc)

					 */

	SKB_DROP_REASON_MAX,

};

include/trace/events/skb.h

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
	EM(SKB_DROP_REASON_NEIGH_QUEUEFULL, NEIGH_QUEUEFULL)	\

	EM(SKB_DROP_REASON_NEIGH_DEAD, NEIGH_DEAD)		\

	EM(SKB_DROP_REASON_TC_EGRESS, TC_EGRESS)		\

	EM(SKB_DROP_REASON_QDISC_DROP, QDISC_DROP)		\

	EMe(SKB_DROP_REASON_MAX, MAX)



#undef EM

net/core/dev.c

+3 −2
Original line number Diff line number Diff line
@@ -3759,7 +3759,8 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q, 


no_lock_out:

		if (unlikely(to_free))

			kfree_skb_list(to_free);

			kfree_skb_list_reason(to_free,

					      SKB_DROP_REASON_QDISC_DROP);

		return rc;

	}
@@ -3814,7 +3815,7 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q, 
	}

	spin_unlock(root_lock);

	if (unlikely(to_free))

		kfree_skb_list(to_free);

		kfree_skb_list_reason(to_free, SKB_DROP_REASON_QDISC_DROP);

	if (unlikely(contended))

		spin_unlock(&q->busylock);

	return rc;