Drop selftests-tc_actions-don-t-dump-2mb-of-0-to-stdout.patch

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

diff --git a/queue-5.10/selftests-tc_actions-don-t-dump-2mb-of-0-to-stdout.patch b/queue-5.10/selftests-tc_actions-don-t-dump-2mb-of-0-to-stdout.patch
deleted file mode 100644 (file)
index 750ba1e..0000000
--- a/queue-5.10/selftests-tc_actions-don-t-dump-2mb-of-0-to-stdout.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From b75d703070e22b63b6d5cb86117b799e261bd121 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 13 Feb 2026 19:51:59 -0800
-Subject: selftests: tc_actions: don't dump 2MB of \0 to stdout
-
-From: Jakub Kicinski <kuba@kernel.org>
-
-[ Upstream commit 32b70e62034aa72f8414ad4e9122cce7ad418c48 ]
-
-Since we started running selftests in NIPA we have been seeing
-tc_actions.sh generate a soft lockup warning on ~20% of the runs.
-On the pre-netdev foundation setup it was actually a missed irq
-splat from the console. Now it's either that or a lockup.
-
-I initially suspected a socket locking issue since the test
-is exercising local loopback with act_mirred.
-After hours of staring at this I noticed in strace that ncat
-when -o $file is specified _both_ saves the output to the file
-and still prints it to stdout. Because the file being sent
-is constructed with:
-
-  dd conv=sparse status=none if=/dev/zero bs=1M count=2 of=$mirred
-                                ^^^^^^^^^
-
-the data printed is all \0. Most terminals don't display nul
-characters (and neither does vng output capture save them).
-But QEMU's serial console still has to poke them thru which
-is very slow and causes the lockup (if the file is >600kB).
-
-Replace the '-o $file' with '> $file'. This speeds the test up
-from 2m20s to 18s on debug kernels, and prevents the warnings.
-
-Fixes: ca22da2fbd69 ("act_mirred: use the backlog for nested calls to mirred ingress")
-Reviewed-by: Simon Horman <horms@kernel.org>
-Link: https://patch.msgid.link/20260214035159.2119699-1-kuba@kernel.org
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/testing/selftests/net/forwarding/tc_actions.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/testing/selftests/net/forwarding/tc_actions.sh b/tools/testing/selftests/net/forwarding/tc_actions.sh
-index dd02ed4cacacb..c25aaced2e1f0 100755
---- a/tools/testing/selftests/net/forwarding/tc_actions.sh
-+++ b/tools/testing/selftests/net/forwarding/tc_actions.sh
-@@ -176,7 +176,7 @@ mirred_egress_to_ingress_tcp_test()
-               ip_proto icmp \
-                       action drop
- 
--      ip vrf exec v$h1 ncat --recv-only -w10 -l -p 12345 -o $mirred_e2i_tf2 &
-+      ip vrf exec v$h1 ncat --recv-only -w10 -l -p 12345 > $mirred_e2i_tf2 &
-       local rpid=$!
-       ip vrf exec v$h1 ncat -w1 --send-only 192.0.2.2 12345 <$mirred_e2i_tf1
-       wait -n $rpid
--- 
-2.51.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 4a95d1409dc88f538d3dde895a2bb54b22b17cc8..4ec17afce21376b503499e28eca6f4b4b0703494 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -144,7 +144,6 @@ netfilter-nf_conntrack_h323-don-t-pass-uninitialised.patch
 ipv6-fix-a-race-in-ip6_sock_set_v6only.patch
 selftests-forwarding-tc_actions-cleanup-temporary-fi.patch
 selftests-forwarding-tc_actions-use-ncat-instead-of-.patch
-selftests-tc_actions-don-t-dump-2mb-of-0-to-stdout.patch
 macvlan-observe-an-rcu-grace-period-in-macvlan_commo.patch
 bonding-alb-fix-uaf-in-rlb_arp_recv-during-bond-up-d.patch
 apparmor-fix-null-sock-in-aa_sock_file_perm.patch

