Drop selftests-mptcp-explicitly-trigger-the-listener-diag.patch

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

diff --git a/queue-6.6/selftests-mptcp-explicitly-trigger-the-listener-diag.patch b/queue-6.6/selftests-mptcp-explicitly-trigger-the-listener-diag.patch
deleted file mode 100644 (file)
index 7d1ef36..0000000
--- a/queue-6.6/selftests-mptcp-explicitly-trigger-the-listener-diag.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 74f2e54aa15772aee0fee291a50ad7a42517c6c7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 23 Feb 2024 17:14:20 +0100
-Subject: selftests: mptcp: explicitly trigger the listener diag code-path
-
-From: Paolo Abeni <pabeni@redhat.com>
-
-[ Upstream commit b4b51d36bbaa3ddb93b3e1ca3a1ef0aa629d6521 ]
-
-The mptcp diag interface already experienced a few locking bugs
-that lockdep and appropriate coverage have detected in advance.
-
-Let's add a test-case triggering the relevant code path, to prevent
-similar issues in the future.
-
-Be careful to cope with very slow environments.
-
-Note that we don't need an explicit timeout on the mptcp_connect
-subprocess to cope with eventual bug/hang-up as the final cleanup
-terminating the child processes will take care of that.
-
-Signed-off-by: Paolo Abeni <pabeni@redhat.com>
-Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
-Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
-Reviewed-by: Simon Horman <horms@kernel.org>
-Link: https://lore.kernel.org/r/20240223-upstream-net-20240223-misc-fixes-v1-10-162e87e48497@kernel.org
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/testing/selftests/net/mptcp/diag.sh | 30 ++++++++++++++++++++++-
- 1 file changed, 29 insertions(+), 1 deletion(-)
-
-diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh
-index 4d8c59be1b30c..ff9a4f45f852f 100755
---- a/tools/testing/selftests/net/mptcp/diag.sh
-+++ b/tools/testing/selftests/net/mptcp/diag.sh
-@@ -20,7 +20,7 @@ flush_pids()
- 
-       ip netns pids "${ns}" | xargs --no-run-if-empty kill -SIGUSR1 &>/dev/null
- 
--      for _ in $(seq 10); do
-+      for _ in $(seq $((timeout_poll * 10))); do
-               [ -z "$(ip netns pids "${ns}")" ] && break
-               sleep 0.1
-       done
-@@ -91,6 +91,15 @@ chk_msk_nr()
-       __chk_msk_nr "grep -c token:" "$@"
- }
- 
-+chk_listener_nr()
-+{
-+      local expected=$1
-+      local msg="$2"
-+
-+      __chk_nr "ss -inmlHMON $ns | wc -l" "$expected" "$msg - mptcp" 0
-+      __chk_nr "ss -inmlHtON $ns | wc -l" "$expected" "$msg - subflows"
-+}
-+
- wait_msk_nr()
- {
-       local condition="grep -c token:"
-@@ -306,5 +315,24 @@ flush_pids
- chk_msk_inuse 0 "many->0"
- chk_msk_cestab 0 "many->0"
- 
-+chk_listener_nr 0 "no listener sockets"
-+NR_SERVERS=100
-+for I in $(seq 1 $NR_SERVERS); do
-+      ip netns exec $ns ./mptcp_connect -p $((I + 20001)) \
-+              -t ${timeout_poll} -l 0.0.0.0 >/dev/null 2>&1 &
-+done
-+
-+for I in $(seq 1 $NR_SERVERS); do
-+      mptcp_lib_wait_local_port_listen $ns $((I + 20001))
-+done
-+
-+chk_listener_nr $NR_SERVERS "many listener sockets"
-+
-+# graceful termination
-+for I in $(seq 1 $NR_SERVERS); do
-+      echo a | ip netns exec $ns ./mptcp_connect -p $((I + 20001)) 127.0.0.1 >/dev/null 2>&1 &
-+done
-+flush_pids
-+
- mptcp_lib_result_print_all_tap
- exit $ret
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index ce18a13c22c123a1f6118ee550bf0150b3ef8ca2..b90de7569e7a7764fcc6d71d5630005955dcebb4 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -47,7 +47,6 @@ wifi-mac80211-only-call-drv_sta_rc_update-for-upload.patch
 drm-ttm-tests-depend-on-uml-compile_test.patch
 asoc-amd-yc-add-lenovo-thinkbook-21j0-into-dmi-quirk.patch
 scsi-mpt3sas-prevent-sending-diag_reset-when-the-con.patch
-selftests-mptcp-explicitly-trigger-the-listener-diag.patch
 alsa-hda-realtek-alc285-reduce-pop-noise-from-headph.patch
 drm-amdgpu-enable-gpu-reset-for-s3-abort-cases-on-ra.patch
 asoc-amd-yc-fix-non-functional-mic-on-lenovo-21j2.patch

diff --git a/queue-6.7/selftests-mptcp-explicitly-trigger-the-listener-diag.patch b/queue-6.7/selftests-mptcp-explicitly-trigger-the-listener-diag.patch
deleted file mode 100644 (file)
index 6607314..0000000
--- a/queue-6.7/selftests-mptcp-explicitly-trigger-the-listener-diag.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 02dc7e7327bc1a3551665745a40029cf96d6a8e6 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 23 Feb 2024 17:14:20 +0100
-Subject: selftests: mptcp: explicitly trigger the listener diag code-path
-
-From: Paolo Abeni <pabeni@redhat.com>
-
-[ Upstream commit b4b51d36bbaa3ddb93b3e1ca3a1ef0aa629d6521 ]
-
-The mptcp diag interface already experienced a few locking bugs
-that lockdep and appropriate coverage have detected in advance.
-
-Let's add a test-case triggering the relevant code path, to prevent
-similar issues in the future.
-
-Be careful to cope with very slow environments.
-
-Note that we don't need an explicit timeout on the mptcp_connect
-subprocess to cope with eventual bug/hang-up as the final cleanup
-terminating the child processes will take care of that.
-
-Signed-off-by: Paolo Abeni <pabeni@redhat.com>
-Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
-Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
-Reviewed-by: Simon Horman <horms@kernel.org>
-Link: https://lore.kernel.org/r/20240223-upstream-net-20240223-misc-fixes-v1-10-162e87e48497@kernel.org
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/testing/selftests/net/mptcp/diag.sh | 30 ++++++++++++++++++++++-
- 1 file changed, 29 insertions(+), 1 deletion(-)
-
-diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh
-index 4d8c59be1b30c..ff9a4f45f852f 100755
---- a/tools/testing/selftests/net/mptcp/diag.sh
-+++ b/tools/testing/selftests/net/mptcp/diag.sh
-@@ -20,7 +20,7 @@ flush_pids()
- 
-       ip netns pids "${ns}" | xargs --no-run-if-empty kill -SIGUSR1 &>/dev/null
- 
--      for _ in $(seq 10); do
-+      for _ in $(seq $((timeout_poll * 10))); do
-               [ -z "$(ip netns pids "${ns}")" ] && break
-               sleep 0.1
-       done
-@@ -91,6 +91,15 @@ chk_msk_nr()
-       __chk_msk_nr "grep -c token:" "$@"
- }
- 
-+chk_listener_nr()
-+{
-+      local expected=$1
-+      local msg="$2"
-+
-+      __chk_nr "ss -inmlHMON $ns | wc -l" "$expected" "$msg - mptcp" 0
-+      __chk_nr "ss -inmlHtON $ns | wc -l" "$expected" "$msg - subflows"
-+}
-+
- wait_msk_nr()
- {
-       local condition="grep -c token:"
-@@ -306,5 +315,24 @@ flush_pids
- chk_msk_inuse 0 "many->0"
- chk_msk_cestab 0 "many->0"
- 
-+chk_listener_nr 0 "no listener sockets"
-+NR_SERVERS=100
-+for I in $(seq 1 $NR_SERVERS); do
-+      ip netns exec $ns ./mptcp_connect -p $((I + 20001)) \
-+              -t ${timeout_poll} -l 0.0.0.0 >/dev/null 2>&1 &
-+done
-+
-+for I in $(seq 1 $NR_SERVERS); do
-+      mptcp_lib_wait_local_port_listen $ns $((I + 20001))
-+done
-+
-+chk_listener_nr $NR_SERVERS "many listener sockets"
-+
-+# graceful termination
-+for I in $(seq 1 $NR_SERVERS); do
-+      echo a | ip netns exec $ns ./mptcp_connect -p $((I + 20001)) 127.0.0.1 >/dev/null 2>&1 &
-+done
-+flush_pids
-+
- mptcp_lib_result_print_all_tap
- exit $ret
--- 
-2.43.0
-

diff --git a/queue-6.7/series b/queue-6.7/series
index 109b2aed86fb5417372ff0c0c557bc3fe98399b3..d94636c76b7a0ccd3fe2c91f3e091b35df28208c 100644 (file)
--- a/queue-6.7/series
+++ b/queue-6.7/series
@@ -58,7 +58,6 @@ wifi-mac80211-only-call-drv_sta_rc_update-for-upload.patch
 drm-ttm-tests-depend-on-uml-compile_test.patch
 asoc-amd-yc-add-lenovo-thinkbook-21j0-into-dmi-quirk.patch
 scsi-mpt3sas-prevent-sending-diag_reset-when-the-con.patch
-selftests-mptcp-explicitly-trigger-the-listener-diag.patch
 alsa-hda-realtek-alc285-reduce-pop-noise-from-headph.patch
 drm-amdgpu-enable-gpu-reset-for-s3-abort-cases-on-ra.patch
 drm-buddy-check-range-allocation-matches-alignment.patch