Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
gdbstub: fixes cases where wrong threads were reported to GDB on SIGINT
This fix is implemented by having the vCont handler set the value of `gdbserver_state.c_cpu` if any threads are to be resumed. The specific CPU picked is arbitrarily from the ones to be resumed, but it should be okay, as all GDB cares about is that it is a resumed thread. Signed-off-by: Matheus Branco Borella <dark.ryu.550@gmail.com> Message-Id: <20230804182633.47300-2-dark.ryu.550@gmail.com> [AJB: style and whitespace fixes] Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1725 Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20230829161528.2707696-9-alex.bennee@linaro.org>
- Loading branch information
Showing
4 changed files
with
164 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| from __future__ import print_function | ||
| # | ||
| # Test some of the softmmu debug features with the multiarch memory | ||
| # test. It is a port of the original vmlinux focused test case but | ||
| # using the "memory" test instead. | ||
| # | ||
| # This is launched via tests/guest-debug/run-test.py | ||
| # | ||
|
|
||
| import gdb | ||
| import sys | ||
|
|
||
| failcount = 0 | ||
|
|
||
|
|
||
| def report(cond, msg): | ||
| "Report success/fail of test" | ||
| if cond: | ||
| print("PASS: %s" % (msg)) | ||
| else: | ||
| print("FAIL: %s" % (msg)) | ||
| global failcount | ||
| failcount += 1 | ||
|
|
||
|
|
||
| def check_interrupt(thread): | ||
| """ | ||
| Check that, if thread is resumed, we go back to the same thread when the | ||
| program gets interrupted. | ||
| """ | ||
|
|
||
| # Switch to the thread we're going to be running the test in. | ||
| print("thread ", thread.num) | ||
| gdb.execute("thr %d" % thread.num) | ||
|
|
||
| # Enter the loop() function on this thread. | ||
| # | ||
| # While there are cleaner ways to do this, we want to minimize the number of | ||
| # side effects on the gdbstub's internal state, since those may mask bugs. | ||
| # Ideally, there should be no difference between what we're doing here and | ||
| # the program reaching the loop() function on its own. | ||
| # | ||
| # For this to be safe, we only need the prologue of loop() to not have | ||
| # instructions that may have problems with what we're doing here. We don't | ||
| # have to worry about anything else, as this function never returns. | ||
| gdb.execute("set $pc = loop") | ||
|
|
||
| # Continue and then interrupt the task. | ||
| gdb.post_event(lambda: gdb.execute("interrupt")) | ||
| gdb.execute("c") | ||
|
|
||
| # Check whether the thread we're in after the interruption is the same we | ||
| # ran continue from. | ||
| return (thread.num == gdb.selected_thread().num) | ||
|
|
||
|
|
||
| def run_test(): | ||
| """ | ||
| Test if interrupting the code always lands us on the same thread when | ||
| running with scheduler-lock enabled. | ||
| """ | ||
|
|
||
| gdb.execute("set scheduler-locking on") | ||
| for thread in gdb.selected_inferior().threads(): | ||
| report(check_interrupt(thread), | ||
| "thread %d resumes correctly on interrupt" % thread.num) | ||
|
|
||
|
|
||
| # | ||
| # This runs as the script it sourced (via -x, via run-test.py) | ||
| # | ||
| try: | ||
| inferior = gdb.selected_inferior() | ||
| arch = inferior.architecture() | ||
| print("ATTACHED: %s" % arch.name()) | ||
| except (gdb.error, AttributeError): | ||
| print("SKIPPING (not connected)", file=sys.stderr) | ||
| exit(0) | ||
|
|
||
| if gdb.parse_and_eval('$pc') == 0: | ||
| print("SKIP: PC not set") | ||
| exit(0) | ||
| if len(gdb.selected_inferior().threads()) == 1: | ||
| print("SKIP: set to run on a single thread") | ||
| exit(0) | ||
|
|
||
| try: | ||
| # Run the actual tests | ||
| run_test() | ||
| except (gdb.error): | ||
| print("GDB Exception: %s" % (sys.exc_info()[0])) | ||
| failcount += 1 | ||
| pass | ||
|
|
||
| # Finally kill the inferior and exit gdb with a count of failures | ||
| gdb.execute("kill") | ||
| exit(failcount) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /* | ||
| * External interruption test. This test is structured in such a way that it | ||
| * passes the cases that require it to exit, but we can make it enter an | ||
| * infinite loop from GDB. | ||
| * | ||
| * We don't have the benefit of libc, just builtin C primitives and | ||
| * whatever is in minilib. | ||
| */ | ||
|
|
||
| #include <minilib.h> | ||
|
|
||
| void loop(void) | ||
| { | ||
| do { | ||
| /* | ||
| * Loop forever. Just make sure the condition is always a constant | ||
| * expression, so that this loop is not UB, as per the C | ||
| * standard. | ||
| */ | ||
| } while (1); | ||
| } | ||
|
|
||
| int main(void) | ||
| { | ||
| return 0; | ||
| } | ||
|
|
||
|
|