* [PATCH net v5 1/2] net: mptcp: factor out __mptcp_close() without socket lock
2022-09-11 4:14 [PATCH net v5 0/2] net: mptcp: fix unreleased socket in accept queue menglong8.dong
@ 2022-09-11 4:14 ` menglong8.dong
2022-09-11 4:14 ` [PATCH net v5 2/2] net: mptcp: fix unreleased socket in accept queue menglong8.dong
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: menglong8.dong @ 2022-09-11 4:14 UTC (permalink / raw)
To: pabeni; +Cc: mptcp, Menglong Dong, Jiang Biao, Mengen Sun
From: Menglong Dong <imagedong@tencent.com>
Factor out __mptcp_close() from mptcp_close(). The caller of
__mptcp_close() should hold the socket lock, and cancel mptcp work when
__mptcp_close() return true.
This function will be used in the next commit.
Reviewed-by: Jiang Biao <benbjiang@tencent.com>
Reviewed-by: Mengen Sun <mengensun@tencent.com>
Signed-off-by: Menglong Dong <imagedong@tencent.com>
---
v5:
- keep sock_hold() in __mptcp_close()
- rename cancel_work to do_cancel_work
---
net/mptcp/protocol.c | 14 ++++++++++++--
net/mptcp/protocol.h | 1 +
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index d398f3810662..06bb43455c62 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -2796,13 +2796,12 @@ static void __mptcp_destroy_sock(struct sock *sk)
sock_put(sk);
}
-static void mptcp_close(struct sock *sk, long timeout)
+bool __mptcp_close(struct sock *sk, long timeout)
{
struct mptcp_subflow_context *subflow;
struct mptcp_sock *msk = mptcp_sk(sk);
bool do_cancel_work = false;
- lock_sock(sk);
sk->sk_shutdown = SHUTDOWN_MASK;
if ((1 << sk->sk_state) & (TCPF_LISTEN | TCPF_CLOSE)) {
@@ -2844,6 +2843,17 @@ static void mptcp_close(struct sock *sk, long timeout)
} else {
mptcp_reset_timeout(msk, 0);
}
+
+ return do_cancel_work;
+}
+
+static void mptcp_close(struct sock *sk, long timeout)
+{
+ bool do_cancel_work;
+
+ lock_sock(sk);
+
+ do_cancel_work = __mptcp_close(sk, timeout);
release_sock(sk);
if (do_cancel_work)
mptcp_cancel_work(sk);
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 132d50833df1..8f123d450c76 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -612,6 +612,7 @@ void mptcp_subflow_reset(struct sock *ssk);
void mptcp_subflow_queue_clean(struct sock *ssk);
void mptcp_sock_graft(struct sock *sk, struct socket *parent);
struct socket *__mptcp_nmpc_socket(const struct mptcp_sock *msk);
+bool __mptcp_close(struct sock *sk, long timeout);
bool mptcp_addresses_equal(const struct mptcp_addr_info *a,
const struct mptcp_addr_info *b, bool use_port);
--
2.37.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH net v5 2/2] net: mptcp: fix unreleased socket in accept queue
2022-09-11 4:14 [PATCH net v5 0/2] net: mptcp: fix unreleased socket in accept queue menglong8.dong
2022-09-11 4:14 ` [PATCH net v5 1/2] net: mptcp: factor out __mptcp_close() without socket lock menglong8.dong
@ 2022-09-11 4:14 ` menglong8.dong
2022-09-19 14:17 ` [PATCH net v5 0/2] " Paolo Abeni
2022-09-19 15:14 ` Matthieu Baerts
3 siblings, 0 replies; 5+ messages in thread
From: menglong8.dong @ 2022-09-11 4:14 UTC (permalink / raw)
To: pabeni; +Cc: mptcp, Menglong Dong, Jiang Biao, Mengen Sun
From: Menglong Dong <imagedong@tencent.com>
The mptcp socket and its subflow sockets in accept queue can't be
released after the process exit.
While the release of a mptcp socket in listening state, the
corresponding tcp socket will be released too. Meanwhile, the tcp
socket in the unaccept queue will be released too. However, only init
subflow is in the unaccept queue, and the joined subflow is not in the
unaccept queue, which makes the joined subflow won't be released, and
therefore the corresponding unaccepted mptcp socket will not be released
to.
This can be reproduced easily with following steps:
1. create 2 namespace and veth:
$ ip netns add mptcp-client
$ ip netns add mptcp-server
$ sysctl -w net.ipv4.conf.all.rp_filter=0
$ ip netns exec mptcp-client sysctl -w net.mptcp.enabled=1
$ ip netns exec mptcp-server sysctl -w net.mptcp.enabled=1
$ ip link add red-client netns mptcp-client type veth peer red-server \
netns mptcp-server
$ ip -n mptcp-server address add 10.0.0.1/24 dev red-server
$ ip -n mptcp-server address add 192.168.0.1/24 dev red-server
$ ip -n mptcp-client address add 10.0.0.2/24 dev red-client
$ ip -n mptcp-client address add 192.168.0.2/24 dev red-client
$ ip -n mptcp-server link set red-server up
$ ip -n mptcp-client link set red-client up
2. configure the endpoint and limit for client and server:
$ ip -n mptcp-server mptcp endpoint flush
$ ip -n mptcp-server mptcp limits set subflow 2 add_addr_accepted 2
$ ip -n mptcp-client mptcp endpoint flush
$ ip -n mptcp-client mptcp limits set subflow 2 add_addr_accepted 2
$ ip -n mptcp-client mptcp endpoint add 192.168.0.2 dev red-client id \
1 subflow
3. listen and accept on a port, such as 9999. The nc command we used
here is modified, which makes it use mptcp protocol by default.
$ ip netns exec mptcp-server nc -l -k -p 9999
4. open another *two* terminal and use each of them to connect to the
server with the following command:
$ ip netns exec mptcp-client nc 10.0.0.1 9999
Input something after connect to triger the connection of the second
subflow. So that there are two established mptcp connections, with the
second one still unaccepted.
5. exit all the nc command, and check the tcp socket in server namespace.
And you will find that there is one tcp socket in CLOSE_WAIT state
and can't release forever.
Fix this by closing all of the unaccepted mptcp socket in
mptcp_subflow_queue_clean() with __mptcp_close().
Now, we can ensure that all unaccepted mptcp sockets will be cleaned by
__mptcp_close() before they are released, so mptcp_sock_destruct(), which
is used to clean the unaccepted mptcp socket, is not needed anymore.
The selftests for mptcp is ran for this commit, and no new failures.
Fixes: f296234c98a8 ("mptcp: Add handling of incoming MP_JOIN requests")
Reviewed-by: Jiang Biao <benbjiang@tencent.com>
Reviewed-by: Mengen Sun <mengensun@tencent.com>
Signed-off-by: Menglong Dong <imagedong@tencent.com>
---
v5:
- don't make mptcp_cancel_work() inline
v4:
- factor-out __mptcp_close() and use it in this commit.
v3:
- remove mptcp_close_nolock() and call mptcp_close() directly in
mptcp_subflow_queue_clean(), as mptcp_close_nolock() will cause
dead lock.
v2:
- remove mptcp_sock_destruct()
- introduce mptcp_close_nolock() and replace mptcp_close() with it in
mptcp_subflow_queue_clean()
---
net/mptcp/protocol.c | 2 +-
net/mptcp/protocol.h | 1 +
net/mptcp/subflow.c | 33 +++++++--------------------------
3 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 06bb43455c62..45ed50e9aec9 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -2656,7 +2656,7 @@ static void __mptcp_clear_xmit(struct sock *sk)
dfrag_clear(sk, dfrag);
}
-static void mptcp_cancel_work(struct sock *sk)
+void mptcp_cancel_work(struct sock *sk)
{
struct mptcp_sock *msk = mptcp_sk(sk);
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 8f123d450c76..8f372b8f059c 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -613,6 +613,7 @@ void mptcp_subflow_queue_clean(struct sock *ssk);
void mptcp_sock_graft(struct sock *sk, struct socket *parent);
struct socket *__mptcp_nmpc_socket(const struct mptcp_sock *msk);
bool __mptcp_close(struct sock *sk, long timeout);
+void mptcp_cancel_work(struct sock *sk);
bool mptcp_addresses_equal(const struct mptcp_addr_info *a,
const struct mptcp_addr_info *b, bool use_port);
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index c7d49fb6e7bd..07dd23d0fe04 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -602,30 +602,6 @@ static bool subflow_hmac_valid(const struct request_sock *req,
return !crypto_memneq(hmac, mp_opt->hmac, MPTCPOPT_HMAC_LEN);
}
-static void mptcp_sock_destruct(struct sock *sk)
-{
- /* if new mptcp socket isn't accepted, it is free'd
- * from the tcp listener sockets request queue, linked
- * from req->sk. The tcp socket is released.
- * This calls the ULP release function which will
- * also remove the mptcp socket, via
- * sock_put(ctx->conn).
- *
- * Problem is that the mptcp socket will be in
- * ESTABLISHED state and will not have the SOCK_DEAD flag.
- * Both result in warnings from inet_sock_destruct.
- */
- if ((1 << sk->sk_state) & (TCPF_ESTABLISHED | TCPF_CLOSE_WAIT)) {
- sk->sk_state = TCP_CLOSE;
- WARN_ON_ONCE(sk->sk_socket);
- sock_orphan(sk);
- }
-
- /* We don't need to clear msk->subflow, as it's still NULL at this point */
- mptcp_destroy_common(mptcp_sk(sk), 0);
- inet_sock_destruct(sk);
-}
-
static void mptcp_force_close(struct sock *sk)
{
/* the msk is not yet exposed to user-space */
@@ -768,7 +744,6 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,
/* new mpc subflow takes ownership of the newly
* created mptcp socket
*/
- new_msk->sk_destruct = mptcp_sock_destruct;
mptcp_sk(new_msk)->setsockopt_seq = ctx->setsockopt_seq;
mptcp_pm_new_connection(mptcp_sk(new_msk), child, 1);
mptcp_token_accept(subflow_req, mptcp_sk(new_msk));
@@ -1763,13 +1738,19 @@ void mptcp_subflow_queue_clean(struct sock *listener_ssk)
for (msk = head; msk; msk = next) {
struct sock *sk = (struct sock *)msk;
- bool slow;
+ bool slow, do_cancel_work;
+ sock_hold(sk);
slow = lock_sock_fast_nested(sk);
next = msk->dl_next;
msk->first = NULL;
msk->dl_next = NULL;
+
+ do_cancel_work = __mptcp_close(sk, 0);
unlock_sock_fast(sk, slow);
+ if (do_cancel_work)
+ mptcp_cancel_work(sk);
+ sock_put(sk);
}
/* we are still under the listener msk socket lock */
--
2.37.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH net v5 0/2] net: mptcp: fix unreleased socket in accept queue
2022-09-11 4:14 [PATCH net v5 0/2] net: mptcp: fix unreleased socket in accept queue menglong8.dong
2022-09-11 4:14 ` [PATCH net v5 1/2] net: mptcp: factor out __mptcp_close() without socket lock menglong8.dong
2022-09-11 4:14 ` [PATCH net v5 2/2] net: mptcp: fix unreleased socket in accept queue menglong8.dong
@ 2022-09-19 14:17 ` Paolo Abeni
2022-09-19 15:14 ` Matthieu Baerts
3 siblings, 0 replies; 5+ messages in thread
From: Paolo Abeni @ 2022-09-19 14:17 UTC (permalink / raw)
To: menglong8.dong; +Cc: mptcp, Menglong Dong
On Sun, 2022-09-11 at 12:14 +0800, menglong8.dong@gmail.com wrote:
> From: Menglong Dong <imagedong@tencent.com>
>
> The mptcp socket and its subflow sockets in accept queue can't be
> released after the process exit.
>
> While the release of a mptcp socket in listening state, the
> corresponding tcp socket will be released too. Meanwhile, the tcp
> socket in the unaccept queue will be released too. However, only init
> subflow is in the unaccept queue, and the joined subflow is not in the
> unaccept queue, which makes the joined subflow won't be released, and
> therefore the corresponding unaccepted mptcp socket will not be released
> to.
>
> In the 1th patch, we factor-out __mptcp_close() which should run under
> socket lock.
>
> And in the 2th patch, we fix the problem we mentioned above by closing
> all of the unaccepted mptcp socket in mptcp_subflow_queue_clean()
> with __mptcp_close().
>
> Changes since v4:
> - keep sock_hold() in __mptcp_close() in the 1th patch
> - rename cancel_work to do_cancel_work in the 1th patch
> - don't make mptcp_cancel_work() inline in the 2th patch
>
> Changes since v3:
> - factor out __mptcp_close() and replace mptcp_close() with it in
> mptcp_subflow_queue_clean()
>
> Menglong Dong (2):
> net: mptcp: factor out __mptcp_close() without socket lock
> net: mptcp: fix unreleased socket in accept queue
>
> net/mptcp/protocol.c | 16 +++++++++++++---
> net/mptcp/protocol.h | 2 ++
> net/mptcp/subflow.c | 33 +++++++--------------------------
> 3 files changed, 22 insertions(+), 29 deletions(-)
I think this is now even a nice cleanup, beyond a relevant bug-fix,
thanks!
For the series:
Acked-by: Paolo Abeni <pabeni@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net v5 0/2] net: mptcp: fix unreleased socket in accept queue
2022-09-11 4:14 [PATCH net v5 0/2] net: mptcp: fix unreleased socket in accept queue menglong8.dong
` (2 preceding siblings ...)
2022-09-19 14:17 ` [PATCH net v5 0/2] " Paolo Abeni
@ 2022-09-19 15:14 ` Matthieu Baerts
3 siblings, 0 replies; 5+ messages in thread
From: Matthieu Baerts @ 2022-09-19 15:14 UTC (permalink / raw)
To: menglong8.dong, pabeni; +Cc: mptcp, Menglong Dong
Hi Menglong, Paolo,
On 11/09/2022 06:14, menglong8.dong@gmail.com wrote:
> From: Menglong Dong <imagedong@tencent.com>
>
> The mptcp socket and its subflow sockets in accept queue can't be
> released after the process exit.
>
> While the release of a mptcp socket in listening state, the
> corresponding tcp socket will be released too. Meanwhile, the tcp
> socket in the unaccept queue will be released too. However, only init
> subflow is in the unaccept queue, and the joined subflow is not in the
> unaccept queue, which makes the joined subflow won't be released, and
> therefore the corresponding unaccepted mptcp socket will not be released
> to.
>
> In the 1th patch, we factor-out __mptcp_close() which should run under
> socket lock.
>
> And in the 2th patch, we fix the problem we mentioned above by closing
> all of the unaccepted mptcp socket in mptcp_subflow_queue_clean()
> with __mptcp_close().
Thank you for the patches and the reviews!
This series is now in our tree (fix for -net) with Paolo's ACK and
without one typo found by "checkpatch.pl --codespell" and 'net:' prefix
has been strip from the commit titles ('mptcp:' is enough)
New patches for t/upstream-net:
- 8c21b4904d34: mptcp: factor out __mptcp_close() without socket lock
- f00ac22032b8: mptcp: fix unreleased socket in accept queue
- Results: 69b3bebab7a6..2882a52515ba (export-net)
New patches for t/upstream:
- 8c21b4904d34: mptcp: factor out __mptcp_close() without socket lock
- f00ac22032b8: mptcp: fix unreleased socket in accept queue
- Results: 6cd726fd86f8..6c59a4b0aee6 (export)
Tests are now in progress:
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export-net/20220919T151225
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220919T151225
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
^ permalink raw reply [flat|nested] 5+ messages in thread