fix gdbstub support for multiple threads in usermode, v3
PATCH 1/1 fix gdbstub support for multiple threads in usermode, v3
When debugging multi-threaded programs, QEMU's gdb stub would report the correct number of threads (the qfThreadInfo and qsThreadInfo packets). However, the stub was unable to actually switch between threads (the T packet), since it would report every thread except the first as being dead. Furthermore, the stub relied upon cpu_index as a reliable means of assigning IDs to the threads. This was a bad idea; if you have this sequence of events:
initial thread created
new thread #1
new thread #2
thread #1 exits
new thread #3
thread #3 will have the same cpu_index as thread #1, which would confuse GDB. (This problem is partly due to the remote protocol not having a good way to send thread creation/destruction events.)
We fix this by using the host thread ID for the identifier passed to GDB when debugging a multi-threaded userspace program. The thread ID might wrap, but the same sort of problems with wrapping thread IDs would come up with debugging programs natively, so this doesn't represent a problem.
--- cpu-defs.h | 1 + exec.c | 2 +- gdbstub.c | 69 +++++++++++++++++++++++++++++++------------------ linux-user/syscall.c | 4 ++- 4 files changed, 49 insertions(+), 27 deletions(-)
Changes from earlier versions: use the host thread ID as the unique ID to pass to GDB instead of inventing a new ID that tries to be robust against wrapping.
cpu-defs.h +1 -0
@@ -207,6 +207,7 @@ typedef struct CPUWatchpoint { \CPUState *next_cpu;/* next CPU sharing TB cache */ \int cpu_index;/* CPU index (informative) */ \ +uint32_t host_tid;/* host thread ID */ \int numa_node;/* NUMA node this cpu is belonging to */ \int running;/* Nonzero if cpu is currently running(usermode). */ \/* user data */ \
exec.c +1 -1
@@ -550,7 +550,7 @@ void cpu_exec_init(CPUState *env) penv = &first_cpu; cpu_index =0 ;while (*penv !=NULL ) { - penv = (CPUState **)&(*penv)->next_cpu; + penv = &(*penv)->next_cpu; cpu_index++; } env->cpu_index = cpu_index;
gdbstub.c +44 -25
122 lines not on this page · raw message
linux-user/syscall.c +3 -1
@@ -3202,6 +3202,7 @@ static void *clone_func(void *arg) env = info->env; thread_env = env; info->tid =gettid (); + env->host_tid = info->tid;if (info->child_tidptr)put_user_u32 (info->tid, info->child_tidptr);if (info->parent_tidptr)
@@ -3792,6 +3793,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,/* FIXME: This probably breaks if a signal arrives. We should probably be disabling signals. */ if (first_cpu->next_cpu) { +TaskState *ts;CPUState **lastp;CPUState *p;
@@ -3809,7 +3811,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,/* Remove the CPU from the list. */ *lastp = p->next_cpu;cpu_list_unlock (); -TaskState *ts = ((CPUState *)cpu_env)->opaque; + ts = ((CPUState *)cpu_env)->opaque;if (ts->child_tidptr) {put_user_u32 (0 , ts->child_tidptr); sys_futex(g2h(ts->child_tidptr), FUTEX_WAKE, INT_MAX,
Signature · 1 line
1.6.0.5
Quoted 30 lines · Nathan Froyd
When debugging multi-threaded programs, QEMU's gdb stub would report the correct number of threads (the qfThreadInfo and qsThreadInfo packets). However, the stub was unable to actually switch between threads (the T packet), since it would report every thread except the first as being dead. Furthermore, the stub relied upon
cpu_indexas a reliable means of assigning IDs to the threads. This was a bad idea; if you have this sequence of events:initial thread created
new thread #1
new thread #2
thread #1 exits
new thread #3thread #3 will have the same
cpu_indexas thread #1, which would confuse GDB. (This problem is partly due to the remote protocol not having a good way to send thread creation/destruction events.)We fix this by using the host thread ID for the identifier passed to GDB when debugging a multi-threaded userspace program. The thread ID might wrap, but the same sort of problems with wrapping thread IDs would come up with debugging programs natively, so this doesn't represent a problem.
--- cpu-defs.h | 1 + exec.c | 2 +- gdbstub.c | 69 +++++++++++++++++++++++++++++++------------------ linux-user/syscall.c | 4 ++- 4 files changed, 49 insertions(+), 27 deletions(-)
Quoted 3 lines
Changes from earlier versions: use the host thread ID as the unique ID to pass to GDB instead of inventing a new ID that tries to be robust against wrapping.
Looks good to me, has additionally some nice cleanup aspects, and survived a quick regression test in system mode.
Jan
When debugging multi-threaded programs, QEMU's gdb stub would report the correct number of threads (the qfThreadInfo and qsThreadInfo packets). However, the stub was unable to actually switch between threads (the T packet), since it would report every thread except the first as being dead. Furthermore, the stub relied upon cpu_index as a reliable means of assigning IDs to the threads. This was a bad idea; if you have this sequence of events:
initial thread created
new thread #1
new thread #2
thread #1 exits
new thread #3
thread #3 will have the same cpu_index as thread #1, which would confuse GDB. (This problem is partly due to the remote protocol not having a good way to send thread creation/destruction events.)
We fix this by using the host thread ID for the identifier passed to GDB when debugging a multi-threaded userspace program. The thread ID might wrap, but the same sort of problems with wrapping thread IDs would come up with debugging programs natively, so this doesn't represent a problem.
--- cpu-defs.h | 1 + exec.c | 2 +- gdbstub.c | 69 +++++++++++++++++++++++++++++++------------------ linux-user/syscall.c | 4 ++- 4 files changed, 49 insertions(+), 27 deletions(-)
Sorry for not including Signed-off-by before. I fail at patchsubmission.
cpu-defs.h +1 -0
@@ -207,6 +207,7 @@ typedef struct CPUWatchpoint { \CPUState *next_cpu;/* next CPU sharing TB cache */ \int cpu_index;/* CPU index (informative) */ \ +uint32_t host_tid;/* host thread ID */ \int numa_node;/* NUMA node this cpu is belonging to */ \int running;/* Nonzero if cpu is currently running(usermode). */ \/* user data */ \
exec.c +1 -1
@@ -550,7 +550,7 @@ void cpu_exec_init(CPUState *env) penv = &first_cpu; cpu_index =0 ;while (*penv !=NULL ) { - penv = (CPUState **)&(*penv)->next_cpu; + penv = &(*penv)->next_cpu; cpu_index++; } env->cpu_index = cpu_index;
gdbstub.c +44 -25
122 lines not on this page · raw message
linux-user/syscall.c +3 -1
@@ -3202,6 +3202,7 @@ static void *clone_func(void *arg) env = info->env; thread_env = env; info->tid =gettid (); + env->host_tid = info->tid;if (info->child_tidptr)put_user_u32 (info->tid, info->child_tidptr);if (info->parent_tidptr)
@@ -3792,6 +3793,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,/* FIXME: This probably breaks if a signal arrives. We should probably be disabling signals. */ if (first_cpu->next_cpu) { +TaskState *ts;CPUState **lastp;CPUState *p;
@@ -3809,7 +3811,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,/* Remove the CPU from the list. */ *lastp = p->next_cpu;cpu_list_unlock (); -TaskState *ts = ((CPUState *)cpu_env)->opaque; + ts = ((CPUState *)cpu_env)->opaque;if (ts->child_tidptr) {put_user_u32 (0 , ts->child_tidptr); sys_futex(g2h(ts->child_tidptr), FUTEX_WAKE, INT_MAX,
Signature · 1 line
1.6.3.2