FAILED: patch "[PATCH] Revert "perf report: Append inlines to non-DWARF callchains"" failed to apply to 6.4-stable tree
Subsystems (2)
[email protected]
maintainerThe 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 <[email protected]>.
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 '<[email protected]>' --in-reply-to '2023081251-conceal-stool-53f1@gregkh' --subject-prefix 'PATCH 6.4.y' HEAD^..
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 <[email protected]>
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.
tools/perf/util/machine.c +0 -5
@@ -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,
[email protected]
maintainerPATCH 1/1 Revert "perf report: Append inlines to non-DWARF callchains"
From: Arnaldo Carvalho de Melo <[email protected]>
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.
--- tools/perf/util/machine.c | 5 ----- 1 file changed, 5 deletions(-)
tools/perf/util/machine.c +0 -5
@@ -44,7 +44,6 @@#include <linux/zalloc.h> static void __machine__remove_thread (struct machine *machine,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) {
@@ -2371,10 +2370,6 @@ static int add_callchain_ip(struct thread *thread, ms.maps = al.maps; ms.map = al.map; ms.sym = al.sym; - -if (!branch &&append_inlines (cursor, &ms, ip) ==0 ) -return 0 ; - srcline =callchain_srcline (&ms, al.addr); err = callchain_cursor_append(cursor, ip, &ms, branch, flags, nr_loop_iter,
Signature · 1 line
2.41.0
Greg KH
maintainerRe: [PATCH 6.4.y 1/1] Revert "perf report: Append inlines to non-DWARF callchains"
Quoted 20 lines · On Tue, Aug 15, 2023 at 03:03:42PM -0300, [email protected] wrote:
From: Arnaldo Carvalho de Melo <[email protected]>
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 <[email protected]>Acked-by Artem Savkov <[email protected]>Cc Andrii Nakryiko <[email protected]>Cc Namhyung Kim <[email protected]>Cc Adrian Hunter <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Ian Rogers <[email protected]>Cc Ingo Molnar <[email protected]>Cc Jiri Olsa <[email protected]>
Quoted 8 lines
Cc Mark Rutland <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Milian Wolff <[email protected]>Cc Peter Zijlstra <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>(cherry picked from commit c0b067588a4836b762cfc6a4c83f122ca1dbb93a)Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
Now queued up, thanks.
greg k-h
Arnaldo Carvalho de Melo
maintainerEm Sat, Aug 12, 2023 at 06:50:51PM +0200, [email protected] escreveu:
Quoted 6 lines
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 <[email protected]>.
Quoted 8 lines
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 checkoutFETCH_HEAD
git cherry-pick -xc0b067588a4836b762cfc6a4c83f122ca1dbb93a
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --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 '<[email protected]>' --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.
Quoted 64 lines
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From
c0b067588a4836b762cfc6a4c83f122ca1dbb93aMon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <[email protected]>
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 <[email protected]>Acked-by Artem Savkov <[email protected]>Cc Andrii Nakryiko <[email protected]>Cc Namhyung Kim <[email protected]>Cc Adrian Hunter <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Ian Rogers <[email protected]>Cc Ingo Molnar <[email protected]>Cc Jiri Olsa <[email protected]>Cc Mark Rutland <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Milian Wolff <[email protected]>Cc Peter Zijlstra <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>tools/perf/util/machine.c +0
-5@@ -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,
Signature · 1 line
- Arnaldo
Greg KH
maintainerQuoted 9 lines · Arnaldo Carvalho de Melo
Em Sat, Aug 12, 2023 at 06:50:51PM +0200, [email protected] escreveu:
Quoted 8 lines
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 <[email protected]>.To reproduce the conflict and resubmit, you may use the following commands:
Quoted 8 lines
Quoted 6 lines
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.4.y
git checkoutFETCH_HEAD
git cherry-pick -xc0b067588a4836b762cfc6a4c83f122ca1dbb93a
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023081251-conceal-stool-53f1@gregkh' --subject-prefix 'PATCH 6.4.y' HEAD^..Had to add "--no-cover-letter":
That's odd, is "cover letter" a default setting somewhere? I've never seen that triggered, but then I don't use git send-email with a patch range...
thanks,
greg k-h