From: menglong8.dong@gmail.com
To: edumazet@google.com
Cc: rostedt@goodmis.org, mingo@redhat.com, davem@davemloft.net,
yoshfuji@linux-ipv6.org, dsahern@kernel.org, kuba@kernel.org,
pabeni@redhat.com, imagedong@tencent.com, kafai@fb.com,
talalahmad@google.com, keescook@chromium.org,
dongli.zhang@oracle.com, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org, Jiang Biao <benbjiang@tencent.com>,
Hao Peng <flyingpeng@tencent.com>
Subject: [PATCH net-next v2 4/9] net: inet: add skb drop reason to inet_csk_destroy_sock()
Date: Tue, 17 May 2022 16:10:03 +0800 [thread overview]
Message-ID: <20220517081008.294325-5-imagedong@tencent.com> (raw)
In-Reply-To: <20220517081008.294325-1-imagedong@tencent.com>
From: Menglong Dong <imagedong@tencent.com>
skb dropping in inet_csk_destroy_sock() seems to be a common case. Add
the new drop reason 'SKB_DROP_REASON_SOCKET_DESTROIED' and apply it to
inet_csk_destroy_sock() to stop confusing users with 'NOT_SPECIFIED'.
Reviewed-by: Jiang Biao <benbjiang@tencent.com>
Reviewed-by: Hao Peng <flyingpeng@tencent.com>
Signed-off-by: Menglong Dong <imagedong@tencent.com>
---
include/linux/skbuff.h | 5 +++++
net/ipv4/inet_connection_sock.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index e9659a63961a..3c7b1e9aabbb 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -548,6 +548,10 @@ struct sk_buff;
*
* SKB_DROP_REASON_PKT_TOO_BIG
* packet size is too big (maybe exceed the MTU)
+ *
+ * SKB_DROP_REASON_SOCKET_DESTROYED
+ * socket is destroyed and the skb in its receive or send queue
+ * are all dropped
*/
#define __DEFINE_SKB_DROP_REASON(FN) \
FN(NOT_SPECIFIED) \
@@ -614,6 +618,7 @@ struct sk_buff;
FN(IP_INADDRERRORS) \
FN(IP_INNOROUTES) \
FN(PKT_TOO_BIG) \
+ FN(SOCKET_DESTROYED) \
FN(MAX)
/* The reason of skb drop, which is used in kfree_skb_reason().
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 1e5b53c2bb26..6775cc8c42e1 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -1006,7 +1006,7 @@ void inet_csk_destroy_sock(struct sock *sk)
sk->sk_prot->destroy(sk);
- sk_stream_kill_queues(sk);
+ sk_stream_kill_queues_reason(sk, SKB_DROP_REASON_SOCKET_DESTROYED);
xfrm_sk_free_policy(sk);
--
2.36.1
next prev parent reply other threads:[~2022-05-17 8:13 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-17 8:09 [PATCH net-next v2 0/9] net: tcp: add skb drop reasons to tcp state change menglong8.dong
2022-05-17 8:10 ` [PATCH net-next v2 1/9] net: skb: introduce __DEFINE_SKB_DROP_REASON() to simply the code menglong8.dong
2022-05-18 1:14 ` Jakub Kicinski
2022-05-18 2:15 ` Menglong Dong
2022-05-17 8:10 ` [PATCH net-next v2 2/9] net: skb: introduce __skb_queue_purge_reason() menglong8.dong
2022-05-17 8:10 ` [PATCH net-next v2 3/9] net: sock: introduce sk_stream_kill_queues_reason() menglong8.dong
2022-05-17 8:10 ` menglong8.dong [this message]
2022-05-17 8:10 ` [PATCH net-next v2 5/9] net: tcp: make tcp_rcv_synsent_state_process() return drop reasons menglong8.dong
2022-05-17 8:10 ` [PATCH net-next v2 6/9] net: tcp: make tcp_rcv_state_process() return drop reason menglong8.dong
2022-05-17 8:10 ` [PATCH net-next v2 7/9] net: tcp: add skb drop reasons to tcp connect requesting menglong8.dong
2022-05-17 8:10 ` [PATCH net-next v2 8/9] net: tcp: add skb drop reasons to tcp tw code path menglong8.dong
2022-05-17 8:10 ` [PATCH net-next v2 9/9] net: tcp: add skb drop reasons to route_req() menglong8.dong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220517081008.294325-5-imagedong@tencent.com \
--to=menglong8.dong@gmail.com \
--cc=benbjiang@tencent.com \
--cc=davem@davemloft.net \
--cc=dongli.zhang@oracle.com \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=flyingpeng@tencent.com \
--cc=imagedong@tencent.com \
--cc=kafai@fb.com \
--cc=keescook@chromium.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=rostedt@goodmis.org \
--cc=talalahmad@google.com \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).