From nobody Tue May 5 11:22:28 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B70BB34CFC5; Mon, 20 Apr 2026 16:19:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776701984; cv=none; b=k/9KHNV11n+DhhUSqSxu0SrpvSVYtyNaMqYL4ru1+tRCHGJYmlmcXzuXneks6OxyjZtwS1BxKIY0XkmXRwT6FNfrynaSykkHsw4/Q1CkJopzohXMKjrSYLVAngYgNI7wRwgev9WIID9XkJJgL+XcErzmLSpDRY8TDYI5jGPIWrA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776701984; c=relaxed/simple; bh=aIjr5GMlqc804kQM52NnLjWmxeDXnoOMEN5wsbiICaI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bslWdlZuO5/TsWpf02mYhnDvMwq4yQ+LMaxKqTDMAMeGWMTYJDwi94MXGQJayWZIEpLvw6bzRYsaVxG6y3PLO1qFfwfhqvecvGg4t3wkHQkgr++F6+aTnkd+D42QnxON7smRuzr7h/Wfeth00/HzGthp4otz/sGjahHmeSPAv3s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=V5cVrNUA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="V5cVrNUA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EE6EC2BCB6; Mon, 20 Apr 2026 16:19:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776701984; bh=aIjr5GMlqc804kQM52NnLjWmxeDXnoOMEN5wsbiICaI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=V5cVrNUA/YNKeS9Df3/DDUCk9W21UbO1y/J86hTY5tyhJGk/FhHfNsC+Wnia0ydmD RC+fuvE+SWK3Qwf8FR6HIcxKL1uu23E6s0sMGg5ApdTaw7AcQlIcVjJnAdfN8aeiat o3czxxJrB0TLs/E/bubPq683viVAcWFyDpBJchqqFiaPrb65gMSlnRr7pu9tkPkebW A25XVTAY6yrvbG0HFsJ3JzfFnG0II0we09W3zt7NQSAflADdUX62Wu2oE1ErMjz1pu fi6cFnNTlz8XPt96hbKIcbw64HQEl21ZJGAnqHT9MrTKEA+5Who75kB0Q+IDZaadtH 5x261QwZ3f+0w== From: "Matthieu Baerts (NGI0)" Date: Mon, 20 Apr 2026 18:19:23 +0200 Subject: [PATCH net 1/2] mptcp: sync the msk->sndbuf at accept() time Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260420-net-mptcp-sync-sndbuf-accept-v1-1-e3523e3aeb44@kernel.org> References: <20260420-net-mptcp-sync-sndbuf-accept-v1-0-e3523e3aeb44@kernel.org> In-Reply-To: <20260420-net-mptcp-sync-sndbuf-accept-v1-0-e3523e3aeb44@kernel.org> To: Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org, "Matthieu Baerts (NGI0)" , Gang Yan , stable@vger.kernel.org X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2078; i=matttbe@kernel.org; h=from:subject:message-id; bh=dmvyd/j6d1SRRnYk4UTrxuzw9U/IArcx0BRy1Vd9c94=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDKfBUl9+nHN1SlHTVzWWfH+qjyWm3v5PqjITjd5t7nlz d8oX3u/jlIWBjEuBlkxRRbptsj8mc+reEu8/Cxg5rAygQxh4OIUgImUFjMyrDzIX5V19HKogkj7 3ioz592vdjYHxM/p7jjsLxZ330taipHhSWbVBdudbROqL5sIhcyVcDobu3NehPCmGVssla8JcZT yAAA= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Gang Yan On passive MPTCP connections, the msk sndbuf is not updated correctly. The root cause is an order issue in the accept path: - tcp_check_req() -> subflow_syn_recv_sock() -> mptcp_sk_clone_init() calls __mptcp_propagate_sndbuf() to copy the ssk sndbuf into msk - Later, tcp_child_process() -> tcp_init_transfer() -> tcp_sndbuf_expand() grows the ssk sndbuf. So __mptcp_propagate_sndbuf() runs before the ssk sndbuf has been expanded and the msk ends up with a much smaller sndbuf than the subflow: MPTCP: msk->sndbuf:20480, msk->first->sndbuf:2626560 Fix this by moving the __mptcp_propagate_sndbuf() call from mptcp_sk_clone_init() -- the ssk sndbuf is not yet finalized there -- to __mptcp_propagate_sndbuf() at accept() time, when the ssk sndbuf has been fully expanded by tcp_sndbuf_expand(). Fixes: 8005184fd1ca ("mptcp: refactor sndbuf auto-tuning") Cc: stable@vger.kernel.org Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/602 Signed-off-by: Gang Yan Acked-by: Paolo Abeni Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index fbffd3a43fe8..718e910ff23f 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3594,7 +3594,6 @@ struct sock *mptcp_sk_clone_init(const struct sock *s= k, * uses the correct data */ mptcp_copy_inaddrs(nsk, ssk); - __mptcp_propagate_sndbuf(nsk, ssk); =20 mptcp_rcv_space_init(msk, ssk); msk->rcvq_space.time =3D mptcp_stamp(); @@ -4252,6 +4251,7 @@ static int mptcp_stream_accept(struct socket *sock, s= truct socket *newsock, =20 mptcp_graft_subflows(newsk); mptcp_rps_record_subflows(msk); + __mptcp_propagate_sndbuf(newsk, mptcp_subflow_tcp_sock(subflow)); =20 /* Do late cleanup for the first subflow as necessary. Also * deal with bad peers not doing a complete shutdown. --=20 2.53.0 From nobody Tue May 5 11:22:28 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4912E34DB59; Mon, 20 Apr 2026 16:19:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776701987; cv=none; b=oNCEmqVSAGIWZ7OljN4l7tVVQT/2s6Lf9I/V7xKWE3aefIpiZGXIIZfBHXN+SBpisWqL8fM7HzdifZA11SQUXbl8Z9stq/95ja8uSQb4SJdb670ZFvFuK6A63GklrmW3r2DiF/8eu0+Xpc1sD0dW838zDOkJxuadNP7x6a+QfHM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776701987; c=relaxed/simple; bh=K5hYUkvpx0JvIf4K9J3AgSbV6rLHDnsmtS5j96WoZks=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tjtYFttH1eCnyQl/FEsHhBDrhZY1y7J6Q3QikSO9cTP2F6nyfcn6KIQIgzQANdCPq7xSXbXgsjWBGxJT+Y+zQbbN69ya67ANoez8Sbq48Hs+dIlKYdpiFYLjMBxm3ANH18epCGbCd7CiiINZCkaJZskPswUWFL5vJHq1rLeyWEM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fF9138Jv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fF9138Jv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BBBC1C2BCB4; Mon, 20 Apr 2026 16:19:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776701986; bh=K5hYUkvpx0JvIf4K9J3AgSbV6rLHDnsmtS5j96WoZks=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=fF9138JvlQgjW/+EOzNdAgyhvTukxN1y++UiqAUENJ+Op6nOJFjHBEBLU4zfwvUV9 OhqjrkjMBM8PghKqcz2or1TNGvKewvgaNGb18Zbg33xOnrwcK/w0iwSA+nBU2PD6Rs 234OzaqRJQPgC0/XuMcbThuxa+UtEo+h0HbEBniKkhIIC9bA5hbPbA2YKezFOoNoIS 3H3zBxwD2ve//1MOih3iOgRbyfXi8vaz68y7DF+QJk8Gqz69RisK1TGdRs5iVL2dbK cfJ63b67xvUqn+vPsYSuRr/qdzkYaOb18xCDzXrDjK8wEiKFeggsh39b1Z6fzjfy32 uJpz2m0Lj9leQ== From: "Matthieu Baerts (NGI0)" Date: Mon, 20 Apr 2026 18:19:24 +0200 Subject: [PATCH net 2/2] selftests: mptcp: add a check for sndbuf of S/C Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260420-net-mptcp-sync-sndbuf-accept-v1-2-e3523e3aeb44@kernel.org> References: <20260420-net-mptcp-sync-sndbuf-accept-v1-0-e3523e3aeb44@kernel.org> In-Reply-To: <20260420-net-mptcp-sync-sndbuf-accept-v1-0-e3523e3aeb44@kernel.org> To: Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org, "Matthieu Baerts (NGI0)" , Gang Yan , Shuah Khan , linux-kselftest@vger.kernel.org X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2113; i=matttbe@kernel.org; h=from:subject:message-id; bh=JuWXrIR8z0Kdry9exlX5cPLEP3UA7EoY3hwK/Q5Akok=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDKfBUlrHgiMqarw1p1+aZnSxYUhMf/kTnv11XSFhZ/5e 2Gpm01/RykLgxgXg6yYIot0W2T+zOdVvCVefhYwc1iZQIYwcHEKwETstjMyNH9Qami6GqFnva+h mkM0uDQpYsb9nVafnwpe73yxJzXeiOGfYUqhp1SZz2K+6YuFfQpz8hkVLPqKctbu6briXJrh8Jg HAA== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Gang Yan Add a new chk_sndbuf() helper to diag.sh that extracts the sndbuf (the 'tb' field from 'ss -m' skmem output) for both server and client MPTCP sockets, and verifies they are equal. Without the previous patch, it will fail: ''' 07 ....chk sndbuf server/client [FAIL] sndbuf S=3D20480 !=3D C=3D2630656 ''' Signed-off-by: Gang Yan Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) --- To: Shuah Khan Cc: linux-kselftest@vger.kernel.org --- tools/testing/selftests/net/mptcp/diag.sh | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index d847ff1737c3..27cbda68144e 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -322,6 +322,33 @@ wait_connected() done } =20 +chk_sndbuf() +{ + local server_sndbuf client_sndbuf msg + local port=3D${1} + + msg=3D"....chk sndbuf server/client" + server_sndbuf=3D$(ss -N "${ns}" -inmHM "sport" "${port}" | \ + sed -n 's/.*tb\([0-9]\+\).*/\1/p') + client_sndbuf=3D$(ss -N "${ns}" -inmHM "dport" "${port}" | \ + sed -n 's/.*tb\([0-9]\+\).*/\1/p') + + mptcp_lib_print_title "${msg}" + if [ -z "${server_sndbuf}" ] || [ -z "${client_sndbuf}" ]; then + mptcp_lib_pr_fail "sndbuf S=3D${server_sndbuf} C=3D${client_sndbuf}" + mptcp_lib_result_fail "${msg}" + ret=3D${KSFT_FAIL} + elif [ "${server_sndbuf}" !=3D "${client_sndbuf}" ]; then + mptcp_lib_pr_fail "sndbuf S=3D${server_sndbuf} !=3D C=3D${client_sndbuf}" + mptcp_lib_result_fail "${msg}" + ret=3D${KSFT_FAIL} + else + mptcp_lib_pr_ok + mptcp_lib_result_pass "${msg}" + fi +} + + trap cleanup EXIT mptcp_lib_ns_init ns =20 @@ -341,6 +368,7 @@ echo "b" | \ 127.0.0.1 >/dev/null & wait_connected $ns 10000 chk_msk_nr 2 "after MPC handshake" +chk_sndbuf 10000 chk_last_time_info 10000 chk_msk_remote_key_nr 2 "....chk remote_key" chk_msk_fallback_nr 0 "....chk no fallback" --=20 2.53.0