From nobody Wed Jul 1 03:09:28 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E61F0C433F5 for ; Tue, 4 Jan 2022 03:22:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232570AbiADDWA (ORCPT ); Mon, 3 Jan 2022 22:22:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232531AbiADDV7 (ORCPT ); Mon, 3 Jan 2022 22:21:59 -0500 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A755C061761; Mon, 3 Jan 2022 19:21:59 -0800 (PST) Received: by mail-pg1-x541.google.com with SMTP id i8so23046822pgt.13; Mon, 03 Jan 2022 19:21:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EKEoNk476cBIT7AG/KhWAKjNPo3TYusHnC8cRKGFm7k=; b=HGmt9kgysIRCJ3PAnqZSI+ipZa7eD3cvIv9piNiAi5OrirnM8d8xtSP0jFafMGmEpw WG/DQQNvhvIEl1tscfk0+nw1ywnp7fM1XgGWZqjFnlxh3Jgq0AjsWeBuTC6KAI+vVnuk 6JfdbRXqlEAan4EjcPmy4IPqqszxoNNRqSzd0yp+2V18o0TxvV0NHkZjbrESJtwTE36y pJr9IEg3LAY8VsBm5SjpeG9+idX3C/fPOlT3d5a3B7LEwyYCi1dlQd6KQdDmDwT+Ulsz PB2BOWGNVFNgxGdbuIi/GU7d3rbmMjV+GOiNZB7ypdhYsODUFzX6EvxWoBPA15e9i6CX yYIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EKEoNk476cBIT7AG/KhWAKjNPo3TYusHnC8cRKGFm7k=; b=MYA2PjYCDb4Rx0/QdDe5mECEaIKGDi782kl6P0EC18qGV9m8gH+180GQQ5AoVOHBD7 078RUoUBTHinYxTU4RCMc+XPNY3Prz1JVk6TGcWu5FAT1aqVAPspL38qbZ1hZe7V9ZkS eeow/T7ek3jp2TWX36KlNkuTSp4sxZj99t54LVY8oppPmVxeazrBLU5i7ADOJpSVX6Bs FtNHK3SjmDTBw5Q/ZmBPqoNgQOi9ewuAM3i/KGqWiZXLWYtVgMxZM0xVtoE5RFGxuWe7 bGdL2K6f2wXJ6mCX7uxHKeC0Zz6euzA7rPKcfIL5Ou0ff3FpJc/mbfEEoVgkRTuJ2oCp k1rA== X-Gm-Message-State: AOAM531uIcLEKfwylbt0FIAPtAz5Wlj6wFa0wqLKJcuTlERZKqpEownb f3X6Fp/d4guiFmnJsSptQp0= X-Google-Smtp-Source: ABdhPJwvbwiw1agB8MxRMtHKf3tIHFHmyxzstImUv3zJB5FUo8eGGiU2RG6e9xaUXFTSfrtYE70vog== X-Received: by 2002:a63:7116:: with SMTP id m22mr42227056pgc.348.1641266518939; Mon, 03 Jan 2022 19:21:58 -0800 (PST) Received: from localhost.localdomain ([43.132.141.8]) by smtp.gmail.com with ESMTPSA id y3sm36029078pju.37.2022.01.03.19.21.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 19:21:58 -0800 (PST) From: menglong8.dong@gmail.com X-Google-Original-From: imagedong@tencent.com To: rostedt@goodmis.org, kuba@kernel.org, dsahern@kernel.org Cc: mingo@redhat.com, davem@davemloft.net, nhorman@tuxdriver.com, edumazet@google.com, yoshfuji@linux-ipv6.org, jonathan.lemon@gmail.com, alobakin@pm.me, keescook@chromium.org, cong.wang@bytedance.com, talalahmad@google.com, haokexin@gmail.com, imagedong@tencent.com, atenart@kernel.org, bigeasy@linutronix.de, weiwan@google.com, arnd@arndb.de, pabeni@redhat.com, vvs@virtuozzo.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, mengensun@tencent.com, mungerjiang@tencent.com Subject: [PATCH v3 net-next 1/3] net: skb: introduce kfree_skb_reason() Date: Tue, 4 Jan 2022 11:21:32 +0800 Message-Id: <20220104032134.1239096-2-imagedong@tencent.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220104032134.1239096-1-imagedong@tencent.com> References: <20220104032134.1239096-1-imagedong@tencent.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Menglong Dong Introduce the interface kfree_skb_reason(), which is able to pass the reason why the skb is dropped to 'kfree_skb' tracepoint. Add the 'reason' field to 'trace_kfree_skb', therefor user can get more detail information about abnormal skb with 'drop_monitor' or eBPF. Signed-off-by: Menglong Dong --- v3: - rename kfree_skb_with_reason() to kfree_skb_reason() - turn kfree_skb() into a static inline calling kfree_skb_reason() --- include/linux/skbuff.h | 23 ++++++++++++++++++++++- include/trace/events/skb.h | 35 ++++++++++++++++++++++++++++------- net/core/dev.c | 3 ++- net/core/drop_monitor.c | 10 +++++++--- net/core/skbuff.c | 12 +++++++----- 5 files changed, 66 insertions(+), 17 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 642acb0d1646..ef0870abc791 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -305,6 +305,17 @@ struct sk_buff_head { =20 struct sk_buff; =20 +/* The reason of skb drop, which is used in kfree_skb_reason(). + * en...maybe they should be splited by group? + * + * Each item here should also be in 'TRACE_SKB_DROP_REASON', which is + * used to translate the reason to string. + */ +enum skb_drop_reason { + SKB_DROP_REASON_NOT_SPECIFIED, + SKB_DROP_REASON_MAX, +}; + /* To allow 64K frame to be packed as single skb without frag_list we * require 64K/PAGE_SIZE pages plus 1 additional page to allow for * buffers which do not start on a page boundary. @@ -1085,8 +1096,18 @@ static inline bool skb_unref(struct sk_buff *skb) return true; } =20 +void kfree_skb_reason(struct sk_buff *skb, enum skb_drop_reason reason); + +/** + * kfree_skb - free an sk_buff with 'NOT_SPECIFIED' reason + * @skb: buffer to free + */ +static inline void kfree_skb(struct sk_buff *skb) +{ + kfree_skb_reason(skb, SKB_DROP_REASON_NOT_SPECIFIED); +} + void skb_release_head_state(struct sk_buff *skb); -void kfree_skb(struct sk_buff *skb); void kfree_skb_list(struct sk_buff *segs); void skb_dump(const char *level, const struct sk_buff *skb, bool full_pkt); void skb_tx_error(struct sk_buff *skb); diff --git a/include/trace/events/skb.h b/include/trace/events/skb.h index 9e92f22eb086..b5ef652e5a93 100644 --- a/include/trace/events/skb.h +++ b/include/trace/events/skb.h @@ -9,29 +9,50 @@ #include #include =20 +#define TRACE_SKB_DROP_REASON \ + EM(SKB_DROP_REASON_NOT_SPECIFIED, NOT_SPECIFIED) \ + EMe(SKB_DROP_REASON_MAX, MAX) + +#undef EM +#undef EMe + +#define EM(a, b) TRACE_DEFINE_ENUM(a); +#define EMe(a, b) TRACE_DEFINE_ENUM(a); + +TRACE_SKB_DROP_REASON + +#undef EM +#undef EMe +#define EM(a, b) { a, #b }, +#define EMe(a, b) { a, #b } + /* * Tracepoint for free an sk_buff: */ TRACE_EVENT(kfree_skb, =20 - TP_PROTO(struct sk_buff *skb, void *location), + TP_PROTO(struct sk_buff *skb, void *location, + enum skb_drop_reason reason), =20 - TP_ARGS(skb, location), + TP_ARGS(skb, location, reason), =20 TP_STRUCT__entry( - __field( void *, skbaddr ) - __field( void *, location ) - __field( unsigned short, protocol ) + __field(void *, skbaddr) + __field(void *, location) + __field(unsigned short, protocol) + __field(enum skb_drop_reason, reason) ), =20 TP_fast_assign( __entry->skbaddr =3D skb; __entry->location =3D location; __entry->protocol =3D ntohs(skb->protocol); + __entry->reason =3D reason; ), =20 - TP_printk("skbaddr=3D%p protocol=3D%u location=3D%p", - __entry->skbaddr, __entry->protocol, __entry->location) + TP_printk("skbaddr=3D%p protocol=3D%u location=3D%p reason: %s", + __entry->skbaddr, __entry->protocol, __entry->location, + __print_symbolic(__entry->reason, TRACE_SKB_DROP_REASON)) ); =20 TRACE_EVENT(consume_skb, diff --git a/net/core/dev.c b/net/core/dev.c index 6c8b226b5f2f..70a6aca1dabf 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4899,7 +4899,8 @@ static __latent_entropy void net_tx_action(struct sof= tirq_action *h) if (likely(get_kfree_skb_cb(skb)->reason =3D=3D SKB_REASON_CONSUMED)) trace_consume_skb(skb); else - trace_kfree_skb(skb, net_tx_action); + trace_kfree_skb(skb, net_tx_action, + SKB_DROP_REASON_NOT_SPECIFIED); =20 if (skb->fclone !=3D SKB_FCLONE_UNAVAILABLE) __kfree_skb(skb); diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c index 3d0ab2eec916..7b288a121a41 100644 --- a/net/core/drop_monitor.c +++ b/net/core/drop_monitor.c @@ -110,7 +110,8 @@ static u32 net_dm_queue_len =3D 1000; =20 struct net_dm_alert_ops { void (*kfree_skb_probe)(void *ignore, struct sk_buff *skb, - void *location); + void *location, + enum skb_drop_reason reason); void (*napi_poll_probe)(void *ignore, struct napi_struct *napi, int work, int budget); void (*work_item_func)(struct work_struct *work); @@ -262,7 +263,9 @@ static void trace_drop_common(struct sk_buff *skb, void= *location) spin_unlock_irqrestore(&data->lock, flags); } =20 -static void trace_kfree_skb_hit(void *ignore, struct sk_buff *skb, void *l= ocation) +static void trace_kfree_skb_hit(void *ignore, struct sk_buff *skb, + void *location, + enum skb_drop_reason reason) { trace_drop_common(skb, location); } @@ -490,7 +493,8 @@ static const struct net_dm_alert_ops net_dm_alert_summa= ry_ops =3D { =20 static void net_dm_packet_trace_kfree_skb_hit(void *ignore, struct sk_buff *skb, - void *location) + void *location, + enum skb_drop_reason reason) { ktime_t tstamp =3D ktime_get_real(); struct per_cpu_dm_data *data; diff --git a/net/core/skbuff.c b/net/core/skbuff.c index e514a36bcffc..0118f0afaa4f 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -759,21 +759,23 @@ void __kfree_skb(struct sk_buff *skb) EXPORT_SYMBOL(__kfree_skb); =20 /** - * kfree_skb - free an sk_buff + * kfree_skb_reason - free an sk_buff with special reason * @skb: buffer to free + * @reason: reason why this skb is dropped * * Drop a reference to the buffer and free it if the usage count has - * hit zero. + * hit zero. Meanwhile, pass the drop reason to 'kfree_skb' + * tracepoint. */ -void kfree_skb(struct sk_buff *skb) +void kfree_skb_reason(struct sk_buff *skb, enum skb_drop_reason reason) { if (!skb_unref(skb)) return; =20 - trace_kfree_skb(skb, __builtin_return_address(0)); + trace_kfree_skb(skb, __builtin_return_address(0), reason); __kfree_skb(skb); } -EXPORT_SYMBOL(kfree_skb); +EXPORT_SYMBOL(kfree_skb_reason); =20 void kfree_skb_list(struct sk_buff *segs) { --=20 2.30.2 From nobody Wed Jul 1 03:09:28 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2589CC433F5 for ; Tue, 4 Jan 2022 03:22:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232578AbiADDWJ (ORCPT ); Mon, 3 Jan 2022 22:22:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232531AbiADDWI (ORCPT ); Mon, 3 Jan 2022 22:22:08 -0500 Received: from mail-pj1-x1042.google.com (mail-pj1-x1042.google.com [IPv6:2607:f8b0:4864:20::1042]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EE58C061761; Mon, 3 Jan 2022 19:22:08 -0800 (PST) Received: by mail-pj1-x1042.google.com with SMTP id rj2-20020a17090b3e8200b001b1944bad25so1674248pjb.5; Mon, 03 Jan 2022 19:22:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UcJQ/igXAjjb9zNSIv1UStOkEDIB31SAlch2s5VfL8E=; b=Qfq9fPzqAikJPMoeL04ghgg/cwrUtQ0dqTcFYGDw76nyQoC/wiUcRzTwG6jb2BgNi/ aXlKjFQvFhT5v4A+Yq+SI3FOTkezg396C5EDyaJWafHg9vnRljlD+2gPOATItE0drBwj mmxFf4pZ6J0bUtGNzJR2VcqEn9EF2dXPP7vLviyEwbwWsLXtgKzwC+O92egsTp5uch3H heQxqbZsQJVL5ROtsks4r6eEgsRmo6IrDS2dgzBL/mzItbB0836n3DvIZP5ukg1DLnYP mGur7sUt0JyPCozWouQQNV4rgEI07lZgoRKSx4fUoYeZvuJ7p8ankC2FE8uWZPMO6p9H mTmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UcJQ/igXAjjb9zNSIv1UStOkEDIB31SAlch2s5VfL8E=; b=T+NH36M5BF5JCjtKukSxwx7xtRP1S9fUaDEahAxgrEzPfG+++bug2Ca9XXtUtS05BV YmGWYMFCV/2KNuZEoc4Fkdn29QfS+A7lg/5nzOIz4BRLikhYILTOAkiyhnoQIZ7Px9YB 7s9jerto/pvMJejsJlr8yK5vd3NtjqeBeBnS1sC+7zr/IEOA1HpGBonQHMUcaGEzidkd WIyylURhnwysv7sIGZspDPD7KT4YBhuf7I7yJptRpZD3YJkd/9+4fSgCE+YYwLtzNYkH hp5GgEk4sQsQMPM00f1ogk2joAGr39vMujrYxgE8G0W9PVKdH/rWz6wvfpTGSGpsAe3+ rIcQ== X-Gm-Message-State: AOAM531SdXyJmYcSeleom9xITl3Y50C4HdUaMKy7CL1RQK3WdGGVegsr vm2htyflVUqYpUVrsj76QYc= X-Google-Smtp-Source: ABdhPJyFw6WgFBMvaWruLCuN7FlGalBaeSr8NR4UAN/fK6wn02HVDGXH2VBr2sKSZVa3NVp8nf00bQ== X-Received: by 2002:a17:90a:7785:: with SMTP id v5mr2167539pjk.139.1641266527931; Mon, 03 Jan 2022 19:22:07 -0800 (PST) Received: from localhost.localdomain ([43.132.141.8]) by smtp.gmail.com with ESMTPSA id y3sm36029078pju.37.2022.01.03.19.22.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 19:22:07 -0800 (PST) From: menglong8.dong@gmail.com X-Google-Original-From: imagedong@tencent.com To: rostedt@goodmis.org, kuba@kernel.org, dsahern@kernel.org Cc: mingo@redhat.com, davem@davemloft.net, nhorman@tuxdriver.com, edumazet@google.com, yoshfuji@linux-ipv6.org, jonathan.lemon@gmail.com, alobakin@pm.me, keescook@chromium.org, cong.wang@bytedance.com, talalahmad@google.com, haokexin@gmail.com, imagedong@tencent.com, atenart@kernel.org, bigeasy@linutronix.de, weiwan@google.com, arnd@arndb.de, pabeni@redhat.com, vvs@virtuozzo.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, mengensun@tencent.com, mungerjiang@tencent.com Subject: [PATCH v3 net-next 2/3] net: skb: use kfree_skb_reason() in tcp_v4_rcv() Date: Tue, 4 Jan 2022 11:21:33 +0800 Message-Id: <20220104032134.1239096-3-imagedong@tencent.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220104032134.1239096-1-imagedong@tencent.com> References: <20220104032134.1239096-1-imagedong@tencent.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Menglong Dong Replace kfree_skb() with kfree_skb_reason() in tcp_v4_rcv(). Following drop reasons are added: SKB_DROP_REASON_NO_SOCKET SKB_DROP_REASON_PKT_TOO_SMALL SKB_DROP_REASON_TCP_CSUM SKB_DROP_REASON_TCP_FILTER After this patch, 'kfree_skb' event will print message like this: $ TASK-PID CPU# ||||| TIMESTAMP FUNCTION $ | | | ||||| | | -0 [000] ..s1. 36.113438: kfree_skb: skbaddr=3D(__= __ptrval____) protocol=3D2048 location=3D(____ptrval____) reason: NO_SOCKET The reason of skb drop is printed too. Signed-off-by: Menglong Dong --- v3: - rename kfree_skb_with_reason() to kfree_skb_reason() v2: - rename some reason name as David suggested - add the new reason: SKB_DROP_REASON_TCP_FILTER --- include/linux/skbuff.h | 4 ++++ include/trace/events/skb.h | 4 ++++ net/ipv4/tcp_ipv4.c | 14 +++++++++++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index ef0870abc791..c9c97b0d0fe9 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -313,6 +313,10 @@ struct sk_buff; */ enum skb_drop_reason { SKB_DROP_REASON_NOT_SPECIFIED, + SKB_DROP_REASON_NO_SOCKET, + SKB_DROP_REASON_PKT_TOO_SMALL, + SKB_DROP_REASON_TCP_CSUM, + SKB_DROP_REASON_TCP_FILTER, SKB_DROP_REASON_MAX, }; =20 diff --git a/include/trace/events/skb.h b/include/trace/events/skb.h index b5ef652e5a93..c16febea9f62 100644 --- a/include/trace/events/skb.h +++ b/include/trace/events/skb.h @@ -11,6 +11,10 @@ =20 #define TRACE_SKB_DROP_REASON \ EM(SKB_DROP_REASON_NOT_SPECIFIED, NOT_SPECIFIED) \ + EM(SKB_DROP_REASON_NO_SOCKET, NO_SOCKET) \ + EM(SKB_DROP_REASON_PKT_TOO_SMALL, PKT_TOO_SMALL) \ + EM(SKB_DROP_REASON_TCP_CSUM, TCP_CSUM) \ + EM(SKB_DROP_REASON_TCP_FILTER, TCP_FILTER) \ EMe(SKB_DROP_REASON_MAX, MAX) =20 #undef EM diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index ac10e4cdd8d0..f83efcc6e76e 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -1971,8 +1971,10 @@ int tcp_v4_rcv(struct sk_buff *skb) const struct tcphdr *th; bool refcounted; struct sock *sk; + int drop_reason; int ret; =20 + drop_reason =3D SKB_DROP_REASON_NOT_SPECIFIED; if (skb->pkt_type !=3D PACKET_HOST) goto discard_it; =20 @@ -1984,8 +1986,10 @@ int tcp_v4_rcv(struct sk_buff *skb) =20 th =3D (const struct tcphdr *)skb->data; =20 - if (unlikely(th->doff < sizeof(struct tcphdr) / 4)) + if (unlikely(th->doff < sizeof(struct tcphdr) / 4)) { + drop_reason =3D SKB_DROP_REASON_PKT_TOO_SMALL; goto bad_packet; + } if (!pskb_may_pull(skb, th->doff * 4)) goto discard_it; =20 @@ -2090,8 +2094,10 @@ int tcp_v4_rcv(struct sk_buff *skb) =20 nf_reset_ct(skb); =20 - if (tcp_filter(sk, skb)) + if (tcp_filter(sk, skb)) { + drop_reason =3D SKB_DROP_REASON_TCP_FILTER; goto discard_and_relse; + } th =3D (const struct tcphdr *)skb->data; iph =3D ip_hdr(skb); tcp_v4_fill_cb(skb, iph, th); @@ -2124,6 +2130,7 @@ int tcp_v4_rcv(struct sk_buff *skb) return ret; =20 no_tcp_socket: + drop_reason =3D SKB_DROP_REASON_NO_SOCKET; if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) goto discard_it; =20 @@ -2131,6 +2138,7 @@ int tcp_v4_rcv(struct sk_buff *skb) =20 if (tcp_checksum_complete(skb)) { csum_error: + drop_reason =3D SKB_DROP_REASON_TCP_CSUM; trace_tcp_bad_csum(skb); __TCP_INC_STATS(net, TCP_MIB_CSUMERRORS); bad_packet: @@ -2141,7 +2149,7 @@ int tcp_v4_rcv(struct sk_buff *skb) =20 discard_it: /* Discard frame. */ - kfree_skb(skb); + kfree_skb_reason(skb, drop_reason); return 0; =20 discard_and_relse: --=20 2.30.2 From nobody Wed Jul 1 03:09:28 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35D98C433FE for ; Tue, 4 Jan 2022 03:22:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232600AbiADDWS (ORCPT ); Mon, 3 Jan 2022 22:22:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232596AbiADDWQ (ORCPT ); Mon, 3 Jan 2022 22:22:16 -0500 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76434C061784; Mon, 3 Jan 2022 19:22:16 -0800 (PST) Received: by mail-pg1-x541.google.com with SMTP id 8so31545470pgc.10; Mon, 03 Jan 2022 19:22:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fYXWXYjnKsnVSNERKBA5KzKXAO+7cw8k8EULgzO2jhw=; b=px6Q1Nbdx26hO2PGIWkMzygvJVBF8sgIqKmCx8wulXnYsy+wi9tv8utBdQnP96vyJV NogGPlr4LGvysSsFu+hjI1+Z3ZG+s9OzBOdb+pOd99CoNdKjRBUlziHjfMLbs9TATg8v VeoNxfxCtQDqys2uMSIk8mf71rI5E812fIf/SqkKOBqpwsWxSssKkM95nqB1a+3r9ZnT UYEtaBTbgYVAQhWI8f3+ty0s5bR46/7W+1JN9hllj2syWb7mFZd+WU2rFi3US9vxi8I4 XqpR4gfiFmCnDrS0WlhsPywoVEJ9Zl2YHKWJgg8isGkVEJVvbbd8Qm9CrxpTBu/uhfm0 G/Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fYXWXYjnKsnVSNERKBA5KzKXAO+7cw8k8EULgzO2jhw=; b=pK7bGaI8KqWBgEMBMJ8SvKQ8LXZfh7/wxOmmCZVJtnm80s00xCD7ew4e7sXLTVN5rz zmrge032V4iUVqJSrXGY7pVVyAJsuE//wuKfxtDyn/0bAk+WhpX1SggKhxBdkcTE9+t/ RlkwzveFcIwRH5FFR0s51CGlaQJ7y4CL6cNF6G/JSZ7RLwlpA6mhbRqKV5gX3LKobBYS tjrYtNhe4zqwheCmcqQ+As4qyXVjjx1Ld41SAPNte7jB7BZ8/Qa9MAGuFLPdBS1m/KES 6I2qN14o3KQGJQXraUJ/he3uRwit4ZJDQOXEsWAUWsJplsyuteJOlXS4e6Z5LxIQc395 tQxw== X-Gm-Message-State: AOAM530vW8jKDre0nGC6EmBXcVm8fELY6ipCISgjc2SHIJc2oIoJl4pF 230KCnwBADXADNfQ36VuhR0= X-Google-Smtp-Source: ABdhPJzScOQOxlF12IEi2WeX3mj0J3cFsDgH2ktEouo771/HSX25Qe9kHOH5uLS4t50cp/T6NwGgaA== X-Received: by 2002:a63:5906:: with SMTP id n6mr42358367pgb.586.1641266535755; Mon, 03 Jan 2022 19:22:15 -0800 (PST) Received: from localhost.localdomain ([43.132.141.8]) by smtp.gmail.com with ESMTPSA id y3sm36029078pju.37.2022.01.03.19.22.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 19:22:15 -0800 (PST) From: menglong8.dong@gmail.com X-Google-Original-From: imagedong@tencent.com To: rostedt@goodmis.org, kuba@kernel.org, dsahern@kernel.org Cc: mingo@redhat.com, davem@davemloft.net, nhorman@tuxdriver.com, edumazet@google.com, yoshfuji@linux-ipv6.org, jonathan.lemon@gmail.com, alobakin@pm.me, keescook@chromium.org, cong.wang@bytedance.com, talalahmad@google.com, haokexin@gmail.com, imagedong@tencent.com, atenart@kernel.org, bigeasy@linutronix.de, weiwan@google.com, arnd@arndb.de, pabeni@redhat.com, vvs@virtuozzo.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, mengensun@tencent.com, mungerjiang@tencent.com Subject: [PATCH v3 net-next 3/3] net: skb: use kfree_skb_reason() in __udp4_lib_rcv() Date: Tue, 4 Jan 2022 11:21:34 +0800 Message-Id: <20220104032134.1239096-4-imagedong@tencent.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220104032134.1239096-1-imagedong@tencent.com> References: <20220104032134.1239096-1-imagedong@tencent.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Menglong Dong Replace kfree_skb() with kfree_skb_reason() in __udp4_lib_rcv. New drop reason 'SKB_DROP_REASON_UDP_CSUM' is added for udp csum error. Signed-off-by: Menglong Dong --- v3: - rename kfree_skb_with_reason() to kfree_skb_reason() --- include/linux/skbuff.h | 1 + include/trace/events/skb.h | 1 + net/ipv4/udp.c | 10 ++++++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index c9c97b0d0fe9..af64c7de9b53 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -317,6 +317,7 @@ enum skb_drop_reason { SKB_DROP_REASON_PKT_TOO_SMALL, SKB_DROP_REASON_TCP_CSUM, SKB_DROP_REASON_TCP_FILTER, + SKB_DROP_REASON_UDP_CSUM, SKB_DROP_REASON_MAX, }; =20 diff --git a/include/trace/events/skb.h b/include/trace/events/skb.h index c16febea9f62..75075512ae19 100644 --- a/include/trace/events/skb.h +++ b/include/trace/events/skb.h @@ -15,6 +15,7 @@ EM(SKB_DROP_REASON_PKT_TOO_SMALL, PKT_TOO_SMALL) \ EM(SKB_DROP_REASON_TCP_CSUM, TCP_CSUM) \ EM(SKB_DROP_REASON_TCP_FILTER, TCP_FILTER) \ + EM(SKB_DROP_REASON_UDP_CSUM, UDP_CSUM) \ EMe(SKB_DROP_REASON_MAX, MAX) =20 #undef EM diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 7b18a6f42f18..22f277cbd97c 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -2411,6 +2411,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_ta= ble *udptable, __be32 saddr, daddr; struct net *net =3D dev_net(skb->dev); bool refcounted; + int drop_reason; + + drop_reason =3D SKB_DROP_REASON_NOT_SPECIFIED; =20 /* * Validate the packet. @@ -2466,6 +2469,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_ta= ble *udptable, if (udp_lib_checksum_complete(skb)) goto csum_error; =20 + drop_reason =3D SKB_DROP_REASON_NO_SOCKET; __UDP_INC_STATS(net, UDP_MIB_NOPORTS, proto =3D=3D IPPROTO_UDPLITE); icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); =20 @@ -2473,10 +2477,11 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_= table *udptable, * Hmm. We got an UDP packet to a port to which we * don't wanna listen. Ignore it. */ - kfree_skb(skb); + kfree_skb_reason(skb, drop_reason); return 0; =20 short_packet: + drop_reason =3D SKB_DROP_REASON_PKT_TOO_SMALL; net_dbg_ratelimited("UDP%s: short packet: From %pI4:%u %d/%d to %pI4:%u\n= ", proto =3D=3D IPPROTO_UDPLITE ? "Lite" : "", &saddr, ntohs(uh->source), @@ -2489,6 +2494,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_ta= ble *udptable, * RFC1122: OK. Discards the bad packet silently (as far as * the network is concerned, anyway) as per 4.1.3.4 (MUST). */ + drop_reason =3D SKB_DROP_REASON_UDP_CSUM; net_dbg_ratelimited("UDP%s: bad checksum. From %pI4:%u to %pI4:%u ulen %d= \n", proto =3D=3D IPPROTO_UDPLITE ? "Lite" : "", &saddr, ntohs(uh->source), &daddr, ntohs(uh->dest), @@ -2496,7 +2502,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_ta= ble *udptable, __UDP_INC_STATS(net, UDP_MIB_CSUMERRORS, proto =3D=3D IPPROTO_UDPLITE); drop: __UDP_INC_STATS(net, UDP_MIB_INERRORS, proto =3D=3D IPPROTO_UDPLITE); - kfree_skb(skb); + kfree_skb_reason(skb, drop_reason); return 0; } =20 --=20 2.30.2