From: Greg Kroah-Hartman Date: Wed, 9 Apr 2025 10:47:35 +0000 (+0200) Subject: drop a perf patch from 6.14, fixing the build X-Git-Tag: v5.4.292~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71f9b8721015c241a2c2fdcd622334f7ffcd0e31;p=thirdparty%2Fkernel%2Fstable-queue.git drop a perf patch from 6.14, fixing the build --- diff --git a/queue-6.14/perf-report-add-parallelism-sort-key.patch b/queue-6.14/perf-report-add-parallelism-sort-key.patch deleted file mode 100644 index 8cae3081bd..0000000000 --- a/queue-6.14/perf-report-add-parallelism-sort-key.patch +++ /dev/null @@ -1,195 +0,0 @@ -From 57a34683ceced28522efd04a896ac031b1138064 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 13 Feb 2025 10:08:15 +0100 -Subject: perf report: Add parallelism sort key - -From: Dmitry Vyukov - -[ Upstream commit 7ae1972e748863b0aa04983caf847d4dd5b7e136 ] - -Show parallelism level in profiles if requested by user. - -Signed-off-by: Dmitry Vyukov -Reviewed-by: Andi Kleen -Link: https://lore.kernel.org/r/7f7bb87cbaa51bf1fb008a0d68b687423ce4bad4.1739437531.git.dvyukov@google.com -Signed-off-by: Namhyung Kim -Stable-dep-of: 6353255e7cfa ("perf report: Fix input reload/switch with symbol sort key") -Signed-off-by: Sasha Levin ---- - tools/perf/builtin-report.c | 11 +++++++++++ - tools/perf/util/hist.c | 2 ++ - tools/perf/util/hist.h | 3 +++ - tools/perf/util/session.c | 12 ++++++++++++ - tools/perf/util/session.h | 1 + - tools/perf/util/sort.c | 23 +++++++++++++++++++++++ - tools/perf/util/sort.h | 1 + - 7 files changed, 53 insertions(+) - -diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c -index c99b14a852dbd..66b8b1c32e00a 100644 ---- a/tools/perf/builtin-report.c -+++ b/tools/perf/builtin-report.c -@@ -1719,6 +1719,17 @@ int cmd_report(int argc, const char **argv) - symbol_conf.annotate_data_sample = true; - } - -+ if (report.disable_order || !perf_session__has_switch_events(session)) { -+ if ((sort_order && strstr(sort_order, "parallelism")) || -+ (field_order && strstr(field_order, "parallelism"))) { -+ if (report.disable_order) -+ ui__error("Use of parallelism is incompatible with --disable-order.\n"); -+ else -+ ui__error("Use of parallelism requires --switch-events during record.\n"); -+ return -1; -+ } -+ } -+ - if (sort_order && strstr(sort_order, "ipc")) { - parse_options_usage(report_usage, options, "s", 1); - goto error; -diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c -index 0f30f843c566d..cafd693568189 100644 ---- a/tools/perf/util/hist.c -+++ b/tools/perf/util/hist.c -@@ -207,6 +207,7 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h) - - hists__new_col_len(hists, HISTC_CGROUP, 6); - hists__new_col_len(hists, HISTC_CGROUP_ID, 20); -+ hists__new_col_len(hists, HISTC_PARALLELISM, 11); - hists__new_col_len(hists, HISTC_CPU, 3); - hists__new_col_len(hists, HISTC_SOCKET, 6); - hists__new_col_len(hists, HISTC_MEM_LOCKED, 6); -@@ -741,6 +742,7 @@ __hists__add_entry(struct hists *hists, - .ip = al->addr, - .level = al->level, - .code_page_size = sample->code_page_size, -+ .parallelism = al->parallelism, - .stat = { - .nr_events = 1, - .period = sample->period, -diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h -index 46c8373e31465..a6e662d77dc24 100644 ---- a/tools/perf/util/hist.h -+++ b/tools/perf/util/hist.h -@@ -42,6 +42,7 @@ enum hist_column { - HISTC_CGROUP_ID, - HISTC_CGROUP, - HISTC_PARENT, -+ HISTC_PARALLELISM, - HISTC_CPU, - HISTC_SOCKET, - HISTC_SRCLINE, -@@ -228,6 +229,7 @@ struct hist_entry { - u64 transaction; - s32 socket; - s32 cpu; -+ int parallelism; - u64 code_page_size; - u64 weight; - u64 ins_lat; -@@ -580,6 +582,7 @@ bool perf_hpp__is_thread_entry(struct perf_hpp_fmt *fmt); - bool perf_hpp__is_comm_entry(struct perf_hpp_fmt *fmt); - bool perf_hpp__is_dso_entry(struct perf_hpp_fmt *fmt); - bool perf_hpp__is_sym_entry(struct perf_hpp_fmt *fmt); -+bool perf_hpp__is_parallelism_entry(struct perf_hpp_fmt *fmt); - - struct perf_hpp_fmt *perf_hpp_fmt__dup(struct perf_hpp_fmt *fmt); - -diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c -index c06e3020a9769..00fcf8d8ac255 100644 ---- a/tools/perf/util/session.c -+++ b/tools/perf/util/session.c -@@ -2403,6 +2403,18 @@ bool perf_session__has_traces(struct perf_session *session, const char *msg) - return false; - } - -+bool perf_session__has_switch_events(struct perf_session *session) -+{ -+ struct evsel *evsel; -+ -+ evlist__for_each_entry(session->evlist, evsel) { -+ if (evsel->core.attr.context_switch) -+ return true; -+ } -+ -+ return false; -+} -+ - int map__set_kallsyms_ref_reloc_sym(struct map *map, const char *symbol_name, u64 addr) - { - char *bracket; -diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h -index bcf1bcf06959b..db1c120a9e67f 100644 ---- a/tools/perf/util/session.h -+++ b/tools/perf/util/session.h -@@ -141,6 +141,7 @@ int perf_session__resolve_callchain(struct perf_session *session, - struct symbol **parent); - - bool perf_session__has_traces(struct perf_session *session, const char *msg); -+bool perf_session__has_switch_events(struct perf_session *session); - - void perf_event__attr_swap(struct perf_event_attr *attr); - -diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c -index 3dd33721823f3..7eef43f5be360 100644 ---- a/tools/perf/util/sort.c -+++ b/tools/perf/util/sort.c -@@ -892,6 +892,27 @@ struct sort_entry sort_cpu = { - .se_width_idx = HISTC_CPU, - }; - -+/* --sort parallelism */ -+ -+static int64_t -+sort__parallelism_cmp(struct hist_entry *left, struct hist_entry *right) -+{ -+ return right->parallelism - left->parallelism; -+} -+ -+static int hist_entry__parallelism_snprintf(struct hist_entry *he, char *bf, -+ size_t size, unsigned int width) -+{ -+ return repsep_snprintf(bf, size, "%*d", width, he->parallelism); -+} -+ -+struct sort_entry sort_parallelism = { -+ .se_header = "Parallelism", -+ .se_cmp = sort__parallelism_cmp, -+ .se_snprintf = hist_entry__parallelism_snprintf, -+ .se_width_idx = HISTC_PARALLELISM, -+}; -+ - /* --sort cgroup_id */ - - static int64_t _sort__cgroup_dev_cmp(u64 left_dev, u64 right_dev) -@@ -2534,6 +2555,7 @@ static struct sort_dimension common_sort_dimensions[] = { - DIM(SORT_ANNOTATE_DATA_TYPE_OFFSET, "typeoff", sort_type_offset), - DIM(SORT_SYM_OFFSET, "symoff", sort_sym_offset), - DIM(SORT_ANNOTATE_DATA_TYPE_CACHELINE, "typecln", sort_type_cacheline), -+ DIM(SORT_PARALLELISM, "parallelism", sort_parallelism), - }; - - #undef DIM -@@ -2735,6 +2757,7 @@ MK_SORT_ENTRY_CHK(thread) - MK_SORT_ENTRY_CHK(comm) - MK_SORT_ENTRY_CHK(dso) - MK_SORT_ENTRY_CHK(sym) -+MK_SORT_ENTRY_CHK(parallelism) - - - static bool __sort__hpp_equal(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b) -diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h -index a8572574e1686..11fb15f914093 100644 ---- a/tools/perf/util/sort.h -+++ b/tools/perf/util/sort.h -@@ -72,6 +72,7 @@ enum sort_type { - SORT_ANNOTATE_DATA_TYPE_OFFSET, - SORT_SYM_OFFSET, - SORT_ANNOTATE_DATA_TYPE_CACHELINE, -+ SORT_PARALLELISM, - - /* branch stack specific sort keys */ - __SORT_BRANCH_STACK, --- -2.39.5 - diff --git a/queue-6.14/perf-report-fix-input-reload-switch-with-symbol-sort.patch b/queue-6.14/perf-report-fix-input-reload-switch-with-symbol-sort.patch index deb195cdc2..2df88bf0bb 100644 --- a/queue-6.14/perf-report-fix-input-reload-switch-with-symbol-sort.patch +++ b/queue-6.14/perf-report-fix-input-reload-switch-with-symbol-sort.patch @@ -18,15 +18,13 @@ Fixes: ec6ae74fe8f0 ("perf report: Display average IPC and IPC coverage per symb Signed-off-by: Namhyung Kim Signed-off-by: Sasha Levin --- - tools/perf/builtin-report.c | 30 ++++++++++++++++-------------- + tools/perf/builtin-report.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) -diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c -index 66b8b1c32e00a..e74d8a6cfa5ae 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c -@@ -1730,22 +1730,24 @@ int cmd_report(int argc, const char **argv) - } +@@ -1719,22 +1719,24 @@ repeat: + symbol_conf.annotate_data_sample = true; } - if (sort_order && strstr(sort_order, "ipc")) { @@ -64,6 +62,3 @@ index 66b8b1c32e00a..e74d8a6cfa5ae 100644 } if ((last_key != K_SWITCH_INPUT_DATA && last_key != K_RELOAD) && --- -2.39.5 - diff --git a/queue-6.14/series b/queue-6.14/series index b6dd44dc61..fe54b7f6ac 100644 --- a/queue-6.14/series +++ b/queue-6.14/series @@ -452,7 +452,6 @@ perf-tests-fix-tool-pmu-test-segfault.patch soundwire-slave-fix-an-of-node-reference-leak-in-sou.patch staging-gpib-fix-cb7210-pcmcia-oops.patch perf-report-switch-data-file-correctly-in-tui.patch -perf-report-add-parallelism-sort-key.patch perf-report-fix-input-reload-switch-with-symbol-sort.patch greybus-gb-beagleplay-add-error-handling-for-gb_grey.patch coresight-catu-fix-number-of-pages-while-using-64k-p.patch