Skip to content

Commit 40eea5a

Browse files
florommelakpm00
authored andcommitted
scripts/gdb: fix detection of current CPU in KGDB
Directly read the current CPU number from the kgdb_active variable. Before, the active CPU was obtained through the current task, which required searching the task list for the pid of GDB's selected thread. Obtaining the pid was buggy: GDB may use selected_thread().ptid[1] (LWPID) instead of .ptid[2] (TID) to store the threads pid; see https://sourceware.org/gdb/current/onlinedocs/gdb.html/Threads-In-Python.html As a result, the detection could return the wrong CPU number, leading to incorrect results for $lx_per_cpu and $lx_current. As a side effect, the patch significantly speeds up $lx_per_cpu and $lx_current in KGDB by avoiding the task-list iteration. Link: https://lkml.kernel.org/r/20240425153501.749966-5-mail@florommel.de Signed-off-by: Florian Rommel <mail@florommel.de> Cc: Andrew Jones <ajones@ventanamicro.com> Cc: Deepak Gupta <debug@rivosinc.com> Cc: Jan Kiszka <jan.kiszka@siemens.com> Cc: Kieran Bingham <kbingham@kernel.org> Cc: Kuan-Ying Lee <Kuan-Ying.Lee@mediatek.com> Cc: Palmer Dabbelt <palmer@rivosinc.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 7566b06 commit 40eea5a

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

scripts/gdb/linux/cpus.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,7 @@ def get_current_cpu():
2626
if utils.get_gdbserver_type() == utils.GDBSERVER_QEMU:
2727
return gdb.selected_thread().num - 1
2828
elif utils.get_gdbserver_type() == utils.GDBSERVER_KGDB:
29-
tid = gdb.selected_thread().ptid[2]
30-
if tid > (0x100000000 - MAX_CPUS - 2):
31-
return 0x100000000 - tid - 2
32-
else:
33-
return tasks.get_thread_info(tasks.get_task_by_pid(tid))['cpu']
29+
return gdb.parse_and_eval("kgdb_active.counter")
3430
else:
3531
raise gdb.GdbError("Sorry, obtaining the current CPU is not yet "
3632
"supported with this gdb server.")

0 commit comments

Comments
 (0)