Commit de8ca627 authored Jul 07, 2021 by Stephen Boyd Committed by sanglipeng1 Jul 23, 2024

scripts/decode_stacktrace.sh: silence stderr messages from addr2line/nm

stable inclusion
from stable-v5.10.210
commit ae992f14b1176293c0998cc241c721b694aa4b67
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAE52H

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=ae992f14b1176293c0998cc241c721b694aa4b67

--------------------------------

[ Upstream commit 5bf0f3bc ]

Sometimes if you're using tools that have linked things improperly or have
new features/sections that older tools don't expect you'll see warnings
printed to stderr.  We don't really care about these warnings, so let's
just silence these messages to cleanup output of this script.

Link: https://lkml.kernel.org/r/20210511003845.2429846-10-swboyd@chromium.org


Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Jessica Yu <jeyu@kernel.org>
Cc: Evan Green <evgreen@chromium.org>
Cc: Hsin-Yi Wang <hsinyi@chromium.org>
Cc: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Cc: Sasha Levin <sashal@kernel.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Petr Mladek <pmladek@suse.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Stable-dep-of: efbd63983533 ("scripts/decode_stacktrace.sh: optionally use LLVM utilities")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: sanglipeng1 <sanglipeng1@jd.com>

parent fb478dfd

scripts/decode_stacktrace.sh

+3 −3

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ find_module() {
		find_module && return

		if [[ $release == "" ]] ; then
		release=$(gdb -ex 'print init_uts_ns.name.release' -ex 'quit' -quiet -batch "$vmlinux" \| sed -n 's/\$1 = "$.$"./\1/p')
		release=$(gdb -ex 'print init_uts_ns.name.release' -ex 'quit' -quiet -batch "$vmlinux" 2>/dev/null \| sed -n 's/\$1 = "$.$"./\1/p')
		fi

		for dn in {/usr/lib/debug,}/lib/modules/$release ; do
		@@ -105,7 +105,7 @@ parse_symbol() {
		if [[ "${cache[$module,$name]+isset}" == "isset" ]]; then
		local base_addr=${cache[$module,$name]}
		else
		local base_addr=$(nm "$objfile" \| awk '$3 == "'$name'" && ($2 == "t" \|\| $2 == "T") {print $1; exit}')
		local base_addr=$(nm "$objfile" 2>/dev/null \| awk '$3 == "'$name'" && ($2 == "t" \|\| $2 == "T") {print $1; exit}')
		if [[ $base_addr == "" ]] ; then
		# address not found
		return
		@@ -129,7 +129,7 @@ parse_symbol() {
		if [[ "${cache[$module,$address]+isset}" == "isset" ]]; then
		local code=${cache[$module,$address]}
		else
		local code=$(${CROSS_COMPILE}addr2line -i -e "$objfile" "$address")
		local code=$(${CROSS_COMPILE}addr2line -i -e "$objfile" "$address" 2>/dev/null)
		cache[$module,$address]=$code
		fi