From patchwork Thu Feb 21 11:05:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 10823697 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4F49E1805 for ; Thu, 21 Feb 2019 11:12:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A563304A8 for ; Thu, 21 Feb 2019 11:12:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2E04C304AA; Thu, 21 Feb 2019 11:12:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 83CB2304A8 for ; Thu, 21 Feb 2019 11:12:38 +0000 (UTC) Received: from localhost ([127.0.0.1]:58377 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwmHN-0006ml-NS for patchwork-qemu-devel@patchwork.kernel.org; Thu, 21 Feb 2019 06:12:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34148) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwmAh-0000eE-HO for qemu-devel@nongnu.org; Thu, 21 Feb 2019 06:05:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwmAf-0005Vg-Bm for qemu-devel@nongnu.org; Thu, 21 Feb 2019 06:05:43 -0500 Received: from mail.ispras.ru ([83.149.199.45]:36182) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwmAb-0005Od-Iw for qemu-devel@nongnu.org; Thu, 21 Feb 2019 06:05:39 -0500 Received: from [127.0.1.1] (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id 1B9BD540093; Thu, 21 Feb 2019 14:05:32 +0300 (MSK) From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Thu, 21 Feb 2019 14:05:34 +0300 Message-ID: <155074713456.32129.8075021906676017770.stgit@pasha-VirtualBox> In-Reply-To: <155074704329.32129.17530905097298071558.stgit@pasha-VirtualBox> References: <155074704329.32129.17530905097298071558.stgit@pasha-VirtualBox> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 83.149.199.45 Subject: [Qemu-devel] [PATCH v13 16/25] gdbstub: add reverse step support in replay mode 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: kwolf@redhat.com, peter.maydell@linaro.org, war2jordan@live.com, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, crosthwaite.peter@gmail.com, ciro.santilli@gmail.com, jasowang@redhat.com, quintela@redhat.com, armbru@redhat.com, mreitz@redhat.com, alex.bennee@linaro.org, maria.klimushenkova@ispras.ru, mst@redhat.com, kraxel@redhat.com, boost.lists@gmail.com, thomas.dullien@googlemail.com, dovgaluk@ispras.ru, artem.k.pisarenko@gmail.com, dgilbert@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP GDB remote protocol supports two reverse debugging commands: reverse step and reverse continue. This patch adds support of the first one to the gdbstub. Reverse step is intended to step one instruction in the backwards direction. This is not possible in regular execution. But replayed execution is deterministic, therefore we can load one of the prior snapshots and proceed to the desired step. It is equivalent to stepping one instruction back. There should be at least one snapshot preceding the debugged part of the replay log. Signed-off-by: Pavel Dovgalyuk --- accel/tcg/translator.c | 1 + cpus.c | 14 +++++++++++--- exec.c | 7 +++++++ gdbstub.c | 44 +++++++++++++++++++++++++++++++++++++++++--- include/sysemu/replay.h | 11 +++++++++++ replay/replay-debugging.c | 33 +++++++++++++++++++++++++++++++++ stubs/replay.c | 5 +++++ 7 files changed, 109 insertions(+), 6 deletions(-) diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index afd0a49ea6..33a543e82f 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -17,6 +17,7 @@ #include "exec/gen-icount.h" #include "exec/log.h" #include "exec/translator.h" +#include "sysemu/replay.h" /* Pairs with tcg_clear_temp_count. To be called by #TranslatorOps.{translate_insn,tb_stop} if diff --git a/cpus.c b/cpus.c index a8910e9c01..408e10cff9 100644 --- a/cpus.c +++ b/cpus.c @@ -1104,9 +1104,17 @@ static bool cpu_can_run(CPUState *cpu) static void cpu_handle_guest_debug(CPUState *cpu) { - gdb_set_stop_cpu(cpu); - qemu_system_debug_request(); - cpu->stopped = true; + if (!replay_running_debug()) { + gdb_set_stop_cpu(cpu); + qemu_system_debug_request(); + cpu->stopped = true; + } else { + if (!cpu->singlestep_enabled) { + cpu_single_step(cpu, SSTEP_ENABLE); + } else { + cpu_single_step(cpu, 0); + } + } } #ifdef CONFIG_LINUX diff --git a/exec.c b/exec.c index 518064530b..fa6283d19c 100644 --- a/exec.c +++ b/exec.c @@ -2742,6 +2742,13 @@ static void check_watchpoint(int offset, int len, MemTxAttrs attrs, int flags) QTAILQ_FOREACH(wp, &cpu->watchpoints, entry) { if (cpu_watchpoint_address_matches(wp, vaddr, len) && (wp->flags & flags)) { + if (replay_running_debug()) { + /* + * Don't process the watchpoints when we are + * in a reverse debugging operation. + */ + return; + } if (flags == BP_MEM_READ) { wp->flags |= BP_WATCHPOINT_HIT_READ; } else { diff --git a/gdbstub.c b/gdbstub.c index bc774ae992..9f987650ae 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -39,6 +39,7 @@ #include "sysemu/kvm.h" #include "exec/semihost.h" #include "exec/exec-all.h" +#include "sysemu/replay.h" #ifdef CONFIG_USER_ONLY #define GDB_ATTACHED "0" @@ -344,6 +345,20 @@ typedef struct GDBState { */ static int sstep_flags = SSTEP_ENABLE|SSTEP_NOIRQ|SSTEP_NOTIMER; +/* Retrieves flags for single step mode. */ +static int get_sstep_flags(void) +{ + /* + * In replay mode all events written into the log should be replayed. + * That is why NOIRQ flag is removed in this mode. + */ + if (replay_mode != REPLAY_MODE_NONE) { + return SSTEP_ENABLE; + } else { + return sstep_flags; + } +} + static GDBState *gdbserver_state; bool gdb_has_xml; @@ -434,7 +449,7 @@ static int gdb_continue_partial(GDBState *s, char *newstates) CPU_FOREACH(cpu) { if (newstates[cpu->cpu_index] == 's') { trace_gdbstub_op_stepping(cpu->cpu_index); - cpu_single_step(cpu, sstep_flags); + cpu_single_step(cpu, get_sstep_flags()); } } s->running_state = 1; @@ -453,7 +468,7 @@ static int gdb_continue_partial(GDBState *s, char *newstates) break; /* nothing to do here */ case 's': trace_gdbstub_op_stepping(cpu->cpu_index); - cpu_single_step(cpu, sstep_flags); + cpu_single_step(cpu, get_sstep_flags()); cpu_resume(cpu); flag = 1; break; @@ -1414,9 +1429,28 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) addr = strtoull(p, (char **)&p, 16); gdb_set_cpu_pc(s, addr); } - cpu_single_step(s->c_cpu, sstep_flags); + cpu_single_step(s->c_cpu, get_sstep_flags()); gdb_continue(s); return RS_IDLE; + case 'b': + /* Backward debugging commands */ + if (replay_mode == REPLAY_MODE_PLAY) { + switch (*p) { + case 's': + if (replay_reverse_step()) { + gdb_continue(s); + return RS_IDLE; + } else { + put_packet(s, "E14"); + break; + } + default: + goto unknown_command; + } + } else { + put_packet(s, "E22"); + } + goto unknown_command; case 'F': { target_ulong ret; @@ -1719,6 +1753,10 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) } pstrcat(buf, sizeof(buf), ";multiprocess+"); + if (replay_mode == REPLAY_MODE_PLAY) { + pstrcat(buf, sizeof(buf), ";ReverseStep+"); + } + put_packet(s, buf); break; } diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h index d7e859d915..533003f2b0 100644 --- a/include/sysemu/replay.h +++ b/include/sysemu/replay.h @@ -73,6 +73,17 @@ void replay_finish(void); void replay_add_blocker(Error *reason); /* Returns name of the replay log file */ const char *replay_get_filename(void); +/* + * Start making one step in backward direction. + * Used by gdbstub for backwards debugging. + * Returns true on success. + */ +bool replay_reverse_step(void); +/* + * Returns true if replay module is processing + * reverse_continue or reverse_step request + */ +bool replay_running_debug(void); /* Processing the instructions */ diff --git a/replay/replay-debugging.c b/replay/replay-debugging.c index e3821ab1ba..3d94859b8f 100644 --- a/replay/replay-debugging.c +++ b/replay/replay-debugging.c @@ -21,6 +21,13 @@ #include "block/snapshot.h" #include "migration/snapshot.h" +static bool replay_is_debugging; + +bool replay_running_debug(void) +{ + return replay_is_debugging; +} + void hmp_info_replay(Monitor *mon, const QDict *qdict) { if (replay_mode == REPLAY_MODE_NONE) { @@ -219,3 +226,29 @@ void hmp_replay_seek(Monitor *mon, const QDict *qdict) return; } } + +static void replay_stop_vm_debug(void *opaque) +{ + replay_is_debugging = false; + vm_stop(RUN_STATE_DEBUG); + replay_delete_break(); +} + +bool replay_reverse_step(void) +{ + Error *err = NULL; + + assert(replay_mode == REPLAY_MODE_PLAY); + + if (replay_get_current_step() != 0) { + replay_seek(replay_get_current_step() - 1, replay_stop_vm_debug, &err); + if (err) { + error_free(err); + return false; + } + replay_is_debugging = true; + return true; + } + + return false; +} diff --git a/stubs/replay.c b/stubs/replay.c index 4ac607895d..521552fa83 100644 --- a/stubs/replay.c +++ b/stubs/replay.c @@ -80,3 +80,8 @@ void replay_mutex_lock(void) void replay_mutex_unlock(void) { } + +bool replay_reverse_step(void) +{ + return false; +}