From: Jason Xing <kerneljasonxing@gmail•com>
To: davem@davemloft•net, edumazet@google•com, kuba@kernel•org,
pabeni@redhat•com, rostedt@goodmis•org, mhiramat@kernel•org,
mathieu.desnoyers@efficios•com, dsahern@kernel•org,
matttbe@kernel•org, martineau@kernel•org, geliang@kernel•org
Cc: mptcp@lists•linux.dev, linux-trace-kernel@vger•kernel.org,
netdev@vger•kernel.org, kerneljasonxing@gmail•com,
Jason Xing <kernelxing@tencent•com>
Subject: [PATCH net-next v3 5/6] mptcp: support rstreason for passive reset
Date: Tue, 9 Apr 2024 18:09:33 +0800 [thread overview]
Message-ID: <20240409100934.37725-6-kerneljasonxing@gmail.com> (raw)
In-Reply-To: <20240409100934.37725-1-kerneljasonxing@gmail.com>
From: Jason Xing <kernelxing@tencent•com>
It relys on what reset options in the skb are as rfc8684 says. Reusing
this logic can save us much energy. This patch replaces most of the prior
NOT_SPECIFIED reasons.
Signed-off-by: Jason Xing <kernelxing@tencent•com>
---
net/mptcp/subflow.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index ba0a252c113f..4f2be72d5b02 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -308,8 +308,11 @@ static struct dst_entry *subflow_v4_route_req(const struct sock *sk,
return dst;
dst_release(dst);
- if (!req->syncookie)
- tcp_request_sock_ops.send_reset(sk, skb, SK_RST_REASON_NOT_SPECIFIED);
+ if (!req->syncookie) {
+ struct mptcp_ext *mpext = mptcp_get_ext(skb);
+
+ tcp_request_sock_ops.send_reset(sk, skb, mpext->reset_reason);
+ }
return NULL;
}
@@ -375,8 +378,11 @@ static struct dst_entry *subflow_v6_route_req(const struct sock *sk,
return dst;
dst_release(dst);
- if (!req->syncookie)
- tcp6_request_sock_ops.send_reset(sk, skb, SK_RST_REASON_NOT_SPECIFIED);
+ if (!req->syncookie) {
+ struct mptcp_ext *mpext = mptcp_get_ext(skb);
+
+ tcp6_request_sock_ops.send_reset(sk, skb, mpext->reset_reason);
+ }
return NULL;
}
#endif
@@ -783,6 +789,7 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,
bool fallback, fallback_is_fatal;
struct mptcp_sock *owner;
struct sock *child;
+ int reason;
pr_debug("listener=%p, req=%p, conn=%p", listener, req, listener->conn);
@@ -911,7 +918,8 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,
tcp_rsk(req)->drop_req = true;
inet_csk_prepare_for_destroy_sock(child);
tcp_done(child);
- req->rsk_ops->send_reset(sk, skb, SK_RST_REASON_NOT_SPECIFIED);
+ reason = mptcp_get_ext(skb)->reset_reason;
+ req->rsk_ops->send_reset(sk, skb, convert_mptcp_reason(reason));
/* The last child reference will be released by the caller */
return child;
--
2.37.3
next prev parent reply other threads:[~2024-04-09 10:10 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-09 10:09 [PATCH net-next v3 0/6] Implement reset reason mechanism to detect Jason Xing
2024-04-09 10:09 ` [PATCH net-next v3 1/6] net: introduce rstreason to detect why the RST is sent Jason Xing
2024-04-09 10:09 ` [PATCH net-next v3 2/6] rstreason: prepare for passive reset Jason Xing
2024-04-10 12:14 ` Antoine Tenart
2024-04-10 12:54 ` Jason Xing
2024-04-10 13:21 ` Antoine Tenart
2024-04-10 13:55 ` Jason Xing
2024-04-09 10:09 ` [PATCH net-next v3 3/6] rstreason: prepare for active reset Jason Xing
2024-04-09 10:09 ` [PATCH net-next v3 4/6] tcp: support rstreason for passive reset Jason Xing
2024-04-09 10:09 ` Jason Xing [this message]
2024-04-09 10:09 ` [PATCH net-next v3 6/6] rstreason: make it work in trace world Jason Xing
2024-04-09 15:38 ` Steven Rostedt
2024-04-09 16:09 ` Jason Xing
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=20240409100934.37725-6-kerneljasonxing@gmail.com \
--to=kerneljasonxing@gmail$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=dsahern@kernel$(echo .)org \
--cc=edumazet@google$(echo .)com \
--cc=geliang@kernel$(echo .)org \
--cc=kernelxing@tencent$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=linux-trace-kernel@vger$(echo .)kernel.org \
--cc=martineau@kernel$(echo .)org \
--cc=mathieu.desnoyers@efficios$(echo .)com \
--cc=matttbe@kernel$(echo .)org \
--cc=mhiramat@kernel$(echo .)org \
--cc=mptcp@lists$(echo .)linux.dev \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=rostedt@goodmis$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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