Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

scripts/decode_stacktrace.sh: fix decoding of lines with an additional info

Since commit bdf8eafbf7f5 ("arm64: stacktrace: report source of unwind
data") a stack trace line can contain an additional info field that was not
present before, in the form of one or more letters in parentheses. E.g.:

[ 504.517915] led_sysfs_enable+0x54/0x80 (P)
^^^

When this is present, decode_stacktrace decodes the line incorrectly:

[ 504.517915] led_sysfs_enable+0x54/0x80 P

Extend parsing to decode it correctly:

[ 504.517915] led_sysfs_enable (drivers/leds/led-core.c:455 (discriminator 7)) (P)

The regex to match such lines assumes the info can be extended in the
future to other uppercase characters, and will need to be extended in case
other characters will be used. Using a much more generic regex might incur
in false positives, so this looked like a good tradeoff.

Link: https://lkml.kernel.org/r/20241230-decode_stacktrace-fix-info-v1-1-984910659173@bootlin.com
Fixes: bdf8eafbf7f5 ("arm64: stacktrace: report source of unwind data")
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Miroslav Benes <mbenes@suse.cz>
Cc: Puranjay Mohan <puranjay@kernel.org>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Luca Ceresoli and committed by
Andrew Morton
2bff77c6 76d5d4c5

+14 -2
+14 -2
scripts/decode_stacktrace.sh
··· 286 286 last=$(( $last - 1 )) 287 287 fi 288 288 289 + # Extract info after the symbol if present. E.g.: 290 + # func_name+0x54/0x80 (P) 291 + # ^^^ 292 + # The regex assumes only uppercase letters will be used. To be 293 + # extended if needed. 294 + local info_str="" 295 + if [[ ${words[$last]} =~ \([A-Z]*\) ]]; then 296 + info_str=${words[$last]} 297 + unset words[$last] 298 + last=$(( $last - 1 )) 299 + fi 300 + 289 301 if [[ ${words[$last]} =~ \[([^]]+)\] ]]; then 290 302 module=${words[$last]} 291 303 # some traces format is "(%pS)", which like "(foo+0x0/0x1 [bar])" ··· 325 313 # Add up the line number to the symbol 326 314 if [[ -z ${module} ]] 327 315 then 328 - echo "${words[@]}" "$symbol" 316 + echo "${words[@]}" "$symbol ${info_str}" 329 317 else 330 - echo "${words[@]}" "$symbol $module" 318 + echo "${words[@]}" "$symbol $module ${info_str}" 331 319 fi 332 320 } 333 321