From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by sourceware.org (Postfix) with ESMTPS id D78053829BE5 for ; Wed, 13 Jul 2022 22:24:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D78053829BE5 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-f46.google.com with SMTP id j29-20020a05600c1c1d00b003a2fdafdefbso157546wms.2 for ; Wed, 13 Jul 2022 15:24:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qKRi9G/GkiHdg/3U8W03lYM7s2xOpcgDmI1qup2uiv0=; b=su1SFvdC9Na/wWKNLn+yfyExSBk+o8PmBaP6c2OXQHvIdCehtVAA75I/N6RxPTnxy/ mipTQ4rWi9EQQhJ7OO0q1GHgwZXh/f6+ECkWOVbGEfVXrQ0i216OGIXliXM1dHbsdaQ5 D1aHh+r2of/pJDDWAzPj34D0ZrQKtnVp+qeDuHy/I/Yq4iYBNIBTheJCXdjNAhA1Vf2u EiIzOySCABYhNSAElG/xr3n0XAs0bwHbvJdUL6W7vxa2UT7MNL1fiS8uH6hM5wckoF4T cItWBHkmNAruymIiUHgafNH1stPTv6smDrDKi7GfzAjdzKZo2+24WyHuv7+YHdeqBD6t el7A== X-Gm-Message-State: AJIora+Kmy1/pGuAauQFEfNeYsrWReuelfg0vvXbSND+khA0Oa19lPKe XlAmpVg3BaiBMr3Tqy+ni+3VReb5QFs= X-Google-Smtp-Source: AGRyM1uJEChKCOX+3+SeRsQAwXZlbTT2OOGwFZecpC9BW4BZmPNgCoHY3A+ZbwZYSKIiV4eZwclB2A== X-Received: by 2002:a05:600c:2282:b0:3a2:d776:cbd6 with SMTP id 2-20020a05600c228200b003a2d776cbd6mr5953861wmf.112.1657751090827; Wed, 13 Jul 2022 15:24:50 -0700 (PDT) Received: from localhost ([2001:8a0:f924:2600:209d:85e2:409e:8726]) by smtp.gmail.com with ESMTPSA id m4-20020a05600c4f4400b003976fbfbf00sm3619967wmq.30.2022.07.13.15.24.49 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 Jul 2022 15:24:49 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH v2 07/29] Thread options & clone events (core + remote) Date: Wed, 13 Jul 2022 23:24:11 +0100 Message-Id: <20220713222433.374898-8-pedro@palves.net> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220713222433.374898-1-pedro@palves.net> References: <20220713222433.374898-1-pedro@palves.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jul 2022 22:24:57 -0000 A previous patch taught GDB about a new TARGET_WAITKIND_THREAD_CLONED event kind, and made the Linux target report clone events. A following patch will teach Linux GDBserver to do the same thing. However, for remote debugging, it wouldn't be ideal for GDBserver to report every clone event to GDB, when GDB only cares about such events in some specific situations. Reporting clone events all the time would be potentially chatty. We don't enable thread create/exit events all the time for the same reason. Instead we have the QThreadEvents packet. QThreadEvents is target-wide, though. This patch makes GDB instead explicitly request that the target reports clone events or not, on a per-thread basis. In order to be able to do that with GDBserver, we need a new remote protocol feature. Since a following patch will want to enable thread exit events on per-thread basis too, the packet introduced here is more generic than just for clone events. It lets you enable/disable a set of options at once, modelled on Linux ptrace's PTRACE_SETOPTIONS. IOW, this commit introduces a new QThreadOptions packet, that lets you specify a set of per-thread event options you want to enable. The packet accepts a list of options/thread-id pairs, similarly to vCont, processed left to right, with the options field being a number interpreted as a bit mask of options. The only option defined in this commit is GDB_TO_CLONE (0x1), which ask the remote target to report clone events. Another patch later in the series will introduce another option. For example, this packet sets option "1" (clone events) on thread p1000.2345: QThreadOptions;1:p1000.2345 and this clears options for all threads of process 1000, and then sets option "1" (clone events) on thread p1000.2345: QThreadOptions;0:p1000.-1;1:p1000.2345 This clears options of all threads of all processes: QThreadOptions;0 The target reports the set of supported options by including "QThreadOptions=" in its qSupported response. infrun is then tweaked to enable GDB_TO_CLONE when stepping over a breakpoint. Unlike PTRACE_SETOPTIONS, fork/vfork/clone children do NOT inherit their parent's thread options. This is so that GDB can send e.g., "QThreadOptions;0;1:TID" without worrying about threads it doesn't know about yet. Documentation for this new remote protocol feature is included in a documentation patch later in the series. Change-Id: If271f20320d864f074d8ac0d531cc1a323da847f Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=19675 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=27830 --- gdb/gdbthread.h | 16 +++++ gdb/infrun.c | 72 +++++++++++++++++++++ gdb/remote.c | 143 ++++++++++++++++++++++++++++++++++++++++- gdb/target-debug.h | 2 + gdb/target-delegates.c | 28 ++++++++ gdb/target.c | 9 +++ gdb/target.h | 8 +++ gdb/target/target.h | 10 +++ gdb/thread.c | 15 +++++ gdbserver/gdbthread.h | 3 + gdbserver/server.cc | 130 +++++++++++++++++++++++++++++++++++++ gdbserver/target.cc | 6 ++ gdbserver/target.h | 9 +++ 13 files changed, 450 insertions(+), 1 deletion(-) diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h index 1a33eb61221..43e9d6ea484 100644 --- a/gdb/gdbthread.h +++ b/gdb/gdbthread.h @@ -28,6 +28,7 @@ struct symtab; #include "ui-out.h" #include "btrace.h" #include "target/waitstatus.h" +#include "target/target.h" #include "cli/cli-utils.h" #include "gdbsupport/refcounted-object.h" #include "gdbsupport/common-gdbthread.h" @@ -470,6 +471,17 @@ class thread_info : public refcounted_object, m_thread_fsm = std::move (fsm); } + /* Record the thread options last set for this thread. */ + + void set_thread_options (gdb_thread_options thread_options); + + /* Get the thread options last set for this thread. */ + + gdb_thread_options thread_options () const + { + return m_thread_options; + } + int current_line = 0; struct symtab *current_symtab = NULL; @@ -577,6 +589,10 @@ class thread_info : public refcounted_object, left to do for the thread's execution command after the target stops. Several execution commands use it. */ std::unique_ptr m_thread_fsm; + + /* The thread options as last set with a call to + target_set_thread_options. */ + gdb_thread_options m_thread_options; }; using thread_info_resumed_with_pending_wait_status_node diff --git a/gdb/infrun.c b/gdb/infrun.c index 9f09373c1db..f3eea44375e 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -1512,6 +1512,16 @@ step_over_info_valid_p (void) displaced step operation on it. See displaced_step_prepare and displaced_step_finish for details. */ +/* Return true if THREAD is doing a displaced step. */ + +static bool +displaced_step_in_progress_thread (thread_info *thread) +{ + gdb_assert (thread != NULL); + + return thread->displaced_step_state.in_progress (); +} + /* Return true if INF has a thread doing a displaced step. */ static bool @@ -1806,6 +1816,28 @@ displaced_step_prepare (thread_info *thread) return status; } +/* Maybe disable thread-{cloned,created,exited} event reporting after + a step-over (either in-line or displaced) finishes. */ + +static void +update_thread_events_after_step_over (thread_info *event_thread) +{ + if (target_supports_set_thread_options (0)) + { + /* We can control per-thread options. Disable events for the + event thread. */ + event_thread->set_thread_options (0); + } + else + { + /* We can only control the target-wide target_thread_events + setting. Disable it, but only if other threads don't need it + enabled. */ + if (!displaced_step_in_progress_any_thread ()) + target_thread_events (false); + } +} + /* If we displaced stepped an instruction successfully, adjust registers and memory to yield the same effect the instruction would have had if we had executed it at its original address, and return @@ -1850,6 +1882,8 @@ displaced_step_finish (thread_info *event_thread, if (!displaced->in_progress ()) return DISPLACED_STEP_FINISH_STATUS_OK; + update_thread_events_after_step_over (event_thread); + gdb_assert (event_thread->inf->displaced_step_state.in_progress_count > 0); event_thread->inf->displaced_step_state.in_progress_count--; @@ -2342,6 +2376,42 @@ do_target_resume (ptid_t resume_ptid, bool step, enum gdb_signal sig) else target_pass_signals (signal_pass); + /* Request that the target report thread-{created,cloned} events in + the following situations: + + - If we are performing an in-line step-over-breakpoint, then we + will remove a breakpoint from the target and only run the + current thread. We don't want any new thread (spawned by the + step) to start running, as it might miss the breakpoint. + + - If we are stepping over a breakpoint out of line (displaced + stepping) then we won't remove a breakpoint from the target, + but, if the step spawns a new clone thread, then we will need + to fixup the $pc address in the clone child too, so we need it + to start stopped. + */ + if (step_over_info_valid_p () + || displaced_step_in_progress_thread (tp)) + { + gdb_thread_options options = GDB_TO_CLONE; + if (target_supports_set_thread_options (options)) + tp->set_thread_options (options); + else + target_thread_events (true); + } + + /* If we're resuming more than one thread simultaneously, then any + thread other than the leader is being set to run free. Clear any + previous thread option for those threads. */ + if (resume_ptid != inferior_ptid && target_supports_set_thread_options (0)) + { + process_stratum_target *resume_target = tp->inf->process_target (); + for (thread_info *thr_iter : all_non_exited_threads (resume_target, + resume_ptid)) + if (thr_iter != tp) + thr_iter->set_thread_options (0); + } + infrun_debug_printf ("resume_ptid=%s, step=%d, sig=%s", resume_ptid.to_string ().c_str (), step, gdb_signal_to_symbol_string (sig)); @@ -6011,6 +6081,8 @@ finish_step_over (struct execution_control_state *ecs) back an event. */ gdb_assert (ecs->event_thread->control.trap_expected); + update_thread_events_after_step_over (ecs->event_thread); + clear_step_over_info (); } diff --git a/gdb/remote.c b/gdb/remote.c index 00ed82dc466..18c31c3e811 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -385,6 +385,10 @@ class remote_state this can go away. */ int wait_forever_enabled_p = 1; + /* The set of thread options the target reported it supports, via + qSupported. */ + gdb_thread_options supported_thread_options = 0; + private: /* Mapping of remote protocol data for each gdbarch. Usually there is only one entry here, though we may see more with stubs that @@ -421,6 +425,8 @@ class remote_target : public process_stratum_target void detach (inferior *, int) override; void disconnect (const char *, int) override; + void commit_requested_thread_options (); + void commit_resumed () override; void resume (ptid_t, int, enum gdb_signal) override; ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) override; @@ -547,6 +553,8 @@ class remote_target : public process_stratum_target void thread_events (int) override; + bool supports_set_thread_options (gdb_thread_options) override; + int can_do_single_step () override; void terminal_inferior () override; @@ -837,6 +845,9 @@ class remote_target : public process_stratum_target void remote_packet_size (const protocol_feature *feature, packet_support support, const char *value); + void remote_supported_thread_options (const protocol_feature *feature, + enum packet_support support, + const char *value); void remote_serial_quit_handler (); @@ -2171,6 +2182,9 @@ enum { /* Support for the QThreadEvents packet. */ PACKET_QThreadEvents, + /* Support for the QThreadOptions packet. */ + PACKET_QThreadOptions, + /* Support for multi-process extensions. */ PACKET_multiprocess_feature, @@ -5293,7 +5307,8 @@ remote_supported_packet (remote_target *remote, void remote_target::remote_packet_size (const protocol_feature *feature, - enum packet_support support, const char *value) + enum packet_support support, + const char *value) { struct remote_state *rs = get_remote_state (); @@ -5330,6 +5345,49 @@ remote_packet_size (remote_target *remote, const protocol_feature *feature, remote->remote_packet_size (feature, support, value); } +void +remote_target::remote_supported_thread_options (const protocol_feature *feature, + enum packet_support support, + const char *value) +{ + struct remote_state *rs = get_remote_state (); + + remote_protocol_packets[feature->packet].support = support; + + if (support != PACKET_ENABLE) + return; + + if (value == nullptr || *value == '\0') + { + warning (_("Remote target reported \"%s\" without supported options."), + feature->name); + return; + } + + ULONGEST options = 0; + const char *p = unpack_varlen_hex (value, &options); + + if (*p != '\0') + { + warning (_("Remote target reported \"%s\" with " + "bad thread options: \"%s\"."), + feature->name, value); + return; + } + + /* Record the set of supported options. */ + rs->supported_thread_options = (gdb_thread_option) options; +} + +static void +remote_supported_thread_options (remote_target *remote, + const protocol_feature *feature, + enum packet_support support, + const char *value) +{ + remote->remote_supported_thread_options (feature, support, value); +} + static const struct protocol_feature remote_protocol_features[] = { { "PacketSize", PACKET_DISABLE, remote_packet_size, -1 }, { "qXfer:auxv:read", PACKET_DISABLE, remote_supported_packet, @@ -5432,6 +5490,8 @@ static const struct protocol_feature remote_protocol_features[] = { PACKET_Qbtrace_conf_pt_size }, { "vContSupported", PACKET_DISABLE, remote_supported_packet, PACKET_vContSupported }, { "QThreadEvents", PACKET_DISABLE, remote_supported_packet, PACKET_QThreadEvents }, + { "QThreadOptions", PACKET_DISABLE, remote_supported_thread_options, + PACKET_QThreadOptions }, { "no-resumed", PACKET_DISABLE, remote_supported_packet, PACKET_no_resumed }, { "memory-tagging", PACKET_DISABLE, remote_supported_packet, PACKET_memory_tagging_feature }, @@ -5526,6 +5586,9 @@ remote_target::remote_query_supported () if (packet_set_cmd_state (PACKET_QThreadEvents) != AUTO_BOOLEAN_FALSE) remote_query_supported_append (&q, "QThreadEvents+"); + if (packet_set_cmd_state (PACKET_QThreadOptions) != AUTO_BOOLEAN_FALSE) + remote_query_supported_append (&q, "QThreadOptions+"); + if (packet_set_cmd_state (PACKET_no_resumed) != AUTO_BOOLEAN_FALSE) remote_query_supported_append (&q, "no-resumed+"); @@ -6612,6 +6675,8 @@ remote_target::resume (ptid_t scope_ptid, int step, enum gdb_signal siggnal) return; } + commit_requested_thread_options (); + /* In all-stop, we can't mark REMOTE_ASYNC_GET_PENDING_EVENTS_TOKEN (explained in remote-notif.c:handle_notification) so remote_notif_process is not called. We need find a place where @@ -6774,6 +6839,8 @@ remote_target::commit_resumed () if (!target_is_non_stop_p () || ::execution_direction == EXEC_REVERSE) return; + commit_requested_thread_options (); + /* Try to send wildcard actions ("vCont;c" or "vCont;c:pPID.-1") instead of resuming all threads of each process individually. However, if any thread of a process must remain halted, we can't @@ -14611,6 +14678,77 @@ remote_target::thread_events (int enable) } } +/* Implementation of the supports_set_thread_options target + method. */ + +bool +remote_target::supports_set_thread_options (gdb_thread_options options) +{ + remote_state *rs = get_remote_state (); + return (packet_support (PACKET_QThreadOptions) == PACKET_ENABLE + && (rs->supported_thread_options & options) == options); +} + +/* For coalescing reasons, actually sending the options to the target + happens at resume time, via this function. See target_resume for + all-stop, and target_commit_resumed for non-stop. */ + +void +remote_target::commit_requested_thread_options () +{ + struct remote_state *rs = get_remote_state (); + + if (packet_support (PACKET_QThreadOptions) != PACKET_ENABLE) + return; + + char *p = rs->buf.data (); + char *endp = p + get_remote_packet_size (); + + /* Clear options for all threads by default. Note that unlike + vCont, the rightmost options that match a thread apply, so we + don't have to worry about whether we can use wildcard ptids. */ + strcpy (p, "QThreadOptions;0"); + p += strlen (p); + + /* Now set non-zero options for threads that need them. We don't + bother with the case of all threads of a process wanting the same + non-zero options as that's not an expected scenario. */ + for (thread_info *tp : all_non_exited_threads (this)) + { + gdb_thread_options options = tp->thread_options (); + + if (options == 0) + continue; + + *p++ = ';'; + p += xsnprintf (p, endp - p, "%s", phex_nz (options, sizeof (options))); + if (tp->ptid != magic_null_ptid) + { + *p++ = ':'; + p = write_ptid (p, endp, tp->ptid); + } + } + + *p++ = '\0'; + + putpkt (rs->buf); + getpkt (&rs->buf, 0); + + switch (packet_ok (rs->buf, + &remote_protocol_packets[PACKET_QThreadOptions])) + { + case PACKET_OK: + if (strcmp (rs->buf.data (), "OK") != 0) + error (_("Remote refused setting thread options: %s"), rs->buf.data ()); + break; + case PACKET_ERROR: + error (_("Remote failure reply: %s"), rs->buf.data ()); + case PACKET_UNKNOWN: + gdb_assert_not_reached ("PACKET_UNKNOWN"); + break; + } +} + static void show_remote_cmd (const char *args, int from_tty) { @@ -15394,6 +15532,9 @@ Show the maximum size of the address (in bits) in a memory packet."), NULL, add_packet_config_cmd (&remote_protocol_packets[PACKET_QThreadEvents], "QThreadEvents", "thread-events", 0); + add_packet_config_cmd (&remote_protocol_packets[PACKET_QThreadOptions], + "QThreadOptions", "thread-options", 0); + add_packet_config_cmd (&remote_protocol_packets[PACKET_no_resumed], "N stop reply", "no-resumed-stop-reply", 0); diff --git a/gdb/target-debug.h b/gdb/target-debug.h index c2b1db1ce8e..0fe5e5e6022 100644 --- a/gdb/target-debug.h +++ b/gdb/target-debug.h @@ -176,6 +176,8 @@ target_debug_do_print (X.get ()) #define target_debug_print_target_waitkind(X) \ target_debug_do_print (pulongest (X)) +#define target_debug_print_gdb_thread_options(X) \ + target_debug_do_print (pulongest (X)) static void target_debug_print_struct_target_waitstatus_p (struct target_waitstatus *status) diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index f58fbe44094..a6fc87d4a2f 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -106,6 +106,7 @@ struct dummy_target : public target_ops int async_wait_fd () override; bool has_pending_events () override; void thread_events (int arg0) override; + bool supports_set_thread_options (gdb_thread_options arg0) override; bool supports_non_stop () override; bool always_non_stop_p () override; int find_memory_regions (find_memory_region_ftype arg0, void *arg1) override; @@ -281,6 +282,7 @@ struct debug_target : public target_ops int async_wait_fd () override; bool has_pending_events () override; void thread_events (int arg0) override; + bool supports_set_thread_options (gdb_thread_options arg0) override; bool supports_non_stop () override; bool always_non_stop_p () override; int find_memory_regions (find_memory_region_ftype arg0, void *arg1) override; @@ -2272,6 +2274,32 @@ debug_target::thread_events (int arg0) gdb_puts (")\n", gdb_stdlog); } +bool +target_ops::supports_set_thread_options (gdb_thread_options arg0) +{ + return this->beneath ()->supports_set_thread_options (arg0); +} + +bool +dummy_target::supports_set_thread_options (gdb_thread_options arg0) +{ + return false; +} + +bool +debug_target::supports_set_thread_options (gdb_thread_options arg0) +{ + bool result; + gdb_printf (gdb_stdlog, "-> %s->supports_set_thread_options (...)\n", this->beneath ()->shortname ()); + result = this->beneath ()->supports_set_thread_options (arg0); + gdb_printf (gdb_stdlog, "<- %s->supports_set_thread_options (", this->beneath ()->shortname ()); + target_debug_print_gdb_thread_options (arg0); + gdb_puts (") = ", gdb_stdlog); + target_debug_print_bool (result); + gdb_puts ("\n", gdb_stdlog); + return result; +} + bool target_ops::supports_non_stop () { diff --git a/gdb/target.c b/gdb/target.c index d1ba229189f..f6548ab3803 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -4377,6 +4377,15 @@ target_thread_events (int enable) current_inferior ()->top_target ()->thread_events (enable); } +/* See target.h. */ + +bool +target_supports_set_thread_options (gdb_thread_options options) +{ + inferior *inf = current_inferior (); + return inf->top_target ()->supports_set_thread_options (options); +} + /* Controls if targets can report that they can/are async. This is just for maintainers to use when debugging gdb. */ bool target_async_permitted = true; diff --git a/gdb/target.h b/gdb/target.h index 1cab47147e3..a49bb6e5f38 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -730,6 +730,10 @@ struct target_ops TARGET_DEFAULT_RETURN (false); virtual void thread_events (int) TARGET_DEFAULT_IGNORE (); + /* Returns true if the target supports setting thread options + OPTIONS, false otherwise. */ + virtual bool supports_set_thread_options (gdb_thread_options options) + TARGET_DEFAULT_RETURN (false); /* This method must be implemented in some situations. See the comment on 'can_run'. */ virtual bool supports_non_stop () @@ -1893,6 +1897,10 @@ extern void target_async (int enable); /* Enables/disables thread create and exit events. */ extern void target_thread_events (int enable); +/* Returns true if the target supports setting thread options + OPTIONS. */ +extern bool target_supports_set_thread_options (gdb_thread_options options); + /* Whether support for controlling the target backends always in non-stop mode is enabled. */ extern enum auto_boolean target_non_stop_enabled; diff --git a/gdb/target/target.h b/gdb/target/target.h index a5b0dd3ed1a..cba98114b5d 100644 --- a/gdb/target/target.h +++ b/gdb/target/target.h @@ -22,9 +22,19 @@ #include "target/waitstatus.h" #include "target/wait.h" +#include "gdbsupport/enum-flags.h" /* This header is a stopgap until more code is shared. */ +enum gdb_thread_option : unsigned +{ + /* Tell the target to report TARGET_WAITKIND_THREAD_CLONED events + for the thread. */ + GDB_TO_CLONE = 1 << 0, +}; + +DEF_ENUM_FLAGS_TYPE (enum gdb_thread_option, gdb_thread_options); + /* Read LEN bytes of target memory at address MEMADDR, placing the results in GDB's memory at MYADDR. Return zero for success, nonzero if any error occurs. This function must be provided by diff --git a/gdb/thread.c b/gdb/thread.c index 378c5ee2d13..6ea05f70a41 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -398,6 +398,21 @@ thread_info::clear_pending_waitstatus () /* See gdbthread.h. */ +void +thread_info::set_thread_options (gdb_thread_options thread_options) +{ + if (m_thread_options == thread_options) + return; + + m_thread_options = thread_options; + + infrun_debug_printf ("[options for %s are now 0x%x]", + this->ptid.to_string ().c_str (), + (unsigned) thread_options); +} + +/* See gdbthread.h. */ + int thread_is_in_step_over_chain (struct thread_info *tp) { diff --git a/gdbserver/gdbthread.h b/gdbserver/gdbthread.h index 8b897e73d33..30040e8afb6 100644 --- a/gdbserver/gdbthread.h +++ b/gdbserver/gdbthread.h @@ -80,6 +80,9 @@ struct thread_info /* Branch trace target information for this thread. */ struct btrace_target_info *btrace = nullptr; + + /* Thread options GDB requested with QThreadOptions. */ + gdb_thread_options thread_options = 0; }; extern std::list all_threads; diff --git a/gdbserver/server.cc b/gdbserver/server.cc index 9b081972dc0..fb7a1036320 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -36,6 +36,7 @@ #include "dll.h" #include "hostio.h" #include +#include #include "gdbsupport/common-inferior.h" #include "gdbsupport/job-control.h" #include "gdbsupport/environ.h" @@ -611,6 +612,17 @@ parse_store_memtags_request (char *request, CORE_ADDR *addr, size_t *len, return true; } +/* Parse thread options starting at *P and return them. On exit, + advance *P past the options. */ + +static gdb_thread_options +parse_gdb_thread_options (const char **p) +{ + ULONGEST options = 0; + *p = unpack_varlen_hex (*p, &options); + return (gdb_thread_option) options; +} + /* Handle all of the extended 'Q' packets. */ static void @@ -892,6 +904,114 @@ handle_general_set (char *own_buf) return; } + if (startswith (own_buf, "QThreadOptions;")) + { + const char *p = own_buf + strlen ("QThreadOptions"); + + gdb_thread_options supported_options; + if (!target_supports_set_thread_options (&supported_options)) + { + /* Something went wrong -- we don't support options, but GDB + sent the packet anyway. */ + write_enn (own_buf); + return; + } + + /* We could store the options directly in thread->thread_options + without this map, but that would mean that a QThreadOptions + packet with a wildcard like "QThreadOptions;0;3:TID" would + result in the debug logs showing: + + [options for TID are now 0x0] + [options for TID are now 0x3] + + It's nicer if we only print the final options for each TID, + and if we only print about it if the options changed compared + to the options that were previously set on the thread. */ + std::unordered_map set_options; + + while (*p != '\0') + { + if (p[0] != ';') + { + write_enn (own_buf); + return; + } + p++; + + /* Read the options. */ + + gdb_thread_options options = parse_gdb_thread_options (&p); + + if ((options & ~supported_options) != 0) + { + /* GDB asked for an unknown or unsupported option, so + error out. */ + std::string err + = string_printf ("E.Unknown option requested: %s\n", + hex_string (options)); + strcpy (own_buf, err.c_str ()); + return; + } + + ptid_t ptid; + + if (p[0] == ';' || p[0] == '\0') + ptid = minus_one_ptid; + else if (p[0] == ':') + { + const char *q; + + ptid = read_ptid (p + 1, &q); + + if (p == q) + { + write_enn (own_buf); + return; + } + p = q; + if (p[0] != ';' && p[0] != '\0') + { + write_enn (own_buf); + return; + } + } + else + { + write_enn (own_buf); + return; + } + + /* Convert PID.-1 => PID.0 for ptid.matches. */ + if (ptid != minus_one_ptid && ptid.lwp () == -1) + ptid = ptid_t (ptid.pid ()); + + for_each_thread ([&] (thread_info *thread) + { + if (ptid_of (thread).matches (ptid)) + set_options[thread] = options; + }); + } + + for (const auto &iter : set_options) + { + thread_info *thread = iter.first; + gdb_thread_options options = iter.second; + + if (debug_threads && thread->thread_options != options) + { + debug_printf ("[options for %s are now 0x%x]\n", + target_pid_to_str (ptid_of (thread)).c_str (), + (unsigned) options); + } + + thread->thread_options = options; + } + + write_ok (own_buf); + return; + } + if (startswith (own_buf, "QStartupWithShell:")) { const char *value = own_buf + strlen ("QStartupWithShell:"); @@ -2364,6 +2484,8 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p) cs.vCont_supported = 1; else if (feature == "QThreadEvents+") ; + else if (feature == "QThreadOptions+") + ; else if (feature == "no-resumed+") { /* GDB supports and wants TARGET_WAITKIND_NO_RESUMED @@ -2489,6 +2611,14 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p) strcat (own_buf, ";vContSupported+"); + gdb_thread_options supported_options; + if (target_supports_set_thread_options (&supported_options)) + { + char *end_buf = own_buf + strlen (own_buf); + sprintf (end_buf, ";QThreadOptions=%s", + phex_nz (supported_options, sizeof (supported_options))); + } + strcat (own_buf, ";QThreadEvents+"); strcat (own_buf, ";no-resumed+"); diff --git a/gdbserver/target.cc b/gdbserver/target.cc index adcfe6e7bcc..70fec6d2078 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -530,6 +530,12 @@ process_stratum_target::supports_vfork_events () return false; } +bool +process_stratum_target::supports_set_thread_options (gdb_thread_options *) +{ + return false; +} + bool process_stratum_target::supports_exec_events () { diff --git a/gdbserver/target.h b/gdbserver/target.h index 6c536a30778..33142363a02 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -277,6 +277,12 @@ class process_stratum_target /* Returns true if vfork events are supported. */ virtual bool supports_vfork_events (); + /* Returns true if the target supports setting thread options. If + options are supported, write into SUPPORTED_OPTIONS the set of + supported options. */ + virtual bool supports_set_thread_options + (gdb_thread_options *supported_options); + /* Returns true if exec events are supported. */ virtual bool supports_exec_events (); @@ -529,6 +535,9 @@ int kill_inferior (process_info *proc); #define target_supports_vfork_events() \ the_target->supports_vfork_events () +#define target_supports_set_thread_options(options) \ + the_target->supports_set_thread_options (options) + #define target_supports_exec_events() \ the_target->supports_exec_events () -- 2.36.0