From patchwork Wed Oct 18 18:23:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mat Martineau X-Patchwork-Id: 13427714 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 6E943F9C4; Wed, 18 Oct 2023 18:24:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nW1vBzhR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AAFF5C433C9; Wed, 18 Oct 2023 18:24:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697653442; bh=MqbWF9KWr+fDWmDuFscKuEg2a6ksnYydthQmw8YMP5s=; h=From:Subject:Date:To:Cc:From; b=nW1vBzhRpKtassDHekDkfjI+vv/pSTzuWk2CiSts7XikL1l5NTOqbC75zCZ8YeTH0 ap+pxSuITI7ioEFdrkraehPbRZ8AUkqjcBHaL2sSNujqkMz/OZ5SaWOb2wVKGFIkeL wemtcEhXS/S+IukTe2noizSNwiCzdeOIZL1K9aylYoJ1mcisZTb0I/WpgdiYrk+6O8 GF8tIQhScJAuvzWbKL1YNbguMJAKuc6bAQ5tL31qjprEdSCmpaXYg/RmFuyGF5fAMW A9CIV8w5LRXBcnEOk0sFuIJNWPfw3ZTLAHnyaZRmQhN/Lf2ISy0fQM8co72NJop2BO pjUad1Z3NBwRA== From: Mat Martineau Subject: [PATCH net 0/5] mptcp: Fixes for v6.6 Date: Wed, 18 Oct 2023 11:23:51 -0700 Message-Id: <20231018-send-net-20231018-v1-0-17ecb002e41d@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIALciMGUC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDI2NDA0ML3eLUvBTdvNQSXbhIYrJZkrFFSpqBaaqRElBfQVFqWmYF2MxoJaB KpdjaWgAcInu2aAAAAA== To: Matthieu Baerts , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , David Ahern , Davide Caratti , Christoph Paasch , Florian Westphal Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, Mat Martineau , stable@vger.kernel.org, Geliang Tang X-Mailer: b4 0.12.3 X-Patchwork-Delegate: kuba@kernel.org Patch 1 corrects the logic for MP_JOIN tests where 0 RSTs are expected. Patch 2 ensures MPTCP packets are not incorrectly coalesced in the TCP backlog queue. Patch 3 avoids a zero-window probe and associated WARN_ON_ONCE() in an expected MPTCP reinjection scenario. Patches 4 & 5 allow an initial MPTCP subflow to be closed cleanly instead of always sending RST. Associated selftest is updated. Signed-off-by: Mat Martineau --- Geliang Tang (1): mptcp: avoid sending RST when closing the initial subflow Matthieu Baerts (2): selftests: mptcp: join: correctly check for no RST selftests: mptcp: join: no RST when rm subflow/addr Paolo Abeni (2): tcp: check mptcp-level constraints for backlog coalescing mptcp: more conservative check for zero probes net/ipv4/tcp_ipv4.c | 1 + net/mptcp/protocol.c | 36 ++++++++++++++++--------- tools/testing/selftests/net/mptcp/mptcp_join.sh | 21 +++++++++++++-- 3 files changed, 43 insertions(+), 15 deletions(-) --- base-commit: 2915240eddba96b37de4c7e9a3d0ac6f9548454b change-id: 20231018-send-net-20231018-ac6b38df05e2 Best regards,