From fbd16038e0489c5c21b61b5ac2656f5c31531159 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 23 Oct 2025 13:44:53 +0200 Subject: [PATCH] drop perf patch from 5.10 and 5.4 --- ...leak-workload-gopipe-in-perf_record_.patch | 202 ------------------ queue-5.10/series | 1 - ...leak-workload-gopipe-in-perf_record_.patch | 202 ------------------ queue-5.4/series | 1 - 4 files changed, 406 deletions(-) delete mode 100644 queue-5.10/perf-test-don-t-leak-workload-gopipe-in-perf_record_.patch delete mode 100644 queue-5.4/perf-test-don-t-leak-workload-gopipe-in-perf_record_.patch diff --git a/queue-5.10/perf-test-don-t-leak-workload-gopipe-in-perf_record_.patch b/queue-5.10/perf-test-don-t-leak-workload-gopipe-in-perf_record_.patch deleted file mode 100644 index 118ca2d315..0000000000 --- a/queue-5.10/perf-test-don-t-leak-workload-gopipe-in-perf_record_.patch +++ /dev/null @@ -1,202 +0,0 @@ -From d1dca40086f08f3f57133962e15b469c4d0096ce Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 18 Sep 2025 15:22:00 -0700 -Subject: perf test: Don't leak workload gopipe in PERF_RECORD_* - -From: Ian Rogers - -[ Upstream commit 48918cacefd226af44373e914e63304927c0e7dc ] - -The test starts a workload and then opens events. If the events fail -to open, for example because of perf_event_paranoid, the gopipe of the -workload is leaked and the file descriptor leak check fails when the -test exits. To avoid this cancel the workload when opening the events -fails. - -Before: -``` -$ perf test -vv 7 - 7: PERF_RECORD_* events & perf_sample fields: - --- start --- -test child forked, pid 1189568 -Using CPUID GenuineIntel-6-B7-1 - ------------------------------------------------------------ -perf_event_attr: - type 0 (PERF_TYPE_HARDWARE) - config 0xa00000000 (cpu_atom/PERF_COUNT_HW_CPU_CYCLES/) - disabled 1 - ------------------------------------------------------------ -sys_perf_event_open: pid 0 cpu -1 group_fd -1 flags 0x8 -sys_perf_event_open failed, error -13 - ------------------------------------------------------------ -perf_event_attr: - type 0 (PERF_TYPE_HARDWARE) - config 0xa00000000 (cpu_atom/PERF_COUNT_HW_CPU_CYCLES/) - disabled 1 - exclude_kernel 1 - ------------------------------------------------------------ -sys_perf_event_open: pid 0 cpu -1 group_fd -1 flags 0x8 = 3 - ------------------------------------------------------------ -perf_event_attr: - type 0 (PERF_TYPE_HARDWARE) - config 0x400000000 (cpu_core/PERF_COUNT_HW_CPU_CYCLES/) - disabled 1 - ------------------------------------------------------------ -sys_perf_event_open: pid 0 cpu -1 group_fd -1 flags 0x8 -sys_perf_event_open failed, error -13 - ------------------------------------------------------------ -perf_event_attr: - type 0 (PERF_TYPE_HARDWARE) - config 0x400000000 (cpu_core/PERF_COUNT_HW_CPU_CYCLES/) - disabled 1 - exclude_kernel 1 - ------------------------------------------------------------ -sys_perf_event_open: pid 0 cpu -1 group_fd -1 flags 0x8 = 3 -Attempt to add: software/cpu-clock/ -..after resolving event: software/config=0/ -cpu-clock -> software/cpu-clock/ - ------------------------------------------------------------ -perf_event_attr: - type 1 (PERF_TYPE_SOFTWARE) - size 136 - config 0x9 (PERF_COUNT_SW_DUMMY) - sample_type IP|TID|TIME|CPU - read_format ID|LOST - disabled 1 - inherit 1 - mmap 1 - comm 1 - enable_on_exec 1 - task 1 - sample_id_all 1 - mmap2 1 - comm_exec 1 - ksymbol 1 - bpf_event 1 - { wakeup_events, wakeup_watermark } 1 - ------------------------------------------------------------ -sys_perf_event_open: pid 1189569 cpu 0 group_fd -1 flags 0x8 -sys_perf_event_open failed, error -13 -perf_evlist__open: Permission denied - ---- end(-2) ---- -Leak of file descriptor 6 that opened: 'pipe:[14200347]' - ---- unexpected signal (6) ---- -iFailed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon - #0 0x565358f6666e in child_test_sig_handler builtin-test.c:311 - #1 0x7f29ce849df0 in __restore_rt libc_sigaction.c:0 - #2 0x7f29ce89e95c in __pthread_kill_implementation pthread_kill.c:44 - #3 0x7f29ce849cc2 in raise raise.c:27 - #4 0x7f29ce8324ac in abort abort.c:81 - #5 0x565358f662d4 in check_leaks builtin-test.c:226 - #6 0x565358f6682e in run_test_child builtin-test.c:344 - #7 0x565358ef7121 in start_command run-command.c:128 - #8 0x565358f67273 in start_test builtin-test.c:545 - #9 0x565358f6771d in __cmd_test builtin-test.c:647 - #10 0x565358f682bd in cmd_test builtin-test.c:849 - #11 0x565358ee5ded in run_builtin perf.c:349 - #12 0x565358ee6085 in handle_internal_command perf.c:401 - #13 0x565358ee61de in run_argv perf.c:448 - #14 0x565358ee6527 in main perf.c:555 - #15 0x7f29ce833ca8 in __libc_start_call_main libc_start_call_main.h:74 - #16 0x7f29ce833d65 in __libc_start_main@@GLIBC_2.34 libc-start.c:128 - #17 0x565358e391c1 in _start perf[851c1] - 7: PERF_RECORD_* events & perf_sample fields : FAILED! -``` - -After: -``` -$ perf test 7 - 7: PERF_RECORD_* events & perf_sample fields : Skip (permissions) -``` - -Fixes: 16d00fee703866c6 ("perf tests: Move test__PERF_RECORD into separate object") -Signed-off-by: Ian Rogers -Tested-by: Arnaldo Carvalho de Melo -Cc: Adrian Hunter -Cc: Alexander Shishkin -Cc: Athira Rajeev -Cc: Chun-Tse Shao -Cc: Howard Chu -Cc: Ingo Molnar -Cc: James Clark -Cc: Jiri Olsa -Cc: Kan Liang -Cc: Mark Rutland -Cc: Namhyung Kim -Cc: Peter Zijlstra -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/tests/perf-record.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tools/perf/tests/perf-record.c b/tools/perf/tests/perf-record.c -index 67d3f5aad0167..160691a1d5522 100644 ---- a/tools/perf/tests/perf-record.c -+++ b/tools/perf/tests/perf-record.c -@@ -115,6 +115,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus - if (err < 0) { - pr_debug("sched__get_first_possible_cpu: %s\n", - str_error_r(errno, sbuf, sizeof(sbuf))); -+ evlist__cancel_workload(evlist); - goto out_delete_evlist; - } - -@@ -126,6 +127,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus - if (sched_setaffinity(evlist->workload.pid, cpu_mask_size, &cpu_mask) < 0) { - pr_debug("sched_setaffinity: %s\n", - str_error_r(errno, sbuf, sizeof(sbuf))); -+ evlist__cancel_workload(evlist); - goto out_delete_evlist; - } - -@@ -137,6 +139,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus - if (err < 0) { - pr_debug("perf_evlist__open: %s\n", - str_error_r(errno, sbuf, sizeof(sbuf))); -+ evlist__cancel_workload(evlist); - goto out_delete_evlist; - } - -@@ -149,6 +152,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus - if (err < 0) { - pr_debug("evlist__mmap: %s\n", - str_error_r(errno, sbuf, sizeof(sbuf))); -+ evlist__cancel_workload(evlist); - goto out_delete_evlist; - } - --- -2.51.0 - diff --git a/queue-5.10/series b/queue-5.10/series index e61982d0a5..408d9e1914 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -101,7 +101,6 @@ clk-at91-peripheral-fix-return-value.patch perf-util-fix-compression-checks-returning-1-as-bool.patch rtc-x1205-fix-xicor-x1205-vendor-prefix.patch perf-session-fix-handling-when-buffer-exceeds-2-gib.patch -perf-test-don-t-leak-workload-gopipe-in-perf_record_.patch clk-nxp-lpc18xx-cgu-convert-from-round_rate-to-deter.patch clk-nxp-fix-pll0-rate-check-condition-in-lpc18xx-cgu.patch scsi-libsas-add-sas_task_find_rq.patch diff --git a/queue-5.4/perf-test-don-t-leak-workload-gopipe-in-perf_record_.patch b/queue-5.4/perf-test-don-t-leak-workload-gopipe-in-perf_record_.patch deleted file mode 100644 index b90e8cd48a..0000000000 --- a/queue-5.4/perf-test-don-t-leak-workload-gopipe-in-perf_record_.patch +++ /dev/null @@ -1,202 +0,0 @@ -From d9e2c984129ee2f288d5f86682143dc9665b33c8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 18 Sep 2025 15:22:00 -0700 -Subject: perf test: Don't leak workload gopipe in PERF_RECORD_* - -From: Ian Rogers - -[ Upstream commit 48918cacefd226af44373e914e63304927c0e7dc ] - -The test starts a workload and then opens events. If the events fail -to open, for example because of perf_event_paranoid, the gopipe of the -workload is leaked and the file descriptor leak check fails when the -test exits. To avoid this cancel the workload when opening the events -fails. - -Before: -``` -$ perf test -vv 7 - 7: PERF_RECORD_* events & perf_sample fields: - --- start --- -test child forked, pid 1189568 -Using CPUID GenuineIntel-6-B7-1 - ------------------------------------------------------------ -perf_event_attr: - type 0 (PERF_TYPE_HARDWARE) - config 0xa00000000 (cpu_atom/PERF_COUNT_HW_CPU_CYCLES/) - disabled 1 - ------------------------------------------------------------ -sys_perf_event_open: pid 0 cpu -1 group_fd -1 flags 0x8 -sys_perf_event_open failed, error -13 - ------------------------------------------------------------ -perf_event_attr: - type 0 (PERF_TYPE_HARDWARE) - config 0xa00000000 (cpu_atom/PERF_COUNT_HW_CPU_CYCLES/) - disabled 1 - exclude_kernel 1 - ------------------------------------------------------------ -sys_perf_event_open: pid 0 cpu -1 group_fd -1 flags 0x8 = 3 - ------------------------------------------------------------ -perf_event_attr: - type 0 (PERF_TYPE_HARDWARE) - config 0x400000000 (cpu_core/PERF_COUNT_HW_CPU_CYCLES/) - disabled 1 - ------------------------------------------------------------ -sys_perf_event_open: pid 0 cpu -1 group_fd -1 flags 0x8 -sys_perf_event_open failed, error -13 - ------------------------------------------------------------ -perf_event_attr: - type 0 (PERF_TYPE_HARDWARE) - config 0x400000000 (cpu_core/PERF_COUNT_HW_CPU_CYCLES/) - disabled 1 - exclude_kernel 1 - ------------------------------------------------------------ -sys_perf_event_open: pid 0 cpu -1 group_fd -1 flags 0x8 = 3 -Attempt to add: software/cpu-clock/ -..after resolving event: software/config=0/ -cpu-clock -> software/cpu-clock/ - ------------------------------------------------------------ -perf_event_attr: - type 1 (PERF_TYPE_SOFTWARE) - size 136 - config 0x9 (PERF_COUNT_SW_DUMMY) - sample_type IP|TID|TIME|CPU - read_format ID|LOST - disabled 1 - inherit 1 - mmap 1 - comm 1 - enable_on_exec 1 - task 1 - sample_id_all 1 - mmap2 1 - comm_exec 1 - ksymbol 1 - bpf_event 1 - { wakeup_events, wakeup_watermark } 1 - ------------------------------------------------------------ -sys_perf_event_open: pid 1189569 cpu 0 group_fd -1 flags 0x8 -sys_perf_event_open failed, error -13 -perf_evlist__open: Permission denied - ---- end(-2) ---- -Leak of file descriptor 6 that opened: 'pipe:[14200347]' - ---- unexpected signal (6) ---- -iFailed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon -Failed to read build ID for //anon - #0 0x565358f6666e in child_test_sig_handler builtin-test.c:311 - #1 0x7f29ce849df0 in __restore_rt libc_sigaction.c:0 - #2 0x7f29ce89e95c in __pthread_kill_implementation pthread_kill.c:44 - #3 0x7f29ce849cc2 in raise raise.c:27 - #4 0x7f29ce8324ac in abort abort.c:81 - #5 0x565358f662d4 in check_leaks builtin-test.c:226 - #6 0x565358f6682e in run_test_child builtin-test.c:344 - #7 0x565358ef7121 in start_command run-command.c:128 - #8 0x565358f67273 in start_test builtin-test.c:545 - #9 0x565358f6771d in __cmd_test builtin-test.c:647 - #10 0x565358f682bd in cmd_test builtin-test.c:849 - #11 0x565358ee5ded in run_builtin perf.c:349 - #12 0x565358ee6085 in handle_internal_command perf.c:401 - #13 0x565358ee61de in run_argv perf.c:448 - #14 0x565358ee6527 in main perf.c:555 - #15 0x7f29ce833ca8 in __libc_start_call_main libc_start_call_main.h:74 - #16 0x7f29ce833d65 in __libc_start_main@@GLIBC_2.34 libc-start.c:128 - #17 0x565358e391c1 in _start perf[851c1] - 7: PERF_RECORD_* events & perf_sample fields : FAILED! -``` - -After: -``` -$ perf test 7 - 7: PERF_RECORD_* events & perf_sample fields : Skip (permissions) -``` - -Fixes: 16d00fee703866c6 ("perf tests: Move test__PERF_RECORD into separate object") -Signed-off-by: Ian Rogers -Tested-by: Arnaldo Carvalho de Melo -Cc: Adrian Hunter -Cc: Alexander Shishkin -Cc: Athira Rajeev -Cc: Chun-Tse Shao -Cc: Howard Chu -Cc: Ingo Molnar -Cc: James Clark -Cc: Jiri Olsa -Cc: Kan Liang -Cc: Mark Rutland -Cc: Namhyung Kim -Cc: Peter Zijlstra -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/tests/perf-record.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tools/perf/tests/perf-record.c b/tools/perf/tests/perf-record.c -index 437426be29e99..21c4169d0c9d0 100644 ---- a/tools/perf/tests/perf-record.c -+++ b/tools/perf/tests/perf-record.c -@@ -114,6 +114,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus - if (err < 0) { - pr_debug("sched__get_first_possible_cpu: %s\n", - str_error_r(errno, sbuf, sizeof(sbuf))); -+ evlist__cancel_workload(evlist); - goto out_delete_evlist; - } - -@@ -125,6 +126,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus - if (sched_setaffinity(evlist->workload.pid, cpu_mask_size, &cpu_mask) < 0) { - pr_debug("sched_setaffinity: %s\n", - str_error_r(errno, sbuf, sizeof(sbuf))); -+ evlist__cancel_workload(evlist); - goto out_delete_evlist; - } - -@@ -136,6 +138,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus - if (err < 0) { - pr_debug("perf_evlist__open: %s\n", - str_error_r(errno, sbuf, sizeof(sbuf))); -+ evlist__cancel_workload(evlist); - goto out_delete_evlist; - } - -@@ -148,6 +151,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus - if (err < 0) { - pr_debug("evlist__mmap: %s\n", - str_error_r(errno, sbuf, sizeof(sbuf))); -+ evlist__cancel_workload(evlist); - goto out_delete_evlist; - } - --- -2.51.0 - diff --git a/queue-5.4/series b/queue-5.4/series index 9b8bb00864..36a20c2d30 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -80,7 +80,6 @@ iio-frequency-adf4350-fix-adf4350_reg3_12bit_clkdiv_mode.patch perf-util-fix-compression-checks-returning-1-as-bool.patch rtc-x1205-fix-xicor-x1205-vendor-prefix.patch perf-session-fix-handling-when-buffer-exceeds-2-gib.patch -perf-test-don-t-leak-workload-gopipe-in-perf_record_.patch clk-nxp-lpc18xx-cgu-convert-from-round_rate-to-deter.patch clk-nxp-fix-pll0-rate-check-condition-in-lpc18xx-cgu.patch scsi-libsas-add-sas_task_find_rq.patch -- 2.47.3