From: Sasha Levin Date: Fri, 31 Jul 2026 16:52:50 +0000 (-0400) Subject: Drop selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch X-Git-Tag: v6.6.148~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=181b643efaa11f4be410e861bc16143162c541ce;p=thirdparty%2Fkernel%2Fstable-queue.git Drop selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.10/selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch b/queue-5.10/selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch deleted file mode 100644 index 7958abcd71..0000000000 --- a/queue-5.10/selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1a087033a6bad73b4140020b40e819b0933aafc3 Mon Sep 17 00:00:00 2001 -From: "Masami Hiramatsu (Google)" -Date: Fri, 17 Jul 2026 11:51:59 +0900 -Subject: selftests/ftrace: Reset triggers at top level before instance loop - -From: Masami Hiramatsu (Google) - -commit 1a087033a6bad73b4140020b40e819b0933aafc3 upstream. - -When running instance tests, 'ftracetest' creates a new ftrace instance -and runs the tests inside it. Before starting each test, it executes -'initialize_system()' to reset the ftrace state to initial-state. - -However, since 'initialize_system()' is executed in the context of the -instance directory, it only cleans up triggers and filters of that -instance. -Any triggers or dynamic events left behind in the top-level instance by -previous failed top-level tests, are left completely untouched. These -top-level leftovers can cause subsequent instance-based tests to fail -or even crash the kernel. - -Fix this by executing 'initialize_system()' in the top-level tracing -directory once before entering the instance loop. - -Cc: stable@vger.kernel.org -Link: https://patch.msgid.link/178425671889.84440.9477850701738666404.stgit@devnote2 -Fixes: b5b77be812de ("selftests: ftrace: Allow some tests to be run in a tracing instance") -Assisted-by: Antigravity:gemini-3.5-flash -Signed-off-by: Masami Hiramatsu (Google) -Signed-off-by: Steven Rostedt -Signed-off-by: Greg Kroah-Hartman ---- - tools/testing/selftests/ftrace/ftracetest | 1 + - 1 file changed, 1 insertion(+) - ---- a/tools/testing/selftests/ftrace/ftracetest -+++ b/tools/testing/selftests/ftrace/ftracetest -@@ -423,6 +423,7 @@ for t in $TEST_CASES; do - done - - # Test on instance loop -+(cd $TRACING_DIR; initialize_system) - INSTANCE=" (instance) " - for t in $TEST_CASES; do - test_on_instance $t || continue diff --git a/queue-5.10/series b/queue-5.10/series index 1a5c10ec1d..b0080878ae 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -175,7 +175,6 @@ net-iucv-fix-use-after-free-of-a-severed-iucv_path.patch net-x25-fix-use-after-free-in-x25_kill_by_neigh.patch net-hip04-fix-rx-buffer-leak-on-build_skb-failure.patch proc-fix-broken-error-paths-for-namespace-links.patch -selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch rbd-reset-positive-result-codes-to-zero-in-object-map-update-path.patch ila-reload-ipv6-header-after-pskb_may_pull-in-checksum-adjust.patch mac802154-llsec-reject-frames-shorter-than-the-authentication-tag.patch diff --git a/queue-5.15/selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch b/queue-5.15/selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch deleted file mode 100644 index 7958abcd71..0000000000 --- a/queue-5.15/selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1a087033a6bad73b4140020b40e819b0933aafc3 Mon Sep 17 00:00:00 2001 -From: "Masami Hiramatsu (Google)" -Date: Fri, 17 Jul 2026 11:51:59 +0900 -Subject: selftests/ftrace: Reset triggers at top level before instance loop - -From: Masami Hiramatsu (Google) - -commit 1a087033a6bad73b4140020b40e819b0933aafc3 upstream. - -When running instance tests, 'ftracetest' creates a new ftrace instance -and runs the tests inside it. Before starting each test, it executes -'initialize_system()' to reset the ftrace state to initial-state. - -However, since 'initialize_system()' is executed in the context of the -instance directory, it only cleans up triggers and filters of that -instance. -Any triggers or dynamic events left behind in the top-level instance by -previous failed top-level tests, are left completely untouched. These -top-level leftovers can cause subsequent instance-based tests to fail -or even crash the kernel. - -Fix this by executing 'initialize_system()' in the top-level tracing -directory once before entering the instance loop. - -Cc: stable@vger.kernel.org -Link: https://patch.msgid.link/178425671889.84440.9477850701738666404.stgit@devnote2 -Fixes: b5b77be812de ("selftests: ftrace: Allow some tests to be run in a tracing instance") -Assisted-by: Antigravity:gemini-3.5-flash -Signed-off-by: Masami Hiramatsu (Google) -Signed-off-by: Steven Rostedt -Signed-off-by: Greg Kroah-Hartman ---- - tools/testing/selftests/ftrace/ftracetest | 1 + - 1 file changed, 1 insertion(+) - ---- a/tools/testing/selftests/ftrace/ftracetest -+++ b/tools/testing/selftests/ftrace/ftracetest -@@ -423,6 +423,7 @@ for t in $TEST_CASES; do - done - - # Test on instance loop -+(cd $TRACING_DIR; initialize_system) - INSTANCE=" (instance) " - for t in $TEST_CASES; do - test_on_instance $t || continue diff --git a/queue-5.15/series b/queue-5.15/series index 067abaa873..91a6cb0384 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -217,7 +217,6 @@ net-iucv-fix-use-after-free-of-a-severed-iucv_path.patch net-x25-fix-use-after-free-in-x25_kill_by_neigh.patch net-hip04-fix-rx-buffer-leak-on-build_skb-failure.patch proc-fix-broken-error-paths-for-namespace-links.patch -selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch rbd-reset-positive-result-codes-to-zero-in-object-map-update-path.patch ice-use-read_once-to-access-cached-phc-time.patch ila-reload-ipv6-header-after-pskb_may_pull-in-checksum-adjust.patch diff --git a/queue-6.1/selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch b/queue-6.1/selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch deleted file mode 100644 index 7958abcd71..0000000000 --- a/queue-6.1/selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1a087033a6bad73b4140020b40e819b0933aafc3 Mon Sep 17 00:00:00 2001 -From: "Masami Hiramatsu (Google)" -Date: Fri, 17 Jul 2026 11:51:59 +0900 -Subject: selftests/ftrace: Reset triggers at top level before instance loop - -From: Masami Hiramatsu (Google) - -commit 1a087033a6bad73b4140020b40e819b0933aafc3 upstream. - -When running instance tests, 'ftracetest' creates a new ftrace instance -and runs the tests inside it. Before starting each test, it executes -'initialize_system()' to reset the ftrace state to initial-state. - -However, since 'initialize_system()' is executed in the context of the -instance directory, it only cleans up triggers and filters of that -instance. -Any triggers or dynamic events left behind in the top-level instance by -previous failed top-level tests, are left completely untouched. These -top-level leftovers can cause subsequent instance-based tests to fail -or even crash the kernel. - -Fix this by executing 'initialize_system()' in the top-level tracing -directory once before entering the instance loop. - -Cc: stable@vger.kernel.org -Link: https://patch.msgid.link/178425671889.84440.9477850701738666404.stgit@devnote2 -Fixes: b5b77be812de ("selftests: ftrace: Allow some tests to be run in a tracing instance") -Assisted-by: Antigravity:gemini-3.5-flash -Signed-off-by: Masami Hiramatsu (Google) -Signed-off-by: Steven Rostedt -Signed-off-by: Greg Kroah-Hartman ---- - tools/testing/selftests/ftrace/ftracetest | 1 + - 1 file changed, 1 insertion(+) - ---- a/tools/testing/selftests/ftrace/ftracetest -+++ b/tools/testing/selftests/ftrace/ftracetest -@@ -423,6 +423,7 @@ for t in $TEST_CASES; do - done - - # Test on instance loop -+(cd $TRACING_DIR; initialize_system) - INSTANCE=" (instance) " - for t in $TEST_CASES; do - test_on_instance $t || continue diff --git a/queue-6.1/series b/queue-6.1/series index 94ec2605ae..3ff746eb94 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -267,7 +267,6 @@ net-iucv-fix-use-after-free-of-a-severed-iucv_path.patch net-x25-fix-use-after-free-in-x25_kill_by_neigh.patch net-hip04-fix-rx-buffer-leak-on-build_skb-failure.patch proc-fix-broken-error-paths-for-namespace-links.patch -selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch rbd-reset-positive-result-codes-to-zero-in-object-map-update-path.patch ksmbd-defer-destroy_previous_session-until-after-ntlm-authentication.patch ice-use-read_once-to-access-cached-phc-time.patch diff --git a/queue-6.12/selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch b/queue-6.12/selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch deleted file mode 100644 index 9018c569d4..0000000000 --- a/queue-6.12/selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1a087033a6bad73b4140020b40e819b0933aafc3 Mon Sep 17 00:00:00 2001 -From: "Masami Hiramatsu (Google)" -Date: Fri, 17 Jul 2026 11:51:59 +0900 -Subject: selftests/ftrace: Reset triggers at top level before instance loop - -From: Masami Hiramatsu (Google) - -commit 1a087033a6bad73b4140020b40e819b0933aafc3 upstream. - -When running instance tests, 'ftracetest' creates a new ftrace instance -and runs the tests inside it. Before starting each test, it executes -'initialize_system()' to reset the ftrace state to initial-state. - -However, since 'initialize_system()' is executed in the context of the -instance directory, it only cleans up triggers and filters of that -instance. -Any triggers or dynamic events left behind in the top-level instance by -previous failed top-level tests, are left completely untouched. These -top-level leftovers can cause subsequent instance-based tests to fail -or even crash the kernel. - -Fix this by executing 'initialize_system()' in the top-level tracing -directory once before entering the instance loop. - -Cc: stable@vger.kernel.org -Link: https://patch.msgid.link/178425671889.84440.9477850701738666404.stgit@devnote2 -Fixes: b5b77be812de ("selftests: ftrace: Allow some tests to be run in a tracing instance") -Assisted-by: Antigravity:gemini-3.5-flash -Signed-off-by: Masami Hiramatsu (Google) -Signed-off-by: Steven Rostedt -Signed-off-by: Greg Kroah-Hartman ---- - tools/testing/selftests/ftrace/ftracetest | 1 + - 1 file changed, 1 insertion(+) - ---- a/tools/testing/selftests/ftrace/ftracetest -+++ b/tools/testing/selftests/ftrace/ftracetest -@@ -483,6 +483,7 @@ for t in $TEST_CASES; do - done - - # Test on instance loop -+(cd $TRACING_DIR; initialize_system) - INSTANCE=" (instance) " - for t in $TEST_CASES; do - test_on_instance $t || continue diff --git a/queue-6.12/series b/queue-6.12/series index 21c635863c..44fc93d108 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -415,7 +415,6 @@ net-gro-fix-double-aggregation-of-flush-marked-skbs.patch net-hip04-fix-rx-buffer-leak-on-build_skb-failure.patch proc-fix-broken-error-paths-for-namespace-links.patch ice-fix-ptp-call-trace-during-ptp-release.patch -selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch rbd-reset-positive-result-codes-to-zero-in-object-map-update-path.patch ksmbd-defer-destroy_previous_session-until-after-ntlm-authentication.patch ice-reject-out-of-range-ptype-in-ice_parser_profile_init.patch diff --git a/queue-6.18/selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch b/queue-6.18/selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch deleted file mode 100644 index 9018c569d4..0000000000 --- a/queue-6.18/selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1a087033a6bad73b4140020b40e819b0933aafc3 Mon Sep 17 00:00:00 2001 -From: "Masami Hiramatsu (Google)" -Date: Fri, 17 Jul 2026 11:51:59 +0900 -Subject: selftests/ftrace: Reset triggers at top level before instance loop - -From: Masami Hiramatsu (Google) - -commit 1a087033a6bad73b4140020b40e819b0933aafc3 upstream. - -When running instance tests, 'ftracetest' creates a new ftrace instance -and runs the tests inside it. Before starting each test, it executes -'initialize_system()' to reset the ftrace state to initial-state. - -However, since 'initialize_system()' is executed in the context of the -instance directory, it only cleans up triggers and filters of that -instance. -Any triggers or dynamic events left behind in the top-level instance by -previous failed top-level tests, are left completely untouched. These -top-level leftovers can cause subsequent instance-based tests to fail -or even crash the kernel. - -Fix this by executing 'initialize_system()' in the top-level tracing -directory once before entering the instance loop. - -Cc: stable@vger.kernel.org -Link: https://patch.msgid.link/178425671889.84440.9477850701738666404.stgit@devnote2 -Fixes: b5b77be812de ("selftests: ftrace: Allow some tests to be run in a tracing instance") -Assisted-by: Antigravity:gemini-3.5-flash -Signed-off-by: Masami Hiramatsu (Google) -Signed-off-by: Steven Rostedt -Signed-off-by: Greg Kroah-Hartman ---- - tools/testing/selftests/ftrace/ftracetest | 1 + - 1 file changed, 1 insertion(+) - ---- a/tools/testing/selftests/ftrace/ftracetest -+++ b/tools/testing/selftests/ftrace/ftracetest -@@ -483,6 +483,7 @@ for t in $TEST_CASES; do - done - - # Test on instance loop -+(cd $TRACING_DIR; initialize_system) - INSTANCE=" (instance) " - for t in $TEST_CASES; do - test_on_instance $t || continue diff --git a/queue-6.18/series b/queue-6.18/series index 3b9e1df7fc..be7e90b5a3 100644 --- a/queue-6.18/series +++ b/queue-6.18/series @@ -544,7 +544,6 @@ proc-fix-broken-error-paths-for-namespace-links.patch s390-ptff-export-ptff_function_mask.patch ptp-ptp_s390-add-missing-facility-check.patch ice-fix-ptp-call-trace-during-ptp-release.patch -selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch super-fix-emergency-thaw-deadlock-on-frozen-block-devices.patch rbd-reset-positive-result-codes-to-zero-in-object-map-update-path.patch smb-client-handle-status_stopped_on_symlink-responses-without-a-symlink-target.patch diff --git a/queue-6.6/selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch b/queue-6.6/selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch deleted file mode 100644 index 64f43c2a72..0000000000 --- a/queue-6.6/selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1a087033a6bad73b4140020b40e819b0933aafc3 Mon Sep 17 00:00:00 2001 -From: "Masami Hiramatsu (Google)" -Date: Fri, 17 Jul 2026 11:51:59 +0900 -Subject: selftests/ftrace: Reset triggers at top level before instance loop - -From: Masami Hiramatsu (Google) - -commit 1a087033a6bad73b4140020b40e819b0933aafc3 upstream. - -When running instance tests, 'ftracetest' creates a new ftrace instance -and runs the tests inside it. Before starting each test, it executes -'initialize_system()' to reset the ftrace state to initial-state. - -However, since 'initialize_system()' is executed in the context of the -instance directory, it only cleans up triggers and filters of that -instance. -Any triggers or dynamic events left behind in the top-level instance by -previous failed top-level tests, are left completely untouched. These -top-level leftovers can cause subsequent instance-based tests to fail -or even crash the kernel. - -Fix this by executing 'initialize_system()' in the top-level tracing -directory once before entering the instance loop. - -Cc: stable@vger.kernel.org -Link: https://patch.msgid.link/178425671889.84440.9477850701738666404.stgit@devnote2 -Fixes: b5b77be812de ("selftests: ftrace: Allow some tests to be run in a tracing instance") -Assisted-by: Antigravity:gemini-3.5-flash -Signed-off-by: Masami Hiramatsu (Google) -Signed-off-by: Steven Rostedt -Signed-off-by: Greg Kroah-Hartman ---- - tools/testing/selftests/ftrace/ftracetest | 1 + - 1 file changed, 1 insertion(+) - ---- a/tools/testing/selftests/ftrace/ftracetest -+++ b/tools/testing/selftests/ftrace/ftracetest -@@ -477,6 +477,7 @@ for t in $TEST_CASES; do - done - - # Test on instance loop -+(cd $TRACING_DIR; initialize_system) - INSTANCE=" (instance) " - for t in $TEST_CASES; do - test_on_instance $t || continue diff --git a/queue-6.6/series b/queue-6.6/series index 90ebc336fa..8d2a43f411 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -321,7 +321,6 @@ net-iucv-fix-use-after-free-of-a-severed-iucv_path.patch net-x25-fix-use-after-free-in-x25_kill_by_neigh.patch net-hip04-fix-rx-buffer-leak-on-build_skb-failure.patch proc-fix-broken-error-paths-for-namespace-links.patch -selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch rbd-reset-positive-result-codes-to-zero-in-object-map-update-path.patch ksmbd-defer-destroy_previous_session-until-after-ntlm-authentication.patch ice-use-read_once-to-access-cached-phc-time.patch diff --git a/queue-7.1/selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch b/queue-7.1/selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch deleted file mode 100644 index 71a97f78c7..0000000000 --- a/queue-7.1/selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1a087033a6bad73b4140020b40e819b0933aafc3 Mon Sep 17 00:00:00 2001 -From: "Masami Hiramatsu (Google)" -Date: Fri, 17 Jul 2026 11:51:59 +0900 -Subject: selftests/ftrace: Reset triggers at top level before instance loop - -From: Masami Hiramatsu (Google) - -commit 1a087033a6bad73b4140020b40e819b0933aafc3 upstream. - -When running instance tests, 'ftracetest' creates a new ftrace instance -and runs the tests inside it. Before starting each test, it executes -'initialize_system()' to reset the ftrace state to initial-state. - -However, since 'initialize_system()' is executed in the context of the -instance directory, it only cleans up triggers and filters of that -instance. -Any triggers or dynamic events left behind in the top-level instance by -previous failed top-level tests, are left completely untouched. These -top-level leftovers can cause subsequent instance-based tests to fail -or even crash the kernel. - -Fix this by executing 'initialize_system()' in the top-level tracing -directory once before entering the instance loop. - -Cc: stable@vger.kernel.org -Link: https://patch.msgid.link/178425671889.84440.9477850701738666404.stgit@devnote2 -Fixes: b5b77be812de ("selftests: ftrace: Allow some tests to be run in a tracing instance") -Assisted-by: Antigravity:gemini-3.5-flash -Signed-off-by: Masami Hiramatsu (Google) -Signed-off-by: Steven Rostedt -Signed-off-by: Greg Kroah-Hartman ---- - tools/testing/selftests/ftrace/ftracetest | 1 + - 1 file changed, 1 insertion(+) - ---- a/tools/testing/selftests/ftrace/ftracetest -+++ b/tools/testing/selftests/ftrace/ftracetest -@@ -503,6 +503,7 @@ for t in $TEST_CASES; do - done - - # Test on instance loop -+(cd $TRACING_DIR; initialize_system) - INSTANCE=" (instance) " - for t in $TEST_CASES; do - test_on_instance $t || continue diff --git a/queue-7.1/series b/queue-7.1/series index e3e078e89a..d04f2dd00f 100644 --- a/queue-7.1/series +++ b/queue-7.1/series @@ -666,7 +666,6 @@ proc-fix-broken-error-paths-for-namespace-links.patch s390-ptff-export-ptff_function_mask.patch ptp-ptp_s390-add-missing-facility-check.patch ice-fix-ptp-call-trace-during-ptp-release.patch -selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch super-fix-emergency-thaw-deadlock-on-frozen-block-devices.patch rbd-reset-positive-result-codes-to-zero-in-object-map-update-path.patch smb-client-handle-status_stopped_on_symlink-responses-without-a-symlink-target.patch