Drop selftests-mptcp-join-ability-to-invert-add_addr-chec.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.10/selftests-mptcp-join-ability-to-invert-add_addr-chec.patch b/queue-6.10/selftests-mptcp-join-ability-to-invert-add_addr-chec.patch
deleted file mode 100644 (file)
index 5ed26d7..0000000
--- a/queue-6.10/selftests-mptcp-join-ability-to-invert-add_addr-chec.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 469e6fe99988649029b7f136218d5c3d8854e705 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jul 2024 13:05:58 +0200
-Subject: selftests: mptcp: join: ability to invert ADD_ADDR check
-
-From: Matthieu Baerts (NGI0) <matttbe@kernel.org>
-
-[ Upstream commit bec1f3b119ebc613d08dfbcdbaef01a79aa7de92 ]
-
-In the following commit, the client will initiate the ADD_ADDR, instead
-of the server. We need to way to verify the ADD_ADDR have been correctly
-sent.
-
-Note: the default expected counters for when the port number is given
-are never changed by the caller, no need to accept them as parameter
-then.
-
-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: 86e39e04482b ("mptcp: keep track of local endpoint still available for each msk")
-Reviewed-by: Mat Martineau <martineau@kernel.org>
-Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
-Link: https://patch.msgid.link/20240731-upstream-net-20240731-mptcp-endp-subflow-signal-v1-6-c8a9b036493b@kernel.org
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- .../testing/selftests/net/mptcp/mptcp_join.sh | 40 ++++++++++++-------
- 1 file changed, 26 insertions(+), 14 deletions(-)
-
-diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
-index 7043984b7e74a..8ab350059ce10 100755
---- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
-+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
-@@ -1415,18 +1415,28 @@ chk_add_nr()
-       local add_nr=$1
-       local echo_nr=$2
-       local port_nr=${3:-0}
--      local syn_nr=${4:-$port_nr}
--      local syn_ack_nr=${5:-$port_nr}
--      local ack_nr=${6:-$port_nr}
--      local mis_syn_nr=${7:-0}
--      local mis_ack_nr=${8:-0}
-+      local ns_invert=${4:-""}
-+      local syn_nr=$port_nr
-+      local syn_ack_nr=$port_nr
-+      local ack_nr=$port_nr
-+      local mis_syn_nr=0
-+      local mis_ack_nr=0
-+      local ns_tx=$ns1
-+      local ns_rx=$ns2
-+      local extra_msg=""
-       local count
-       local timeout
- 
--      timeout=$(ip netns exec $ns1 sysctl -n net.mptcp.add_addr_timeout)
-+      if [[ $ns_invert = "invert" ]]; then
-+              ns_tx=$ns2
-+              ns_rx=$ns1
-+              extra_msg="invert"
-+      fi
-+
-+      timeout=$(ip netns exec ${ns_tx} sysctl -n net.mptcp.add_addr_timeout)
- 
-       print_check "add"
--      count=$(mptcp_lib_get_counter ${ns2} "MPTcpExtAddAddr")
-+      count=$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtAddAddr")
-       if [ -z "$count" ]; then
-               print_skip
-       # if the test configured a short timeout tolerate greater then expected
-@@ -1438,7 +1448,7 @@ chk_add_nr()
-       fi
- 
-       print_check "echo"
--      count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtEchoAdd")
-+      count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtEchoAdd")
-       if [ -z "$count" ]; then
-               print_skip
-       elif [ "$count" != "$echo_nr" ]; then
-@@ -1449,7 +1459,7 @@ chk_add_nr()
- 
-       if [ $port_nr -gt 0 ]; then
-               print_check "pt"
--              count=$(mptcp_lib_get_counter ${ns2} "MPTcpExtPortAdd")
-+              count=$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtPortAdd")
-               if [ -z "$count" ]; then
-                       print_skip
-               elif [ "$count" != "$port_nr" ]; then
-@@ -1459,7 +1469,7 @@ chk_add_nr()
-               fi
- 
-               print_check "syn"
--              count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPJoinPortSynRx")
-+              count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPJoinPortSynRx")
-               if [ -z "$count" ]; then
-                       print_skip
-               elif [ "$count" != "$syn_nr" ]; then
-@@ -1470,7 +1480,7 @@ chk_add_nr()
-               fi
- 
-               print_check "synack"
--              count=$(mptcp_lib_get_counter ${ns2} "MPTcpExtMPJoinPortSynAckRx")
-+              count=$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPJoinPortSynAckRx")
-               if [ -z "$count" ]; then
-                       print_skip
-               elif [ "$count" != "$syn_ack_nr" ]; then
-@@ -1481,7 +1491,7 @@ chk_add_nr()
-               fi
- 
-               print_check "ack"
--              count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPJoinPortAckRx")
-+              count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPJoinPortAckRx")
-               if [ -z "$count" ]; then
-                       print_skip
-               elif [ "$count" != "$ack_nr" ]; then
-@@ -1492,7 +1502,7 @@ chk_add_nr()
-               fi
- 
-               print_check "syn"
--              count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtMismatchPortSynRx")
-+              count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMismatchPortSynRx")
-               if [ -z "$count" ]; then
-                       print_skip
-               elif [ "$count" != "$mis_syn_nr" ]; then
-@@ -1503,7 +1513,7 @@ chk_add_nr()
-               fi
- 
-               print_check "ack"
--              count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtMismatchPortAckRx")
-+              count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMismatchPortAckRx")
-               if [ -z "$count" ]; then
-                       print_skip
-               elif [ "$count" != "$mis_ack_nr" ]; then
-@@ -1513,6 +1523,8 @@ chk_add_nr()
-                       print_ok
-               fi
-       fi
-+
-+      print_info "$extra_msg"
- }
- 
- chk_add_tx_nr()
--- 
-2.43.0
-

