Skip to content

Commit a6f0459

Browse files
Paolo Abenikuba-moo
authored andcommitted
mptcp: fix subflow rcvbuf adjust
The mptcp PM can add subflow to the conn_list before tcp_init_transfer(). Calling tcp_rcvbuf_grow() on such subflow is not correct as later init will overwrite the update. Fix the issue calling tcp_rcvbuf_grow() only after init buffer initialization. Fixes: e118cdc ("mptcp: rcvbuf auto-tuning improvement") Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Link: https://patch.msgid.link/20251028-net-tcp-recv-autotune-v3-1-74b43ba4c84c@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent f99c579 commit a6f0459

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

net/mptcp/protocol.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2051,6 +2051,7 @@ static void mptcp_rcv_space_adjust(struct mptcp_sock *msk, int copied)
20512051

20522052
msk->rcvq_space.space = msk->rcvq_space.copied;
20532053
if (mptcp_rcvbuf_grow(sk)) {
2054+
int copied = msk->rcvq_space.copied;
20542055

20552056
/* Make subflows follow along. If we do not do this, we
20562057
* get drops at subflow level if skbs can't be moved to
@@ -2063,8 +2064,11 @@ static void mptcp_rcv_space_adjust(struct mptcp_sock *msk, int copied)
20632064

20642065
ssk = mptcp_subflow_tcp_sock(subflow);
20652066
slow = lock_sock_fast(ssk);
2066-
tcp_sk(ssk)->rcvq_space.space = msk->rcvq_space.copied;
2067-
tcp_rcvbuf_grow(ssk);
2067+
/* subflows can be added before tcp_init_transfer() */
2068+
if (tcp_sk(ssk)->rcvq_space.space) {
2069+
tcp_sk(ssk)->rcvq_space.space = copied;
2070+
tcp_rcvbuf_grow(ssk);
2071+
}
20682072
unlock_sock_fast(ssk, slow);
20692073
}
20702074
}

0 commit comments

Comments
 (0)