diff --git a/queue-5.15/selftests-tc_actions-don-t-dump-2mb-of-0-to-stdout.patch b/queue-5.15/selftests-tc_actions-don-t-dump-2mb-of-0-to-stdout.patch
deleted file mode 100644 (file)
index adb42e7..0000000
--- a/queue-5.15/selftests-tc_actions-don-t-dump-2mb-of-0-to-stdout.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d45fe9433273fdc1294b0c1988dbec24248a23ec Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 13 Feb 2026 19:51:59 -0800
-Subject: selftests: tc_actions: don't dump 2MB of \0 to stdout
-
-From: Jakub Kicinski <kuba@kernel.org>
-
-[ Upstream commit 32b70e62034aa72f8414ad4e9122cce7ad418c48 ]
-
-Since we started running selftests in NIPA we have been seeing
-tc_actions.sh generate a soft lockup warning on ~20% of the runs.
-On the pre-netdev foundation setup it was actually a missed irq
-splat from the console. Now it's either that or a lockup.
-
-I initially suspected a socket locking issue since the test
-is exercising local loopback with act_mirred.
-After hours of staring at this I noticed in strace that ncat
-when -o $file is specified _both_ saves the output to the file
-and still prints it to stdout. Because the file being sent
-is constructed with:
-
-  dd conv=sparse status=none if=/dev/zero bs=1M count=2 of=$mirred
-                                ^^^^^^^^^
-
-the data printed is all \0. Most terminals don't display nul
-characters (and neither does vng output capture save them).
-But QEMU's serial console still has to poke them thru which
-is very slow and causes the lockup (if the file is >600kB).
-
-Replace the '-o $file' with '> $file'. This speeds the test up
-from 2m20s to 18s on debug kernels, and prevents the warnings.
-
-Fixes: ca22da2fbd69 ("act_mirred: use the backlog for nested calls to mirred ingress")
-Reviewed-by: Simon Horman <horms@kernel.org>
-Link: https://patch.msgid.link/20260214035159.2119699-1-kuba@kernel.org
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/testing/selftests/net/forwarding/tc_actions.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/testing/selftests/net/forwarding/tc_actions.sh b/tools/testing/selftests/net/forwarding/tc_actions.sh
-index dd02ed4cacacb..c25aaced2e1f0 100755
---- a/tools/testing/selftests/net/forwarding/tc_actions.sh
-+++ b/tools/testing/selftests/net/forwarding/tc_actions.sh
-@@ -176,7 +176,7 @@ mirred_egress_to_ingress_tcp_test()
-               ip_proto icmp \
-                       action drop
- 
--      ip vrf exec v$h1 ncat --recv-only -w10 -l -p 12345 -o $mirred_e2i_tf2 &
-+      ip vrf exec v$h1 ncat --recv-only -w10 -l -p 12345 > $mirred_e2i_tf2 &
-       local rpid=$!
-       ip vrf exec v$h1 ncat -w1 --send-only 192.0.2.2 12345 <$mirred_e2i_tf1
-       wait -n $rpid
--- 
-2.51.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 4386e69ba3d4bb1b9dbe4e65bdd635d6f127cf86..de57149307c21b49e9cfe0ba9e67648d62f89963 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -160,7 +160,6 @@ netfilter-nf_conntrack_h323-don-t-pass-uninitialised.patch
 net-remove-warn_on_once-when-accessing-forward-path-.patch
 ipv6-fix-a-race-in-ip6_sock_set_v6only.patch
 bpftool-fix-truncated-netlink-dumps.patch
-selftests-tc_actions-don-t-dump-2mb-of-0-to-stdout.patch
 macvlan-observe-an-rcu-grace-period-in-macvlan_commo.patch
 octeontx2-af-fix-default-entries-mcam-entry-action.patch
 bonding-alb-fix-uaf-in-rlb_arp_recv-during-bond-up-d.patch

