From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by sourceware.org (Postfix) with ESMTPS id ED246396DC26 for ; Fri, 16 Sep 2022 11:38:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org ED246396DC26 X-IronPort-AV: E=McAfee;i="6500,9779,10471"; a="282000391" X-IronPort-AV: E=Sophos;i="5.93,320,1654585200"; d="scan'208";a="282000391" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Sep 2022 04:38:34 -0700 X-IronPort-AV: E=Sophos;i="5.93,320,1654585200"; d="scan'208";a="617640014" Received: from mulvlfelix.iul.intel.com (HELO localhost) ([172.28.48.92]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Sep 2022 04:38:32 -0700 From: Felix Willgerodt To: gdb-patches@sourceware.org, markus.t.metzger@intel.com Subject: [PATCH v6 07/10] btrace, gdbserver: Add ptwrite to btrace_config_pt. Date: Fri, 16 Sep 2022 13:36:43 +0200 Message-Id: <20220916113646.49749-8-felix.willgerodt@intel.com> X-Mailer: git-send-email 2.34.3 In-Reply-To: <20220916113646.49749-1-felix.willgerodt@intel.com> References: <20220916113646.49749-1-felix.willgerodt@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-10.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_NONE, TXREP 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: Fri, 16 Sep 2022 11:38:37 -0000 This enables gdb and gdbserver to communicate about ptwrite support. If ptwrite support would be enabled unconditionally, GDBs with older libipt versions would break. --- gdb/btrace.c | 8 +++++++- gdb/doc/gdb.texinfo | 21 +++++++++++++++++++++ gdb/features/btrace-conf.dtd | 1 + gdb/remote.c | 30 ++++++++++++++++++++++++++++++ gdbserver/linux-low.cc | 2 ++ gdbserver/server.cc | 18 ++++++++++++++++++ gdbsupport/btrace-common.h | 6 ++++++ 7 files changed, 85 insertions(+), 1 deletion(-) diff --git a/gdb/btrace.c b/gdb/btrace.c index 3305ebfb58f..b5ccb2c8264 100644 --- a/gdb/btrace.c +++ b/gdb/btrace.c @@ -2273,7 +2273,7 @@ parse_xml_btrace_conf_pt (struct gdb_xml_parser *parser, std::vector &attributes) { struct btrace_config *conf; - struct gdb_xml_value *size; + struct gdb_xml_value *size, *ptwrite; conf = (struct btrace_config *) user_data; conf->format = BTRACE_FORMAT_PT; @@ -2282,10 +2282,16 @@ parse_xml_btrace_conf_pt (struct gdb_xml_parser *parser, size = xml_find_attribute (attributes, "size"); if (size != NULL) conf->pt.size = (unsigned int) *(ULONGEST *) size->value.get (); + + ptwrite = xml_find_attribute (attributes, "ptwrite"); + if (ptwrite != nullptr) + conf->pt.ptwrite = (bool) *(ULONGEST *) ptwrite->value.get (); } static const struct gdb_xml_attribute btrace_conf_pt_attributes[] = { { "size", GDB_XML_AF_OPTIONAL, gdb_xml_parse_attr_ulongest, NULL }, + { "ptwrite", GDB_XML_AF_OPTIONAL, gdb_xml_parse_attr_enum, + gdb_xml_enums_boolean }, { NULL, GDB_XML_AF_NONE, NULL, NULL } }; diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index d5c4718a8f9..cbc2d301c92 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -43012,6 +43012,11 @@ These are the currently defined stub features and their properties: @tab @samp{-} @tab Yes +@item @samp{Qbtrace-conf:pt:ptwrite} +@tab Yes +@tab @samp{-} +@tab Yes + @item @samp{QNonStop} @tab No @tab @samp{-} @@ -43323,6 +43328,9 @@ The remote stub understands the @samp{Qbtrace-conf:bts:size} packet. @item Qbtrace-conf:pt:size The remote stub understands the @samp{Qbtrace-conf:pt:size} packet. +@item Qbtrace-conf:pt:ptwrite +The remote stub understands the @samp{Qbtrace-conf:pt:ptwrite} packet. + @item swbreak The remote stub reports the @samp{swbreak} stop reason for memory breakpoints. @@ -43824,6 +43832,18 @@ The ring buffer size has been set. A badly formed request or an error was encountered. @end table +@item Qbtrace-conf:pt:ptwrite=@var{(yes|no)} +Indicate support for ptwrite packets. This allows for backwards- +compatibility. + +Reply: +@table @samp +@item OK +The ptwrite config parameter has been set. +@item E.errtext +A badly formed request or an error was encountered. +@end table + @end table @node Architecture-Specific Protocol Details @@ -46466,6 +46486,7 @@ The formal DTD for the branch trace configuration format is given below: + @end smallexample @include agentexpr.texi diff --git a/gdb/features/btrace-conf.dtd b/gdb/features/btrace-conf.dtd index c71b11f2087..6571515c264 100644 --- a/gdb/features/btrace-conf.dtd +++ b/gdb/features/btrace-conf.dtd @@ -12,3 +12,4 @@ + diff --git a/gdb/remote.c b/gdb/remote.c index 70f918a7362..f8cca2330aa 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -2204,6 +2204,9 @@ enum { /* Support for the Qbtrace-conf:pt:size packet. */ PACKET_Qbtrace_conf_pt_size, + /* Support for the Qbtrace-conf:pt:ptwrite packet. */ + PACKET_Qbtrace_conf_pt_ptwrite, + /* Support for exec events. */ PACKET_exec_event_feature, @@ -5422,6 +5425,8 @@ static const struct protocol_feature remote_protocol_features[] = { PACKET_exec_event_feature }, { "Qbtrace-conf:pt:size", PACKET_DISABLE, remote_supported_packet, PACKET_Qbtrace_conf_pt_size }, + { "Qbtrace-conf:pt:ptwrite", PACKET_DISABLE, remote_supported_packet, + PACKET_Qbtrace_conf_pt_ptwrite }, { "vContSupported", PACKET_DISABLE, remote_supported_packet, PACKET_vContSupported }, { "QThreadEvents", PACKET_DISABLE, remote_supported_packet, PACKET_QThreadEvents }, { "no-resumed", PACKET_DISABLE, remote_supported_packet, PACKET_no_resumed }, @@ -14106,6 +14111,28 @@ remote_target::btrace_sync_conf (const btrace_config *conf) rs->btrace_config.pt.size = conf->pt.size; } + + packet = &remote_protocol_packets[PACKET_Qbtrace_conf_pt_ptwrite]; + if (packet_config_support (packet) == PACKET_ENABLE + && conf->pt.ptwrite != rs->btrace_config.pt.ptwrite) + { + pos = buf; + const char *ptw = conf->pt.ptwrite ? "yes" : "no"; + pos += xsnprintf (pos, endbuf - pos, "%s=\"%s\"", packet->name, ptw); + + putpkt (buf); + getpkt (&rs->buf, 0); + + if (packet_ok (buf, packet) == PACKET_ERROR) + { + if (buf[0] == 'E' && buf[1] == '.') + error (_("Failed to sync ptwrite config: %s"), buf + 2); + else + error (_("Failed to sync ptwrite config.")); + } + + rs->btrace_config.pt.ptwrite = conf->pt.ptwrite; + } } /* Read TP's btrace configuration from the target and store it into CONF. */ @@ -15324,6 +15351,9 @@ Show the maximum size of the address (in bits) in a memory packet."), NULL, add_packet_config_cmd (&remote_protocol_packets[PACKET_Qbtrace_conf_pt_size], "Qbtrace-conf:pt:size", "btrace-conf-pt-size", 0); + add_packet_config_cmd (&remote_protocol_packets[PACKET_Qbtrace_conf_pt_ptwrite], + "Qbtrace-conf:pt:ptwrite", "btrace-conf-pt-ptwrite", 0); + add_packet_config_cmd (&remote_protocol_packets[PACKET_vContSupported], "vContSupported", "verbose-resume-supported", 0); diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 2f71360d3bd..1333ec13dbd 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6806,6 +6806,8 @@ linux_process_target::read_btrace_conf (const btrace_target_info *tinfo, case BTRACE_FORMAT_PT: buffer_xml_printf (buffer, "pt.size); + const char *ptw = conf->pt.ptwrite ? "yes" : "no"; + buffer_xml_printf (buffer, " ptwrite=\"%s\"", ptw); buffer_xml_printf (buffer, "/>\n"); break; } diff --git a/gdbserver/server.cc b/gdbserver/server.cc index c619206d5d2..0ea7b1a9d57 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -542,6 +542,23 @@ handle_btrace_conf_general_set (char *own_buf) current_btrace_conf.pt.size = (unsigned int) size; } + else if (strncmp (op, "pt:ptwrite=", strlen ("pt:ptwrite=")) == 0) + { + bool ptwrite; + + op += strlen ("pt:ptwrite="); + if (strncmp (op, "\"yes\"", strlen ("\"yes\"")) == 0) + ptwrite = true; + else if (strncmp (op, "\"no\"", strlen ("\"no\"")) == 0) + ptwrite = false; + else + { + strcpy (own_buf, "E.Bad ptwrite value."); + return -1; + } + + current_btrace_conf.pt.ptwrite = ptwrite; + } else { strcpy (own_buf, "E.Bad Qbtrace configuration option."); @@ -2162,6 +2179,7 @@ supported_btrace_packets (char *buf) strcat (buf, ";Qbtrace-conf:bts:size+"); strcat (buf, ";Qbtrace:pt+"); strcat (buf, ";Qbtrace-conf:pt:size+"); + strcat (buf, ";Qbtrace-conf:pt:ptwrite+"); strcat (buf, ";Qbtrace:off+"); strcat (buf, ";qXfer:btrace:read+"); strcat (buf, ";qXfer:btrace-conf:read+"); diff --git a/gdbsupport/btrace-common.h b/gdbsupport/btrace-common.h index 3c55ae92185..74708891923 100644 --- a/gdbsupport/btrace-common.h +++ b/gdbsupport/btrace-common.h @@ -117,6 +117,12 @@ struct btrace_config_pt This is unsigned int and not size_t since it is registered as control variable for "set record btrace pt buffer-size". */ unsigned int size; + + /* Configuration bit for ptwrite packets. + + If both gdb and gdbserver support this, gdb will try to enable ptwrite + packets when tracing is started. */ + bool ptwrite; }; /* A branch tracing configuration. -- 2.34.3 Intel Deutschland GmbH Registered Address: Am Campeon 10, 85579 Neubiberg, Germany Tel: +49 89 99 8853-0, www.intel.de Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva Chairperson of the Supervisory Board: Nicole Lau Registered Office: Munich Commercial Register: Amtsgericht Muenchen HRB 186928