[Devel] [PATCH RHEL9 COMMIT] net: dev: use kfree_skb_reason() for sch_handle_egress()

[Konstantin Khorenko]

The commit is pushed to "branch-rh9-5.14.0-162.6.1.vz9.18.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh9-5.14.0-162.6.1.vz9.18.2
------>
commit 4230d1649beab2c405340292dc38a51fbc2a4aae
Author: Menglong Dong <imagedong at tencent.com>
Date:   Tue Jan 3 17:39:17 2023 +0200

    net: dev: use kfree_skb_reason() for sch_handle_egress()
    
    Replace kfree_skb() used in sch_handle_egress() with kfree_skb_reason().
    The drop reason SKB_DROP_REASON_TC_EGRESS is introduced. Considering
    the code path of tc egerss, we make it distinct with the drop reason
    of SKB_DROP_REASON_QDISC_DROP in the next commit.
    
    Signed-off-by: Menglong Dong <imagedong at tencent.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>
    Acked-by: Nikolay Borisov <nborisov at suse.com>
    Signed-off-by: Nikolay Borisov <nikolay.borisov at virtuozzo.com>
    
    ======
    Patchset description:
    ms/net: Annotate skb free sites with reason
    
    This series backports most of the patches that add a reason to skb free sites.
    
    https://jira.sw.ru/browse/PSBM-143302
    
    Feature: net: improve verbosity of dropped packets reporting
---
 include/linux/skbuff.h     | 1 +
 include/trace/events/skb.h | 1 +
 net/core/dev.c             | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index df1c8c5110ed..fbe1cadf1771 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -392,6 +392,7 @@ enum skb_drop_reason {
 						 * entry is full
 						 */
 	SKB_DROP_REASON_NEIGH_DEAD,     /* neigh entry is dead */
+	SKB_DROP_REASON_TC_EGRESS,      /* dropped in TC egress HOOK */
 	SKB_DROP_REASON_MAX,
 };
 
diff --git a/include/trace/events/skb.h b/include/trace/events/skb.h
index 005ad4a645e1..8141102d3735 100644
--- a/include/trace/events/skb.h
+++ b/include/trace/events/skb.h
@@ -45,6 +45,7 @@
 	EM(SKB_DROP_REASON_NEIGH_FAILED, NEIGH_FAILED)          \
 	EM(SKB_DROP_REASON_NEIGH_QUEUEFULL, NEIGH_QUEUEFULL)    \
 	EM(SKB_DROP_REASON_NEIGH_DEAD, NEIGH_DEAD)              \
+	EM(SKB_DROP_REASON_TC_EGRESS, TC_EGRESS)		\
 	EMe(SKB_DROP_REASON_MAX, MAX)
 
 #undef EM
diff --git a/net/core/dev.c b/net/core/dev.c
index c064543c372f..265bae952468 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3882,7 +3882,7 @@ sch_handle_egress(struct sk_buff *skb, int *ret, struct net_device *dev)
 	case TC_ACT_SHOT:
 		mini_qdisc_qstats_cpu_drop(miniq);
 		*ret = NET_XMIT_DROP;
-		kfree_skb(skb);
+		kfree_skb_reason(skb, SKB_DROP_REASON_TC_EGRESS);
 		return NULL;
 	case TC_ACT_STOLEN:
 	case TC_ACT_QUEUED: