From patchwork Wed Dec 11 17:05:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 181291 Delivered-To: patch@linaro.org Received: by 2002:ac9:44c4:0:0:0:0:0 with SMTP id t4csp1037677och; Wed, 11 Dec 2019 09:08:47 -0800 (PST) X-Google-Smtp-Source: APXvYqxXcSaeHKSFQtub/usuRFyrpYuAShbUCCSy4RXmvs1UYXhEddURYmmSuBIsmmLRNMlTYB4M X-Received: by 2002:a05:6830:1257:: with SMTP id s23mr3001652otp.241.1576084127590; Wed, 11 Dec 2019 09:08:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576084127; cv=none; d=google.com; s=arc-20160816; b=ffE9ciQsyx5PxgZxc8JAkyYERldSBlhY32SkNbdrCt/4aZUh8F939fwxBU82Yqt8s/ jzfyeTXgSJOFbED36M+NBr9FKfDtkm7/EUGrx0iPywUVbufMQvgg4mGLDsmsKRMSWZBK fmVPjdqp4q4bgdVRzzvY4FHRA6037LkgL80RbCNAGCr+RudEQXV1cAg6PPjDD1sb9GJ0 7kQwlTBzWLCWvK/GFXC5LXUuZbMOk50UQORh7IYbk5nVbBoq2aiv47aX7Tlk5O80ZLG7 yLqPeQLT21fhXSTxu9k+PjyNub9TABvUriYuhwXYS5IjrVFISK0Cc+3AmkBn1yA6wgp/ toRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=10ri5OPZ3wXmAnewtDMagCSgDZyQ+hI5ZaV97yVftek=; b=dssmuVE7ra1+vmQDd2R9N7eu9oxB3NpNL3kOdfeZRUewzeH/jq7djtZD0od7330Box ly43HErqK/M4E5G7jf7hqUXv7rpiljkL4O81eBd0YhrzDVgf/6J7O+JWDAx//eCmeaaG GNXm7fjuWBMUtAzH4uKKc0UpmQEtThY/gl2UehusF3iNvubgourJyC/hopp8yLFD6tOt d21qAGhO0//FlJxBaV5T5w/mGhYvBCUCHDE054S/p9EzuKhRafz6ZlwHvqauXApCOF/e if6yLENPAu4jENkYWA4YySPK3TlXEvbwDLoBBWFqaF8a85lJWpgQ6bEIuWPujwF6iQJx ZnuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Bc7xrHh0; 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=fail (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 x8si1428914oto.259.2019.12.11.09.08.47 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Dec 2019 09:08:47 -0800 (PST) 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=fail header.i=@linaro.org header.s=google header.b=Bc7xrHh0; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1if5Ti-0000PO-6S for patch@linaro.org; Wed, 11 Dec 2019 12:08:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38191) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1if5QW-0004uh-Rs for qemu-devel@nongnu.org; Wed, 11 Dec 2019 12:05:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1if5QV-000345-1O for qemu-devel@nongnu.org; Wed, 11 Dec 2019 12:05:28 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:52736) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1if5QU-00032r-O8 for qemu-devel@nongnu.org; Wed, 11 Dec 2019 12:05:26 -0500 Received: by mail-wm1-x341.google.com with SMTP id p9so7965661wmc.2 for ; Wed, 11 Dec 2019 09:05:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=10ri5OPZ3wXmAnewtDMagCSgDZyQ+hI5ZaV97yVftek=; b=Bc7xrHh0KYq77Ym7OBgBEyaNlc/xIsOrO0NI34t4NZcKerf9MgOWguMKaUNY5z9pOm A4BvOegLz286AOX/rGIzZCeEY3lwL1uVwe1cGHWIPUwa6S2gnti4LACCpJZ19W/7JPR6 SWhUdVmKMP55LWDBe/p8RpTLFg5sE2Q0a6utJHSMNnHMQwdea3qYQyX7kdUD9NL35qya EMHJnkEU34CDSTZOfOQ1rZVmiE9hFoner13NVR2ac2ilRr63+5vIihxxmXQeb4+zIMPh QnOAc47Bs8AiOCPv1intd8LQQWiEen8h0QKLbIhaH5YFPClHLUBZIQ52HYmtluHR1gCR ijcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=10ri5OPZ3wXmAnewtDMagCSgDZyQ+hI5ZaV97yVftek=; b=jNuTFBSQYilEJhITdV6X51jooMpw3ySHn7d6JCPwf4lNGneX1MzG77lwkBt8CJKaSg VqLHA/Ym95VVd7a3cQbt6usOn9wV2OsClIOkmzEzihOXjvqUYRAlDI2ag/fJhSyXBwba ktMYvrm5KeZfJIOdZ7K23fu6E0WaEEIbY4Mf1rGqr5FMOxDV8CIotF/iVOXO6Y/fl0V6 kktF/neDMNyyJei2c/pqu20X9AD+QIURQdVf+zSkw86gyqwUd5x8OABFAor+575qXGMg ynrBHdZ6dZQfGQxe436ka0HKZu3bnVjwhVOwlYy2EOjfB249QBnNXvdAbs/EKUPchrtw SMRA== X-Gm-Message-State: APjAAAUq3XQMAyOIgy0R6h8kvird04Gdc1MoO3MIba89YAF14yI8qGtd 4sC7D/aB/+kPYyveowYVLXO0+w== X-Received: by 2002:a7b:c1cc:: with SMTP id a12mr859717wmj.53.1576083925545; Wed, 11 Dec 2019 09:05:25 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v3sm2868697wru.32.2019.12.11.09.05.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 09:05:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 97A1D1FF91; Wed, 11 Dec 2019 17:05:21 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 04/20] gdbstub: move mem_buf to GDBState and use GByteArray Date: Wed, 11 Dec 2019 17:05:04 +0000 Message-Id: <20191211170520.7747-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191211170520.7747-1-alex.bennee@linaro.org> References: <20191211170520.7747-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: damien.hedde@greensocs.com, luis.machado@linaro.org, =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , richard.henderson@linaro.org, alan.hayward@arm.com, =?utf-8?q?Alex_Be?= =?utf-8?b?bm7DqWU=?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is in preparation for further re-factoring of the register API with the rest of the code. Theoretically the read register function could overwrite the MAX_PACKET_LENGTH buffer although currently all registers are well within the size range. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Damien Hedde Tested-by: Damien Hedde --- v3 - fixed up email on Damien's tags --- gdbstub.c | 56 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 21 deletions(-) -- 2.20.1 diff --git a/gdbstub.c b/gdbstub.c index 1816e7af827..ba63710cdcf 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -367,6 +367,7 @@ typedef struct GDBState { char syscall_buf[256]; gdb_syscall_complete_cb current_syscall_cb; GString *str_buf; + GByteArray *mem_buf; } GDBState; /* By default use no IRQs and no timers while single stepping so as to @@ -382,6 +383,7 @@ static void init_gdbserver_state(void) memset(&gdbserver_state, 0, sizeof(GDBState)); gdbserver_state.init = true; gdbserver_state.str_buf = g_string_new(NULL); + gdbserver_state.mem_buf = g_byte_array_sized_new(MAX_PACKET_LENGTH); } #ifndef CONFIG_USER_ONLY @@ -576,12 +578,13 @@ static void memtohex(GString *buf, const uint8_t *mem, int len) g_string_append_c(buf, '\0'); } -static void hextomem(uint8_t *mem, const char *buf, int len) +static void hextomem(GByteArray *mem, const char *buf, int len) { int i; for(i = 0; i < len; i++) { - mem[i] = (fromhex(buf[0]) << 4) | fromhex(buf[1]); + guint8 byte = fromhex(buf[0]) << 4 | fromhex(buf[1]); + g_byte_array_append(mem, &byte, 1); buf += 2; } } @@ -1412,7 +1415,6 @@ static int cmd_parse_params(const char *data, const char *schema, typedef struct GdbCmdContext { GdbCmdVariant *params; int num_params; - uint8_t mem_buf[MAX_PACKET_LENGTH]; } GdbCmdContext; typedef void (*GdbCmdHandler)(GdbCmdContext *gdb_ctx, void *user_ctx); @@ -1503,6 +1505,7 @@ static void run_cmd_parser(const char *data, const GdbCmdParseEntry *cmd) } g_string_set_size(gdbserver_state.str_buf, 0); + g_byte_array_set_size(gdbserver_state.mem_buf, 0); /* In case there was an error during the command parsing we must * send a NULL packet to indicate the command is not supported */ @@ -1715,8 +1718,8 @@ static void handle_set_reg(GdbCmdContext *gdb_ctx, void *user_ctx) } reg_size = strlen(gdb_ctx->params[1].data) / 2; - hextomem(gdb_ctx->mem_buf, gdb_ctx->params[1].data, reg_size); - gdb_write_register(gdbserver_state.g_cpu, gdb_ctx->mem_buf, + hextomem(gdbserver_state.mem_buf, gdb_ctx->params[1].data, reg_size); + gdb_write_register(gdbserver_state.g_cpu, gdbserver_state.mem_buf->data, gdb_ctx->params[0].val_ull); put_packet("OK"); } @@ -1735,14 +1738,17 @@ static void handle_get_reg(GdbCmdContext *gdb_ctx, void *user_ctx) return; } - reg_size = gdb_read_register(gdbserver_state.g_cpu, gdb_ctx->mem_buf, + reg_size = gdb_read_register(gdbserver_state.g_cpu, + gdbserver_state.mem_buf->data, gdb_ctx->params[0].val_ull); if (!reg_size) { put_packet("E14"); return; + } else { + g_byte_array_set_size(gdbserver_state.mem_buf, reg_size); } - memtohex(gdbserver_state.str_buf, gdb_ctx->mem_buf, reg_size); + memtohex(gdbserver_state.str_buf, gdbserver_state.mem_buf->data, reg_size); put_strbuf(); } @@ -1759,11 +1765,11 @@ static void handle_write_mem(GdbCmdContext *gdb_ctx, void *user_ctx) return; } - hextomem(gdb_ctx->mem_buf, gdb_ctx->params[2].data, + hextomem(gdbserver_state.mem_buf, gdb_ctx->params[2].data, gdb_ctx->params[1].val_ull); if (target_memory_rw_debug(gdbserver_state.g_cpu, gdb_ctx->params[0].val_ull, - gdb_ctx->mem_buf, - gdb_ctx->params[1].val_ull, true)) { + gdbserver_state.mem_buf->data, + gdbserver_state.mem_buf->len, true)) { put_packet("E14"); return; } @@ -1784,14 +1790,17 @@ static void handle_read_mem(GdbCmdContext *gdb_ctx, void *user_ctx) return; } + g_byte_array_set_size(gdbserver_state.mem_buf, gdb_ctx->params[1].val_ull); + if (target_memory_rw_debug(gdbserver_state.g_cpu, gdb_ctx->params[0].val_ull, - gdb_ctx->mem_buf, - gdb_ctx->params[1].val_ull, false)) { + gdbserver_state.mem_buf->data, + gdbserver_state.mem_buf->len, false)) { put_packet("E14"); return; } - memtohex(gdbserver_state.str_buf, gdb_ctx->mem_buf, gdb_ctx->params[1].val_ull); + memtohex(gdbserver_state.str_buf, gdbserver_state.mem_buf->data, + gdbserver_state.mem_buf->len); put_strbuf(); } @@ -1806,9 +1815,9 @@ static void handle_write_all_regs(GdbCmdContext *gdb_ctx, void *user_ctx) } cpu_synchronize_state(gdbserver_state.g_cpu); - registers = gdb_ctx->mem_buf; len = strlen(gdb_ctx->params[0].data) / 2; - hextomem(registers, gdb_ctx->params[0].data, len); + hextomem(gdbserver_state.mem_buf, gdb_ctx->params[0].data, len); + registers = gdbserver_state.mem_buf->data; for (addr = 0; addr < gdbserver_state.g_cpu->gdb_num_g_regs && len > 0; addr++) { reg_size = gdb_write_register(gdbserver_state.g_cpu, registers, addr); @@ -1825,11 +1834,14 @@ static void handle_read_all_regs(GdbCmdContext *gdb_ctx, void *user_ctx) cpu_synchronize_state(gdbserver_state.g_cpu); len = 0; for (addr = 0; addr < gdbserver_state.g_cpu->gdb_num_g_regs; addr++) { - len += gdb_read_register(gdbserver_state.g_cpu, gdb_ctx->mem_buf + len, + len += gdb_read_register(gdbserver_state.g_cpu, + gdbserver_state.mem_buf->data + len, addr); } + /* FIXME: This is after the fact sizing */ + g_byte_array_set_size(gdbserver_state.mem_buf, len); - memtohex(gdbserver_state.str_buf, gdb_ctx->mem_buf, len); + memtohex(gdbserver_state.str_buf, gdbserver_state.mem_buf->data, len); put_strbuf(); } @@ -2078,6 +2090,7 @@ static void handle_query_offsets(GdbCmdContext *gdb_ctx, void *user_ctx) #else static void handle_query_rcmd(GdbCmdContext *gdb_ctx, void *user_ctx) { + const guint8 zero = 0; int len; if (!gdb_ctx->num_params) { @@ -2092,11 +2105,12 @@ static void handle_query_rcmd(GdbCmdContext *gdb_ctx, void *user_ctx) } len = len / 2; - hextomem(gdb_ctx->mem_buf, gdb_ctx->params[0].data, len); - gdb_ctx->mem_buf[len++] = 0; - qemu_chr_be_write(gdbserver_state.mon_chr, gdb_ctx->mem_buf, len); + g_byte_array_set_size(gdbserver_state.mem_buf, len); + hextomem(gdbserver_state.mem_buf, gdb_ctx->params[0].data, len); + g_byte_array_append(gdbserver_state.mem_buf, &zero, 1); + qemu_chr_be_write(gdbserver_state.mon_chr, gdbserver_state.mem_buf->data, + gdbserver_state.mem_buf->len); put_packet("OK"); - } #endif