From patchwork Fri Jun 28 05:08:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gustavo Romero X-Patchwork-Id: 808138 Delivered-To: patch@linaro.org Received: by 2002:adf:fe0a:0:b0:362:4979:7f74 with SMTP id n10csp194919wrr; Thu, 27 Jun 2024 22:22:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVAx1L7ZFBiYU7VpW1VC9h9UifVimPdu4ttZhyFkGxIfIMFS1ctr0eR9N/Q5h9pkbsAG+FgQ0N0r/enZyFRxVw1 X-Google-Smtp-Source: AGHT+IFoWpVgDj7zDhrXrnPwS6qMmeo40vXsN/EdW0OlZhCJyXaLoslNUb4bffBqmDosLC+uqq3x X-Received: by 2002:a05:6214:4113:b0:6b5:434:cc86 with SMTP id 6a1803df08f44-6b54099aa45mr195621636d6.10.1719552132431; Thu, 27 Jun 2024 22:22:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719552132; cv=none; d=google.com; s=arc-20160816; b=cFu9UgkaUx8PqC1q6zBNtj23CdnoAhWd8XdANjVfPK3dC571ROpshwRrwOEctNWrgQ jziXAJn3Q00xzbRnIRh3a3mTBb0KYMdkKVrlKV/RZ4Sb42XfqqmQtNWRsTqwquPyzULF uLpeaRKt9Ni27I5UNke/bXjXlkvNxyvu667nQ+bMAEYxbR9zuMYQgyv0YPCR/js1tpHZ oLTjpMEay1sm7vzdVY/96CruBu0mvocGrish3PuzdaWqW1mGKDYV8lnXCrAe/QVHUPNU X8J7OZ96tDnusMjKVb20lVfUU4qMEHrbs6EM+Z3EhloxePIiT8oVkTuEfVDhGPXjxI/E qkFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=b2VaaTPgTAEqVDnMnsMoaFor8kxb0lDdN/vBY1aKTbA=; fh=fQSRkfw+DkTHa5KQssXieneufL+rl3wPoA2jkVIsZpk=; b=zumBh1cIqKxcN/1Gw1no7/qy21epD/Q2HJ6LxUvNpM4wIHaYFLGv/lFMzZiR9UTFlX tbw0gtDhqGu2V4GlDhtZgDWwLb7xmn/Vx6jsMHa7LC6o2vGdBpynpj1lIt0mUwLaeud2 8CNt0c0sqhp+pSN1nMcHiWMZjtbiQf6FkCCoQ72SECUfUR+OUJIWFtNS6JvLzRwZKFFb 3gcIoq8vauSwG67pnFpq+x8+8Wt2R++UfmpEtPVCCgsiAFINR+MZKmppbAcKirIKLgnf 7gBGQCuJNgxoo3D5zpdJSEgD5JgSvs/unTnrwB8EAdGK7NvVJGbe7vUo25OtAffHtuau /qnw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zpqpyd9G; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6b59e5edfd8si12415516d6.380.2024.06.27.22.22.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Jun 2024 22:22:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zpqpyd9G; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sN42p-0003GN-Ou; Fri, 28 Jun 2024 01:21:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sN42n-0003Fo-L6 for qemu-devel@nongnu.org; Fri, 28 Jun 2024 01:21:09 -0400 Received: from mail-yb1-xb32.google.com ([2607:f8b0:4864:20::b32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sN42j-0008D1-J4 for qemu-devel@nongnu.org; Fri, 28 Jun 2024 01:21:08 -0400 Received: by mail-yb1-xb32.google.com with SMTP id 3f1490d57ef6-dfe1aa7cce2so172438276.1 for ; Thu, 27 Jun 2024 22:21:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719552063; x=1720156863; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=b2VaaTPgTAEqVDnMnsMoaFor8kxb0lDdN/vBY1aKTbA=; b=Zpqpyd9GANdO52FqkUpEfRHNys0KPEIugrJOZJoffk5h4RaeCeIGEnl8+U0W0QH0xF yh9PVbreyuhZrSv8maC0DKJhOknrFhhktUbHGonP9mOkA5jPvT36IyJ9lI/aPHvNOZhY Eq+hX1hG0vA2DTsI8xlFwd30EjwRwv2uAAisOgDh89ThIN9mhx8kwNHX4NKPafO4Uo7/ Z/N1Os7IVpN5zlXMOSLOKf/08KmBiGOgUYa8w9iWrEF4gVKKNXipJhdF9AwZyT7s8Gib b2sxCeoVCDEArMT4voHvLiZNY645lcn+8qxzzNxhh3+nxfiy8zwLxBRWIb1swG4LyOMz P2kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719552063; x=1720156863; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b2VaaTPgTAEqVDnMnsMoaFor8kxb0lDdN/vBY1aKTbA=; b=LAH2pg9YlMUcvndCC4tUQuRoecLlURfZMFiHecXMDeOI9Ddmxy7mft1yjYad+QV5ru BrcNCTguBgV8oO1dyiP21yLoRzxYS8UuAMX3gAiwOYf2WEDghcQYlIlCRpn550Hx/lhE eDp9BDCAez0+uTREgmIJZmhiEmagl+35f8eKMeLryvVGBpr/9OUlJkEKk3HMYSGZJT1W birlxjdk0H9y+Vq+esEV188hYJt4Z9+KWkJddlOS/dGP3cHIvQZZP8pDGP7+0NqfZC0b OOANRlwwHBeph//UlbYP1/1kjBnY4g0OXarMXXOvm/AlrPXUXkGLbE0HD/LjdrCAUfVt TFNw== X-Gm-Message-State: AOJu0YwVqtOsp304le4ew0M1VmbEfAbAM/iCJf9h/kBaLdGI+jfEQLsU vNHzUhRcch5ChNWDrKnV9Hr+kg+iVVmoEzpyx45Lc4joSlW+oM4HND+Xa4HKx1BMcBcMI5Ix539 p X-Received: by 2002:a25:b10f:0:b0:e03:6023:ef75 with SMTP id 3f1490d57ef6-e036023f83dmr91679276.38.1719552062687; Thu, 27 Jun 2024 22:21:02 -0700 (PDT) Received: from amd.. ([2804:7f0:b401:391e:3e7c:3fff:fe7a:e83b]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-72c6b2a16cdsm423932a12.46.2024.06.27.22.21.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jun 2024 22:21:02 -0700 (PDT) From: Gustavo Romero To: qemu-devel@nongnu.org, philmd@linaro.org, alex.bennee@linaro.org, richard.henderson@linaro.org Cc: peter.maydell@linaro.org, gustavo.romero@linaro.org Subject: [PATCH v6 03/11] gdbstub: Add support for target-specific stubs Date: Fri, 28 Jun 2024 05:08:42 +0000 Message-Id: <20240628050850.536447-4-gustavo.romero@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240628050850.536447-1-gustavo.romero@linaro.org> References: <20240628050850.536447-1-gustavo.romero@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::b32; envelope-from=gustavo.romero@linaro.org; helo=mail-yb1-xb32.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Currently, it's not possible to have stubs specific to a given target, even though there are GDB features which are target-specific, like, for instance, memory tagging. This commit introduces gdb_extend_qsupported_features, gdb_extend_query_table, and gdb_extend_set_table functions as interfaces to extend the qSupported string, the query handler table, and the set handler table, allowing target-specific stub implementations. Signed-off-by: Gustavo Romero Reviewed-by: Alex Bennée --- gdbstub/gdbstub.c | 102 ++++++++++++++++++++++++++++++++++--- include/gdbstub/commands.h | 22 ++++++++ 2 files changed, 118 insertions(+), 6 deletions(-) diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 9ff2f4177d..b1ca253f97 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -1609,6 +1609,20 @@ static void handle_query_thread_extra(GArray *params, void *user_ctx) gdb_put_strbuf(); } +static char *extended_qsupported_features; +void gdb_extend_qsupported_features(char *qsupported_features) +{ + /* + * We don't support different sets of CPU gdb features on different CPUs yet + * so assert the feature strings are the same on all CPUs, or is set only + * once (1 CPU). + */ + g_assert(extended_qsupported_features == NULL || + g_strcmp0(extended_qsupported_features, qsupported_features) == 0); + + extended_qsupported_features = qsupported_features; +} + static void handle_query_supported(GArray *params, void *user_ctx) { CPUClass *cc; @@ -1648,6 +1662,11 @@ static void handle_query_supported(GArray *params, void *user_ctx) } g_string_append(gdbserver_state.str_buf, ";vContSupported+;multiprocess+"); + + if (extended_qsupported_features) { + g_string_append(gdbserver_state.str_buf, extended_qsupported_features); + } + gdb_put_strbuf(); } @@ -1729,6 +1748,41 @@ static const GdbCmdParseEntry gdb_gen_query_set_common_table[] = { }, }; +/* Compares if a set of command parsers is equal to another set of parsers. */ +static bool cmp_cmds(GdbCmdParseEntry *c, GdbCmdParseEntry *d, int size) +{ + for (int i = 0; i < size; i++) { + if (!(c[i].handler == d[i].handler && + g_strcmp0(c[i].cmd, d[i].cmd) == 0 && + c[i].cmd_startswith == d[i].cmd_startswith && + g_strcmp0(c[i].schema, d[i].schema) == 0)) { + + /* Sets are different. */ + return false; + } + } + + /* Sets are equal, i.e. contain the same command parsers. */ + return true; +} + +static GdbCmdParseEntry *extended_query_table; +static int extended_query_table_size; +void gdb_extend_query_table(GdbCmdParseEntry *table, int size) +{ + /* + * We don't support different sets of CPU gdb features on different CPUs yet + * so assert query table is the same on all CPUs, or is set only once + * (1 CPU). + */ + g_assert(extended_query_table == NULL || + (extended_query_table_size == size && + cmp_cmds(extended_query_table, table, size))); + + extended_query_table = table; + extended_query_table_size = size; +} + static const GdbCmdParseEntry gdb_gen_query_table[] = { { .handler = handle_query_curr_tid, @@ -1821,6 +1875,22 @@ static const GdbCmdParseEntry gdb_gen_query_table[] = { #endif }; +static GdbCmdParseEntry *extended_set_table; +static int extended_set_table_size; +void gdb_extend_set_table(GdbCmdParseEntry *table, int size) +{ + /* + * We don't support different sets of CPU gdb features on different CPUs yet + * so assert set table is the same on all CPUs, or is set only once (1 CPU). + */ + g_assert(extended_set_table == NULL || + (extended_set_table_size == size && + cmp_cmds(extended_set_table, table, size))); + + extended_set_table = table; + extended_set_table_size = size; +} + static const GdbCmdParseEntry gdb_gen_set_table[] = { /* Order is important if has same prefix */ { @@ -1859,11 +1929,21 @@ static void handle_gen_query(GArray *params, void *user_ctx) return; } - if (!process_string_cmd(gdb_get_cmd_param(params, 0)->data, - gdb_gen_query_table, - ARRAY_SIZE(gdb_gen_query_table))) { - gdb_put_packet(""); + if (process_string_cmd(gdb_get_cmd_param(params, 0)->data, + gdb_gen_query_table, + ARRAY_SIZE(gdb_gen_query_table))) { + return; + } + + if (extended_query_table && + process_string_cmd(gdb_get_cmd_param(params, 0)->data, + extended_query_table, + extended_query_table_size)) { + return; } + + /* Can't handle query, return Empty response. */ + gdb_put_packet(""); } static void handle_gen_set(GArray *params, void *user_ctx) @@ -1878,11 +1958,21 @@ static void handle_gen_set(GArray *params, void *user_ctx) return; } - if (!process_string_cmd(gdb_get_cmd_param(params, 0)->data, + if (process_string_cmd(gdb_get_cmd_param(params, 0)->data, gdb_gen_set_table, ARRAY_SIZE(gdb_gen_set_table))) { - gdb_put_packet(""); + return; } + + if (extended_set_table && + process_string_cmd(gdb_get_cmd_param(params, 0)->data, + extended_set_table, + extended_set_table_size)) { + return; + } + + /* Can't handle set, return Empty response. */ + gdb_put_packet(""); } static void handle_target_halt(GArray *params, void *user_ctx) diff --git a/include/gdbstub/commands.h b/include/gdbstub/commands.h index 639257493e..306dfdef97 100644 --- a/include/gdbstub/commands.h +++ b/include/gdbstub/commands.h @@ -69,4 +69,26 @@ typedef struct GdbCmdParseEntry { */ int gdb_put_packet(const char *buf); +/** + * gdb_extend_query_table() - Extend query table. + * @table: The table with the additional query packet handlers. + * @size: The number of handlers to be added. + */ +void gdb_extend_query_table(GdbCmdParseEntry *table, int size); + +/** + * gdb_extend_set_table() - Extend set table. + * @table: The table with the additional set packet handlers. + * @size: The number of handlers to be added. + */ +void gdb_extend_set_table(GdbCmdParseEntry *table, int size); + +/** + * gdb_extend_qsupported_features() - Extend the qSupported features string. + * @qsupported_features: The additional qSupported feature(s) string. The string + * should start with a semicolon and, if there are more than one feature, the + * features should be separate by a semiocolon. + */ +void gdb_extend_qsupported_features(char *qsupported_features); + #endif /* GDBSTUB_COMMANDS_H */