* [PATCH] scripts/decode_stacktrace: strip all base path prefixes
@ 2020-07-20 7:44 Jiri Slaby
2020-07-20 23:05 ` Andrew Morton
0 siblings, 1 reply; 3+ messages in thread
From: Jiri Slaby @ 2020-07-20 7:44 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, Jiri Slaby, Sasha Levin
When addr2line returns more than one location, decode_stacktrace does
not currently remove base path from the paths. So the result might look
like (line wrapped here):
ptrace_stop (include/linux/freezer.h:57
/home/abuild/rpmbuild/BUILD/kernel-default-5.8.rc5/linux-5.8-rc5/linux-obj/../include/linux/freezer.h:67
/home/abuild/rpmbuild/BUILD/kernel-default-5.8.rc5/linux-5.8-rc5/linux-obj/../include/linux/freezer.h:128
/home/abuild/rpmbuild/BUILD/kernel-default-5.8.rc5/linux-5.8-rc5/linux-obj/../include/linux/freezer.h:173
/home/abuild/rpmbuild/BUILD/kernel-default-5.8.rc5/linux-5.8-rc5/linux-obj/../kernel/signal.c:2217)
Make sure all the lines are processed, so the result now looks like
(line wrapped here again):
ptrace_stop (include/linux/freezer.h:57 include/linux/freezer.h:67
include/linux/freezer.h:128 include/linux/freezer.h:173
kernel/signal.c:2217)
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Fixes: 67a28de47faa (scripts/decode_stacktrace: only strip base path when a prefix of the path)
Cc: Sasha Levin <sashal@kernel.org>
---
scripts/decode_stacktrace.sh | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/scripts/decode_stacktrace.sh b/scripts/decode_stacktrace.sh
index 4bdcb6d8c605..3fddcb48b464 100755
--- a/scripts/decode_stacktrace.sh
+++ b/scripts/decode_stacktrace.sh
@@ -140,14 +140,15 @@ parse_symbol() {
return
fi
- # Strip out the base of the path
- code=${code#$basepath/}
-
- # In the case of inlines, move everything to same line
- code=${code//$'\n'/' '}
+ declare -a output
+ while read LINE; do
+ # Strip out the base of the path
+ LINE=${LINE#$basepath/}
+ output+=("$LINE")
+ done <<< $code
# Replace old address with pretty line numbers
- symbol="$segment$name ($code)"
+ symbol="$segment$name (${output[@]})"
}
decode_code() {
--
2.27.0
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] scripts/decode_stacktrace: strip all base path prefixes
2020-07-20 7:44 [PATCH] scripts/decode_stacktrace: strip all base path prefixes Jiri Slaby
@ 2020-07-20 23:05 ` Andrew Morton
2020-07-22 7:12 ` Jiri Slaby
0 siblings, 1 reply; 3+ messages in thread
From: Andrew Morton @ 2020-07-20 23:05 UTC (permalink / raw)
To: Jiri Slaby
Cc: linux-kernel, Sasha Levin, Pi-Hsun Shih, Shik Chen, Stephen Boyd,
Nicolas Boichat
On Mon, 20 Jul 2020 09:44:29 +0200 Jiri Slaby <jslaby@suse.cz> wrote:
> When addr2line returns more than one location, decode_stacktrace does
> not currently remove base path from the paths. So the result might look
> like (line wrapped here):
> ptrace_stop (include/linux/freezer.h:57
> /home/abuild/rpmbuild/BUILD/kernel-default-5.8.rc5/linux-5.8-rc5/linux-obj/../include/linux/freezer.h:67
> /home/abuild/rpmbuild/BUILD/kernel-default-5.8.rc5/linux-5.8-rc5/linux-obj/../include/linux/freezer.h:128
> /home/abuild/rpmbuild/BUILD/kernel-default-5.8.rc5/linux-5.8-rc5/linux-obj/../include/linux/freezer.h:173
> /home/abuild/rpmbuild/BUILD/kernel-default-5.8.rc5/linux-5.8-rc5/linux-obj/../kernel/signal.c:2217)
>
> Make sure all the lines are processed, so the result now looks like
> (line wrapped here again):
> ptrace_stop (include/linux/freezer.h:57 include/linux/freezer.h:67
> include/linux/freezer.h:128 include/linux/freezer.h:173
> kernel/signal.c:2217)
hm, I just merged
http://lkml.kernel.org/r/20200720082709.252805-1-pihsun@chromium.org.
Which is preferable?
> --- a/scripts/decode_stacktrace.sh
> +++ b/scripts/decode_stacktrace.sh
> @@ -140,14 +140,15 @@ parse_symbol() {
> return
> fi
>
> - # Strip out the base of the path
> - code=${code#$basepath/}
> -
> - # In the case of inlines, move everything to same line
> - code=${code//$'\n'/' '}
> + declare -a output
> + while read LINE; do
> + # Strip out the base of the path
> + LINE=${LINE#$basepath/}
> + output+=("$LINE")
> + done <<< $code
>
> # Replace old address with pretty line numbers
> - symbol="$segment$name ($code)"
> + symbol="$segment$name (${output[@]})"
> }
>
> decode_code() {
> --
> 2.27.0
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] scripts/decode_stacktrace: strip all base path prefixes
2020-07-20 23:05 ` Andrew Morton
@ 2020-07-22 7:12 ` Jiri Slaby
0 siblings, 0 replies; 3+ messages in thread
From: Jiri Slaby @ 2020-07-22 7:12 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-kernel, Sasha Levin, Pi-Hsun Shih, Shik Chen, Stephen Boyd,
Nicolas Boichat
On 21. 07. 20, 1:05, Andrew Morton wrote:
> On Mon, 20 Jul 2020 09:44:29 +0200 Jiri Slaby <jslaby@suse.cz> wrote:
>
>> When addr2line returns more than one location, decode_stacktrace does
>> not currently remove base path from the paths. So the result might look
>> like (line wrapped here):
>> ptrace_stop (include/linux/freezer.h:57
>> /home/abuild/rpmbuild/BUILD/kernel-default-5.8.rc5/linux-5.8-rc5/linux-obj/../include/linux/freezer.h:67
>> /home/abuild/rpmbuild/BUILD/kernel-default-5.8.rc5/linux-5.8-rc5/linux-obj/../include/linux/freezer.h:128
>> /home/abuild/rpmbuild/BUILD/kernel-default-5.8.rc5/linux-5.8-rc5/linux-obj/../include/linux/freezer.h:173
>> /home/abuild/rpmbuild/BUILD/kernel-default-5.8.rc5/linux-5.8-rc5/linux-obj/../kernel/signal.c:2217)
>>
>> Make sure all the lines are processed, so the result now looks like
>> (line wrapped here again):
>> ptrace_stop (include/linux/freezer.h:57 include/linux/freezer.h:67
>> include/linux/freezer.h:128 include/linux/freezer.h:173
>> kernel/signal.c:2217)
>
> hm, I just merged
> http://lkml.kernel.org/r/20200720082709.252805-1-pihsun@chromium.org.
> Which is preferable?
Nobody cares, apparently. And I don't mind either of them. You can add:
Reviewed-by: Jiri Slaby <jirislaby@kernel.org>
to the other one if you want. FTR it is this commit in -next-20200721:
commit a1bc7c359e6044391cfc759ae8a2adf0bc5cd731
Author: Pi-Hsun Shih <pihsun@chromium.org>
Date: Tue Jul 21 12:57:33 2020 +1000
scripts/decode_stacktrace: strip basepath from all paths
thanks,
--
js
suse labs
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-22 7:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-20 7:44 [PATCH] scripts/decode_stacktrace: strip all base path prefixes Jiri Slaby
2020-07-20 23:05 ` Andrew Morton
2020-07-22 7:12 ` Jiri Slaby
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®