From nobody Sun Mar 22 09:48:08 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 D724031B83B; Mon, 9 Mar 2026 15:57:04 +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=1773071824; cv=none; b=clu7H1MX/xtltq6z/xXftyNb0F275Uy8zkQpzo3Q0CULOmiO7jc2F9yNVV34+9zIceHaxAC2tfJKOgHMYB/cA2QjYGnGTnCchpTzqKQ+lbcdi7XUx1naKKV1yrnStsoHf4h4JqLCe/7HqFyYG2RmLc19++Hi1QFUtJbaoEAUgXw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773071824; c=relaxed/simple; bh=QcizqaPDX56iZ2udPtRGKDZ8CnFeyrIcP65rubKpgg8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=V6fGDBJqvZLNwNuDT4bz1j0ZDUTgXchvpeeHp0HCe+3okWo83jalalZtF3yK2Uy1hRq5J1PphbcGVh+AljYHhKCRjYkU4nFC3Kh12YK3t0kFzepB9D0/O4TQ1XWltvUL5SjcYtuajPtXsU+8yQaM2zC7FsBWqdMBaisP2X/9/bQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aODDw/ei; 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="aODDw/ei" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8964CC2BC9E; Mon, 9 Mar 2026 15:57:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773071824; bh=QcizqaPDX56iZ2udPtRGKDZ8CnFeyrIcP65rubKpgg8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=aODDw/eiWkBT5PHQsVikxun/8LXefBYuw1UwWEthro6a+nu6r5S9Y0cleNLomAbq/ xc9sbNp9p/F6yGJ6IqBsdWOKpAF+usXSpkQXhB77DOV0X52Zq1JgaF3TNjX/z6OYae o+lEZbvrPP+ygYImtHH4glJJwmGooFs/H5q5L5X1w/2kyubHmG8hK0rhquTtYnKBYj eutClLEc5PqT56JyT6wPcH73cGNV0yLPumBm+OErgEKODxxGrrQceSL8mx1G0Vx57T x/YVjqWKbM4H2gnI/s8L8ivWC8+CvY76CDfnCn3Bb+U2hUvqcvwgCu4xyAHwh2z0MI Ea4fUAlCVRxLA== From: "Matthieu Baerts (NGI0)" Date: Mon, 09 Mar 2026 16:56:46 +0100 Subject: [PATCH net-next 2/2] mptcp: add receive queue awareness in tcp_rcv_space_adjust() 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: <20260309-net-next-mptcp-reduce-rbuf-v1-2-8f471206f9c5@kernel.org> References: <20260309-net-next-mptcp-reduce-rbuf-v1-0-8f471206f9c5@kernel.org> In-Reply-To: <20260309-net-next-mptcp-reduce-rbuf-v1-0-8f471206f9c5@kernel.org> To: Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Florian Westphal Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org, "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1895; i=matttbe@kernel.org; h=from:subject:message-id; bh=JVrga8j7mqpvJMieK/tkZeFj1MEfF7/MpEtmOeP552A=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDLXvT1h6vEnp1uDQXt6j2J46o87J48uNJD20FR6ntS0R TroXCN/RykLgxgXg6yYIot0W2T+zOdVvCVefhYwc1iZQIYwcHEKwERWf2VkOJfx/YS5nKjmXsmV U9KrT6Y2l8TG/n7C+zo9VOThsUYjNYZ/pnrfXVRUD6fH8AWK725036Zw+e1vkZXu5z9+Vr4nkez JBQA= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Paolo Abeni This is the MPTCP counter-part of commit ea33537d8292 ("tcp: add receive queue awareness in tcp_rcv_space_adjust()"). Prior to this commit: ESTAB 33165568 0 192.168.255.2:5201 192.168.255.1:53380 \ skmem:(r33076416,rb33554432,t0,tb91136,f448,w0,o0,bl0,d0) After: ESTAB 3279168 0 192.168.255.2:5201 192.168.255.1]:53042 \ skmem:(r3190912,rb3719956,t0,tb91136,f1536,w0,o0,bl0,d0) Same throughput. Reviewed-by: Mat Martineau Signed-off-by: Paolo Abeni Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/protocol.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 1ce6b9f51ea4..5f39eafc6e87 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2138,11 +2138,13 @@ static void mptcp_rcv_space_adjust(struct mptcp_soc= k *msk, int copied) if (rtt_us =3D=3D U32_MAX || time < (rtt_us >> 3)) return; =20 - if (msk->rcvq_space.copied <=3D msk->rcvq_space.space) + copied =3D msk->rcvq_space.copied; + copied -=3D mptcp_inq_hint(sk); + if (copied <=3D msk->rcvq_space.space) goto new_measure; =20 trace_mptcp_rcvbuf_grow(sk, time); - if (mptcp_rcvbuf_grow(sk, msk->rcvq_space.copied)) { + if (mptcp_rcvbuf_grow(sk, copied)) { /* Make subflows follow along. If we do not do this, we * get drops at subflow level if skbs can't be moved to * the mptcp rx queue fast enough (announced rcv_win can @@ -2156,7 +2158,7 @@ static void mptcp_rcv_space_adjust(struct mptcp_sock = *msk, int copied) slow =3D lock_sock_fast(ssk); /* subflows can be added before tcp_init_transfer() */ if (tcp_sk(ssk)->rcvq_space.space) - tcp_rcvbuf_grow(ssk, msk->rcvq_space.copied); + tcp_rcvbuf_grow(ssk, copied); unlock_sock_fast(ssk, slow); } } --=20 2.53.0