diff --git a/queue-6.1/selftests-tc_actions-don-t-dump-2mb-of-0-to-stdout.patch b/queue-6.1/selftests-tc_actions-don-t-dump-2mb-of-0-to-stdout.patch
deleted file mode 100644 (file)
index 44b4d15..0000000
--- a/queue-6.1/selftests-tc_actions-don-t-dump-2mb-of-0-to-stdout.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From ad1fbdecce232b59495a7e35fa36c013798caf83 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 13 Feb 2026 19:51:59 -0800
-Subject: selftests: tc_actions: don't dump 2MB of \0 to stdout
-
-From: Jakub Kicinski <kuba@kernel.org>
-
-[ Upstream commit 32b70e62034aa72f8414ad4e9122cce7ad418c48 ]
-
-Since we started running selftests in NIPA we have been seeing
-tc_actions.sh generate a soft lockup warning on ~20% of the runs.
-On the pre-netdev foundation setup it was actually a missed irq
-splat from the console. Now it's either that or a lockup.
-
-I initially suspected a socket locking issue since the test
-is exercising local loopback with act_mirred.
-After hours of staring at this I noticed in strace that ncat
-when -o $file is specified _both_ saves the output to the file
-and still prints it to stdout. Because the file being sent
-is constructed with:
-
-  dd conv=sparse status=none if=/dev/zero bs=1M count=2 of=$mirred
-                                ^^^^^^^^^
-
-the data printed is all \0. Most terminals don't display nul
-characters (and neither does vng output capture save them).
-But QEMU's serial console still has to poke them thru which
-is very slow and causes the lockup (if the file is >600kB).
-
-Replace the '-o $file' with '> $file'. This speeds the test up
-from 2m20s to 18s on debug kernels, and prevents the warnings.
-
-Fixes: ca22da2fbd69 ("act_mirred: use the backlog for nested calls to mirred ingress")
-Reviewed-by: Simon Horman <horms@kernel.org>
-Link: https://patch.msgid.link/20260214035159.2119699-1-kuba@kernel.org
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/testing/selftests/net/forwarding/tc_actions.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/testing/selftests/net/forwarding/tc_actions.sh b/tools/testing/selftests/net/forwarding/tc_actions.sh
-index b0f5e55d2d0b2..0d891c2045802 100755
---- a/tools/testing/selftests/net/forwarding/tc_actions.sh
-+++ b/tools/testing/selftests/net/forwarding/tc_actions.sh
-@@ -222,7 +222,7 @@ mirred_egress_to_ingress_tcp_test()
-               ip_proto icmp \
-                       action drop
- 
--      ip vrf exec v$h1 ncat --recv-only -w10 -l -p 12345 -o $mirred_e2i_tf2 &
-+      ip vrf exec v$h1 ncat --recv-only -w10 -l -p 12345 > $mirred_e2i_tf2 &
-       local rpid=$!
-       ip vrf exec v$h1 ncat -w1 --send-only 192.0.2.2 12345 <$mirred_e2i_tf1
-       wait -n $rpid
--- 
-2.51.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 180146d31d0881110a5b76d0401fb25f0e0d417e..a76b7a561bdce4fac66c8569986e7a5786a202d4 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -228,7 +228,6 @@ bpftool-fix-truncated-netlink-dumps.patch
 ping-convert-hlist_nulls-to-plain-hlist.patch
 inet-ping-check-sock_net-in-ping_get_port-and-ping_l.patch
 ping-annotate-data-races-in-ping_lookup.patch
-selftests-tc_actions-don-t-dump-2mb-of-0-to-stdout.patch
 macvlan-observe-an-rcu-grace-period-in-macvlan_commo.patch
 icmp-move-icmp_global.credit-and-icmp_global.stamp-t.patch
 icmp-icmp_msgs_per_sec-and-icmp_msgs_burst-sysctls-b.patch

