[Devel] [PATCH RHEL9 COMMIT] net: skb: rename SKB_DROP_REASON_PTYPE_ABSENT

[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 5763358c923a05437b5b54d7234629545597a678
Author: Menglong Dong <imagedong at tencent.com>
Date:   Tue Jan 3 17:39:28 2023 +0200

    net: skb: rename SKB_DROP_REASON_PTYPE_ABSENT
    
    As David Ahern suggested, the reasons for skb drops should be more
    general and not be code based.
    
    Therefore, rename SKB_DROP_REASON_PTYPE_ABSENT to
    SKB_DROP_REASON_UNHANDLED_PROTO, which is used for the cases of no
    L3 protocol handler, no L4 protocol handler, version extensions, etc.
    
    >From previous discussion, now we have the aim to make these reasons
    more abstract and users based, avoiding code based.
    
    Signed-off-by: Menglong Dong <imagedong at tencent.com>
    Reviewed-by: David Ahern <dsahern at kernel.org>
    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     | 8 +++-----
 include/trace/events/skb.h | 2 +-
 net/core/dev.c             | 8 +++-----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 997e1f71aa55..9cd27a37f785 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -406,11 +406,9 @@ enum skb_drop_reason {
 					 */
 	SKB_DROP_REASON_XDP,            /* dropped by XDP in input path */
 	SKB_DROP_REASON_TC_INGRESS,     /* dropped in TC ingress HOOK */
-	SKB_DROP_REASON_PTYPE_ABSENT,   /* not packet_type found to handle
-					 * the skb. For an etner packet,
-					 * this means that L3 protocol is
-					 * not supported
-					 */
+	SKB_DROP_REASON_UNHANDLED_PROTO,        /* protocol not implemented
+						 * or not supported
+						 */
 	SKB_DROP_REASON_SKB_CSUM,       /* sk_buff checksum computation
 					 * error
 					 */
diff --git a/include/trace/events/skb.h b/include/trace/events/skb.h
index 81d62df3f1ed..ed54e4719abe 100644
--- a/include/trace/events/skb.h
+++ b/include/trace/events/skb.h
@@ -50,7 +50,7 @@
 	EM(SKB_DROP_REASON_CPU_BACKLOG, CPU_BACKLOG)            \
 	EM(SKB_DROP_REASON_XDP, XDP)				\
 	EM(SKB_DROP_REASON_TC_INGRESS, TC_INGRESS)		\
-	EM(SKB_DROP_REASON_PTYPE_ABSET, PTYPE_ABSENT)		\
+	EM(SKB_DROP_REASON_UNHANDLED_PROTO, UNHANDLED_PROTO)	\
 	EM(SKB_DROP_REASON_SKB_CSUM, SKB_CSUM)                  \
 	EM(SKB_DROP_REASON_SKB_GSO_SEG, SKB_GSO_SEG)            \
 	EM(SKB_DROP_REASON_SKB_UCOPY_FAULT, SKB_UCOPY_FAULT)    \
diff --git a/net/core/dev.c b/net/core/dev.c
index f06a004450dc..826584477edb 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5341,13 +5341,11 @@ static int __netif_receive_skb_core(struct sk_buff **pskb, bool pfmemalloc,
 		*ppt_prev = pt_prev;
 	} else {
 drop:
-		if (!deliver_exact) {
+		if (!deliver_exact)
 			atomic_long_inc(&skb->dev->rx_dropped);
-			kfree_skb_reason(skb, SKB_DROP_REASON_PTYPE_ABSENT);
-		} else {
+		else
 			atomic_long_inc(&skb->dev->rx_nohandler);
-			kfree_skb(skb);
-		}
+		kfree_skb_reason(skb, SKB_DROP_REASON_UNHANDLED_PROTO);
 		/* Jamal, now you will not able to escape explaining
 		 * me how you were going to use this. :-)
 		 */