From nobody Sat Sep 26 11:49:00 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 038CC519929 for ; Thu, 17 Sep 2026 13:13:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789650829; cv=none; b=btbOMhWz+7hhFhacJCt5oj5bBvNNQSSMqIkHx7qpJlaG/CFy7ewS87aCoV6K7RpjMEhm/cG7RnPnJatuOaK3PCEuvmIJxZhdl9GatjcBEpbGHrm98KOgOn4ikxJlHaZ796bVWExh96nBuMCcVrp78/bm7cgUDjihX7ANoRH5EbA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789650829; c=relaxed/simple; bh=DzrEyVcKMyjq/tvzTTERvzhiOd55bZGNzar2McnYtP4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DEpBr3Pk0t1M3CBB/hvgBqVWFctvA6ZrLha9nK59glQKBM0m3rrJPidyQOzdMiLxP6Wu7VrqcG8INtGTJMdtl9m5WkNfbYI56GeurN9U2LuDbmHa0IcRaZ0V4YBo5n0k8MYcys7T+xtwN6JB70afTkqhjB83ZGlnK27acGFXCbs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Iod4yM09; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Iod4yM09" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 534051F00893; Thu, 17 Sep 2026 13:13:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789650827; bh=wElvJ+VyxZWxC8zR3Di2mY1vJgC+FIqxiOB/ApQUYTQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=Iod4yM09zCim7IE9sddzgGCJCYK59jYSsVkNAcDESpuirYV7fvHby2tneuo/shOWe fHVvF2AuJ5tL8o/M8DeqBOYeqHUSzmAlhG8gAqFtBUjzAj1m2HGjj0Wr0rvyewFeFA 9NmaFooc5Zg+sT0BxI5NZ6rrc7LCV0UNtO/Wb4RoIpW1qIBgdyD/YRpohr2mmzO0ju wUDk6IadvKL9PkCOvwxjvFToJfiiqtRhTeu1WVXoYkCi+9/9arvmS3/pAMpN2piTFB 3YgamkO2mh8V8hyByyZWUvwvHPR1fFxriDGZqpjacmssreK4uFeMGAEuObd/PxOQnB p6RjvEeBfoijg== From: "Matthieu Baerts (NGI0)" Date: Thu, 17 Sep 2026 15:13:13 +0200 Subject: [PATCH mptcp-next 1/2] Squash-to: "mptcp: avoid unneeded actions on subflow reset" 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: <20260917-mptcp-fixes-7-3-rc4-v2-v1-1-1553391e7815@kernel.org> References: <20260917-mptcp-fixes-7-3-rc4-v2-v1-0-1553391e7815@kernel.org> In-Reply-To: <20260917-mptcp-fixes-7-3-rc4-v2-v1-0-1553391e7815@kernel.org> To: MPTCP Linux Cc: "Matthieu Baerts (NGI0)" , Paolo Abeni X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1881; i=matttbe@kernel.org; h=from:subject:message-id; bh=Ud2xCl2QFZRzZC5Jx0DPitJO/yDdabweUCvsRkOUkeY=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGLJWP+/4Kp5m9ScqICHpVfBVBs3OlfGrVv01uLj8iHXwy hrnhGMOHaUsDGJcDLJiiizSbZH5M59X8ZZ4+VnAzGFlAhnCwMUpABMpVmP4X7QjdvrfXY4F5x3m arEvLqn06zWU+WFvtrJyfXCVidftzQz/fa2ib0Vacd/6ZH3cuqpiq5KA5Zt695ZnF37G96r+6j7 BAgA= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Paolo Abeni explicitly flush the rx queue on reset, to please sashiko; the changelog last paragraph become: """ Add a new flag instead of using an existing one like 'closing', to exit early in subflow_state_change(), and explicitly flush the RX queue at reset time. This avoids unneeded processing to check for available data -- calling get_mapping_status() and more on a dying subflow -- but also in error reporting and worker scheduling. Note that we must consume the currently peeked skb before invoking mptcp_dss_corruption to avoid consuming it again after the eventual reset has freed it. """ Signed-off-by: Paolo Abeni Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/protocol.c | 4 ++-- net/mptcp/subflow.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 296cf52d198c..01e37bfe4b7d 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -857,12 +857,12 @@ static bool __mptcp_move_skbs_from_subflow(struct mpt= cp_sock *msk, mptcp_dss_corruption(msk, ssk); } } else { + sk_eat_skb(ssk, skb); + if (unlikely(!fin)) { DEBUG_NET_WARN_ON_ONCE(1); mptcp_dss_corruption(msk, ssk); } - - sk_eat_skb(ssk, skb); } =20 WRITE_ONCE(tp->copied_seq, seq); diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index c727e937f265..14aa82647c3d 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -440,6 +440,9 @@ void mptcp_subflow_reset(struct sock *ssk) sock_hold(sk); =20 subflow->resetting =3D 1; + + /* No need to delay the actual close for to-be discarded data. */ + __skb_queue_purge(&ssk->sk_receive_queue); mptcp_send_active_reset_reason(ssk); tcp_done(ssk); if (!test_and_set_bit(MPTCP_WORK_CLOSE_SUBFLOW, &mptcp_sk(sk)->flags)) --=20 2.55.0 From nobody Sat Sep 26 11:49:00 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 3757D519930 for ; Thu, 17 Sep 2026 13:13:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789650830; cv=none; b=qqaPYzvz4RijJ1OsBorBYCcxBWiRFEYlfT2mm4LKTKmpZkFDaKDrJJQbxNcZ38s3vfnYScKbuXZLKYid4CUHMjVn+xJH6XnkKWna9Q2j4U8dMGPdovQfOgCPQPXpteLosuL9OEckTJlmuU4Z6w8oonuZOAymx+mf+Sj2C8YwCc4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789650830; c=relaxed/simple; bh=PQH22Io9GFvhRgo1tnhuZTJKWDaHrc5HilSz4VvpvPY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tyJZsEFTPN+fWLXBBOQL4zOwSMtqf2je3AFPLip5Cd1T/NXHE+7HA3ox3yCIEEtnJG3JAN7rgXidhRJgR+a1WkWXJkpjrjbFA6a8LaCNG45sP7naSdBErsmEhsNlAN5yxDHbBRND6De9h4Ki0dvG0cTD9jEJvSYVPgCmNw1ZcQU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hkhC3p0o; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hkhC3p0o" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B61D1F00898; Thu, 17 Sep 2026 13:13:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789650828; bh=PSq36IBPDkJHOXuYKAT/6jwtbFI4fRdaDLKx815qMBA=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=hkhC3p0objmwP0TG83+IoSJN/3sMfwgSqe92Ua8OvB0eEqbGyt96iLY1HhBi+08Ct Jw3hCl2JcT5K15jMe6mNix93le6+zFLfbHqI0r3F4XwN7lC1j9K1EokKLPs7U7gdSm QEIMAs33cBAmHvIs9j5SPsdZB/g01V4EL4XE83HH5rIocl+xaWCtyW6ieD6xtYk64E keqspsi90Wwcwz5ogfns3GrMx+T5TOgyY1AxKG6FGhHL2LZ7udeIKLpKFK7Ouoecm8 gvfNnoMQU4Prnk+e2OvkhvJNnbXss2JQC6PqhXFoKF00BMiOPnWaJus53nLGGzLXMo jhSSgEGVsv1YA== From: "Matthieu Baerts (NGI0)" Date: Thu, 17 Sep 2026 15:13:14 +0200 Subject: [PATCH mptcp-next 2/2] mptcp: fix bad accounting in __mptcp_subflow_push_pending() 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: <20260917-mptcp-fixes-7-3-rc4-v2-v1-2-1553391e7815@kernel.org> References: <20260917-mptcp-fixes-7-3-rc4-v2-v1-0-1553391e7815@kernel.org> In-Reply-To: <20260917-mptcp-fixes-7-3-rc4-v2-v1-0-1553391e7815@kernel.org> To: MPTCP Linux Cc: "Matthieu Baerts (NGI0)" , Paolo Abeni X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=855; i=matttbe@kernel.org; h=from:subject:message-id; bh=x9OBdAz5XjJ0gnu99WbTrETuTMZukPmhJ9IVUZjyhfk=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGLJWP+9cZ16ckLBY5ILIvabUnfqX2QL/3WHZIH8nUkKfZ QrLx7V+HaUsDGJcDLJiiizSbZH5M59X8ZZ4+VnAzGFlAhnCwMUpABPZ+ovhfwF3lsXSkg9bizvs fZRk/Xf9u7aJ9ffH5uI5OxzaJ9XavWL4K84uv3ezRvOLiClqkz9x3OIP+yoe0yiZUvT1v7fdGvk qFgA= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Paolo Abeni If __subflow_push_pending() errors out we should avoid updating the copied byte counters, to avoid mismatch push call later on. Fixes: 0fa1b3783a17 ("mptcp: use get_send wrapper") Signed-off-by: Paolo Abeni Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/protocol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 01e37bfe4b7d..09779428e9ea 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1891,7 +1891,8 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, bool ret =3D __subflow_push_pending(sk, ssk, &info); if (ret <=3D 0) keep_pushing =3D false; - copied +=3D ret; + else + copied +=3D ret; } =20 mptcp_for_each_subflow(msk, subflow) { --=20 2.55.0