From: Menglong Dong <imaged...@tencent.com>

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: Menglong Dong <imaged...@tencent.com>
Signed-off-by: David S. Miller <da...@davemloft.net>
Acked-by: Nikolay Borisov <nbori...@suse.com>
Signed-off-by: Nikolay Borisov <nikolay.bori...@virtuozzo.com>
---
 include/linux/skbuff.h     | 4 ++++
 include/trace/events/skb.h | 1 +
 net/core/dev.c             | 5 +++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 064201f7ac40..289f66cf58f9 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -393,6 +393,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,
 };
 
diff --git a/include/trace/events/skb.h b/include/trace/events/skb.h
index 8141102d3735..ca65f2080724 100644
--- a/include/trace/events/skb.h
+++ b/include/trace/events/skb.h
@@ -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
diff --git a/net/core/dev.c b/net/core/dev.c
index 265bae952468..9d7bc5812fae 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3757,7 +3757,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;
        }
 
@@ -3808,7 +3809,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;
-- 
2.34.1

_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel

Reply via email to