[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220517081008.294325-5-imagedong@tencent.com>
Date: Tue, 17 May 2022 16:10:03 +0800
From: menglong8.dong@...il.com
To: edumazet@...gle.com
Cc: rostedt@...dmis.org, mingo@...hat.com, davem@...emloft.net,
yoshfuji@...ux-ipv6.org, dsahern@...nel.org, kuba@...nel.org,
pabeni@...hat.com, imagedong@...cent.com, kafai@...com,
talalahmad@...gle.com, keescook@...omium.org,
dongli.zhang@...cle.com, linux-kernel@...r.kernel.org,
netdev@...r.kernel.org, Jiang Biao <benbjiang@...cent.com>,
Hao Peng <flyingpeng@...cent.com>
Subject: [PATCH net-next v2 4/9] net: inet: add skb drop reason to inet_csk_destroy_sock()
From: Menglong Dong <imagedong@...cent.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@...cent.com>
Reviewed-by: Hao Peng <flyingpeng@...cent.com>
Signed-off-by: Menglong Dong <imagedong@...cent.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
Powered by blists - more mailing lists