Skip to content

Commit fcf04b1

Browse files
Dwyane-YanPaolo Abeni
authored andcommitted
mptcp: sync the msk->sndbuf at accept() time
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: 8005184 ("mptcp: refactor sndbuf auto-tuning") Cc: stable@vger.kernel.org Closes: multipath-tcp/mptcp_net-next#602 Signed-off-by: Gang Yan <yangang@kylinos.cn> Acked-by: Paolo Abeni <pabeni@redhat.com> Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Link: https://patch.msgid.link/20260420-net-mptcp-sync-sndbuf-accept-v1-1-e3523e3aeb44@kernel.org Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent 1cb36e2 commit fcf04b1

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

net/mptcp/protocol.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3594,7 +3594,6 @@ struct sock *mptcp_sk_clone_init(const struct sock *sk,
35943594
* uses the correct data
35953595
*/
35963596
mptcp_copy_inaddrs(nsk, ssk);
3597-
__mptcp_propagate_sndbuf(nsk, ssk);
35983597

35993598
mptcp_rcv_space_init(msk, ssk);
36003599
msk->rcvq_space.time = mptcp_stamp();
@@ -4252,6 +4251,7 @@ static int mptcp_stream_accept(struct socket *sock, struct socket *newsock,
42524251

42534252
mptcp_graft_subflows(newsk);
42544253
mptcp_rps_record_subflows(msk);
4254+
__mptcp_propagate_sndbuf(newsk, mptcp_subflow_tcp_sock(subflow));
42554255

42564256
/* Do late cleanup for the first subflow as necessary. Also
42574257
* deal with bad peers not doing a complete shutdown.

0 commit comments

Comments
 (0)