From nobody Fri Apr 3 10:17:45 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 C99003DFC94; Tue, 24 Mar 2026 09:50:54 +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=1774345854; cv=none; b=bGRbxwBLnDekGa3YPaKHonbXalFXHADxexHg2pJXxwn+gZWrKSYqh+8CeKj5QS7NkXhT62+R8L/LIEsYbhgnRgRjE+c0JFry6NK4uvODWhsB4Mn/E6UZMKnJFdz3cGpj+vXHRxYIOA4NlP8rmm1ioCU7M1gZZW06S8CZnx8TKFc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774345854; c=relaxed/simple; bh=WWYsXIQKqwFtBguw1GEAWGegDLh6cX2bIrRO2RLIyzA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t5lbqUlpGIhS4euEglZegfK/f+MCbllJnfMbAOFyG+fISyWhoN2e8xJZ2E2Ae+Zm2+HJigK26L6nWpodiFUUWAxs1XcMuUot0jxneUfW5dsZrR3e57DvnAKD31wIBLunJadnf4NYmeU1Ya40AEmzI+Cb4yBz5Xj/d4Cs0y2PxuM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gQiRqyYc; 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="gQiRqyYc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9E3BCC19424; Tue, 24 Mar 2026 09:50:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774345854; bh=WWYsXIQKqwFtBguw1GEAWGegDLh6cX2bIrRO2RLIyzA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gQiRqyYcRmELaB+VZmYUJYA15dVoRuxkEWQm7FDMWAplfeaAWTwPA6XuA78R/JFEI jihgqHpbeDWVZb84Cs/s1XVgZp4G7AgcRhbofeCHdd9LV/9lETKUVRoLDBfbhIL6xm 89WBWFBVN5q4I7NV8sIF8tUZ4F5Spi/3ZpGUcrfEDDnzI7iBfRuiOrXrwZohWREk3p cT0Cql2ZRNN+QiKv/QWbn3x29AJH8O0FffqRMBKu8VJSAJuCjm6zERNKJvD3xQ26yt zn8MvxnEgWsC9HYdY+kaEVrI90ob3wz7DxVgICmsorHz38ZHiTr+sm5hDUS5OeJFrX FSDoZwwd46j5Q== From: "Matthieu Baerts (NGI0)" To: mptcp@lists.linux.dev, stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: "Matthieu Baerts (NGI0)" , sashal@kernel.org Subject: [PATCH 6.1.y 1/2] selftests: mptcp: join: implicit: stop transfer after last check Date: Tue, 24 Mar 2026 10:49:38 +0100 Message-ID: <20260324094936.1826804-5-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: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3684; i=matttbe@kernel.org; h=from:subject; bh=WWYsXIQKqwFtBguw1GEAWGegDLh6cX2bIrRO2RLIyzA=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDIPxRmZGq3VPFvq/9un9Hq0cJtrVY+bL/+Dy+dm/Dude D9q5wvvjlIWBjEuBlkxRRbptsj8mc+reEu8/Cxg5rAygQxh4OIUgIlsa2dkONn4vbls667uTU5b 9XYzHLukYC65uPKy2Mutq73deuYa6jMybHmr5zxp4jnBjUerV/IsmXtrxhe+DrO59nvj2P9fyg5 o4wAA X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" With this kernel version, the 'implicit EP' MPTCP Join selftest ended with an error message: 115 implicit EP creation[ ok ] ID change is prevented[ ok ] modif is allowed[ ok ] TcpPassiveOpens 2 0.0 TcpEstabResets 2 0.0 TcpInSegs 315 0.0 TcpOutSegs 617 0.0 TcpOutRsts 1 0.0 TcpExtDelayedACKs 289 0.0 TcpExtTCPPureAcks 6 0.0 TcpExtTCPOrigDataSent 306 0.0 TcpExtTCPDelivered 306 0.0 MPTcpExtMPCapableSYNRX 1 0.0 MPTcpExtMPCapableACKRX 1 0.0 MPTcpExtMPJoinSynRx 1 0.0 MPTcpExtMPJoinAckRx 1 0.0 MPTcpExtAddAddr 1 0.0 MPTcpExtEchoAdd 1 0.0 MPTcpExtMPFastcloseTx 1 0.0 MPTcpExtMPRstTx 1 0.0 MPTcpExtMPRstRx 1 0.0 TcpActiveOpens 2 0.0 TcpEstabResets 2 0.0 TcpInSegs 617 0.0 TcpOutSegs 315 0.0 TcpOutRsts 1 0.0 TcpExtTCPPureAcks 308 0.0 TcpExtTCPOrigDataSent 306 0.0 TcpExtTCPDelivered 307 0.0 MPTcpExtMPCapableSYNTX 1 0.0 MPTcpExtMPCapableSYNACKRX 1 0.0 MPTcpExtMPJoinSynAckRx 1 0.0 MPTcpExtAddAddr 1 0.0 MPTcpExtEchoAdd 1 0.0 MPTcpExtMPFastcloseRx 1 0.0 MPTcpExtMPRstTx 1 0.0 MPTcpExtMPRstRx 1 0.0 MPTcpExtRcvWndShared 1 0.0 That's because the test was waiting for the end of the transfer for no reasons, which ended after a timeout with an error. In this case, the stats were displayed, but this error was ignored: the end of transfer is not validated in this test. To fix that, stop the transfer after the last check, similar to what is done in the other tests. Fixes: 699879d5f866 ("selftests: mptcp: join: endpoints: longer transfer") Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 80497053fe2f..044ba9c4e169 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3429,6 +3429,7 @@ endpoint_tests() pm_nl_set_limits $ns2 2 2 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 128 0 0 slow 2>/dev/null & + local tests_pid=3D$! =20 wait_mpj $ns1 pm_nl_check_endpoint 1 "creation" \ @@ -3441,6 +3442,7 @@ endpoint_tests() pm_nl_add_endpoint $ns2 10.0.2.2 flags signal pm_nl_check_endpoint 0 "modif is allowed" \ $ns2 10.0.2.2 id 1 flags signal + kill_wait "${tests_pid}" kill_tests_wait fi =20 --=20 2.53.0 From nobody Fri Apr 3 10:17:45 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 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: mptcp@lists.linux.dev 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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 i= s 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-4= b5462b6f016@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/testin= g/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 =20 + # 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 --=20 2.53.0