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
Subject: [PATCH net-next 3/9] net: sock: introduce sk_stream_kill_queues_reason()
Date: Mon, 16 May 2022 11:45:13 +0800 [thread overview]
Message-ID: <20220516034519.184876-4-imagedong@tencent.com> (raw)
In-Reply-To: <20220516034519.184876-1-imagedong@tencent.com>
From: Menglong Dong <imagedong@tencent.com>
Introduce the function sk_stream_kill_queues_reason() and make the
origin sk_stream_kill_queues() an inline call to it.
Signed-off-by: Menglong Dong <imagedong@tencent.com>
---
include/net/sock.h | 8 +++++++-
net/core/stream.c | 7 ++++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/include/net/sock.h b/include/net/sock.h
index 73063c88a249..085838ce70d5 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1128,12 +1128,18 @@ int sk_stream_wait_connect(struct sock *sk, long *timeo_p);
int sk_stream_wait_memory(struct sock *sk, long *timeo_p);
void sk_stream_wait_close(struct sock *sk, long timeo_p);
int sk_stream_error(struct sock *sk, int flags, int err);
-void sk_stream_kill_queues(struct sock *sk);
+void sk_stream_kill_queues_reason(struct sock *sk,
+ enum skb_drop_reason reason);
void sk_set_memalloc(struct sock *sk);
void sk_clear_memalloc(struct sock *sk);
void __sk_flush_backlog(struct sock *sk);
+static inline void sk_stream_kill_queues(struct sock *sk)
+{
+ sk_stream_kill_queues_reason(sk, SKB_DROP_REASON_NOT_SPECIFIED);
+}
+
static inline bool sk_flush_backlog(struct sock *sk)
{
if (unlikely(READ_ONCE(sk->sk_backlog.tail))) {
diff --git a/net/core/stream.c b/net/core/stream.c
index 06b36c730ce8..a562b23a1a6e 100644
--- a/net/core/stream.c
+++ b/net/core/stream.c
@@ -190,10 +190,11 @@ int sk_stream_error(struct sock *sk, int flags, int err)
}
EXPORT_SYMBOL(sk_stream_error);
-void sk_stream_kill_queues(struct sock *sk)
+void sk_stream_kill_queues_reason(struct sock *sk,
+ enum skb_drop_reason reason)
{
/* First the read buffer. */
- __skb_queue_purge(&sk->sk_receive_queue);
+ __skb_queue_purge_reason(&sk->sk_receive_queue, reason);
/* Next, the write queue. */
WARN_ON(!skb_queue_empty(&sk->sk_write_queue));
@@ -209,4 +210,4 @@ void sk_stream_kill_queues(struct sock *sk)
* have gone away, only the net layer knows can touch it.
*/
}
-EXPORT_SYMBOL(sk_stream_kill_queues);
+EXPORT_SYMBOL(sk_stream_kill_queues_reason);
--
2.36.1
next prev parent reply other threads:[~2022-05-16 3:46 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-16 3:45 [PATCH net-next 0/9] net: tcp: add skb drop reasons to tcp state change menglong8.dong
2022-05-16 3:45 ` [PATCH net-next 1/9] net: skb: introduce __DEFINE_SKB_DROP_REASON() to simply the code menglong8.dong
2022-05-16 3:45 ` [PATCH net-next 2/9] net: skb: introduce __skb_queue_purge_reason() menglong8.dong
2022-05-16 3:45 ` menglong8.dong [this message]
2022-05-16 3:45 ` [PATCH net-next 4/9] net: inet: add skb drop reason to inet_csk_destroy_sock() menglong8.dong
2022-05-16 3:45 ` [PATCH net-next 5/9] net: tcp: make tcp_rcv_synsent_state_process() return drop reasons menglong8.dong
2022-05-16 3:45 ` [PATCH net-next 6/9] net: tcp: make tcp_rcv_state_process() return drop reason menglong8.dong
2022-05-16 3:45 ` [PATCH net-next 7/9] net: tcp: add skb drop reasons to tcp connect requesting menglong8.dong
2022-05-16 6:34 ` kernel test robot
2022-05-16 12:54 ` kernel test robot
2022-05-16 3:45 ` [PATCH net-next 8/9] net: tcp: add skb drop reasons to tcp tw code path menglong8.dong
2022-05-16 4:22 ` Eric Dumazet
2022-05-16 4:54 ` Menglong Dong
2022-05-16 15:30 ` kernel test robot
2022-05-16 3:45 ` [PATCH net-next 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=20220516034519.184876-4-imagedong@tencent.com \
--to=menglong8.dong@gmail.com \
--cc=davem@davemloft.net \
--cc=dongli.zhang@oracle.com \
--cc=dsahern@kernel.org \
--cc=edumazet@google.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).