net: dev: use kfree_skb_reason() for do_xdp_generic()

Replace kfree_skb() used in do_xdp_generic() with kfree_skb_reason().
The drop reason SKB_DROP_REASON_XDP is introduced for this case.

Signed-off-by: Menglong Dong <imagedong@tencent.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 44ecbfff2b6938a6f584051bcdf6394a704eb9be..7a38d0f90cef52fb27b799454298b1cb60475a4e 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -405,6 +405,7 @@ enum skb_drop_reason {
                                         * full (see netdev_max_backlog in
                                         * net.rst) or RPS flow limit
                                         */
+       SKB_DROP_REASON_XDP,            /* dropped by XDP in input path */
        SKB_DROP_REASON_MAX,
 };
 

diff --git a/include/trace/events/skb.h b/include/trace/events/skb.h
index 3bb90ca893ae0d34a7263856aaf27690e0dade37..8c4c343c830f0315e96a459f278253e913d46389 100644 (file)
--- a/include/trace/events/skb.h
+++ b/include/trace/events/skb.h
@@ -48,6 +48,7 @@
        EM(SKB_DROP_REASON_TC_EGRESS, TC_EGRESS)                \
        EM(SKB_DROP_REASON_QDISC_DROP, QDISC_DROP)              \
        EM(SKB_DROP_REASON_CPU_BACKLOG, CPU_BACKLOG)            \
+       EM(SKB_DROP_REASON_XDP, XDP)                            \
        EMe(SKB_DROP_REASON_MAX, MAX)
 
 #undef EM

diff --git a/net/core/dev.c b/net/core/dev.c
index 460ac941a63188160f820f43b50cc5ad8aa2457d..f449834a63df05d9d9c305529568c9af308f097e 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4825,7 +4825,7 @@ int do_xdp_generic(struct bpf_prog *xdp_prog, struct sk_buff *skb)
        }
        return XDP_PASS;
 out_redir:
-       kfree_skb(skb);
+       kfree_skb_reason(skb, SKB_DROP_REASON_XDP);
        return XDP_DROP;
 }
 EXPORT_SYMBOL_GPL(do_xdp_generic);