From nobody Mon May 13 13:58:07 2024 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 A561D13AD6 for ; Sun, 22 Oct 2023 21:33:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="stJA1F04" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 56389C433C8; Sun, 22 Oct 2023 21:33:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698010385; bh=g/hyyzZKVQ0+FqD1E/Rm91HvO2Mq26Gkt1fpii+h/RY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=stJA1F04zw6ln+ofRBvcNUOBwGACk5aPUrMxmg5j/dyS0uXYDtNk8GeKTYvYv8Cea y9LUBROfNQHFXBJGeTwHV2utSP4GVS3GIM1XkIfaurm1loeAQRzo8B5eOQU+BlWOYL BAX1VZtJlp0CQ72Y39agNWSoiLyhdI4KJ1svhGlS8dF6Dyi7AnY3J2Gz5L3/lf8PXr vyvzmygvsbNJvhGXNUVQqn57gv+qx3YvR7C2/Ucy7CB1s0W0lD5A+KubGsGy7VpBkh bpC3CefJbQPLjrGSKdMcc8puX0FfhtGN/7XpktjXShHToDNFd4yBIUlEInWkwyWEB3 yTAPeyl7UuxuA== From: Matthieu Baerts To: stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: MPTCP Upstream , Matthieu Baerts , Paolo Abeni , Mat Martineau , Jakub Kicinski Subject: [PATCH 6.1.y] selftests: mptcp: join: no RST when rm subflow/addr Date: Sun, 22 Oct 2023 23:32:29 +0200 Message-Id: <20231022213229.3394813-1-matttbe@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <2023102046-haven-jargon-a683@gregkh> References: <2023102046-haven-jargon-a683@gregkh> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3192; i=matttbe@kernel.org; h=from:subject; bh=g/hyyzZKVQ0+FqD1E/Rm91HvO2Mq26Gkt1fpii+h/RY=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBlNZTtEfdDxr1Qwvec71bo4uHW+QUidaAKS7C4u SZUggWbTCmJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZTWU7QAKCRD2t4JPQmmg c0psD/9DmsEowzfz24d0+KHBcfTprCVcSgwOUotBoOOhORC2n2oYm0E5AnwXMIoSw/q3+/qaHbW d+N/HxXft9z+z0NmsKIN7ugoANbhr2cTs5ZAIfnrB06BQ8K8C1W3sgtutMeNqQhK27hwA47Sa+N TpGGV6rgOTCqYbA2fg/u81JnIrBViV4Zg0rSxV6pgrr0nHHHHAmZes7ncWC//VowsdZAoBKx732 c1AsB1XK5JPYQMhQM1Nf4G9w3mhZ/Ww48+qC4rI16xnz1u378DyOZq4fHWMIZd9LTIOKVjueZlO SzqUrrIbaBWmDS7lxvs2vsYN0PewRCKuPDwoKBg0Dg7iwSUkk9DwDlNxBmsA/RNGKSLOXxASiR8 fAfmsariEv3T6A2BhQDoTAEhn8GMVVHzyUzjbM2djRVpyLQpQ+YjXdZMjTM3ZLrtraZK6EI0PcD uYFAaCPSXm595yM3p5VYo0mZjpuK+xhF1MIaR8wlvP3xieyrp4s0+mlFT52Qv/zdyUzyhTo6/5o z/lN1/khpzJQPlfb3jnmEHXSdCqVAgeB9JXvvS/37hR7RNTvPeYVuPGiUbw728Az851XOFlFhS8 18YPaRMLbxlSYVgFyDIpZiyC4/GWuI0TzS86dgajkSSOuDbC0mhkSYZMNIFQvDxD1u7N6woR5hf lzQ8R9ilmJ3XONQ== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" commit 2cfaa8b3b7aece3c7b13dd10db20dcea65875692 upstream. Recently, we noticed that some RST were wrongly generated when removing the initial subflow. This patch makes sure RST are not sent when removing any subflows or any addresses. Fixes: c2b2ae3925b6 ("mptcp: handle correctly disconnect() failures") Cc: stable@vger.kernel.org Acked-by: Paolo Abeni Signed-off-by: Matthieu Baerts Signed-off-by: Mat Martineau Link: https://lore.kernel.org/r/20231018-send-net-20231018-v1-5-17ecb002e41= d@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Matthieu Baerts --- Backport notes - No conflicts --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 8dcfcdba58c6..ea6fc59e9f62 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2263,6 +2263,7 @@ remove_tests() run_tests $ns1 $ns2 10.0.1.1 0 0 -1 slow chk_join_nr 1 1 1 chk_rm_nr 1 1 + chk_rst_nr 0 0 fi =20 # multiple subflows, remove @@ -2274,6 +2275,7 @@ remove_tests() run_tests $ns1 $ns2 10.0.1.1 0 0 -2 slow chk_join_nr 2 2 2 chk_rm_nr 2 2 + chk_rst_nr 0 0 fi =20 # single address, remove @@ -2285,6 +2287,7 @@ remove_tests() chk_join_nr 1 1 1 chk_add_nr 1 1 chk_rm_nr 1 1 invert + chk_rst_nr 0 0 fi =20 # subflow and signal, remove @@ -2297,6 +2300,7 @@ remove_tests() chk_join_nr 2 2 2 chk_add_nr 1 1 chk_rm_nr 1 1 + chk_rst_nr 0 0 fi =20 # subflows and signal, remove @@ -2310,6 +2314,7 @@ remove_tests() chk_join_nr 3 3 3 chk_add_nr 1 1 chk_rm_nr 2 2 + chk_rst_nr 0 0 fi =20 # addresses remove @@ -2323,6 +2328,7 @@ remove_tests() chk_join_nr 3 3 3 chk_add_nr 3 3 chk_rm_nr 3 3 invert + chk_rst_nr 0 0 fi =20 # invalid addresses remove @@ -2336,6 +2342,7 @@ remove_tests() chk_join_nr 1 1 1 chk_add_nr 3 3 chk_rm_nr 3 1 invert + chk_rst_nr 0 0 fi =20 # subflows and signal, flush @@ -2349,6 +2356,7 @@ remove_tests() chk_join_nr 3 3 3 chk_add_nr 1 1 chk_rm_nr 1 3 invert simult + chk_rst_nr 0 0 fi =20 # subflows flush @@ -2366,6 +2374,7 @@ remove_tests() else chk_rm_nr 3 3 fi + chk_rst_nr 0 0 fi =20 # addresses flush @@ -2379,6 +2388,7 @@ remove_tests() chk_join_nr 3 3 3 chk_add_nr 3 3 chk_rm_nr 3 3 invert simult + chk_rst_nr 0 0 fi =20 # invalid addresses flush @@ -2392,6 +2402,7 @@ remove_tests() chk_join_nr 1 1 1 chk_add_nr 3 3 chk_rm_nr 3 1 invert + chk_rst_nr 0 0 fi =20 # remove id 0 subflow @@ -2402,6 +2413,7 @@ remove_tests() run_tests $ns1 $ns2 10.0.1.1 0 0 -9 slow chk_join_nr 1 1 1 chk_rm_nr 1 1 + chk_rst_nr 0 0 fi =20 # remove id 0 address @@ -2413,6 +2425,7 @@ remove_tests() chk_join_nr 1 1 1 chk_add_nr 1 1 chk_rm_nr 1 1 invert + chk_rst_nr 0 0 invert fi } =20 --=20 2.40.1