diff --git a/queue-6.12/selftests-tc_actions-don-t-dump-2mb-of-0-to-stdout.patch b/queue-6.12/selftests-tc_actions-don-t-dump-2mb-of-0-to-stdout.patch
deleted file mode 100644 (file)
index f251e81..0000000
--- a/queue-6.12/selftests-tc_actions-don-t-dump-2mb-of-0-to-stdout.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From c323066db198394bebc818f8af36b4f75fbe43b7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 13 Feb 2026 19:51:59 -0800
-Subject: selftests: tc_actions: don't dump 2MB of \0 to stdout
-
-From: Jakub Kicinski <kuba@kernel.org>
-
-[ Upstream commit 32b70e62034aa72f8414ad4e9122cce7ad418c48 ]
-
-Since we started running selftests in NIPA we have been seeing
-tc_actions.sh generate a soft lockup warning on ~20% of the runs.
-On the pre-netdev foundation setup it was actually a missed irq
-splat from the console. Now it's either that or a lockup.
-
-I initially suspected a socket locking issue since the test
-is exercising local loopback with act_mirred.
-After hours of staring at this I noticed in strace that ncat
-when -o $file is specified _both_ saves the output to the file
-and still prints it to stdout. Because the file being sent
-is constructed with:
-
-  dd conv=sparse status=none if=/dev/zero bs=1M count=2 of=$mirred
-                                ^^^^^^^^^
-
-the data printed is all \0. Most terminals don't display nul
-characters (and neither does vng output capture save them).
-But QEMU's serial console still has to poke them thru which
-is very slow and causes the lockup (if the file is >600kB).
-
-Replace the '-o $file' with '> $file'. This speeds the test up
-from 2m20s to 18s on debug kernels, and prevents the warnings.
-
-Fixes: ca22da2fbd69 ("act_mirred: use the backlog for nested calls to mirred ingress")
-Reviewed-by: Simon Horman <horms@kernel.org>
-Link: https://patch.msgid.link/20260214035159.2119699-1-kuba@kernel.org
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/testing/selftests/net/forwarding/tc_actions.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/testing/selftests/net/forwarding/tc_actions.sh b/tools/testing/selftests/net/forwarding/tc_actions.sh
-index ea89e558672db..86edbc7e2489b 100755
---- a/tools/testing/selftests/net/forwarding/tc_actions.sh
-+++ b/tools/testing/selftests/net/forwarding/tc_actions.sh
-@@ -223,7 +223,7 @@ mirred_egress_to_ingress_tcp_test()
-               ip_proto icmp \
-                       action drop
- 
--      ip vrf exec v$h1 ncat --recv-only -w10 -l -p 12345 -o $mirred_e2i_tf2 &
-+      ip vrf exec v$h1 ncat --recv-only -w10 -l -p 12345 > $mirred_e2i_tf2 &
-       local rpid=$!
-       ip vrf exec v$h1 ncat -w1 --send-only 192.0.2.2 12345 <$mirred_e2i_tf1
-       wait -n $rpid
--- 
-2.51.0
-

diff --git a/queue-6.12/series b/queue-6.12/series
index d28c52636a8612d4282a28023dbb23706ab41154..bf41c6aed7eaf557a346293f330076466471f8d3 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -381,7 +381,6 @@ netfilter-nf_tables-fix-use-after-free-in-nf_tables_.patch
 ipv6-fix-a-race-in-ip6_sock_set_v6only.patch
 bpftool-fix-truncated-netlink-dumps.patch
 ping-annotate-data-races-in-ping_lookup.patch
-selftests-tc_actions-don-t-dump-2mb-of-0-to-stdout.patch
 macvlan-observe-an-rcu-grace-period-in-macvlan_commo.patch
 icmp-prevent-possible-overflow-in-icmp_global_allow.patch
 inet-move-icmp_global_-credit-stamp-to-a-separate-ca.patch