diff --git a/queue-6.10/series b/queue-6.10/series
index 0a510993e1d155000e5e492e33d99e6f03e806d1..3254b4d2619a2d9ee3cbf5f0ab69b4074442e2db 100644 (file)
--- a/queue-6.10/series
+++ b/queue-6.10/series
@@ -16,7 +16,6 @@ x86-mm-fix-pti_clone_pgtable-alignment-assumption.patch
 x86-mm-fix-pti_clone_entry_text-for-i386.patch
 smb-client-handle-lack-of-fsctl_get_reparse_point-su.patch
 power-supply-rt5033-bring-back-i2c_set_clientdata.patch
-selftests-mptcp-join-ability-to-invert-add_addr-chec.patch
 selftests-mptcp-join-test-both-signal-subflow.patch
 sctp-fix-null-ptr-deref-in-reuseport_add_sock.patch
 net-pse-pd-tps23881-fix-the-device-id-check.patch

diff --git a/queue-6.6/selftests-mptcp-join-ability-to-invert-add_addr-chec.patch b/queue-6.6/selftests-mptcp-join-ability-to-invert-add_addr-chec.patch
deleted file mode 100644 (file)
index 588c400..0000000
--- a/queue-6.6/selftests-mptcp-join-ability-to-invert-add_addr-chec.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 948e273671d1fad2c394968275a004158a95d350 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jul 2024 13:05:58 +0200
-Subject: selftests: mptcp: join: ability to invert ADD_ADDR check
-
-From: Matthieu Baerts (NGI0) <matttbe@kernel.org>
-
-[ Upstream commit bec1f3b119ebc613d08dfbcdbaef01a79aa7de92 ]
-
-In the following commit, the client will initiate the ADD_ADDR, instead
-of the server. We need to way to verify the ADD_ADDR have been correctly
-sent.
-
-Note: the default expected counters for when the port number is given
-are never changed by the caller, no need to accept them as parameter
-then.
-
-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: 86e39e04482b ("mptcp: keep track of local endpoint still available for each msk")
-Reviewed-by: Mat Martineau <martineau@kernel.org>
-Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
-Link: https://patch.msgid.link/20240731-upstream-net-20240731-mptcp-endp-subflow-signal-v1-6-c8a9b036493b@kernel.org
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- .../testing/selftests/net/mptcp/mptcp_join.sh | 40 ++++++++++++-------
- 1 file changed, 26 insertions(+), 14 deletions(-)
-
-diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
-index a2dae2a3a93e0..f928db7b999ee 100755
---- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
-+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
-@@ -1559,18 +1559,28 @@ chk_add_nr()
-       local add_nr=$1
-       local echo_nr=$2
-       local port_nr=${3:-0}
--      local syn_nr=${4:-$port_nr}
--      local syn_ack_nr=${5:-$port_nr}
--      local ack_nr=${6:-$port_nr}
--      local mis_syn_nr=${7:-0}
--      local mis_ack_nr=${8:-0}
-+      local ns_invert=${4:-""}
-+      local syn_nr=$port_nr
-+      local syn_ack_nr=$port_nr
-+      local ack_nr=$port_nr
-+      local mis_syn_nr=0
-+      local mis_ack_nr=0
-+      local ns_tx=$ns1
-+      local ns_rx=$ns2
-+      local extra_msg=""
-       local count
-       local timeout
- 
--      timeout=$(ip netns exec $ns1 sysctl -n net.mptcp.add_addr_timeout)
-+      if [[ $ns_invert = "invert" ]]; then
-+              ns_tx=$ns2
-+              ns_rx=$ns1
-+              extra_msg="invert"
-+      fi
-+
-+      timeout=$(ip netns exec ${ns_tx} sysctl -n net.mptcp.add_addr_timeout)
- 
-       print_check "add"
--      count=$(mptcp_lib_get_counter ${ns2} "MPTcpExtAddAddr")
-+      count=$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtAddAddr")
-       if [ -z "$count" ]; then
-               print_skip
-       # if the test configured a short timeout tolerate greater then expected
-@@ -1582,7 +1592,7 @@ chk_add_nr()
-       fi
- 
-       print_check "echo"
--      count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtEchoAdd")
-+      count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtEchoAdd")
-       if [ -z "$count" ]; then
-               print_skip
-       elif [ "$count" != "$echo_nr" ]; then
-@@ -1593,7 +1603,7 @@ chk_add_nr()
- 
-       if [ $port_nr -gt 0 ]; then
-               print_check "pt"
--              count=$(mptcp_lib_get_counter ${ns2} "MPTcpExtPortAdd")
-+              count=$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtPortAdd")
-               if [ -z "$count" ]; then
-                       print_skip
-               elif [ "$count" != "$port_nr" ]; then
-@@ -1603,7 +1613,7 @@ chk_add_nr()
-               fi
- 
-               print_check "syn"
--              count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPJoinPortSynRx")
-+              count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPJoinPortSynRx")
-               if [ -z "$count" ]; then
-                       print_skip
-               elif [ "$count" != "$syn_nr" ]; then
-@@ -1614,7 +1624,7 @@ chk_add_nr()
-               fi
- 
-               print_check "synack"
--              count=$(mptcp_lib_get_counter ${ns2} "MPTcpExtMPJoinPortSynAckRx")
-+              count=$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPJoinPortSynAckRx")
-               if [ -z "$count" ]; then
-                       print_skip
-               elif [ "$count" != "$syn_ack_nr" ]; then
-@@ -1625,7 +1635,7 @@ chk_add_nr()
-               fi
- 
-               print_check "ack"
--              count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPJoinPortAckRx")
-+              count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPJoinPortAckRx")
-               if [ -z "$count" ]; then
-                       print_skip
-               elif [ "$count" != "$ack_nr" ]; then
-@@ -1636,7 +1646,7 @@ chk_add_nr()
-               fi
- 
-               print_check "syn"
--              count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtMismatchPortSynRx")
-+              count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMismatchPortSynRx")
-               if [ -z "$count" ]; then
-                       print_skip
-               elif [ "$count" != "$mis_syn_nr" ]; then
-@@ -1647,7 +1657,7 @@ chk_add_nr()
-               fi
- 
-               print_check "ack"
--              count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtMismatchPortAckRx")
-+              count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMismatchPortAckRx")
-               if [ -z "$count" ]; then
-                       print_skip
-               elif [ "$count" != "$mis_ack_nr" ]; then
-@@ -1657,6 +1667,8 @@ chk_add_nr()
-                       print_ok
-               fi
-       fi
-+
-+      print_info "$extra_msg"
- }
- 
- chk_add_tx_nr()
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index ffd0adee7e30a9279385f2724cce0cacf52991b5..297cbfe36f057be7d45fd33dd1cfb23525238fc3 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -9,7 +9,6 @@ smb-client-handle-lack-of-fsctl_get_reparse_point-su.patch
 wifi-ath12k-rename-the-sc-naming-convention-to-ab.patch
 wifi-ath12k-add-ce-and-ext-irq-flag-to-indicate-irq_.patch
 wifi-ath12k-fix-soft-lockup-on-suspend.patch
-selftests-mptcp-join-ability-to-invert-add_addr-chec.patch
 selftests-mptcp-join-test-both-signal-subflow.patch
 sctp-fix-null-ptr-deref-in-reuseport_add_sock.patch
 net-usb-qmi_wwan-fix-memory-leak-for-not-ip-packets.patch