From: Sasha Levin Date: Thu, 16 Nov 2023 13:56:07 +0000 (-0500) Subject: Drop perf-tools-get-rid-of-evlist__add_on_all_cpus.patch X-Git-Tag: v4.14.330~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=07015b7c06ac7a39d882fb88e8d7835ac470dae1;p=thirdparty%2Fkernel%2Fstable-queue.git Drop perf-tools-get-rid-of-evlist__add_on_all_cpus.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.10/perf-tools-get-rid-of-evlist__add_on_all_cpus.patch b/queue-5.10/perf-tools-get-rid-of-evlist__add_on_all_cpus.patch deleted file mode 100644 index f053b353040..00000000000 --- a/queue-5.10/perf-tools-get-rid-of-evlist__add_on_all_cpus.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 3627fba55acc8e51663896cb8718e6431c364cd6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 3 Oct 2022 13:46:45 -0700 -Subject: perf tools: Get rid of evlist__add_on_all_cpus() - -From: Namhyung Kim - -[ Upstream commit 60ea006f72512fd7c36f16cdbe91f4fc284f8115 ] - -The cpu and thread maps are properly handled in libperf now. No need to -do it in the perf tools anymore. Let's remove the logic. - -Reviewed-by: Adrian Hunter -Signed-off-by: Namhyung Kim -Cc: Ian Rogers -Cc: Ingo Molnar -Cc: Jiri Olsa -Cc: Kan Liang -Cc: Leo Yan -Cc: Peter Zijlstra -Link: https://lore.kernel.org/r/20221003204647.1481128-4-namhyung@kernel.org -Signed-off-by: Arnaldo Carvalho de Melo -Stable-dep-of: f9cdeb58a9cf ("perf evlist: Avoid frequency mode for the dummy event") -Signed-off-by: Sasha Levin ---- - tools/perf/util/evlist.c | 29 ++--------------------------- - 1 file changed, 2 insertions(+), 27 deletions(-) - -diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c -index 117420abdc325..f0ca9aa7c208e 100644 ---- a/tools/perf/util/evlist.c -+++ b/tools/perf/util/evlist.c -@@ -261,28 +261,6 @@ int evlist__add_dummy(struct evlist *evlist) - return 0; - } - --static void evlist__add_on_all_cpus(struct evlist *evlist, struct evsel *evsel) --{ -- evsel->core.system_wide = true; -- -- /* -- * All CPUs. -- * -- * Note perf_event_open() does not accept CPUs that are not online, so -- * in fact this CPU list will include only all online CPUs. -- */ -- perf_cpu_map__put(evsel->core.own_cpus); -- evsel->core.own_cpus = perf_cpu_map__new(NULL); -- perf_cpu_map__put(evsel->core.cpus); -- evsel->core.cpus = perf_cpu_map__get(evsel->core.own_cpus); -- -- /* No threads */ -- perf_thread_map__put(evsel->core.threads); -- evsel->core.threads = perf_thread_map__new_dummy(); -- -- evlist__add(evlist, evsel); --} -- - struct evsel *evlist__add_aux_dummy(struct evlist *evlist, bool system_wide) - { - struct evsel *evsel = evlist__dummy_event(evlist); -@@ -295,14 +273,11 @@ struct evsel *evlist__add_aux_dummy(struct evlist *evlist, bool system_wide) - evsel->core.attr.exclude_hv = 1; - evsel->core.attr.freq = 0; - evsel->core.attr.sample_period = 1; -+ evsel->core.system_wide = system_wide; - evsel->no_aux_samples = true; - evsel->name = strdup("dummy:u"); - -- if (system_wide) -- evlist__add_on_all_cpus(evlist, evsel); -- else -- evlist__add(evlist, evsel); -- -+ evlist__add(evlist, evsel); - return evsel; - } - --- -2.42.0 - diff --git a/queue-5.10/series b/queue-5.10/series index aaf8019c84a..2ae31cf1368 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -121,7 +121,6 @@ leds-trigger-ledtrig-cpu-fix-output-may-be-truncated.patch tty-tty_jobctrl-fix-pid-memleak-in-disassociate_ctty.patch livepatch-fix-missing-newline-character-in-klp_resol.patch perf-evlist-add-evlist__add_dummy_on_all_cpus.patch -perf-tools-get-rid-of-evlist__add_on_all_cpus.patch usb-dwc2-fix-possible-null-pointer-dereference-cause.patch dmaengine-ti-edma-handle-irq_of_parse_and_map-errors.patch misc-st_core-do-not-call-kfree_skb-under-spin_lock_i.patch diff --git a/queue-5.15/perf-tools-get-rid-of-evlist__add_on_all_cpus.patch b/queue-5.15/perf-tools-get-rid-of-evlist__add_on_all_cpus.patch deleted file mode 100644 index 5fcda1f69f4..00000000000 --- a/queue-5.15/perf-tools-get-rid-of-evlist__add_on_all_cpus.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 0bad7dc2bbd481839db55a75620e7603c114eee2 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 3 Oct 2022 13:46:45 -0700 -Subject: perf tools: Get rid of evlist__add_on_all_cpus() - -From: Namhyung Kim - -[ Upstream commit 60ea006f72512fd7c36f16cdbe91f4fc284f8115 ] - -The cpu and thread maps are properly handled in libperf now. No need to -do it in the perf tools anymore. Let's remove the logic. - -Reviewed-by: Adrian Hunter -Signed-off-by: Namhyung Kim -Cc: Ian Rogers -Cc: Ingo Molnar -Cc: Jiri Olsa -Cc: Kan Liang -Cc: Leo Yan -Cc: Peter Zijlstra -Link: https://lore.kernel.org/r/20221003204647.1481128-4-namhyung@kernel.org -Signed-off-by: Arnaldo Carvalho de Melo -Stable-dep-of: f9cdeb58a9cf ("perf evlist: Avoid frequency mode for the dummy event") -Signed-off-by: Sasha Levin ---- - tools/perf/util/evlist.c | 29 ++--------------------------- - 1 file changed, 2 insertions(+), 27 deletions(-) - -diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c -index a75cdcf381308..63ef40543a9fe 100644 ---- a/tools/perf/util/evlist.c -+++ b/tools/perf/util/evlist.c -@@ -258,28 +258,6 @@ int evlist__add_dummy(struct evlist *evlist) - return 0; - } - --static void evlist__add_on_all_cpus(struct evlist *evlist, struct evsel *evsel) --{ -- evsel->core.system_wide = true; -- -- /* -- * All CPUs. -- * -- * Note perf_event_open() does not accept CPUs that are not online, so -- * in fact this CPU list will include only all online CPUs. -- */ -- perf_cpu_map__put(evsel->core.own_cpus); -- evsel->core.own_cpus = perf_cpu_map__new(NULL); -- perf_cpu_map__put(evsel->core.cpus); -- evsel->core.cpus = perf_cpu_map__get(evsel->core.own_cpus); -- -- /* No threads */ -- perf_thread_map__put(evsel->core.threads); -- evsel->core.threads = perf_thread_map__new_dummy(); -- -- evlist__add(evlist, evsel); --} -- - struct evsel *evlist__add_aux_dummy(struct evlist *evlist, bool system_wide) - { - struct evsel *evsel = evlist__dummy_event(evlist); -@@ -292,14 +270,11 @@ struct evsel *evlist__add_aux_dummy(struct evlist *evlist, bool system_wide) - evsel->core.attr.exclude_hv = 1; - evsel->core.attr.freq = 0; - evsel->core.attr.sample_period = 1; -+ evsel->core.system_wide = system_wide; - evsel->no_aux_samples = true; - evsel->name = strdup("dummy:u"); - -- if (system_wide) -- evlist__add_on_all_cpus(evlist, evsel); -- else -- evlist__add(evlist, evsel); -- -+ evlist__add(evlist, evsel); - return evsel; - } - --- -2.42.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 269bb9e176b..c1e0d642ebf 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -168,7 +168,6 @@ f2fs-compress-fix-to-avoid-redundant-compress-extens.patch tty-tty_jobctrl-fix-pid-memleak-in-disassociate_ctty.patch livepatch-fix-missing-newline-character-in-klp_resol.patch perf-evlist-add-evlist__add_dummy_on_all_cpus.patch -perf-tools-get-rid-of-evlist__add_on_all_cpus.patch dmaengine-idxd-register-dsa_bus_type-before-register.patch usb-dwc2-fix-possible-null-pointer-dereference-cause.patch usb-chipidea-fix-dma-overwrite-for-tegra.patch