From nobody Thu May 2 13:23:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1512264758533427.78339365899603; Sat, 2 Dec 2017 17:32:38 -0800 (PST) Received: from localhost ([::1]:37497 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eLJ8p-0001v7-N1 for importer@patchew.org; Sat, 02 Dec 2017 20:32:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eLJ7c-0001J4-6a for qemu-devel@nongnu.org; Sat, 02 Dec 2017 20:31:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eLJ7Z-0003Sw-00 for qemu-devel@nongnu.org; Sat, 02 Dec 2017 20:31:08 -0500 Received: from mail-io0-x244.google.com ([2607:f8b0:4001:c06::244]:34588) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eLJ7Y-0003ST-Qv for qemu-devel@nongnu.org; Sat, 02 Dec 2017 20:31:04 -0500 Received: by mail-io0-x244.google.com with SMTP id s19so15127355ioa.1 for ; Sat, 02 Dec 2017 17:31:03 -0800 (PST) Received: from localhost.localdomain (209-197-184-95.cpe.distributel.net. [209.197.184.95]) by smtp.gmail.com with ESMTPSA id c141sm4496372ioe.13.2017.12.02.17.31.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Dec 2017 17:31:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=vgh/NpKfwus8Do9Xp+0QdGGDkhDKyen+qsJrPorCE6s=; b=ppJ9zik12PIKuGj5jvnI0F1DQLrk6l3Z+Q+wpiB0OhXfF9ucFq1boAwaja/VicujD8 k1ROAdusqZUyUsmnms3/CvqYCvb5P52lD3KvzgumyHOtrtuPqbAMXFZZ5eKS7vR9Dfr6 su4eXm/QzjAM8CNBFLddiTaf3V15nvPupdu5cg0Q/iYIk7YexUc/u+O5yZ2oZ2rAURPv XiiQLc+jdTiyDEaVbGvUWpqCK0qnGdqPij3NCrlaMqAuAVlWY01G0NM4N2Ww1oGuwR8I iaf1ifVYe7GFk2AI2zDoDTS+5FSu0xqcINOHDW7Rus330kEvyDMM7wtrTvgjKUEplPb5 HlAA== 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; bh=vgh/NpKfwus8Do9Xp+0QdGGDkhDKyen+qsJrPorCE6s=; b=PicexKph8DAg3G0Bns271p3MgcaBwVHrz5DB0wbaY3o/KCWjXF3tJeCIC8g+SRyUrc l43hlnUUeeq4o8SFLI3QBaxuqAKsxOX1m9xs+z+FvcdZcR90Ja4LmBGN0XpInPM4fAWM pW/rEBE38H64GDQ3TanRJGZQLozbgnqPK+o45IhdwDcAGNkOsCAGOWUVdcVpLy85ZG/N pJNkgDzpv1vB2VNgrabhsb9+MSob3kfQ3oe+Uh4kpPiPIfflu/nPrE4xfdAH1Bn2g15N +x6ahwCEjJkWNr4oJfBPYxI7wrjxNVhtFfq58J+YiQjB9mgrZl8PZPjSi9eDWIhkLmZr PWCA== X-Gm-Message-State: AJaThX6VYw8N8m+cTVJSNlb3BYOvA8epeef6a6p+YDAYJLsCww8Bjo2e ThD0WE6j4Kvcn1tvOmmm2Ks= X-Google-Smtp-Source: AGs4zMbB2l9kJWuD3sutaRxvrOTNZIvtbl9JHYM1dfYGv7rkoW+kDSiNNKh2kuSNnChGBjGOuW9X7g== X-Received: by 10.107.107.6 with SMTP id g6mr19078493ioc.305.1512264662693; Sat, 02 Dec 2017 17:31:02 -0800 (PST) From: Doug Gale To: Stefan Hajnoczi , qemu-devel@nongnu.org Date: Sat, 2 Dec 2017 20:30:37 -0500 Message-Id: <20171203013037.31978-1-doug16k@gmail.com> X-Mailer: git-send-email 2.14.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4001:c06::244 Subject: [Qemu-devel] [PATCH v4] gdbstub: add tracing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Doug Gale Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Doug Gale --- Fix usage of %c in trace output, now uses 0x%02x Fix possible sign extended char that could cause 0xfc to say 0xfffffffc Add missing traces for hitting breakpoints, continuing, stepping Fix incorrect dynamic check for tracing being enabled in hexdump Fix missing braces around single line if body Fix incorrectly indented return statement Fix order of trace-events to be more tidy gdbstub.c | 113 +++++++++++++++++++++++++++++++++++++++++--------------= ---- trace-events | 28 +++++++++++++++ 2 files changed, 106 insertions(+), 35 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 2a94030d3b..f1d51480f7 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -21,6 +21,7 @@ #include "qemu/error-report.h" #include "qemu/cutils.h" #include "cpu.h" +#include "trace-root.h" #ifdef CONFIG_USER_ONLY #include "qemu.h" #else @@ -287,21 +288,6 @@ static int gdb_signal_to_target (int sig) return -1; } =20 -/* #define DEBUG_GDB */ - -#ifdef DEBUG_GDB -# define DEBUG_GDB_GATE 1 -#else -# define DEBUG_GDB_GATE 0 -#endif - -#define gdb_debug(fmt, ...) do { \ - if (DEBUG_GDB_GATE) { \ - fprintf(stderr, "%s: " fmt, __func__, ## __VA_ARGS__); \ - } \ -} while (0) - - typedef struct GDBRegisterState { int base_reg; int num_regs; @@ -410,10 +396,13 @@ int use_gdb_syscalls(void) /* Resume execution. */ static inline void gdb_continue(GDBState *s) { + #ifdef CONFIG_USER_ONLY s->running_state =3D 1; + trace_gdbstub_op_continue(); #else if (!runstate_needs_reset()) { + trace_gdbstub_op_continue(); vm_start(); } #endif @@ -434,6 +423,7 @@ static int gdb_continue_partial(GDBState *s, char *news= tates) */ CPU_FOREACH(cpu) { if (newstates[cpu->cpu_index] =3D=3D 's') { + trace_gdbstub_op_stepping(cpu->cpu_index); cpu_single_step(cpu, sstep_flags); } } @@ -452,11 +442,13 @@ static int gdb_continue_partial(GDBState *s, char *ne= wstates) case 1: break; /* nothing to do here */ case 's': + trace_gdbstub_op_stepping(cpu->cpu_index); cpu_single_step(cpu, sstep_flags); cpu_resume(cpu); flag =3D 1; break; case 'c': + trace_gdbstub_op_continue_cpu(cpu->cpu_index); cpu_resume(cpu); flag =3D 1; break; @@ -538,12 +530,49 @@ static void hextomem(uint8_t *mem, const char *buf, i= nt len) } } =20 +static void hexdump(const char *buf, int len, + void (*trace_fn)(size_t ofs, char const *text)) +{ + char line_buffer[3 * 16 + 4 + 16 + 1]; + + size_t i; + for (i =3D 0; i < len || (i & 0xF); ++i) { + size_t byte_ofs =3D i & 15; + + if (byte_ofs =3D=3D 0) { + memset(line_buffer, ' ', 3 * 16 + 4 + 16); + line_buffer[3 * 16 + 4 + 16] =3D 0; + } + + size_t col_group =3D (i >> 2) & 3; + size_t hex_col =3D byte_ofs * 3 + col_group; + size_t txt_col =3D 3 * 16 + 4 + byte_ofs; + + if (i < len) { + char value =3D buf[i]; + + line_buffer[hex_col + 0] =3D tohex((value >> 4) & 0xF); + line_buffer[hex_col + 1] =3D tohex((value >> 0) & 0xF); + line_buffer[txt_col + 0] =3D (value >=3D ' ' && value < 127) + ? value + : '.'; + } + + if (byte_ofs =3D=3D 0xF) + trace_fn(i & -16, line_buffer); + } +} + /* return -1 if error, 0 if OK */ -static int put_packet_binary(GDBState *s, const char *buf, int len) +static int put_packet_binary(GDBState *s, const char *buf, int len, bool d= ump) { int csum, i; uint8_t *p; =20 + if (dump && trace_event_get_state_backends(TRACE_GDBSTUB_IO_BINARYREPL= Y)) { + hexdump(buf, len, trace_gdbstub_io_binaryreply); + } + for(;;) { p =3D s->last_packet; *(p++) =3D '$'; @@ -576,9 +605,9 @@ static int put_packet_binary(GDBState *s, const char *b= uf, int len) /* return -1 if error, 0 if OK */ static int put_packet(GDBState *s, const char *buf) { - gdb_debug("reply=3D'%s'\n", buf); + trace_gdbstub_io_reply(buf); =20 - return put_packet_binary(s, buf, strlen(buf)); + return put_packet_binary(s, buf, strlen(buf), false); } =20 /* Encode data using the encoding for 'x' packets. */ @@ -975,8 +1004,7 @@ static int gdb_handle_packet(GDBState *s, const char *= line_buf) uint8_t *registers; target_ulong addr, len; =20 - - gdb_debug("command=3D'%s'\n", line_buf); + trace_gdbstub_io_command(line_buf); =20 p =3D line_buf; ch =3D *p++; @@ -999,7 +1027,7 @@ static int gdb_handle_packet(GDBState *s, const char *= line_buf) } s->signal =3D 0; gdb_continue(s); - return RS_IDLE; + return RS_IDLE; case 'C': s->signal =3D gdb_signal_to_target (strtoul(p, (char **)&p, 16)); if (s->signal =3D=3D -1) @@ -1045,7 +1073,7 @@ static int gdb_handle_packet(GDBState *s, const char = *line_buf) } cpu_single_step(s->c_cpu, sstep_flags); gdb_continue(s); - return RS_IDLE; + return RS_IDLE; case 'F': { target_ulong ret; @@ -1267,6 +1295,7 @@ static int gdb_handle_packet(GDBState *s, const char = *line_buf) len =3D snprintf((char *)mem_buf, sizeof(buf) / 2, "CPU#%d [%s]", cpu->cpu_index, cpu->halted ? "halted " : "running"); + trace_gdbstub_op_extra_info((char *)mem_buf); memtohex(buf, mem_buf, len); put_packet(s, buf); } @@ -1350,7 +1379,7 @@ static int gdb_handle_packet(GDBState *s, const char = *line_buf) buf[0] =3D 'l'; len =3D memtox(buf + 1, xml + addr, total_len - addr); } - put_packet_binary(s, buf, len + 1); + put_packet_binary(s, buf, len + 1, true); break; } if (is_query_packet(p, "Attached", ':')) { @@ -1407,29 +1436,38 @@ static void gdb_vm_state_change(void *opaque, int r= unning, RunState state) type =3D ""; break; } + trace_gdbstub_hit_watchpoint(type, cpu_gdb_index(cpu), + (target_ulong)cpu->watchpoint_hit->vaddr); snprintf(buf, sizeof(buf), "T%02xthread:%02x;%swatch:" TARGET_FMT_lx ";", GDB_SIGNAL_TRAP, cpu_gdb_index(cpu), type, (target_ulong)cpu->watchpoint_hit->vaddr); cpu->watchpoint_hit =3D NULL; goto send_packet; + } else { + trace_gdbstub_hit_break(); } tb_flush(cpu); ret =3D GDB_SIGNAL_TRAP; break; case RUN_STATE_PAUSED: + trace_gdbstub_hit_paused(); ret =3D GDB_SIGNAL_INT; break; case RUN_STATE_SHUTDOWN: + trace_gdbstub_hit_shutdown(); ret =3D GDB_SIGNAL_QUIT; break; case RUN_STATE_IO_ERROR: + trace_gdbstub_hit_io_error(); ret =3D GDB_SIGNAL_IO; break; case RUN_STATE_WATCHDOG: + trace_gdbstub_hit_watchdog(); ret =3D GDB_SIGNAL_ALRM; break; case RUN_STATE_INTERNAL_ERROR: + trace_gdbstub_hit_internal_error(); ret =3D GDB_SIGNAL_ABRT; break; case RUN_STATE_SAVE_VM: @@ -1439,6 +1477,7 @@ static void gdb_vm_state_change(void *opaque, int run= ning, RunState state) ret =3D GDB_SIGNAL_XCPU; break; default: + trace_gdbstub_hit_unknown(state); ret =3D GDB_SIGNAL_UNKNOWN; break; } @@ -1538,12 +1577,12 @@ static void gdb_read_byte(GDBState *s, int ch) /* Waiting for a response to the last packet. If we see the start of a new command then abandon the previous response. */ if (ch =3D=3D '-') { - gdb_debug("Got NACK, retransmitting\n"); + trace_gdbstub_err_got_nack(); put_buffer(s, (uint8_t *)s->last_packet, s->last_packet_len); } else if (ch =3D=3D '+') { - gdb_debug("Got ACK\n"); + trace_gdbstub_io_got_ack(); } else { - gdb_debug("Got '%c' when expecting ACK/NACK\n", ch); + trace_gdbstub_io_got_unexpected((uint8_t)ch); } =20 if (ch =3D=3D '+' || ch =3D=3D '$') @@ -1566,7 +1605,7 @@ static void gdb_read_byte(GDBState *s, int ch) s->line_sum =3D 0; s->state =3D RS_GETLINE; } else { - gdb_debug("received garbage between packets: 0x%x\n", ch); + trace_gdbstub_err_garbage((uint8_t)ch); } break; case RS_GETLINE: @@ -1582,7 +1621,7 @@ static void gdb_read_byte(GDBState *s, int ch) /* end of command, start of checksum*/ s->state =3D RS_CHKSUM1; } else if (s->line_buf_index >=3D sizeof(s->line_buf) - 1) { - gdb_debug("command buffer overrun, dropping command\n"); + trace_gdbstub_err_overrun(); s->state =3D RS_IDLE; } else { /* unescaped command character */ @@ -1596,7 +1635,7 @@ static void gdb_read_byte(GDBState *s, int ch) s->state =3D RS_CHKSUM1; } else if (s->line_buf_index >=3D sizeof(s->line_buf) - 1) { /* command buffer overrun */ - gdb_debug("command buffer overrun, dropping command\n"); + trace_gdbstub_err_overrun(); s->state =3D RS_IDLE; } else { /* parse escaped character and leave escape state */ @@ -1608,18 +1647,18 @@ static void gdb_read_byte(GDBState *s, int ch) case RS_GETLINE_RLE: if (ch < ' ') { /* invalid RLE count encoding */ - gdb_debug("got invalid RLE count: 0x%x\n", ch); + trace_gdbstub_err_invalid_repeat((uint8_t)ch); s->state =3D RS_GETLINE; } else { /* decode repeat length */ int repeat =3D (unsigned char)ch - ' ' + 3; if (s->line_buf_index + repeat >=3D sizeof(s->line_buf) - = 1) { /* that many repeats would overrun the command buffer = */ - gdb_debug("command buffer overrun, dropping command\n"= ); + trace_gdbstub_err_overrun(); s->state =3D RS_IDLE; } else if (s->line_buf_index < 1) { /* got a repeat but we have nothing to repeat */ - gdb_debug("got invalid RLE sequence\n"); + trace_gdbstub_err_invalid_rle(); s->state =3D RS_GETLINE; } else { /* repeat the last character */ @@ -1634,7 +1673,7 @@ static void gdb_read_byte(GDBState *s, int ch) case RS_CHKSUM1: /* get high hex digit of checksum */ if (!isxdigit(ch)) { - gdb_debug("got invalid command checksum digit\n"); + trace_gdbstub_err_checksum_invalid((uint8_t)ch); s->state =3D RS_GETLINE; break; } @@ -1645,14 +1684,14 @@ static void gdb_read_byte(GDBState *s, int ch) case RS_CHKSUM2: /* get low hex digit of checksum */ if (!isxdigit(ch)) { - gdb_debug("got invalid command checksum digit\n"); + trace_gdbstub_err_checksum_invalid((uint8_t)ch); s->state =3D RS_GETLINE; break; } s->line_csum |=3D fromhex(ch); =20 if (s->line_csum !=3D (s->line_sum & 0xff)) { - gdb_debug("got command packet with incorrect checksum\n"); + trace_gdbstub_err_checksum_incorrect(s->line_sum, s->line_= csum); /* send NAK reply */ reply =3D '-'; put_buffer(s, &reply, 1); @@ -1686,6 +1725,8 @@ void gdb_exit(CPUArchState *env, int code) } #endif =20 + trace_gdbstub_op_exiting((uint8_t)code); + snprintf(buf, sizeof(buf), "W%02x", (uint8_t)code); put_packet(s, buf); =20 @@ -1944,6 +1985,8 @@ static const TypeInfo char_gdb_type_info =3D { =20 int gdbserver_start(const char *device) { + trace_gdbstub_op_start(device); + GDBState *s; char gdbstub_device_name[128]; Chardev *chr =3D NULL; diff --git a/trace-events b/trace-events index 1d2eb5d3e4..3695959d0a 100644 --- a/trace-events +++ b/trace-events @@ -68,6 +68,34 @@ flatview_new(FlatView *view, MemoryRegion *root) "%p (ro= ot %p)" flatview_destroy(FlatView *view, MemoryRegion *root) "%p (root %p)" flatview_destroy_rcu(FlatView *view, MemoryRegion *root) "%p (root %p)" =20 +# gdbstub.c +gdbstub_op_start(char const *device) "Starting gdbstub using device %s" +gdbstub_op_exiting(uint8_t code) "notifying exit with code=3D0x%02x" +gdbstub_op_continue(void) "Continuing all CPUs" +gdbstub_op_continue_cpu(int cpu_index) "Continuing CPU %d" +gdbstub_op_stepping(int cpu_index) "Stepping CPU %d" +gdbstub_op_extra_info(char const *info) "Thread extra info: %s" +gdbstub_hit_watchpoint(char const *type, int cpu_gdb_index, uint64_t vaddr= ) "Watchpoint hit, type=3D\"%s\" cpu=3D%d, vaddr=3D0x%" PRIx64 "" +gdbstub_hit_internal_error(void) "RUN_STATE_INTERNAL_ERROR" +gdbstub_hit_break(void) "RUN_STATE_DEBUG" +gdbstub_hit_paused(void) "RUN_STATE_PAUSED" +gdbstub_hit_shutdown(void) "RUN_STATE_SHUTDOWN" +gdbstub_hit_io_error(void) "RUN_STATE_IO_ERROR" +gdbstub_hit_watchdog(void) "RUN_STATE_WATCHDOG" +gdbstub_hit_unknown(int state) "Unknown run state=3D0x%x" +gdbstub_io_reply(char const *message) "Sent: %s" +gdbstub_io_binaryreply(size_t ofs, char const *line) "0x%04zx: %s" +gdbstub_io_command(char const *command) "Received: %s" +gdbstub_io_got_ack(void) "Got ACK" +gdbstub_io_got_unexpected(uint8_t ch) "Got 0x%02x when expecting ACK/NACK" +gdbstub_err_got_nack(void) "Got NACK, retransmitting" +gdbstub_err_garbage(uint8_t ch) "received garbage between packets: 0x%02x" +gdbstub_err_overrun(void) "command buffer overrun, dropping command" +gdbstub_err_invalid_repeat(uint8_t ch) "got invalid RLE count: 0x%02x" +gdbstub_err_invalid_rle(void) "got invalid RLE sequence" +gdbstub_err_checksum_invalid(uint8_t ch) "got invalid command checksum dig= it: 0x%02x" +gdbstub_err_checksum_incorrect(uint8_t expected, uint8_t got) "got command= packet with incorrect checksum, expected=3D0x%02x, received=3D0x%02x" + ### Guest events, keep at bottom =20 =20 --=20 2.14.1