From: Florian Rommel <mail@florommel.de>
To: Jan Kiszka <jan.kiszka@siemens.com>,
Kieran Bingham <kbingham@kernel.org>
Cc: Kuan-Ying Lee <Kuan-Ying.Lee@mediatek.com>,
Palmer Dabbelt <palmer@rivosinc.com>,
Deepak Gupta <debug@rivosinc.com>,
Andrew Jones <ajones@ventanamicro.com>,
Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org, Florian Rommel <mail@florommel.de>
Subject: [PATCH 4/4] scripts/gdb: Fix detection of current CPU in KGDB
Date: Thu, 25 Apr 2024 17:35:01 +0200 [thread overview]
Message-ID: <20240425153501.749966-5-mail@florommel.de> (raw)
In-Reply-To: <20240425153501.749966-1-mail@florommel.de>
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.
Signed-off-by: Florian Rommel <mail@florommel.de>
---
scripts/gdb/linux/cpus.py | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/scripts/gdb/linux/cpus.py b/scripts/gdb/linux/cpus.py
index 2b51a3abd363..2f11c4f9c345 100644
--- a/scripts/gdb/linux/cpus.py
+++ b/scripts/gdb/linux/cpus.py
@@ -26,11 +26,7 @@ def get_current_cpu():
if utils.get_gdbserver_type() == utils.GDBSERVER_QEMU:
return gdb.selected_thread().num - 1
elif utils.get_gdbserver_type() == utils.GDBSERVER_KGDB:
- tid = gdb.selected_thread().ptid[2]
- if tid > (0x100000000 - MAX_CPUS - 2):
- return 0x100000000 - tid - 2
- else:
- return tasks.get_thread_info(tasks.get_task_by_pid(tid))['cpu']
+ return gdb.parse_and_eval("kgdb_active.counter")
else:
raise gdb.GdbError("Sorry, obtaining the current CPU is not yet "
"supported with this gdb server.")
--
2.44.0
prev parent reply other threads:[~2024-04-25 15:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-25 15:34 [PATCH 0/4] scripts/gdb: Fixes for $lx_current and $lx_per_cpu Florian Rommel
2024-04-25 15:34 ` [PATCH 1/4] scripts/gdb: Fix failing KGDB detection during probe Florian Rommel
2024-04-25 15:34 ` [PATCH 2/4] scripts/gdb: Fix parameter handling in $lx_per_cpu Florian Rommel
2024-04-25 15:35 ` [PATCH 3/4] scripts/gdb: Make get_thread_info accept pointers Florian Rommel
2024-04-25 15:35 ` Florian Rommel [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240425153501.749966-5-mail@florommel.de \
--to=mail@florommel.de \
--cc=Kuan-Ying.Lee@mediatek.com \
--cc=ajones@ventanamicro.com \
--cc=akpm@linux-foundation.org \
--cc=debug@rivosinc.com \
--cc=jan.kiszka@siemens.com \
--cc=kbingham@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=palmer@rivosinc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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®