From c269dbdb603216de2be52f07f26e65ead7e11c7b Mon Sep 17 00:00:00 2001 From: Don Breazeal Date: Tue, 12 May 2015 09:52:45 -0700 Subject: [PATCH] Extended-remote follow vfork This patch implements follow-fork for vfork on extended-remote Linux targets. The implementation follows the native implementation as much as possible. Most of the work is done on the GDB side in the existing code now in infrun.c. GDBserver just has to report the events and do a little bookkeeping. Implementation includes: * enabling VFORK events by adding ptrace options for VFORK and VFORK_DONE to linux-low.c:linux_low_ptrace_options. * handling VFORK and VFORK_DONE events in linux-low.c:handle_extended_wait and reporting them to GDB. * including VFORK and VFORK_DONE events in the predicate linux-low.c:extended_event_reported. * adding support for VFORK and VFORK_DONE events in RSP by adding stop reasons "vfork" and "vforkdone" to the 'T' Stop Reply Packet in both gdbserver/remote-utils.c and gdb/remote.c. Tested on x64 Ubuntu Lucid, native, remote, extended-remote. gdb/gdbserver/ChangeLog: * linux-low.c (handle_extended_wait): Handle PTRACE_EVENT_FORK and PTRACE_EVENT_VFORK_DONE. (linux_low_ptrace_options, extended_event_reported): Add vfork events. * remote-utils.c (prepare_resume_reply): New stop reasons "vfork" and "vforkdone" for RSP 'T' Stop Reply Packet. * server.h (report_vfork_events): Declare global variable. gdb/ChangeLog: * remote.c (remove_vfork_event_p): New function. (remote_follow_fork): Add vfork event type to event checking. (remote_parse_stop_reply): New stop reasons "vfork" and "vforkdone" for RSP 'T' Stop Reply Packet. --- gdb/ChangeLog | 7 +++++++ gdb/gdbserver/ChangeLog | 11 +++++++++++ gdb/gdbserver/linux-low.c | 26 ++++++++++++++++++++++---- gdb/gdbserver/remote-utils.c | 18 ++++++++++++++++-- gdb/gdbserver/server.h | 1 + gdb/remote.c | 22 +++++++++++++++++++++- 6 files changed, 78 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c9c2e62eecf..e84f23faf84 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2015-05-12 Don Breazeal + + * remote.c (remove_vfork_event_p): New function. + (remote_follow_fork): Add vfork event type to event checking. + (remote_parse_stop_reply): New stop reasons "vfork" and + "vforkdone" for RSP 'T' Stop Reply Packet. + 2015-05-12 Don Breazeal * linux-nat.c (linux_nat_ptrace_options): New function. diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 0bdcdf36c36..1e20a36cacb 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,14 @@ +2015-05-12 Don Breazeal + + * linux-low.c (handle_extended_wait): Handle PTRACE_EVENT_FORK and + PTRACE_EVENT_VFORK_DONE. + (linux_low_ptrace_options, extended_event_reported): Add vfork + events. + * remote-utils.c (prepare_resume_reply): New stop reasons "vfork" + and "vforkdone" for RSP 'T' Stop Reply Packet. + * server.h (report_vfork_events): Declare + global variable. + 2015-05-12 Don Breazeal * linux-aarch64-low.c (aarch64_linux_new_fork): New function. diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index d9053ad6048..9f3ea4881ff 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -425,7 +425,8 @@ handle_extended_wait (struct lwp_info *event_lwp, int wstat) struct thread_info *event_thr = get_lwp_thread (event_lwp); struct lwp_info *new_lwp; - if ((event == PTRACE_EVENT_FORK) || (event == PTRACE_EVENT_CLONE)) + if ((event == PTRACE_EVENT_FORK) || (event == PTRACE_EVENT_VFORK) + || (event == PTRACE_EVENT_CLONE)) { ptid_t ptid; unsigned long new_pid; @@ -451,7 +452,7 @@ handle_extended_wait (struct lwp_info *event_lwp, int wstat) warning ("wait returned unexpected status 0x%x", status); } - if (event == PTRACE_EVENT_FORK) + if (event == PTRACE_EVENT_FORK || event == PTRACE_EVENT_VFORK) { struct process_info *parent_proc; struct process_info *child_proc; @@ -494,8 +495,13 @@ handle_extended_wait (struct lwp_info *event_lwp, int wstat) the_low_target.new_fork (parent_proc, child_proc); /* Save fork info in the parent thread. */ - event_lwp->waitstatus.kind = TARGET_WAITKIND_FORKED; + if (event == PTRACE_EVENT_FORK) + event_lwp->waitstatus.kind = TARGET_WAITKIND_FORKED; + else if (event == PTRACE_EVENT_VFORK) + event_lwp->waitstatus.kind = TARGET_WAITKIND_VFORKED; + event_lwp->waitstatus.value.related_pid = ptid; + /* The status_pending field contains bits denoting the extended event, so when the pending event is handled, the handler will look at lwp->waitstatus. */ @@ -538,6 +544,13 @@ handle_extended_wait (struct lwp_info *event_lwp, int wstat) /* Don't report the event. */ return 1; } + else if (event == PTRACE_EVENT_VFORK_DONE) + { + event_lwp->waitstatus.kind = TARGET_WAITKIND_VFORK_DONE; + + /* Report the event. */ + return 0; + } internal_error (__FILE__, __LINE__, _("unknown ptrace event %d"), event); } @@ -2010,6 +2023,9 @@ linux_low_ptrace_options (int attached) if (report_fork_events) options |= PTRACE_O_TRACEFORK; + if (report_vfork_events) + options |= (PTRACE_O_TRACEVFORK | PTRACE_O_TRACEVFORKDONE); + return options; } @@ -2714,7 +2730,9 @@ extended_event_reported (const struct target_waitstatus *waitstatus) if (waitstatus == NULL) return 0; - return (waitstatus->kind == TARGET_WAITKIND_FORKED); + return (waitstatus->kind == TARGET_WAITKIND_FORKED + || waitstatus->kind == TARGET_WAITKIND_VFORKED + || waitstatus->kind == TARGET_WAITKIND_VFORK_DONE); } /* Wait for process, returns status. */ diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c index 60783489b8a..bb3145683bb 100644 --- a/gdb/gdbserver/remote-utils.c +++ b/gdb/gdbserver/remote-utils.c @@ -1115,16 +1115,20 @@ prepare_resume_reply (char *buf, ptid_t ptid, { case TARGET_WAITKIND_STOPPED: case TARGET_WAITKIND_FORKED: + case TARGET_WAITKIND_VFORKED: { struct thread_info *saved_thread; const char **regp; struct regcache *regcache; - if (status->kind == TARGET_WAITKIND_FORKED && report_fork_events) + if ((status->kind == TARGET_WAITKIND_FORKED && report_fork_events) + || (status->kind == TARGET_WAITKIND_VFORKED && report_vfork_events)) { enum gdb_signal signal = GDB_SIGNAL_TRAP; + const char *event = (status->kind == TARGET_WAITKIND_FORKED + ? "fork" : "vfork"); - sprintf (buf, "T%02xfork:", signal); + sprintf (buf, "T%02x%s:", signal, event); buf += strlen (buf); buf = write_ptid (buf, status->value.related_pid); strcat (buf, ";"); @@ -1244,6 +1248,16 @@ prepare_resume_reply (char *buf, ptid_t ptid, else sprintf (buf, "X%02x", status->value.sig); break; + case TARGET_WAITKIND_VFORK_DONE: + if (report_vfork_events) + { + enum gdb_signal signal = GDB_SIGNAL_TRAP; + + sprintf (buf, "T%02xvforkdone:;", signal); + } + else + sprintf (buf, "T%02x", GDB_SIGNAL_0); + break; default: error ("unhandled waitkind"); break; diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index 696a24e8c4a..09a56245575 100644 --- a/gdb/gdbserver/server.h +++ b/gdb/gdbserver/server.h @@ -85,6 +85,7 @@ extern int disable_packet_qfThreadInfo; extern int run_once; extern int multi_process; extern int report_fork_events; +extern int report_vfork_events; extern int non_stop; /* True if the "swbreak+" feature is active. In that case, GDB wants diff --git a/gdb/remote.c b/gdb/remote.c index 390d30db82e..df8fca3513c 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -1470,6 +1470,14 @@ remote_fork_event_p (struct remote_state *rs) return packet_support (PACKET_fork_event_feature) == PACKET_ENABLE; } +/* Returns true if vfork events are supported. */ + +static int +remote_vfork_event_p (struct remote_state *rs) +{ + return packet_support (PACKET_vfork_event_feature) == PACKET_ENABLE; +} + /* Tokens for use by the asynchronous signal handlers for SIGINT. */ static struct async_signal_handler *async_sigint_remote_twice_token; static struct async_signal_handler *async_sigint_remote_token; @@ -4537,8 +4545,10 @@ remote_follow_fork (struct target_ops *ops, int follow_child, int detach_fork) { struct remote_state *rs = get_remote_state (); + enum target_waitkind kind = inferior_thread ()->pending_follow.kind; - if (remote_fork_event_p (rs)) + if ((kind == TARGET_WAITKIND_FORKED && remote_fork_event_p (rs)) + || (kind == TARGET_WAITKIND_VFORKED && remote_vfork_event_p (rs))) { /* When following the parent and detaching the child, we detach the child here. For the case of following the child and @@ -5727,6 +5737,16 @@ Packet: '%s'\n"), event->ws.value.related_pid = read_ptid (++p1, &p); event->ws.kind = TARGET_WAITKIND_FORKED; } + else if (strncmp (p, "vfork", p1 - p) == 0) + { + event->ws.value.related_pid = read_ptid (++p1, &p); + event->ws.kind = TARGET_WAITKIND_VFORKED; + } + else if (strncmp (p, "vforkdone", p1 - p) == 0) + { + event->ws.kind = TARGET_WAITKIND_VFORK_DONE; + p = skip_to_semicolon (p1 + 1); + } else { ULONGEST pnum; -- 2.30.2