From nobody Fri Oct 31 16:29:25 2025 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 DCA6A33468F; Mon, 20 Oct 2025 20:53:51 +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=1760993632; cv=none; b=CLv+it9Px/PVW7kz66Y/2zML3zQk+IENK0q6slNOmV0zyIVFaGGhI7k6SXAb2KvYAhwHXG9L64MLBJPEfqeOPDI8PA7Lfmz27RiisvIi0xlNQ1v53c2s/BSHQjG4uY85F1Vly28YqX3BO91ISuwsMdwfb1cWRlDYjwP9JU+D1+8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760993632; c=relaxed/simple; bh=lbxVN5XeAG7DYcSl4ZfWs3aOTME+7P56iQKAJu77YPo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=u6fHMqWgsyMPcpWn7SJw3kwWd7hxiNTyNi/h0KFw5Yn18v4HJXHYv9UbwPvUNd4dwTNPAOuuCIRlD3T/yUfNgMhYfkkoM3BLScGAT30ckefY5z5nsf8pnQz4VRNOvkXYKOfzO2uPgfbqB8pKMnFRmHgzQjjQOFPck9tAwKQtteA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JbzBe1i7; 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="JbzBe1i7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE809C2BCC6; Mon, 20 Oct 2025 20:53:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760993631; bh=lbxVN5XeAG7DYcSl4ZfWs3aOTME+7P56iQKAJu77YPo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=JbzBe1i7wbRJaeWZQCCNs7FWlLLbIgzNVO0s9N14rUe5yLIxmjRUAf0Q1LPXRAvqt txsvg9FsQwl+iI7PAgt+pksYWrMJE8B3GbOHh4q+ca8b2pGIEwoTkmA94LNc4mz+Nj LxW3I15TChZKq717MvsQB4lCipmYyv2tZ1ofqz1R8aMc7s/dCqKF+i9zPzwELj9WOm pfaqkFL2tRq3IXA7pcv42/qwHk54BBycfSz88+zxp7rd/qdnrlvYwWjClvnlS6m/O5 mjqM3J0zsQK9onl4NzKgSVMBv4H6snElXEYkkJhps+Lw0qL/TExHPdBuDq8PETERe5 G59xTTJDDbumw== From: "Matthieu Baerts (NGI0)" Date: Mon, 20 Oct 2025 22:53:26 +0200 Subject: [PATCH net 1/5] mptcp: pm: in-kernel: C-flag: handle late ADD_ADDR 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: <20251020-net-mptcp-c-flag-late-add-addr-v1-1-8207030cb0e8@kernel.org> References: <20251020-net-mptcp-c-flag-late-add-addr-v1-0-8207030cb0e8@kernel.org> In-Reply-To: <20251020-net-mptcp-c-flag-late-add-addr-v1-0-8207030cb0e8@kernel.org> To: Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, "Matthieu Baerts (NGI0)" , stable@vger.kernel.org X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2688; i=matttbe@kernel.org; h=from:subject:message-id; bh=lbxVN5XeAG7DYcSl4ZfWs3aOTME+7P56iQKAJu77YPo=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDK+LQxeYxW/P2Pp1EbNyVfEDQW+ez9Lj3fU3Hr1oeUbI cOuhOdeHaUsDGJcDLJiiizSbZH5M59X8ZZ4+VnAzGFlAhnCwMUpABO5qMLI8OyI/8x/nFcZmxS8 z6il2v10L22ecGN11b2Hj81852+4mcTIsOnL08Jqk31zn3/Nc4if88mGLfnRLZe07PbZy1buXho XyA8A X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 The special C-flag case expects the ADD_ADDR to be received when switching to 'fully-established'. But for various reasons, the ADD_ADDR could be sent after the "4th ACK", and the special case doesn't work. On NIPA, the new test validating this special case for the C-flag failed a few times, e.g. 102 default limits, server deny join id 0 syn rx [FAIL] got 0 JOIN[s] syn rx expected 2 Server ns stats (...) MPTcpExtAddAddrTx 1 MPTcpExtEchoAdd 1 Client ns stats (...) MPTcpExtAddAddr 1 MPTcpExtEchoAddTx 1 synack rx [FAIL] got 0 JOIN[s] synack rx expected 2 ack rx [FAIL] got 0 JOIN[s] ack rx expected 2 join Rx [FAIL] see above syn tx [FAIL] got 0 JOIN[s] syn tx expected 2 join Tx [FAIL] see above I had a suspicion about what the issue could be: the ADD_ADDR might have been received after the switch to the 'fully-established' state. The issue was not easy to reproduce. The packet capture shown that the ADD_ADDR can indeed be sent with a delay, and the client would not try to establish subflows to it as expected. A simple fix is not to mark the endpoints as 'used' in the C-flag case, when looking at creating subflows to the remote initial IP address and port. In this case, there is no need to try. Note: newly added fullmesh endpoints will still continue to be used as expected, thanks to the conditions behind mptcp_pm_add_addr_c_flag_case. Fixes: 4b1ff850e0c1 ("mptcp: pm: in-kernel: usable client side with C-flag") Cc: stable@vger.kernel.org Reviewed-by: Geliang Tang Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/pm_kernel.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/mptcp/pm_kernel.c b/net/mptcp/pm_kernel.c index e0f44dc232aa..2ae95476dba3 100644 --- a/net/mptcp/pm_kernel.c +++ b/net/mptcp/pm_kernel.c @@ -370,6 +370,10 @@ static void mptcp_pm_create_subflow_or_signal_addr(str= uct mptcp_sock *msk) } =20 subflow: + /* No need to try establishing subflows to remote id0 if not allowed */ + if (mptcp_pm_add_addr_c_flag_case(msk)) + goto exit; + /* check if should create a new subflow */ while (msk->pm.local_addr_used < endp_subflow_max && msk->pm.extra_subflows < limit_extra_subflows) { @@ -401,6 +405,8 @@ static void mptcp_pm_create_subflow_or_signal_addr(stru= ct mptcp_sock *msk) __mptcp_subflow_connect(sk, &local, &addrs[i]); spin_lock_bh(&msk->pm.lock); } + +exit: mptcp_pm_nl_check_work_pending(msk); } =20 --=20 2.51.0 From nobody Fri Oct 31 16:29:25 2025 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 D0D7B2E762D; Mon, 20 Oct 2025 20:53: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=1760993634; cv=none; b=WySquURWz6MBlb2+Xh0qNKaJZRojnlPzU0hqcariFyuNASkLh4jJ0LeEOcHZLDOEUddYa/NZhVK26WKXqalRAKtgsVDLlDXKsiemk+jkLVrqUq6GyJcljOYE3OAfbqUesNtpKt5FY6nJZHeJov4Cx8pe795sn2OKHb20RLy2bTc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760993634; c=relaxed/simple; bh=xIa1OUBTl75WwgFA+OKNsrau5d81ys+xlnMTikT3Ck8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bap0OZTE1K3nNuarW/GHQECG6hJAN+bYgf0Ks4ij2GS1h9XIcEVOFmkiQ24CV4Kx/HHJsDz3sOCNZWU1TlnTcWW74f5Ap1vEIWMHVuNzKAurQ6uZrHoFXaXWU0gHBzQxVhqqP3I8pi97xJfZDGfJpJI/1sbGYoS+24ziEIkFDng= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iVoz7j+G; 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="iVoz7j+G" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA25BC116D0; Mon, 20 Oct 2025 20:53:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760993634; bh=xIa1OUBTl75WwgFA+OKNsrau5d81ys+xlnMTikT3Ck8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=iVoz7j+GQ7WFko/Otp217DO57FIbND1aeylEq6e5yiaNTd3129Nkt+YfvfitoYKPu ExGaW5s/O2ccuzX0xabdRdHQoPAjHY5wutvBUZDyTfwa1sRPqt3sHXohNR9a4nZooO PnhLLsiRWXm2+nWaZ3c9hkrAeIolLqJsHjSmkzMQdFDy9EFOeDHlUnauFPd6p0BG/C flzaalPjhR9KAu/7ghVrhwX7BnDn+GX39rrfq5srO64eSymZ3ixXxPdKX27wxSp+zA LshpXugEoiNgTAMuYRgOKyUuxH1T0sASFg1dkoc9LNgEL3JidtUVkGY8x7Tke151CU f1JwynhvHMvAQ== From: "Matthieu Baerts (NGI0)" Date: Mon, 20 Oct 2025 22:53:27 +0200 Subject: [PATCH net 2/5] selftests: mptcp: join: mark 'flush re-add' as skipped if not supported 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: <20251020-net-mptcp-c-flag-late-add-addr-v1-2-8207030cb0e8@kernel.org> References: <20251020-net-mptcp-c-flag-late-add-addr-v1-0-8207030cb0e8@kernel.org> In-Reply-To: <20251020-net-mptcp-c-flag-late-add-addr-v1-0-8207030cb0e8@kernel.org> To: Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, "Matthieu Baerts (NGI0)" , stable@vger.kernel.org X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1206; i=matttbe@kernel.org; h=from:subject:message-id; bh=xIa1OUBTl75WwgFA+OKNsrau5d81ys+xlnMTikT3Ck8=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDK+LQz9Xhmrl3Jj09yiexsXFDt9urN29aQvU9ZK3uqTM WudVlwb31HKwiDGxSArpsgi3RaZP/N5FW+Jl58FzBxWJpAhDFycAjCRxEkM/8MbHtVqu3IsfMrH pT31o8rLLKYJD63PxSyf/vjAsz0KPqoM/5Q3eVxWS1YrYXARXTdDMHL2hEetmwIeWv0vP/1JRCU lggsA X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 The call to 'continue_if' was missing: it properly marks a subtest as 'skipped' if the attached condition is not valid. Without that, the test is wrongly marked as passed on older kernels. Fixes: e06959e9eebd ("selftests: mptcp: join: test for flush/re-add endpoin= ts") Cc: stable@vger.kernel.org Reviewed-by: Geliang Tang Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index c90d8e8b95cb..deba21ca5a97 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -4115,7 +4115,7 @@ endpoint_tests() =20 # flush and re-add if reset_with_tcp_filter "flush re-add" ns2 10.0.3.2 REJECT OUTPUT && - mptcp_lib_kallsyms_has "subflow_rebuild_header$"; then + continue_if mptcp_lib_kallsyms_has "subflow_rebuild_header$"; then pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 1 2 # broadcast IP: no packet for this address will be received on ns1 --=20 2.51.0 From nobody Fri Oct 31 16:29:25 2025 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 0672B337BA7; Mon, 20 Oct 2025 20:53:57 +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=1760993638; cv=none; b=Zl8n4xHJpwe5gtiwSTDRyOjWaGkMAjLUGgJpDpmic/s5hmLbD38D9XXYdSdITbQ7okojAGSsmz8L9fJA4keJeaBiNtRW5tZHenFVaz9W1DfXh3rhvvHADCS/ZE6sPfT2MbFxg7u/oT2INPZ9Bi8nmvYo2U56zJkQ3KPv3go8mbY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760993638; c=relaxed/simple; bh=Ex6n0S48Ck7Plo4nY6ioRrqLE/WG/09KNPUA0FObYxQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=H/wHf/PEkw72xEZsO3fYRWV2VmEmmXiofUfwaakgDXHFzu3DefgEoT5pQso0aXUqntRXU3gJbBf7V60aoN6TNglc5M4UQI6lAWeJWzRmWVw/kvn0qf/FBiZBBWZUVdzlMsGQo4GgDnX43kiM+U1DOZf1R4QKeB4chy7DVwOv2y0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CB2royZI; 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="CB2royZI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1B6BC2BCF4; Mon, 20 Oct 2025 20:53:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760993637; bh=Ex6n0S48Ck7Plo4nY6ioRrqLE/WG/09KNPUA0FObYxQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=CB2royZIFoehWRr9hLbMLoLflvZLDyYrE56lHWw04MEq3RbEAYlKU4UHTPIddfiTQ Na2n2JNLkK3PuE46xQrm6h8zRNApOopwRv4rQvbK8J7bVCSuV0eMKJUbR25lqZiXlR IZ7NIG/GxDsSl448WL1xkgkUJczolhIuqpHMSFcHQtQmM9dF6B9FJ/IZt+VaoXZGIW wGUeNibl7sEcx248zPvgIoLSAWR5N8ftC1b2pr3FMaESC3laZaqL7P1U0UKg0Tdydu Dj+Ua+HBil+41Or4zpS0MbqtsyR8Er3uRKfIVt7n039PuzR0RHDFyFnUSQWFDRcXwu 2NsAATYLfmclg== From: "Matthieu Baerts (NGI0)" Date: Mon, 20 Oct 2025 22:53:28 +0200 Subject: [PATCH net 3/5] selftests: mptcp: join: mark implicit tests as skipped if not supported 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: <20251020-net-mptcp-c-flag-late-add-addr-v1-3-8207030cb0e8@kernel.org> References: <20251020-net-mptcp-c-flag-late-add-addr-v1-0-8207030cb0e8@kernel.org> In-Reply-To: <20251020-net-mptcp-c-flag-late-add-addr-v1-0-8207030cb0e8@kernel.org> To: Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, "Matthieu Baerts (NGI0)" , stable@vger.kernel.org X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1571; i=matttbe@kernel.org; h=from:subject:message-id; bh=Ex6n0S48Ck7Plo4nY6ioRrqLE/WG/09KNPUA0FObYxQ=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDK+LQyTuMTkUjjXyC2h8q/MlaB1usfeu6a83OtjF2i0O XmLV7lNRykLgxgXg6yYIot0W2T+zOdVvCVefhYwc1iZQIYwcHEKwEQinjD8FTCtuetRue+ApqvI 2UvbfKLD5p45NdFs0/SS3/MSI9pecjEyvEzZp7t+mqiOWK/iymuZVTKrn+zI+bM96//WP27xM2s 9OQE= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 The call to 'continue_if' was missing: it properly marks a subtest as 'skipped' if the attached condition is not valid. Without that, the test is wrongly marked as passed on older kernels. Fixes: 36c4127ae8dd ("selftests: mptcp: join: skip implicit tests if not su= pported") Cc: stable@vger.kernel.org Reviewed-by: Geliang Tang Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index deba21ca5a97..d98f8f8905b9 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3939,7 +3939,7 @@ endpoint_tests() # subflow_rebuild_header is needed to support the implicit flag # userspace pm type prevents add_addr if reset "implicit EP" && - mptcp_lib_kallsyms_has "subflow_rebuild_header$"; then + continue_if mptcp_lib_kallsyms_has "subflow_rebuild_header$"; then pm_nl_set_limits $ns1 2 2 pm_nl_set_limits $ns2 2 2 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal @@ -3964,7 +3964,7 @@ endpoint_tests() fi =20 if reset_with_tcp_filter "delete and re-add" ns2 10.0.3.2 REJECT OUTPUT && - mptcp_lib_kallsyms_has "subflow_rebuild_header$"; then + continue_if mptcp_lib_kallsyms_has "subflow_rebuild_header$"; then start_events pm_nl_set_limits $ns1 0 3 pm_nl_set_limits $ns2 0 3 --=20 2.51.0 From nobody Fri Oct 31 16:29:25 2025 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 C9E00337B91; Mon, 20 Oct 2025 20:54:00 +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=1760993640; cv=none; b=YU3BWUx4I21+f5TrysYyAXj6F69JgeE84mzM95Qso7hnU3wTQEzJV8lyBK/CxEGNi5wRUbrt3RKCSO+204lg2YpTy+6xxQD6MjWi4bgwT10u1os3eqij7h3ZmcJw5ADuK1dASHlX81HWKYp/Fy7sVT9SZR/o+6TZBwnqWa4WI9o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760993640; c=relaxed/simple; bh=oZeuTBdKyvhXFvs6kqfXdPyeq9dxJOn0u2Uo580N4Zs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kIwX2sdI1Np9wEoNIUGO8kWhlZZeFqpU40WIko1OJ8Wm/kFY/lsdKfv1gsrj9p5XqjGdfzvjoD3I1qD2BooNrEYP1lVFQasexT0IybUqCdwD4T6hh9tGPm9FrXAWGL3H1ukt0FbJh8DxZzBCoh4VY524ykY+TXf+80wp/clo7+A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gPvieKZd; 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="gPvieKZd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B10A6C2BC9E; Mon, 20 Oct 2025 20:53:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760993640; bh=oZeuTBdKyvhXFvs6kqfXdPyeq9dxJOn0u2Uo580N4Zs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=gPvieKZd02WniFWZLczdyuFomyLAGOaebAPaXFkYxYfrl4rvcmKQ/qA7w771q7bZw eTuFGzaFzFTwIUms9hDqcwH10EcNK0DIKFw4Xlf3snVg3+QzQNIszNP5joBhtyZN/Q yC1L4o9uRQeedezDtyf60XGuuhmcAN5CyzxkMjiou9ULkQDcPW3hxjnaBiQXlbKfW8 r4SIr4fZfHdgOCvlQvIZAM8asO2/LQVSCHhs3cpFa5b+iAC+nl9Sf0q/NIo1VxTBKk 8MptPs8bdWJ46CZ/eqQtq29xGsyFwymLrC+0ZDmNB5sre6frysvpPiwo6d6wQoPUxT D45WHkkZTMRVg== From: "Matthieu Baerts (NGI0)" Date: Mon, 20 Oct 2025 22:53:29 +0200 Subject: [PATCH net 4/5] selftests: mptcp: join: mark 'delete re-add signal' as skipped if not supported 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: <20251020-net-mptcp-c-flag-late-add-addr-v1-4-8207030cb0e8@kernel.org> References: <20251020-net-mptcp-c-flag-late-add-addr-v1-0-8207030cb0e8@kernel.org> In-Reply-To: <20251020-net-mptcp-c-flag-late-add-addr-v1-0-8207030cb0e8@kernel.org> To: Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, "Matthieu Baerts (NGI0)" , stable@vger.kernel.org X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1177; i=matttbe@kernel.org; h=from:subject:message-id; bh=oZeuTBdKyvhXFvs6kqfXdPyeq9dxJOn0u2Uo580N4Zs=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDK+LQwP7c/gKvp/OGDbTvO7K9+dvr3n3xnDFweTT9tkf 4tcW7hFtaOUhUGMi0FWTJFFui0yf+bzKt4SLz8LmDmsTCBDGLg4BWAiUdMYGfZqfMzOexAz+dJr saB0P+9lrirrvq/OTjZQ3RDwzTxKPIDhf6GbOatmBNOeW/P+nptcE645MeHlVF6fz8tT5zkLrw7 mYQEA X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 The call to 'continue_if' was missing: it properly marks a subtest as 'skipped' if the attached condition is not valid. Without that, the test is wrongly marked as passed on older kernels. Fixes: b5e2fb832f48 ("selftests: mptcp: add explicit test case for remove/r= eadd") Cc: stable@vger.kernel.org Reviewed-by: Geliang Tang Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index d98f8f8905b9..b2a8c51a3969 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -4040,7 +4040,7 @@ endpoint_tests() =20 # remove and re-add if reset_with_events "delete re-add signal" && - mptcp_lib_kallsyms_has "subflow_rebuild_header$"; then + continue_if mptcp_lib_kallsyms_has "subflow_rebuild_header$"; then ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=3D0 pm_nl_set_limits $ns1 0 3 pm_nl_set_limits $ns2 3 3 --=20 2.51.0 From nobody Fri Oct 31 16:29:25 2025 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 D050F339B33; Mon, 20 Oct 2025 20:54:03 +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=1760993644; cv=none; b=qc8ORfh00mAeNBRdokwoV7iLfQzRRKQxIqXeCv6dxtBejKCsGicShdb58iYNuKa3Q/CMr5EsemfjGhAc2NQ3kEg2WxOTm+zK+Yzb8B6Z/etgJWnhkjFIEdTkx7fsWML+wPIK17OpMbpXMB1cfwEheVStqhKLy1YVO/88zCofYCM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760993644; c=relaxed/simple; bh=bHGo8+BWrfJBGH0sCvbI3J2YnPZniPBZaTu937O/yl0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=saBkOSJoYMiSK3VQonHPPR1x+mHXsjFsIStoy8wb8Kp3hJtcUlYXEL33rRXmJQNFolxIKa69uRETfiDRXAQPmv8oCnIAaAdHI9YulpWHaqmH7webaITxcLPk17dy5JlnwVMqcH1wOB/FdPeCOj/PKQUJgZe8CrERrLA6EqrVVoY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NrlY2yEq; 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="NrlY2yEq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93858C2BCF7; Mon, 20 Oct 2025 20:54:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760993642; bh=bHGo8+BWrfJBGH0sCvbI3J2YnPZniPBZaTu937O/yl0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=NrlY2yEqf8J/6HabLfI4t1bHNmQHnv/8197GtVsmbrsdnJmTN5DFxOvAbcyEzkMSv vfcdGjCTfKThEh4e0lBSTFZz5mHewt4r897QAKppkY94OFwdzHSgcwWulE9GA2R5a2 3s2PUTofrq3sPqcNGfywbq/Vs93EmvInFdtRDZ/BjqMjWR7Fl+2xMqHA9/JL3bUGA7 4jRVzZFNDtYmuZ/mfq9rWV8oFnTh/+uy9J4FccxiwGY0KCNZTDvfid9i3Dbo7BhJTN QsfqRzepsqy1n7+eSMxT1KMi1pm2VGcWKYWP8dPPa4SdRGoGBpjDHcCpx/cy2EBuU6 tyJvh3ascdbLA== From: "Matthieu Baerts (NGI0)" Date: Mon, 20 Oct 2025 22:53:30 +0200 Subject: [PATCH net 5/5] selftests: mptcp: join: mark laminar tests as skipped if not supported 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: <20251020-net-mptcp-c-flag-late-add-addr-v1-5-8207030cb0e8@kernel.org> References: <20251020-net-mptcp-c-flag-late-add-addr-v1-0-8207030cb0e8@kernel.org> In-Reply-To: <20251020-net-mptcp-c-flag-late-add-addr-v1-0-8207030cb0e8@kernel.org> To: Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2950; i=matttbe@kernel.org; h=from:subject:message-id; bh=bHGo8+BWrfJBGH0sCvbI3J2YnPZniPBZaTu937O/yl0=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDK+LYzw1t+pKv5+Z9q7lOeXLGKmhj/zz+7Kky54ZNR2u Pj7rfpzHaUsDGJcDLJiiizSbZH5M59X8ZZ4+VnAzGFlAhnCwMUpABPZ1srIsPcG29aQojCf3bZR U8yjauO9A/13KP/tkez7t/rH7UBLTob/KXeuv7Z2SbQykxdkfrmdc1t5/p7PU7+y8xVskdy+Keo SGwA= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 The call to 'continue_if' was missing: it properly marks a subtest as 'skipped' if the attached condition is not valid. Without that, the test is wrongly marked as passed on older kernels. Fixes: c912f935a5c7 ("selftests: mptcp: join: validate new laminar endp") Reviewed-by: Geliang Tang Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index b2a8c51a3969..78a1aa4ecff2 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2324,7 +2324,7 @@ laminar_endp_tests() { # no laminar endpoints: routing rules are used if reset_with_tcp_filter "without a laminar endpoint" ns1 10.0.2.2 REJECT= && - mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then + continue_if mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; t= hen pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 2 2 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal @@ -2336,7 +2336,7 @@ laminar_endp_tests() =20 # laminar endpoints: this endpoint is used if reset_with_tcp_filter "with a laminar endpoint" ns1 10.0.2.2 REJECT && - mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then + continue_if mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; t= hen pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 2 2 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal @@ -2348,7 +2348,7 @@ laminar_endp_tests() =20 # laminar endpoints: these endpoints are used if reset_with_tcp_filter "with multiple laminar endpoints" ns1 10.0.2.2 R= EJECT && - mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then + continue_if mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; t= hen pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 2 2 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal @@ -2363,7 +2363,7 @@ laminar_endp_tests() =20 # laminar endpoints: only one endpoint is used if reset_with_tcp_filter "single laminar endpoint" ns1 10.0.2.2 REJECT && - mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then + continue_if mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; t= hen pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 2 2 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal @@ -2376,7 +2376,7 @@ laminar_endp_tests() =20 # laminar endpoints: subflow and laminar flags if reset_with_tcp_filter "sublow + laminar endpoints" ns1 10.0.2.2 REJECT= && - mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then + continue_if mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; t= hen pm_nl_set_limits $ns1 0 4 pm_nl_set_limits $ns2 2 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal --=20 2.51.0