Skip to content

Commit

Permalink
gdbstub: Call gdbserver_fork() both in parent and in child
Browse files Browse the repository at this point in the history
The upcoming follow-fork-mode child support requires post-fork message
exchange between the parent and the child. Prepare gdbserver_fork() for
this purpose. Rename it to gdbserver_fork_end() to better reflect its
purpose.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Message-Id: <20240219141628.246823-8-iii@linux.ibm.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240305121005.3528075-9-alex.bennee@linaro.org>
  • Loading branch information
iii-i authored and stsquad committed Mar 6, 2024
1 parent 9d456e0 commit 6604b05
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion bsd-user/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,11 @@ void fork_end(pid_t pid)
*/
qemu_init_cpu_list();
get_task_state(thread_cpu)->ts_tid = qemu_get_thread_id();
gdbserver_fork(thread_cpu, pid);
gdbserver_fork_end(thread_cpu, pid);
} else {
mmap_fork_end(child);
cpu_list_unlock();
gdbserver_fork_end(thread_cpu, pid);
end_exclusive();
}
}
Expand Down
5 changes: 2 additions & 3 deletions gdbstub/user.c
Original file line number Diff line number Diff line change
Expand Up @@ -374,10 +374,9 @@ static void disable_gdbstub(CPUState *thread_cpu)
tb_flush(thread_cpu);
}

/* Disable gdb stub for child processes. */
void gdbserver_fork(CPUState *cpu, pid_t pid)
void gdbserver_fork_end(CPUState *cpu, pid_t pid)
{
if (!gdbserver_state.init || gdbserver_user_state.fd < 0) {
if (pid != 0 || !gdbserver_state.init || gdbserver_user_state.fd < 0) {
return;
}
disable_gdbstub(cpu);
Expand Down
5 changes: 3 additions & 2 deletions include/gdbstub/user.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,11 @@ void gdb_signalled(CPUArchState *as, int sig);
void gdbserver_fork_start(void);

/**
* gdbserver_fork() - disable gdb stub for child processes.
* gdbserver_fork_end() - inform gdb of the completed fork()
* @cs: CPU
* @pid: 0 if in child process, -1 if fork failed, child process pid otherwise
*/
void gdbserver_fork(CPUState *cs, pid_t pid);
void gdbserver_fork_end(CPUState *cs, pid_t pid);

/**
* gdb_syscall_entry() - inform gdb of syscall entry and yield control to it
Expand Down
2 changes: 1 addition & 1 deletion linux-user/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,10 @@ void fork_end(pid_t pid)
}
qemu_init_cpu_list();
get_task_state(thread_cpu)->ts_tid = qemu_get_thread_id();
gdbserver_fork(thread_cpu, pid);
} else {
cpu_list_unlock();
}
gdbserver_fork_end(thread_cpu, pid);
/*
* qemu_init_cpu_list() reinitialized the child exclusive state, but we
* also need to keep current_cpu consistent, so call end_exclusive() for
Expand Down

0 comments on commit 6604b05

Please sign in to comment.