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@tencent.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 2394441fa3dd5e256e66ca2d424f30b0a47263ae..173bc35a10a38903e7838c8dc6bbb21239ca075c 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -408,11 +408,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 e1670e1e493425a58be109c6f766a4c76398fa0d..85abd7cbd22194e1163e9426014ab138d8ba88eb 100644 (file)
--- 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_ABSENT, 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 e027410e861bbc1fcd9aae7f94c468480efd5572..ba853e878007240dad00a5cd042d73351973d7ed 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5375,13 +5375,11 @@ check_vlan_id:
                *ppt_prev = pt_prev;
        } else {
 drop:
-               if (!deliver_exact) {
+               if (!deliver_exact)
                        dev_core_stats_rx_dropped_inc(skb->dev);
-                       kfree_skb_reason(skb, SKB_DROP_REASON_PTYPE_ABSENT);
-               } else {
+               else
                        dev_core_stats_rx_nohandler_inc(skb->dev);
-                       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. :-)
                 */