From mboxrd@z Thu Jan 1 00:00:00 1970 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 63F3A3E0225; Tue, 24 Mar 2026 09:50:56 +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=1774345856; cv=none; b=rouHLuk7qn3P9BWJe7EgDk0r/kZj+Rf2BPyPdzz/vnHmCl5ReeMsVzOyDFbDjZNTgWhLqTjO75cHdb6re3PBo0YBwL0G5V57Kj1VXFpjFoJlGN8y97B3l84rdYCR85AVi9++c6ihM3S7nVZKBzJAdA93A86Tw/afm/SHdHQAfiA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774345856; c=relaxed/simple; bh=qr05f7GL58ruAJ4cL/ZakCzrxQR0FA5VbILQ6QQ/W/0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FIM6X+nQal3jFJAmPqUzawyV3gXPLcJ3ZYvWyDbEUWc0qjBRHa6LBGe46nIH/EFAYJUuc7X2nsWmD5qRmsK9bwlWJblIA1OmjPx7ztwrggmk8n/oJcdec1auSoYKO+IcEyFLHKbS+7EsDaWQyiQNXBXHHSiRs5TIr8aUe+Y3vyI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ej/su665; 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="Ej/su665" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 043DEC19424; Tue, 24 Mar 2026 09:50:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774345856; bh=qr05f7GL58ruAJ4cL/ZakCzrxQR0FA5VbILQ6QQ/W/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ej/su665NkLZwqizRq3QilZlDqSDcRhFJNNeqJnVK7F+4IQgJtErBGmjTfDE2Xb/R agtwXq3Fi/wNVukwmpHGTKo/z4iHsYMTBHLIZGK44cGBO1elid0EpewjL7rKFwwv+U LEklmiwIkZXlSLPRxTJsQcBBaYObur6T8fF3Ro8HYrz3G/UDKr0jf34ZbSEiq0TV21 xg0b29wX9l/GHJD1s3ByeQwrNh9Y2q3mHYy0sr9pviJWYG7AcY3IPCq1vlpY+laNX7 bNgECbr4QE/827YgWwqw48SmA9PJ1g2yGUoc80/0N59gaBftb1W6M+vy+IQyfd4dPt 9eNrvSUXqFGzw== From: "Matthieu Baerts (NGI0)" To: mptcp@lists.linux.dev, stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: "Matthieu Baerts (NGI0)" , sashal@kernel.org, Mat Martineau , Jakub Kicinski Subject: [PATCH 6.1.y 2/2] selftests: mptcp: join: check removing signal+subflow endp Date: Tue, 24 Mar 2026 10:49:39 +0100 Message-ID: <20260324094936.1826804-6-matttbe@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260324094936.1826804-4-matttbe@kernel.org> References: <20260324094936.1826804-4-matttbe@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2479; i=matttbe@kernel.org; h=from:subject; bh=qr05f7GL58ruAJ4cL/ZakCzrxQR0FA5VbILQ6QQ/W/0=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDIPxRmfL026+WFDwpWH+bpP5pTdcnv/5ZNdye7AlYH5f A03L3516ihlYRDjYpAVU2SRbovMn/m8irfEy88CZg4rE8gQBi5OAZiIsxYjwyGPBsXK5OVFHuzr mDlmvNuTeVLM0uWhzpmLups+Fa/UXszIsD3s7ec7t7cYveaX+aBpOzf02nXOoHtXTs7u3qa09d/ eMg4A X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: 8bit commit 1777f349ff41b62dfe27454b69c27b0bc99ffca5 upstream. This validates the previous commit: endpoints with both the signal and subflow flags should always be marked as used even if it was not possible to create new subflows due to the MPTCP PM limits. For this test, an extra endpoint is created with both the signal and the subflow flags, and limits are set not to create extra subflows. In this case, an ADD_ADDR is sent, but no subflows are created. Still, the local endpoint is marked as used, and no warning is fired when removing the endpoint, after having sent a RM_ADDR. The 'Fixes' tag here below is the same as the one from the previous commit: this patch here is not fixing anything wrong in the selftests, but it validates the previous fix for an issue introduced by this commit ID. Fixes: 85df533a787b ("mptcp: pm: do not ignore 'subflow' if 'signal' flag is also set") Cc: stable@vger.kernel.org Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260303-net-mptcp-misc-fixes-7-0-rc2-v1-5-4b5462b6f016@kernel.org Signed-off-by: Jakub Kicinski [ No conflicts, but in this kernel version 'run_tests' doesn't support parameters set via env vars: positional parameters need to be used. See commit 595ef566a2ef ("selftests: mptcp: drop addr_nr_ns1/2 parameters") and commit e571fb09c893 ("selftests: mptcp: add speed env var") which are not in this kernel version. ] Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh index 044ba9c4e169..973f76557f23 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2407,6 +2407,18 @@ remove_tests() chk_rst_nr 0 0 fi + # signal+subflow with limits, remove + if reset "remove signal+subflow with limits"; then + pm_nl_set_limits $ns1 0 0 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,subflow + pm_nl_set_limits $ns2 0 0 + run_tests $ns1 $ns2 10.0.1.1 0 -1 0 slow + chk_join_nr 0 0 0 + chk_add_nr 1 1 + chk_rm_nr 1 0 invert + chk_rst_nr 0 0 + fi + # addresses remove if reset "remove addresses"; then pm_nl_set_limits $ns1 3 3 -- 2.53.0