Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 310c6dd0 authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by Linus Torvalds
Browse files

scripts/decode_stacktrace.sh: handle symbols in modules 



scripts/decode_stacktrace.sh presently displays module symbols as

	func+0x0ff/0x5153 [module]

Add a third argument: the pathname of a directory where the script
should look for the file module.ko so that the output appears as

	func (foo/bar.c:123) module

Without the argument or if the module file isn't found the script prints
such symbols as is without decoding.

Signed-off-by: default avatarKonstantin Khlebnikov <koct9i@gmail.com>
Cc: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8e4f70e2

scripts/decode_stacktrace.sh

+39 −16
Original line number Diff line number Diff line
@@ -2,15 +2,17 @@ 
# (c) 2014, Sasha Levin <sasha.levin@oracle.com>

#set -x



if [[ $# != 2 ]]; then

if [[ $# < 2 ]]; then

	echo "Usage:"

	echo "	$0 [vmlinux] [base path]"

	echo "	$0 [vmlinux] [base path] [modules path]"

	exit 1

fi



vmlinux=$1

basepath=$2

modpath=$3

declare -A cache

declare -A modcache



parse_symbol() {

	# The structure of symbol at this point is:
@@ -19,6 +21,17 @@ parse_symbol() { 
	# For example:

	#   do_basic_setup+0x9c/0xbf



	if [[ $module == "" ]] ; then

		local objfile=$vmlinux

	elif [[ "${modcache[$module]+isset}" == "isset" ]]; then

		local objfile=${modcache[$module]}

	else

		[[ $modpath == "" ]] && return

		local objfile=$(find "$modpath" -name $module.ko -print -quit)

		[[ $objfile == "" ]] && return

		modcache[$module]=$objfile

	fi



	# Remove the englobing parenthesis

	symbol=${symbol#\(}

	symbol=${symbol%\)}
@@ -29,11 +42,11 @@ parse_symbol() { 
	# Use 'nm vmlinux' to figure out the base address of said symbol.

	# It's actually faster to call it every time than to load it

	# all into bash.

	if [[ "${cache[$name]+isset}" == "isset" ]]; then

		local base_addr=${cache[$name]}

	if [[ "${cache[$module,$name]+isset}" == "isset" ]]; then

		local base_addr=${cache[$module,$name]}

	else

		local base_addr=$(nm "$vmlinux" | grep -i ' t ' | awk "/ $name\$/ {print \$1}" | head -n1)

		cache["$name"]="$base_addr"

		local base_addr=$(nm "$objfile" | grep -i ' t ' | awk "/ $name\$/ {print \$1}" | head -n1)

		cache[$module,$name]="$base_addr"

	fi

	# Let's start doing the math to get the exact address into the

	# symbol. First, strip out the symbol total length.
@@ -49,11 +62,11 @@ parse_symbol() { 


	# Pass it to addr2line to get filename and line number

	# Could get more than one result

	if [[ "${cache[$address]+isset}" == "isset" ]]; then

		local code=${cache[$address]}

	if [[ "${cache[$module,$address]+isset}" == "isset" ]]; then

		local code=${cache[$module,$address]}

	else

		local code=$(addr2line -i -e "$vmlinux" "$address")

		cache[$address]=$code

		local code=$(addr2line -i -e "$objfile" "$address")

		cache[$module,$address]=$code

	fi



	# addr2line doesn't return a proper error code if it fails, so
@@ -105,13 +118,23 @@ handle_line() { 
		fi

	done



	if [[ ${words[$last]} =~ \[([^]]+)\] ]]; then

		module=${words[$last]}

		module=${module#\[}

		module=${module%\]}

		symbol=${words[$last-1]}

		unset words[$last-1]

	else

		# The symbol is the last element, process it

		symbol=${words[$last]}

		module=

	fi



	unset words[$last]

	parse_symbol # modifies $symbol



	# Add up the line number to the symbol

	echo "${words[@]}" "$symbol"

	echo "${words[@]}" "$symbol $module"

}



while read line; do