Em Sat, Aug 12, 2023 at 06:50:51PM +0200, gregkh@xxxxxxxxxxxxxxxxxxx escreveu: > > The patch below does not apply to the 6.4-stable tree. > If someone wants it applied there, or to any other stable or longterm > tree, then please email the backport, including the original git commit > id to <stable@xxxxxxxxxxxxxxx>. > > To reproduce the conflict and resubmit, you may use the following commands: > > git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.4.y > git checkout FETCH_HEAD > git cherry-pick -x c0b067588a4836b762cfc6a4c83f122ca1dbb93a > # <resolve conflicts, build, test, etc.> > git commit -s > git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2023081251-conceal-stool-53f1@gregkh' --subject-prefix 'PATCH 6.4.y' HEAD^.. Had to add "--no-cover-letter": [acme@quaco perf-tools-next]$ git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2023081251-conceal-stool-53f1@gregkh' --subject-prefix 'PATCH 6.4.y' HEAD^.. /tmp/5jnzQlFK3_/0000-cover-letter.patch /tmp/5jnzQlFK3_/0001-Revert-perf-report-Append-inlines-to-non-DWARF-callc.patch Refusing to send because the patch /tmp/5jnzQlFK3_/0000-cover-letter.patch has the template subject '*** SUBJECT HERE ***'. Pass --force if you really want to send. [acme@quaco perf-tools-next]$ [acme@quaco perf-tools-next]$ [acme@quaco perf-tools-next]$ [acme@quaco perf-tools-next]$ man git-send-email [acme@quaco perf-tools-next]$ [acme@quaco perf-tools-next]$ git send-email --no-cover-letter Sent. > Possible dependencies: > > > > thanks, > > greg k-h > > ------------------ original commit in Linus's tree ------------------ > > From c0b067588a4836b762cfc6a4c83f122ca1dbb93a Mon Sep 17 00:00:00 2001 > From: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> > Date: Tue, 1 Aug 2023 18:42:47 -0300 > Subject: [PATCH] Revert "perf report: Append inlines to non-DWARF callchains" > > This reverts commit 46d21ec067490ab9cdcc89b9de5aae28786a8b8e. > > The tests were made with a specific workload, further tests on a > recently updated fedora 38 system with a system wide perf.data file > shows 'perf report' taking excessive time resolving inlines in vmlinux, > so lets revert this until a full investigation and improvement on the > addr2line support code is made. > > Reported-by: Jesper Dangaard Brouer <hawk@xxxxxxxxxx> > Acked-by: Artem Savkov <asavkov@xxxxxxxxxx> > Tested-by: Jesper Dangaard Brouer <hawk@xxxxxxxxxx> > Cc: Andrii Nakryiko <andrii.nakryiko@xxxxxxxxx> > Cc: Namhyung Kim <namhyung@xxxxxxxxxx> > Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx> > Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx> > Cc: Ian Rogers <irogers@xxxxxxxxxx> > Cc: Ingo Molnar <mingo@xxxxxxxxxx> > Cc: Jiri Olsa <jolsa@xxxxxxxxxx> > Cc: Mark Rutland <mark.rutland@xxxxxxx> > Cc: Masami Hiramatsu <mhiramat@xxxxxxxxxx> > Cc: Milian Wolff <milian.wolff@xxxxxxxx> > Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> > Link: https://lore.kernel.org/r/ZMl8VyhdwhClTM5g@xxxxxxxxxx > Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> > > diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c > index 4e62843d51b7..f4cb41ee23cd 100644 > --- a/tools/perf/util/machine.c > +++ b/tools/perf/util/machine.c > @@ -45,7 +45,6 @@ > > static void __machine__remove_thread(struct machine *machine, struct thread_rb_node *nd, > struct thread *th, bool lock); > -static int append_inlines(struct callchain_cursor *cursor, struct map_symbol *ms, u64 ip); > > static struct dso *machine__kernel_dso(struct machine *machine) > { > @@ -2385,10 +2384,6 @@ static int add_callchain_ip(struct thread *thread, > ms.maps = maps__get(al.maps); > ms.map = map__get(al.map); > ms.sym = al.sym; > - > - if (!branch && append_inlines(cursor, &ms, ip) == 0) > - goto out; > - > srcline = callchain_srcline(&ms, al.addr); > err = callchain_cursor_append(cursor, ip, &ms, > branch, flags, nr_loop_iter, > -- - Arnaldo
