From patchwork Mon Jan 3 08:32:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 77238 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2B122B6F10 for ; Mon, 3 Jan 2011 20:02:56 +1100 (EST) Received: from localhost ([127.0.0.1]:35738 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PZfuW-00023P-E2 for incoming@patchwork.ozlabs.org; Mon, 03 Jan 2011 03:37:00 -0500 Received: from [140.186.70.92] (port=52218 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PZfr7-0000hz-H7 for qemu-devel@nongnu.org; Mon, 03 Jan 2011 03:33:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PZfr4-0008KC-Ly for qemu-devel@nongnu.org; Mon, 03 Jan 2011 03:33:27 -0500 Received: from fmmailgate03.web.de ([217.72.192.234]:50542) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PZfr4-0008K4-A7 for qemu-devel@nongnu.org; Mon, 03 Jan 2011 03:33:26 -0500 Received: from smtp01.web.de ( [172.20.0.243]) by fmmailgate03.web.de (Postfix) with ESMTP id 6B04018393D0D; Mon, 3 Jan 2011 09:33:25 +0100 (CET) Received: from [88.64.22.98] (helo=localhost.localdomain) by smtp01.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1PZfr3-0007fO-00; Mon, 03 Jan 2011 09:33:25 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Mon, 3 Jan 2011 09:32:55 +0100 Message-Id: <4721707c3f684689860b046cfb0cacc38a29f287.1294043582.git.jan.kiszka@web.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1/XX99FAjOaAxHGf05B5YHjnoSKitfSnZJda0nr PQovYlM2rm9va2NisLgu+xTWP4Tp2Ixy2k/DQ9ynNKT0mv4/xY 2IhAqAIZM= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: Jan Kiszka , qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH v2 05/17] x86: Optionally dump code bytes on cpu_dump_state X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jan Kiszka Introduce the cpu_dump_state flag CPU_DUMP_CODE and implement it for x86. This writes out the code bytes around the current instruction pointer. Make use of this feature in KVM to help debugging fatal vm exits. Signed-off-by: Jan Kiszka --- cpu-all.h | 2 ++ kvm-all.c | 4 ++-- target-i386/helper.c | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/cpu-all.h b/cpu-all.h index 4ce4e83..ffbd6a4 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -765,6 +765,8 @@ int page_check_range(target_ulong start, target_ulong len, int flags); CPUState *cpu_copy(CPUState *env); CPUState *qemu_get_cpu(int cpu); +#define CPU_DUMP_CODE 0x00010000 + void cpu_dump_state(CPUState *env, FILE *f, fprintf_function cpu_fprintf, int flags); void cpu_dump_statistics(CPUState *env, FILE *f, fprintf_function cpu_fprintf, diff --git a/kvm-all.c b/kvm-all.c index ad1d0a8..ef2ca3b 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -791,7 +791,7 @@ static int kvm_handle_internal_error(CPUState *env, struct kvm_run *run) if (run->internal.suberror == KVM_INTERNAL_ERROR_EMULATION) { fprintf(stderr, "emulation failure\n"); if (!kvm_arch_stop_on_emulation_error(env)) { - cpu_dump_state(env, stderr, fprintf, 0); + cpu_dump_state(env, stderr, fprintf, CPU_DUMP_CODE); return 0; } } @@ -953,7 +953,7 @@ void kvm_cpu_exec(CPUState *env) } while (ret > 0); if (ret < 0) { - cpu_dump_state(env, stderr, fprintf, 0); + cpu_dump_state(env, stderr, fprintf, CPU_DUMP_CODE); vm_stop(0); env->exit_request = 1; } diff --git a/target-i386/helper.c b/target-i386/helper.c index adf9542..1ab42c3 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -249,6 +249,9 @@ done: cpu_fprintf(f, "\n"); } +#define DUMP_CODE_BYTES_TOTAL 50 +#define DUMP_CODE_BYTES_BACKWARD 20 + void cpu_dump_state(CPUState *env, FILE *f, fprintf_function cpu_fprintf, int flags) { @@ -434,6 +437,24 @@ void cpu_dump_state(CPUState *env, FILE *f, fprintf_function cpu_fprintf, cpu_fprintf(f, " "); } } + if (flags & CPU_DUMP_CODE) { + target_phys_addr_t base = env->segs[R_CS].base + env->eip; + target_phys_addr_t offs = MIN(env->eip, DUMP_CODE_BYTES_BACKWARD); + uint8_t code; + char codestr[3]; + + cpu_fprintf(f, "Code="); + for (i = 0; i < DUMP_CODE_BYTES_TOTAL; i++) { + if (cpu_memory_rw_debug(env, base - offs + i, &code, 1, 0) == 0) { + snprintf(codestr, sizeof(codestr), "%02x", code); + } else { + snprintf(codestr, sizeof(codestr), "??"); + } + cpu_fprintf(f, "%s%s%s%s", i > 0 ? " ": "", + i == offs ? "<" : "", codestr, i == offs ? ">" : ""); + } + cpu_fprintf(f, "\n"); + } } /***********************************************************/