diff --git a/queue-6.6/selftests-tc_actions-don-t-dump-2mb-of-0-to-stdout.patch b/queue-6.6/selftests-tc_actions-don-t-dump-2mb-of-0-to-stdout.patch
deleted file mode 100644 (file)
index ec66c15..0000000
--- a/queue-6.6/selftests-tc_actions-don-t-dump-2mb-of-0-to-stdout.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From cff71c2fa13849512f84b7f7f9a04167eff28026 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 13 Feb 2026 19:51:59 -0800
-Subject: selftests: tc_actions: don't dump 2MB of \0 to stdout
-
-From: Jakub Kicinski <kuba@kernel.org>
-
-[ Upstream commit 32b70e62034aa72f8414ad4e9122cce7ad418c48 ]
-
-Since we started running selftests in NIPA we have been seeing
-tc_actions.sh generate a soft lockup warning on ~20% of the runs.
-On the pre-netdev foundation setup it was actually a missed irq
-splat from the console. Now it's either that or a lockup.
-
-I initially suspected a socket locking issue since the test
-is exercising local loopback with act_mirred.
-After hours of staring at this I noticed in strace that ncat
-when -o $file is specified _both_ saves the output to the file
-and still prints it to stdout. Because the file being sent
-is constructed with:
-
-  dd conv=sparse status=none if=/dev/zero bs=1M count=2 of=$mirred
-                                ^^^^^^^^^
-
-the data printed is all \0. Most terminals don't display nul
-characters (and neither does vng output capture save them).
-But QEMU's serial console still has to poke them thru which
-is very slow and causes the lockup (if the file is >600kB).
-
-Replace the '-o $file' with '> $file'. This speeds the test up
-from 2m20s to 18s on debug kernels, and prevents the warnings.
-
-Fixes: ca22da2fbd69 ("act_mirred: use the backlog for nested calls to mirred ingress")
-Reviewed-by: Simon Horman <horms@kernel.org>
-Link: https://patch.msgid.link/20260214035159.2119699-1-kuba@kernel.org
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/testing/selftests/net/forwarding/tc_actions.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/testing/selftests/net/forwarding/tc_actions.sh b/tools/testing/selftests/net/forwarding/tc_actions.sh
-index 5896296365022..b2f9aae401e09 100755
---- a/tools/testing/selftests/net/forwarding/tc_actions.sh
-+++ b/tools/testing/selftests/net/forwarding/tc_actions.sh
-@@ -222,7 +222,7 @@ mirred_egress_to_ingress_tcp_test()
-               ip_proto icmp \
-                       action drop
- 
--      ip vrf exec v$h1 ncat --recv-only -w10 -l -p 12345 -o $mirred_e2i_tf2 &
-+      ip vrf exec v$h1 ncat --recv-only -w10 -l -p 12345 > $mirred_e2i_tf2 &
-       local rpid=$!
-       ip vrf exec v$h1 ncat -w1 --send-only 192.0.2.2 12345 <$mirred_e2i_tf1
-       wait -n $rpid
--- 
-2.51.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 34c124e3ee8562f877db49913994c77de7f0fe4e..2efe39a8188a5851fbf4c26ba272a2ffacecc0d5 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -279,7 +279,6 @@ netfilter-nf_tables-fix-use-after-free-in-nf_tables_.patch
 ipv6-fix-a-race-in-ip6_sock_set_v6only.patch
 bpftool-fix-truncated-netlink-dumps.patch
 ping-annotate-data-races-in-ping_lookup.patch
-selftests-tc_actions-don-t-dump-2mb-of-0-to-stdout.patch
 macvlan-observe-an-rcu-grace-period-in-macvlan_commo.patch
 icmp-move-icmp_global.credit-and-icmp_global.stamp-t.patch
 icmp-icmp_msgs_per_sec-and-icmp_msgs_burst-sysctls-b.patch