From nobody Fri May 3 11:30:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1649265505325323.6918889275877; Wed, 6 Apr 2022 10:18:25 -0700 (PDT) Received: from localhost ([::1]:34890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nc9IV-0005ad-NH for importer@patchew.org; Wed, 06 Apr 2022 13:18:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nc9GQ-0002dQ-8x for qemu-devel@nongnu.org; Wed, 06 Apr 2022 13:16:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:46085) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nc9GK-0005mW-0W for qemu-devel@nongnu.org; Wed, 06 Apr 2022 13:16:12 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-674-oJXUIaRaOFyn1_AE2tcW6A-1; Wed, 06 Apr 2022 13:16:04 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B0F17802819; Wed, 6 Apr 2022 17:16:03 +0000 (UTC) Received: from vp-pc.redhat.com (unknown [10.40.192.40]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5DE3440470E1; Wed, 6 Apr 2022 17:16:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649265367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4dzQQbZRRM5FwSVrgVzPMYjgRIXBODwb6uweAMMn9u4=; b=f239XU7aJEugMfCk0NkfkifwgL93jyWgr5VGldbrVr7EXHcY+tbQoKfGUVNhTe7BWOUCBV 7XpGX6g2xE9xltCw0U373Nrqqyou32H7nzmEal/eDoE2w19dhJG0+ZEdl8r/9Rd8OW0oWr +DmDnHp70ECZugw0iYyHs/6ILiikvyg= X-MC-Unique: oJXUIaRaOFyn1_AE2tcW6A-1 From: Viktor Prutyanov To: marcandre.lureau@redhat.com, dgilbert@redhat.com, f4bug@amsat.org Subject: [PATCH v4 1/4] include/qemu: rename Windows context definitions to expose bitness Date: Wed, 6 Apr 2022 20:15:55 +0300 Message-Id: <20220406171558.199263-2-viktor.prutyanov@redhat.com> In-Reply-To: <20220406171558.199263-1-viktor.prutyanov@redhat.com> References: <20220406171558.199263-1-viktor.prutyanov@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=viktor.prutyanov@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=viktor.prutyanov@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: yan@daynix.com, qemu-devel@nongnu.org, viktor.prutyanov@phystech.edu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1649265506532100005 Context structure in 64-bit Windows differs from 32-bit one and it should be reflected in its name. Signed-off-by: Viktor Prutyanov Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- contrib/elf2dmp/main.c | 6 +++--- dump/win_dump.c | 14 +++++++------- include/qemu/win_dump_defs.h | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/contrib/elf2dmp/main.c b/contrib/elf2dmp/main.c index 20b477d582..b9fc6d230c 100644 --- a/contrib/elf2dmp/main.c +++ b/contrib/elf2dmp/main.c @@ -141,10 +141,10 @@ static KDDEBUGGER_DATA64 *get_kdbg(uint64_t KernBase,= struct pdb_reader *pdb, return kdbg; } =20 -static void win_context_init_from_qemu_cpu_state(WinContext *ctx, +static void win_context_init_from_qemu_cpu_state(WinContext64 *ctx, QEMUCPUState *s) { - WinContext win_ctx =3D (WinContext){ + WinContext64 win_ctx =3D (WinContext64){ .ContextFlags =3D WIN_CTX_X64 | WIN_CTX_INT | WIN_CTX_SEG | WIN_CT= X_CTL, .MxCsr =3D INITIAL_MXCSR, =20 @@ -302,7 +302,7 @@ static int fill_context(KDDEBUGGER_DATA64 *kdbg, for (i =3D 0; i < qe->state_nr; i++) { uint64_t Prcb; uint64_t Context; - WinContext ctx; + WinContext64 ctx; QEMUCPUState *s =3D qe->state[i]; =20 if (va_space_rw(vs, kdbg->KiProcessorBlock + sizeof(Prcb) * i, diff --git a/dump/win_dump.c b/dump/win_dump.c index c5eb5a9aac..29b6e4f670 100644 --- a/dump/win_dump.c +++ b/dump/win_dump.c @@ -189,7 +189,7 @@ try_again: } =20 struct saved_context { - WinContext ctx; + WinContext64 ctx; uint64_t addr; }; =20 @@ -221,7 +221,7 @@ static void patch_and_save_context(WinDumpHeader64 *h, CPUX86State *env =3D &x86_cpu->env; uint64_t Prcb; uint64_t Context; - WinContext ctx; + WinContext64 ctx; =20 if (cpu_memory_rw_debug(first_cpu, KiProcessorBlock + i * sizeof(uint64_t), @@ -241,8 +241,8 @@ static void patch_and_save_context(WinDumpHeader64 *h, =20 saved_ctx[i].addr =3D Context; =20 - ctx =3D (WinContext){ - .ContextFlags =3D WIN_CTX_ALL, + ctx =3D (WinContext64){ + .ContextFlags =3D WIN_CTX64_ALL, .MxCsr =3D env->mxcsr, =20 .SegEs =3D env->segs[0].selector, @@ -284,13 +284,13 @@ static void patch_and_save_context(WinDumpHeader64 *h, }; =20 if (cpu_memory_rw_debug(first_cpu, Context, - (uint8_t *)&saved_ctx[i].ctx, sizeof(WinContext), 0)) { + (uint8_t *)&saved_ctx[i].ctx, sizeof(WinContext64), 0)) { error_setg(errp, "win-dump: failed to save CPU #%d context", i= ); return; } =20 if (cpu_memory_rw_debug(first_cpu, Context, - (uint8_t *)&ctx, sizeof(WinContext), 1)) { + (uint8_t *)&ctx, sizeof(WinContext64), 1)) { error_setg(errp, "win-dump: failed to write CPU #%d context", = i); return; } @@ -306,7 +306,7 @@ static void restore_context(WinDumpHeader64 *h, =20 for (i =3D 0; i < h->NumberProcessors; i++) { if (cpu_memory_rw_debug(first_cpu, saved_ctx[i].addr, - (uint8_t *)&saved_ctx[i].ctx, sizeof(WinContext), 1)) { + (uint8_t *)&saved_ctx[i].ctx, sizeof(WinContext64), 1)) { warn_report("win-dump: failed to restore CPU #%d context", i); } } diff --git a/include/qemu/win_dump_defs.h b/include/qemu/win_dump_defs.h index 145096e8ee..5a5e5a5e09 100644 --- a/include/qemu/win_dump_defs.h +++ b/include/qemu/win_dump_defs.h @@ -97,8 +97,8 @@ typedef struct WinDumpHeader64 { #define WIN_CTX_FP 0x00000008L #define WIN_CTX_DBG 0x00000010L =20 -#define WIN_CTX_FULL (WIN_CTX_X64 | WIN_CTX_CTL | WIN_CTX_INT | WIN_CTX= _FP) -#define WIN_CTX_ALL (WIN_CTX_FULL | WIN_CTX_SEG | WIN_CTX_DBG) +#define WIN_CTX64_FULL (WIN_CTX_X64 | WIN_CTX_CTL | WIN_CTX_INT | WIN_CTX= _FP) +#define WIN_CTX64_ALL (WIN_CTX64_FULL | WIN_CTX_SEG | WIN_CTX_DBG) =20 #define LIVE_SYSTEM_DUMP 0x00000161 =20 @@ -107,7 +107,7 @@ typedef struct WinM128A { int64_t high; } QEMU_ALIGNED(16) WinM128A; =20 -typedef struct WinContext { +typedef struct WinContext64 { uint64_t PHome[6]; =20 uint32_t ContextFlags; @@ -174,6 +174,6 @@ typedef struct WinContext { uint64_t LastBranchFromRip; uint64_t LastExceptionToRip; uint64_t LastExceptionFromRip; -} QEMU_ALIGNED(16) WinContext; +} QEMU_ALIGNED(16) WinContext64; =20 #endif /* QEMU_WIN_DUMP_DEFS_H */ --=20 2.35.1 From nobody Fri May 3 11:30:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1649265503222377.9778958364881; Wed, 6 Apr 2022 10:18:23 -0700 (PDT) Received: from localhost ([::1]:34686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nc9IT-0005S6-Rf for importer@patchew.org; Wed, 06 Apr 2022 13:18:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nc9GO-0002ax-0l for qemu-devel@nongnu.org; Wed, 06 Apr 2022 13:16:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:23392) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nc9GL-0005md-Go for qemu-devel@nongnu.org; Wed, 06 Apr 2022 13:16:11 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-142-djzntTjzPY6fTWQqHPB0pA-1; Wed, 06 Apr 2022 13:16:06 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 89106185A7A4; Wed, 6 Apr 2022 17:16:05 +0000 (UTC) Received: from vp-pc.redhat.com (unknown [10.40.192.40]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0DA0440D1B98; Wed, 6 Apr 2022 17:16:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649265368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NFi8ihaQHmurYgG9gBfURIyisjzMSnfRquolbCSYWeM=; b=az5hv64u7SnIuaTuAA9YL6I60GAXldVmcnRGfNXPSkid3ZEUg9sg2v18SP5gUbs0L0Ydtk RCRrS+idICFSpD62D8XMnnV5K6dK44vWNUZxwd3xbeGU4C4R+XYgx4/yFwY9leeBBIAvXs y6NjJYpiX4Nnb9qGP4XrabZAJvVXMk4= X-MC-Unique: djzntTjzPY6fTWQqHPB0pA-1 From: Viktor Prutyanov To: marcandre.lureau@redhat.com, dgilbert@redhat.com, f4bug@amsat.org Subject: [PATCH v4 2/4] dump/win_dump: add helper macros for Windows dump header access Date: Wed, 6 Apr 2022 20:15:56 +0300 Message-Id: <20220406171558.199263-3-viktor.prutyanov@redhat.com> In-Reply-To: <20220406171558.199263-1-viktor.prutyanov@redhat.com> References: <20220406171558.199263-1-viktor.prutyanov@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=viktor.prutyanov@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=viktor.prutyanov@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: yan@daynix.com, qemu-devel@nongnu.org, viktor.prutyanov@phystech.edu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1649265504431100003 Perform read access to Windows dump header fields via helper macros. This is preparation for the next 32-bit guest Windows dump support. Signed-off-by: Viktor Prutyanov Reviewed-by: Marc-Andr=C3=A9 Lureau --- dump/win_dump.c | 100 +++++++++++++++++++++++++++++++----------------- 1 file changed, 65 insertions(+), 35 deletions(-) diff --git a/dump/win_dump.c b/dump/win_dump.c index 29b6e4f670..df3b432ca5 100644 --- a/dump/win_dump.c +++ b/dump/win_dump.c @@ -24,11 +24,25 @@ #include "hw/misc/vmcoreinfo.h" #include "win_dump.h" =20 -static size_t write_run(WinDumpPhyMemRun64 *run, int fd, Error **errp) +#define WIN_DUMP_PTR_SIZE sizeof(uint64_t) + +#define _WIN_DUMP_FIELD(f) (h->f) +#define WIN_DUMP_FIELD(field) _WIN_DUMP_FIELD(field) + +#define _WIN_DUMP_FIELD_PTR(f) ((void *)&h->f) +#define WIN_DUMP_FIELD_PTR(field) _WIN_DUMP_FIELD_PTR(field) + +#define _WIN_DUMP_FIELD_SIZE(f) sizeof(h->f) +#define WIN_DUMP_FIELD_SIZE(field) _WIN_DUMP_FIELD_SIZE(field) + +#define WIN_DUMP_CTX_SIZE sizeof(WinContext64) + +static size_t write_run(uint64_t base_page, uint64_t page_count, + int fd, Error **errp) { void *buf; - uint64_t addr =3D run->BasePage << TARGET_PAGE_BITS; - uint64_t size =3D run->PageCount << TARGET_PAGE_BITS; + uint64_t addr =3D base_page << TARGET_PAGE_BITS; + uint64_t size =3D page_count << TARGET_PAGE_BITS; uint64_t len, l; size_t total =3D 0; =20 @@ -59,13 +73,14 @@ static size_t write_run(WinDumpPhyMemRun64 *run, int fd= , Error **errp) =20 static void write_runs(DumpState *s, WinDumpHeader64 *h, Error **errp) { - WinDumpPhyMemDesc64 *desc =3D &h->PhysicalMemoryBlock; - WinDumpPhyMemRun64 *run =3D desc->Run; + uint64_t BasePage, PageCount; Error *local_err =3D NULL; int i; =20 - for (i =3D 0; i < desc->NumberOfRuns; i++) { - s->written_size +=3D write_run(run + i, s->fd, &local_err); + for (i =3D 0; i < WIN_DUMP_FIELD(PhysicalMemoryBlock.NumberOfRuns); i+= +) { + BasePage =3D WIN_DUMP_FIELD(PhysicalMemoryBlock.Run[i].BasePage); + PageCount =3D WIN_DUMP_FIELD(PhysicalMemoryBlock.Run[i].PageCount); + s->written_size +=3D write_run(BasePage, PageCount, s->fd, &local_= err); if (local_err) { error_propagate(errp, local_err); return; @@ -73,11 +88,24 @@ static void write_runs(DumpState *s, WinDumpHeader64 *h= , Error **errp) } } =20 +static int cpu_read_ptr(CPUState *cpu, uint64_t addr, uint64_t *ptr) +{ + int ret; + uint64_t ptr64; + + ret =3D cpu_memory_rw_debug(cpu, addr, &ptr64, WIN_DUMP_PTR_SIZE, 0); + + *ptr =3D ptr64; + + return ret; +} + static void patch_mm_pfn_database(WinDumpHeader64 *h, Error **errp) { if (cpu_memory_rw_debug(first_cpu, - h->KdDebuggerDataBlock + KDBG_MM_PFN_DATABASE_OFFSET64, - (uint8_t *)&h->PfnDatabase, sizeof(h->PfnDatabase), 0)) { + WIN_DUMP_FIELD(KdDebuggerDataBlock) + KDBG_MM_PFN_DATABASE_OFF= SET64, + WIN_DUMP_FIELD_PTR(PfnDatabase), + WIN_DUMP_FIELD_SIZE(PfnDatabase), 0)) { error_setg(errp, "win-dump: failed to read MmPfnDatabase"); return; } @@ -87,16 +115,17 @@ static void patch_bugcheck_data(WinDumpHeader64 *h, Er= ror **errp) { uint64_t KiBugcheckData; =20 - if (cpu_memory_rw_debug(first_cpu, - h->KdDebuggerDataBlock + KDBG_KI_BUGCHECK_DATA_OFFSET64, - (uint8_t *)&KiBugcheckData, sizeof(KiBugcheckData), 0)) { + if (cpu_read_ptr(first_cpu, + WIN_DUMP_FIELD(KdDebuggerDataBlock) + + KDBG_KI_BUGCHECK_DATA_OFFSET64, + &KiBugcheckData)) { error_setg(errp, "win-dump: failed to read KiBugcheckData"); return; } =20 - if (cpu_memory_rw_debug(first_cpu, - KiBugcheckData, - h->BugcheckData, sizeof(h->BugcheckData), 0)) { + if (cpu_memory_rw_debug(first_cpu, KiBugcheckData, + WIN_DUMP_FIELD(BugcheckData), + WIN_DUMP_FIELD_SIZE(BugcheckData), 0)) { error_setg(errp, "win-dump: failed to read bugcheck data"); return; } @@ -105,8 +134,8 @@ static void patch_bugcheck_data(WinDumpHeader64 *h, Err= or **errp) * If BugcheckCode wasn't saved, we consider guest OS as alive. */ =20 - if (!h->BugcheckCode) { - h->BugcheckCode =3D LIVE_SYSTEM_DUMP; + if (!WIN_DUMP_FIELD(BugcheckCode)) { + *(uint32_t *)WIN_DUMP_FIELD_PTR(BugcheckCode) =3D LIVE_SYSTEM_DUMP; } } =20 @@ -155,7 +184,7 @@ static void check_kdbg(WinDumpHeader64 *h, Error **errp) { const char OwnerTag[] =3D "KDBG"; char read_OwnerTag[4]; - uint64_t KdDebuggerDataBlock =3D h->KdDebuggerDataBlock; + uint64_t KdDebuggerDataBlock =3D WIN_DUMP_FIELD(KdDebuggerDataBlock); bool try_fallback =3D true; =20 try_again: @@ -174,7 +203,7 @@ try_again: * we try to use KDBG obtained by guest driver. */ =20 - KdDebuggerDataBlock =3D h->BugcheckParameter1; + KdDebuggerDataBlock =3D WIN_DUMP_FIELD(BugcheckParameter1); try_fallback =3D false; goto try_again; } else { @@ -197,20 +226,21 @@ static void patch_and_save_context(WinDumpHeader64 *h, struct saved_context *saved_ctx, Error **errp) { + uint64_t KdDebuggerDataBlock =3D WIN_DUMP_FIELD(KdDebuggerDataBlock); uint64_t KiProcessorBlock; uint16_t OffsetPrcbContext; CPUState *cpu; int i =3D 0; =20 - if (cpu_memory_rw_debug(first_cpu, - h->KdDebuggerDataBlock + KDBG_KI_PROCESSOR_BLOCK_OFFSET64, - (uint8_t *)&KiProcessorBlock, sizeof(KiProcessorBlock), 0)) { + if (cpu_read_ptr(first_cpu, + KdDebuggerDataBlock + KDBG_KI_PROCESSOR_BLOCK_OFFSET64, + &KiProcessorBlock)) { error_setg(errp, "win-dump: failed to read KiProcessorBlock"); return; } =20 if (cpu_memory_rw_debug(first_cpu, - h->KdDebuggerDataBlock + KDBG_OFFSET_PRCB_CONTEXT_OFFSET64, + KdDebuggerDataBlock + KDBG_OFFSET_PRCB_CONTEXT_OFFSET64, (uint8_t *)&OffsetPrcbContext, sizeof(OffsetPrcbContext), 0)) { error_setg(errp, "win-dump: failed to read OffsetPrcbContext"); return; @@ -223,17 +253,17 @@ static void patch_and_save_context(WinDumpHeader64 *h, uint64_t Context; WinContext64 ctx; =20 - if (cpu_memory_rw_debug(first_cpu, - KiProcessorBlock + i * sizeof(uint64_t), - (uint8_t *)&Prcb, sizeof(Prcb), 0)) { + if (cpu_read_ptr(first_cpu, + KiProcessorBlock + i * WIN_DUMP_PTR_SIZE, + &Prcb)) { error_setg(errp, "win-dump: failed to read" " CPU #%d PRCB location", i); return; } =20 - if (cpu_memory_rw_debug(first_cpu, + if (cpu_read_ptr(first_cpu, Prcb + OffsetPrcbContext, - (uint8_t *)&Context, sizeof(Context), 0)) { + &Context)) { error_setg(errp, "win-dump: failed to read" " CPU #%d ContextFrame location", i); return; @@ -284,13 +314,13 @@ static void patch_and_save_context(WinDumpHeader64 *h, }; =20 if (cpu_memory_rw_debug(first_cpu, Context, - (uint8_t *)&saved_ctx[i].ctx, sizeof(WinContext64), 0)) { + &saved_ctx[i].ctx, WIN_DUMP_CTX_SIZE, 0)) { error_setg(errp, "win-dump: failed to save CPU #%d context", i= ); return; } =20 if (cpu_memory_rw_debug(first_cpu, Context, - (uint8_t *)&ctx, sizeof(WinContext64), 1)) { + &ctx, WIN_DUMP_CTX_SIZE, 1)) { error_setg(errp, "win-dump: failed to write CPU #%d context", = i); return; } @@ -304,9 +334,9 @@ static void restore_context(WinDumpHeader64 *h, { int i; =20 - for (i =3D 0; i < h->NumberProcessors; i++) { + for (i =3D 0; i < WIN_DUMP_FIELD(NumberProcessors); i++) { if (cpu_memory_rw_debug(first_cpu, saved_ctx[i].addr, - (uint8_t *)&saved_ctx[i].ctx, sizeof(WinContext64), 1)) { + &saved_ctx[i].ctx, WIN_DUMP_CTX_SIZE, 1)) { warn_report("win-dump: failed to restore CPU #%d context", i); } } @@ -338,7 +368,7 @@ void create_win_dump(DumpState *s, Error **errp) * should be made from system context. */ =20 - first_x86_cpu->env.cr[3] =3D h->DirectoryTableBase; + first_x86_cpu->env.cr[3] =3D WIN_DUMP_FIELD(DirectoryTableBase); =20 check_kdbg(h, &local_err); if (local_err) { @@ -348,7 +378,7 @@ void create_win_dump(DumpState *s, Error **errp) =20 patch_header(h); =20 - saved_ctx =3D g_new(struct saved_context, h->NumberProcessors); + saved_ctx =3D g_new(struct saved_context, WIN_DUMP_FIELD(NumberProcess= ors)); =20 /* * Always patch context because there is no way @@ -361,7 +391,7 @@ void create_win_dump(DumpState *s, Error **errp) goto out_free; } =20 - s->total_size =3D h->RequiredDumpSpace; + s->total_size =3D WIN_DUMP_FIELD(RequiredDumpSpace); =20 s->written_size =3D qemu_write_full(s->fd, h, sizeof(*h)); if (s->written_size !=3D sizeof(*h)) { --=20 2.35.1 From nobody Fri May 3 11:30:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164926554523598.07647052588118; Wed, 6 Apr 2022 10:19:05 -0700 (PDT) Received: from localhost ([::1]:39254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nc9J9-0008UA-Se for importer@patchew.org; Wed, 06 Apr 2022 13:19:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nc9GP-0002cO-09 for qemu-devel@nongnu.org; Wed, 06 Apr 2022 13:16:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:31518) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nc9GN-0005mt-7h for qemu-devel@nongnu.org; Wed, 06 Apr 2022 13:16:12 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-302-ReO1bWwSNre1Tafp8zubeg-1; Wed, 06 Apr 2022 13:16:07 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 388ED1C02349; Wed, 6 Apr 2022 17:16:07 +0000 (UTC) Received: from vp-pc.redhat.com (unknown [10.40.192.40]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D8D5340D2821; Wed, 6 Apr 2022 17:16:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649265370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dWE2q+Edp5uEdudNdqNzfgghdz8JRhi/IV9DdODEVb4=; b=O6nRGAIvvC1Oykn6/a/EkTrn3Nb4TutmUaKxiOlKBkgsd0Tjigbjl1ap3dOytXzQeAU1Lu U7GuyU1RhGiU1kVxHSe4rAzqQBT03GnTw88HpyGNL6gm7iNGGBnRAXc++oQ11z49udDT/t s+vORFrZ2eaRbP4EEcfILp5e9uJaFWs= X-MC-Unique: ReO1bWwSNre1Tafp8zubeg-1 From: Viktor Prutyanov To: marcandre.lureau@redhat.com, dgilbert@redhat.com, f4bug@amsat.org Subject: [PATCH v4 3/4] include/qemu: add 32-bit Windows dump structures Date: Wed, 6 Apr 2022 20:15:57 +0300 Message-Id: <20220406171558.199263-4-viktor.prutyanov@redhat.com> In-Reply-To: <20220406171558.199263-1-viktor.prutyanov@redhat.com> References: <20220406171558.199263-1-viktor.prutyanov@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=viktor.prutyanov@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=viktor.prutyanov@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: yan@daynix.com, qemu-devel@nongnu.org, viktor.prutyanov@phystech.edu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1649265547399100001 These structures are required to produce 32-bit guest Windows Complete Memory Dump. Add 32-bit Windows dump header, CPU context and physical memory descriptor structures along with corresponding definitions. Signed-off-by: Viktor Prutyanov Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- include/qemu/win_dump_defs.h | 107 +++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/include/qemu/win_dump_defs.h b/include/qemu/win_dump_defs.h index 5a5e5a5e09..73a44e2408 100644 --- a/include/qemu/win_dump_defs.h +++ b/include/qemu/win_dump_defs.h @@ -11,11 +11,22 @@ #ifndef QEMU_WIN_DUMP_DEFS_H #define QEMU_WIN_DUMP_DEFS_H =20 +typedef struct WinDumpPhyMemRun32 { + uint32_t BasePage; + uint32_t PageCount; +} QEMU_PACKED WinDumpPhyMemRun32; + typedef struct WinDumpPhyMemRun64 { uint64_t BasePage; uint64_t PageCount; } QEMU_PACKED WinDumpPhyMemRun64; =20 +typedef struct WinDumpPhyMemDesc32 { + uint32_t NumberOfRuns; + uint32_t NumberOfPages; + WinDumpPhyMemRun32 Run[86]; +} QEMU_PACKED WinDumpPhyMemDesc32; + typedef struct WinDumpPhyMemDesc64 { uint32_t NumberOfRuns; uint32_t unused; @@ -33,6 +44,39 @@ typedef struct WinDumpExceptionRecord { uint64_t ExceptionInformation[15]; } QEMU_PACKED WinDumpExceptionRecord; =20 +typedef struct WinDumpHeader32 { + char Signature[4]; + char ValidDump[4]; + uint32_t MajorVersion; + uint32_t MinorVersion; + uint32_t DirectoryTableBase; + uint32_t PfnDatabase; + uint32_t PsLoadedModuleList; + uint32_t PsActiveProcessHead; + uint32_t MachineImageType; + uint32_t NumberProcessors; + union { + struct { + uint32_t BugcheckCode; + uint32_t BugcheckParameter1; + uint32_t BugcheckParameter2; + uint32_t BugcheckParameter3; + uint32_t BugcheckParameter4; + }; + uint8_t BugcheckData[20]; + }; + uint8_t VersionUser[32]; + uint32_t reserved0; + uint32_t KdDebuggerDataBlock; + union { + WinDumpPhyMemDesc32 PhysicalMemoryBlock; + uint8_t PhysicalMemoryBlockBuffer[700]; + }; + uint8_t reserved1[3200]; + uint32_t RequiredDumpSpace; + uint8_t reserved2[92]; +} QEMU_PACKED WinDumpHeader32; + typedef struct WinDumpHeader64 { char Signature[4]; char ValidDump[4]; @@ -81,25 +125,49 @@ typedef struct WinDumpHeader64 { uint8_t reserved[4018]; } QEMU_PACKED WinDumpHeader64; =20 +typedef union WinDumpHeader { + struct { + char Signature[4]; + char ValidDump[4]; + }; + WinDumpHeader32 x32; + WinDumpHeader64 x64; +} WinDumpHeader; + #define KDBG_OWNER_TAG_OFFSET64 0x10 #define KDBG_MM_PFN_DATABASE_OFFSET64 0xC0 #define KDBG_KI_BUGCHECK_DATA_OFFSET64 0x88 #define KDBG_KI_PROCESSOR_BLOCK_OFFSET64 0x218 #define KDBG_OFFSET_PRCB_CONTEXT_OFFSET64 0x338 =20 +#define KDBG_OWNER_TAG_OFFSET KDBG_OWNER_TAG_OFFSET64 +#define KDBG_MM_PFN_DATABASE_OFFSET KDBG_MM_PFN_DATABASE_OFFSET64 +#define KDBG_KI_BUGCHECK_DATA_OFFSET KDBG_KI_BUGCHECK_DATA_OFFSET64 +#define KDBG_KI_PROCESSOR_BLOCK_OFFSET KDBG_KI_PROCESSOR_BLOCK_OFFSET64 +#define KDBG_OFFSET_PRCB_CONTEXT_OFFSET KDBG_OFFSET_PRCB_CONTEXT_OFFSET64 + #define VMCOREINFO_ELF_NOTE_HDR_SIZE 24 +#define VMCOREINFO_WIN_DUMP_NOTE_SIZE64 (sizeof(WinDumpHeader64) + \ + VMCOREINFO_ELF_NOTE_HDR_SIZE) +#define VMCOREINFO_WIN_DUMP_NOTE_SIZE32 (sizeof(WinDumpHeader32) + \ + VMCOREINFO_ELF_NOTE_HDR_SIZE) =20 #define WIN_CTX_X64 0x00100000L +#define WIN_CTX_X86 0x00010000L =20 #define WIN_CTX_CTL 0x00000001L #define WIN_CTX_INT 0x00000002L #define WIN_CTX_SEG 0x00000004L #define WIN_CTX_FP 0x00000008L #define WIN_CTX_DBG 0x00000010L +#define WIN_CTX_EXT 0x00000020L =20 #define WIN_CTX64_FULL (WIN_CTX_X64 | WIN_CTX_CTL | WIN_CTX_INT | WIN_CTX= _FP) #define WIN_CTX64_ALL (WIN_CTX64_FULL | WIN_CTX_SEG | WIN_CTX_DBG) =20 +#define WIN_CTX32_FULL (WIN_CTX_X86 | WIN_CTX_CTL | WIN_CTX_INT | WIN_CTX_= SEG) +#define WIN_CTX32_ALL (WIN_CTX32_FULL | WIN_CTX_FP | WIN_CTX_DBG | WIN_CTX= _EXT) + #define LIVE_SYSTEM_DUMP 0x00000161 =20 typedef struct WinM128A { @@ -107,6 +175,40 @@ typedef struct WinM128A { int64_t high; } QEMU_ALIGNED(16) WinM128A; =20 +typedef struct WinContext32 { + uint32_t ContextFlags; + + uint32_t Dr0; + uint32_t Dr1; + uint32_t Dr2; + uint32_t Dr3; + uint32_t Dr6; + uint32_t Dr7; + + uint8_t FloatSave[112]; + + uint32_t SegGs; + uint32_t SegFs; + uint32_t SegEs; + uint32_t SegDs; + + uint32_t Edi; + uint32_t Esi; + uint32_t Ebx; + uint32_t Edx; + uint32_t Ecx; + uint32_t Eax; + + uint32_t Ebp; + uint32_t Eip; + uint32_t SegCs; + uint32_t EFlags; + uint32_t Esp; + uint32_t SegSs; + + uint8_t ExtendedRegisters[512]; +} QEMU_ALIGNED(16) WinContext32; + typedef struct WinContext64 { uint64_t PHome[6]; =20 @@ -176,4 +278,9 @@ typedef struct WinContext64 { uint64_t LastExceptionFromRip; } QEMU_ALIGNED(16) WinContext64; =20 +typedef union WinContext { + WinContext32 x32; + WinContext64 x64; +} WinContext; + #endif /* QEMU_WIN_DUMP_DEFS_H */ --=20 2.35.1 From nobody Fri May 3 11:30:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1649265579234328.3623862383057; Wed, 6 Apr 2022 10:19:39 -0700 (PDT) Received: from localhost ([::1]:41332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nc9Ji-0001R2-6j for importer@patchew.org; Wed, 06 Apr 2022 13:19:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nc9GQ-0002fY-2i for qemu-devel@nongnu.org; Wed, 06 Apr 2022 13:16:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:21224) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nc9GN-0005mw-94 for qemu-devel@nongnu.org; Wed, 06 Apr 2022 13:16:13 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-503-n2XdxVBxMkOVTBAdcw_1kA-1; Wed, 06 Apr 2022 13:16:09 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 117501C0234B; Wed, 6 Apr 2022 17:16:09 +0000 (UTC) Received: from vp-pc.redhat.com (unknown [10.40.192.40]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8A49F40D1B98; Wed, 6 Apr 2022 17:16:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649265370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2MZRrRA0+dJKbfWDAuDYxbg3JiGy/eqys+I4vgo1mYE=; b=FtbCGJg/o+TYgU6yhZoccNHFlZrX6EbN3lxSnMr9vloeGCkEkJtB2i91DuNzohSUmoLcf7 AxZTdjxvvTdf6oh0wS0xWn9E0oF8C5pywfAosYL1xACN9rpVRfQCSo+pPK1OR3HNUxyPDs HpVmjQPA/j+9k1mpVxOC42glDwAm1wg= X-MC-Unique: n2XdxVBxMkOVTBAdcw_1kA-1 From: Viktor Prutyanov To: marcandre.lureau@redhat.com, dgilbert@redhat.com, f4bug@amsat.org Subject: [PATCH v4 4/4] dump/win_dump: add 32-bit guest Windows support Date: Wed, 6 Apr 2022 20:15:58 +0300 Message-Id: <20220406171558.199263-5-viktor.prutyanov@redhat.com> In-Reply-To: <20220406171558.199263-1-viktor.prutyanov@redhat.com> References: <20220406171558.199263-1-viktor.prutyanov@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=viktor.prutyanov@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=viktor.prutyanov@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: yan@daynix.com, qemu-devel@nongnu.org, viktor.prutyanov@phystech.edu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1649265579531100003 Before this patch, 'dump-guest-memory -w' was accepting only 64-bit dump header provided by guest through vmcoreinfo and thus was unable to produce 32-bit guest Windows dump. So, add 32-bit guest Windows dumping support. Signed-off-by: Viktor Prutyanov Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- dump/win_dump.c | 245 +++++++++++++++++++++++++++++------------------- hmp-commands.hx | 2 +- 2 files changed, 150 insertions(+), 97 deletions(-) diff --git a/dump/win_dump.c b/dump/win_dump.c index df3b432ca5..fda32da036 100644 --- a/dump/win_dump.c +++ b/dump/win_dump.c @@ -24,18 +24,24 @@ #include "hw/misc/vmcoreinfo.h" #include "win_dump.h" =20 -#define WIN_DUMP_PTR_SIZE sizeof(uint64_t) +static size_t win_dump_ptr_size(bool x64) +{ + return x64 ? sizeof(uint64_t) : sizeof(uint32_t); +} =20 -#define _WIN_DUMP_FIELD(f) (h->f) +#define _WIN_DUMP_FIELD(f) (x64 ? h->x64.f : h->x32.f) #define WIN_DUMP_FIELD(field) _WIN_DUMP_FIELD(field) =20 -#define _WIN_DUMP_FIELD_PTR(f) ((void *)&h->f) +#define _WIN_DUMP_FIELD_PTR(f) (x64 ? (void *)&h->x64.f : (void *)&h->x32.= f) #define WIN_DUMP_FIELD_PTR(field) _WIN_DUMP_FIELD_PTR(field) =20 -#define _WIN_DUMP_FIELD_SIZE(f) sizeof(h->f) +#define _WIN_DUMP_FIELD_SIZE(f) (x64 ? sizeof(h->x64.f) : sizeof(h->x32.f)) #define WIN_DUMP_FIELD_SIZE(field) _WIN_DUMP_FIELD_SIZE(field) =20 -#define WIN_DUMP_CTX_SIZE sizeof(WinContext64) +static size_t win_dump_ctx_size(bool x64) +{ + return x64 ? sizeof(WinContext64) : sizeof(WinContext32); +} =20 static size_t write_run(uint64_t base_page, uint64_t page_count, int fd, Error **errp) @@ -71,7 +77,7 @@ static size_t write_run(uint64_t base_page, uint64_t page= _count, return total; } =20 -static void write_runs(DumpState *s, WinDumpHeader64 *h, Error **errp) +static void write_runs(DumpState *s, WinDumpHeader *h, bool x64, Error **e= rrp) { uint64_t BasePage, PageCount; Error *local_err =3D NULL; @@ -88,22 +94,24 @@ static void write_runs(DumpState *s, WinDumpHeader64 *h= , Error **errp) } } =20 -static int cpu_read_ptr(CPUState *cpu, uint64_t addr, uint64_t *ptr) +static int cpu_read_ptr(bool x64, CPUState *cpu, uint64_t addr, uint64_t *= ptr) { int ret; + uint32_t ptr32; uint64_t ptr64; =20 - ret =3D cpu_memory_rw_debug(cpu, addr, &ptr64, WIN_DUMP_PTR_SIZE, 0); + ret =3D cpu_memory_rw_debug(cpu, addr, x64 ? (void *)&ptr64 : (void *)= &ptr32, + win_dump_ptr_size(x64), 0); =20 - *ptr =3D ptr64; + *ptr =3D x64 ? ptr64 : ptr32; =20 return ret; } =20 -static void patch_mm_pfn_database(WinDumpHeader64 *h, Error **errp) +static void patch_mm_pfn_database(WinDumpHeader *h, bool x64, Error **errp) { if (cpu_memory_rw_debug(first_cpu, - WIN_DUMP_FIELD(KdDebuggerDataBlock) + KDBG_MM_PFN_DATABASE_OFF= SET64, + WIN_DUMP_FIELD(KdDebuggerDataBlock) + KDBG_MM_PFN_DATABASE_OFF= SET, WIN_DUMP_FIELD_PTR(PfnDatabase), WIN_DUMP_FIELD_SIZE(PfnDatabase), 0)) { error_setg(errp, "win-dump: failed to read MmPfnDatabase"); @@ -111,13 +119,12 @@ static void patch_mm_pfn_database(WinDumpHeader64 *h,= Error **errp) } } =20 -static void patch_bugcheck_data(WinDumpHeader64 *h, Error **errp) +static void patch_bugcheck_data(WinDumpHeader *h, bool x64, Error **errp) { uint64_t KiBugcheckData; =20 - if (cpu_read_ptr(first_cpu, - WIN_DUMP_FIELD(KdDebuggerDataBlock) + - KDBG_KI_BUGCHECK_DATA_OFFSET64, + if (cpu_read_ptr(x64, first_cpu, + WIN_DUMP_FIELD(KdDebuggerDataBlock) + KDBG_KI_BUGCHECK_DATA_OF= FSET, &KiBugcheckData)) { error_setg(errp, "win-dump: failed to read KiBugcheckData"); return; @@ -142,30 +149,34 @@ static void patch_bugcheck_data(WinDumpHeader64 *h, E= rror **errp) /* * This routine tries to correct mistakes in crashdump header. */ -static void patch_header(WinDumpHeader64 *h) +static void patch_header(WinDumpHeader *h, bool x64) { Error *local_err =3D NULL; =20 - h->RequiredDumpSpace =3D sizeof(WinDumpHeader64) + - (h->PhysicalMemoryBlock.NumberOfPages << TARGET_PAGE_BITS); - h->PhysicalMemoryBlock.unused =3D 0; - h->unused1 =3D 0; + if (x64) { + h->x64.RequiredDumpSpace =3D sizeof(WinDumpHeader64) + + (h->x64.PhysicalMemoryBlock.NumberOfPages << TARGET_PAGE_BITS); + h->x64.PhysicalMemoryBlock.unused =3D 0; + h->x64.unused1 =3D 0; + } else { + h->x32.RequiredDumpSpace =3D sizeof(WinDumpHeader32) + + (h->x32.PhysicalMemoryBlock.NumberOfPages << TARGET_PAGE_BITS); + } =20 - patch_mm_pfn_database(h, &local_err); + patch_mm_pfn_database(h, x64, &local_err); if (local_err) { warn_report_err(local_err); local_err =3D NULL; } - patch_bugcheck_data(h, &local_err); + patch_bugcheck_data(h, x64, &local_err); if (local_err) { warn_report_err(local_err); } } =20 -static void check_header(WinDumpHeader64 *h, Error **errp) +static void check_header(WinDumpHeader *h, bool *x64, Error **errp) { const char Signature[] =3D "PAGE"; - const char ValidDump[] =3D "DU64"; =20 if (memcmp(h->Signature, Signature, sizeof(h->Signature))) { error_setg(errp, "win-dump: invalid header, expected '%.4s'," @@ -173,14 +184,17 @@ static void check_header(WinDumpHeader64 *h, Error **= errp) return; } =20 - if (memcmp(h->ValidDump, ValidDump, sizeof(h->ValidDump))) { - error_setg(errp, "win-dump: invalid header, expected '%.4s'," - " got '%.4s'", ValidDump, h->ValidDump); - return; + if (!memcmp(h->ValidDump, "DUMP", sizeof(h->ValidDump))) { + *x64 =3D false; + } else if (!memcmp(h->ValidDump, "DU64", sizeof(h->ValidDump))) { + *x64 =3D true; + } else { + error_setg(errp, "win-dump: invalid header, expected 'DUMP' or 'DU= 64'," + " got '%.4s'", h->ValidDump); } } =20 -static void check_kdbg(WinDumpHeader64 *h, Error **errp) +static void check_kdbg(WinDumpHeader *h, bool x64, Error **errp) { const char OwnerTag[] =3D "KDBG"; char read_OwnerTag[4]; @@ -189,7 +203,7 @@ static void check_kdbg(WinDumpHeader64 *h, Error **errp) =20 try_again: if (cpu_memory_rw_debug(first_cpu, - KdDebuggerDataBlock + KDBG_OWNER_TAG_OFFSET64, + KdDebuggerDataBlock + KDBG_OWNER_TAG_OFFSET, (uint8_t *)&read_OwnerTag, sizeof(read_OwnerTag), 0)) { error_setg(errp, "win-dump: failed to read OwnerTag"); return; @@ -214,15 +228,19 @@ try_again: } } =20 - h->KdDebuggerDataBlock =3D KdDebuggerDataBlock; + if (x64) { + h->x64.KdDebuggerDataBlock =3D KdDebuggerDataBlock; + } else { + h->x32.KdDebuggerDataBlock =3D KdDebuggerDataBlock; + } } =20 struct saved_context { - WinContext64 ctx; + WinContext ctx; uint64_t addr; }; =20 -static void patch_and_save_context(WinDumpHeader64 *h, +static void patch_and_save_context(WinDumpHeader *h, bool x64, struct saved_context *saved_ctx, Error **errp) { @@ -232,15 +250,15 @@ static void patch_and_save_context(WinDumpHeader64 *h, CPUState *cpu; int i =3D 0; =20 - if (cpu_read_ptr(first_cpu, - KdDebuggerDataBlock + KDBG_KI_PROCESSOR_BLOCK_OFFSET64, + if (cpu_read_ptr(x64, first_cpu, + KdDebuggerDataBlock + KDBG_KI_PROCESSOR_BLOCK_OFFSET, &KiProcessorBlock)) { error_setg(errp, "win-dump: failed to read KiProcessorBlock"); return; } =20 if (cpu_memory_rw_debug(first_cpu, - KdDebuggerDataBlock + KDBG_OFFSET_PRCB_CONTEXT_OFFSET64, + KdDebuggerDataBlock + KDBG_OFFSET_PRCB_CONTEXT_OFFSET, (uint8_t *)&OffsetPrcbContext, sizeof(OffsetPrcbContext), 0)) { error_setg(errp, "win-dump: failed to read OffsetPrcbContext"); return; @@ -251,17 +269,17 @@ static void patch_and_save_context(WinDumpHeader64 *h, CPUX86State *env =3D &x86_cpu->env; uint64_t Prcb; uint64_t Context; - WinContext64 ctx; + WinContext ctx; =20 - if (cpu_read_ptr(first_cpu, - KiProcessorBlock + i * WIN_DUMP_PTR_SIZE, + if (cpu_read_ptr(x64, first_cpu, + KiProcessorBlock + i * win_dump_ptr_size(x64), &Prcb)) { error_setg(errp, "win-dump: failed to read" " CPU #%d PRCB location", i); return; } =20 - if (cpu_read_ptr(first_cpu, + if (cpu_read_ptr(x64, first_cpu, Prcb + OffsetPrcbContext, &Context)) { error_setg(errp, "win-dump: failed to read" @@ -271,56 +289,88 @@ static void patch_and_save_context(WinDumpHeader64 *h, =20 saved_ctx[i].addr =3D Context; =20 - ctx =3D (WinContext64){ - .ContextFlags =3D WIN_CTX64_ALL, - .MxCsr =3D env->mxcsr, - - .SegEs =3D env->segs[0].selector, - .SegCs =3D env->segs[1].selector, - .SegSs =3D env->segs[2].selector, - .SegDs =3D env->segs[3].selector, - .SegFs =3D env->segs[4].selector, - .SegGs =3D env->segs[5].selector, - .EFlags =3D cpu_compute_eflags(env), - - .Dr0 =3D env->dr[0], - .Dr1 =3D env->dr[1], - .Dr2 =3D env->dr[2], - .Dr3 =3D env->dr[3], - .Dr6 =3D env->dr[6], - .Dr7 =3D env->dr[7], - - .Rax =3D env->regs[R_EAX], - .Rbx =3D env->regs[R_EBX], - .Rcx =3D env->regs[R_ECX], - .Rdx =3D env->regs[R_EDX], - .Rsp =3D env->regs[R_ESP], - .Rbp =3D env->regs[R_EBP], - .Rsi =3D env->regs[R_ESI], - .Rdi =3D env->regs[R_EDI], - .R8 =3D env->regs[8], - .R9 =3D env->regs[9], - .R10 =3D env->regs[10], - .R11 =3D env->regs[11], - .R12 =3D env->regs[12], - .R13 =3D env->regs[13], - .R14 =3D env->regs[14], - .R15 =3D env->regs[15], - - .Rip =3D env->eip, - .FltSave =3D { + if (x64) { + ctx.x64 =3D (WinContext64){ + .ContextFlags =3D WIN_CTX64_ALL, .MxCsr =3D env->mxcsr, - }, - }; + + .SegEs =3D env->segs[0].selector, + .SegCs =3D env->segs[1].selector, + .SegSs =3D env->segs[2].selector, + .SegDs =3D env->segs[3].selector, + .SegFs =3D env->segs[4].selector, + .SegGs =3D env->segs[5].selector, + .EFlags =3D cpu_compute_eflags(env), + + .Dr0 =3D env->dr[0], + .Dr1 =3D env->dr[1], + .Dr2 =3D env->dr[2], + .Dr3 =3D env->dr[3], + .Dr6 =3D env->dr[6], + .Dr7 =3D env->dr[7], + + .Rax =3D env->regs[R_EAX], + .Rbx =3D env->regs[R_EBX], + .Rcx =3D env->regs[R_ECX], + .Rdx =3D env->regs[R_EDX], + .Rsp =3D env->regs[R_ESP], + .Rbp =3D env->regs[R_EBP], + .Rsi =3D env->regs[R_ESI], + .Rdi =3D env->regs[R_EDI], + .R8 =3D env->regs[8], + .R9 =3D env->regs[9], + .R10 =3D env->regs[10], + .R11 =3D env->regs[11], + .R12 =3D env->regs[12], + .R13 =3D env->regs[13], + .R14 =3D env->regs[14], + .R15 =3D env->regs[15], + + .Rip =3D env->eip, + .FltSave =3D { + .MxCsr =3D env->mxcsr, + }, + }; + } else { + ctx.x32 =3D (WinContext32){ + .ContextFlags =3D WIN_CTX32_FULL | WIN_CTX_DBG, + + .SegEs =3D env->segs[0].selector, + .SegCs =3D env->segs[1].selector, + .SegSs =3D env->segs[2].selector, + .SegDs =3D env->segs[3].selector, + .SegFs =3D env->segs[4].selector, + .SegGs =3D env->segs[5].selector, + .EFlags =3D cpu_compute_eflags(env), + + .Dr0 =3D env->dr[0], + .Dr1 =3D env->dr[1], + .Dr2 =3D env->dr[2], + .Dr3 =3D env->dr[3], + .Dr6 =3D env->dr[6], + .Dr7 =3D env->dr[7], + + .Eax =3D env->regs[R_EAX], + .Ebx =3D env->regs[R_EBX], + .Ecx =3D env->regs[R_ECX], + .Edx =3D env->regs[R_EDX], + .Esp =3D env->regs[R_ESP], + .Ebp =3D env->regs[R_EBP], + .Esi =3D env->regs[R_ESI], + .Edi =3D env->regs[R_EDI], + + .Eip =3D env->eip, + }; + } =20 if (cpu_memory_rw_debug(first_cpu, Context, - &saved_ctx[i].ctx, WIN_DUMP_CTX_SIZE, 0)) { + &saved_ctx[i].ctx, win_dump_ctx_size(x64), 0)) { error_setg(errp, "win-dump: failed to save CPU #%d context", i= ); return; } =20 if (cpu_memory_rw_debug(first_cpu, Context, - &ctx, WIN_DUMP_CTX_SIZE, 1)) { + &ctx, win_dump_ctx_size(x64), 1)) { error_setg(errp, "win-dump: failed to write CPU #%d context", = i); return; } @@ -329,14 +379,14 @@ static void patch_and_save_context(WinDumpHeader64 *h, } } =20 -static void restore_context(WinDumpHeader64 *h, +static void restore_context(WinDumpHeader *h, bool x64, struct saved_context *saved_ctx) { int i; =20 for (i =3D 0; i < WIN_DUMP_FIELD(NumberProcessors); i++) { if (cpu_memory_rw_debug(first_cpu, saved_ctx[i].addr, - &saved_ctx[i].ctx, WIN_DUMP_CTX_SIZE, 1)) { + &saved_ctx[i].ctx, win_dump_ctx_size(x64), 1)) { warn_report("win-dump: failed to restore CPU #%d context", i); } } @@ -344,25 +394,28 @@ static void restore_context(WinDumpHeader64 *h, =20 void create_win_dump(DumpState *s, Error **errp) { - WinDumpHeader64 *h =3D (WinDumpHeader64 *)(s->guest_note + - VMCOREINFO_ELF_NOTE_HDR_SIZE); + WinDumpHeader *h =3D (void *)(s->guest_note + VMCOREINFO_ELF_NOTE_HDR_= SIZE); X86CPU *first_x86_cpu =3D X86_CPU(first_cpu); uint64_t saved_cr3 =3D first_x86_cpu->env.cr[3]; struct saved_context *saved_ctx =3D NULL; Error *local_err =3D NULL; + bool x64; + size_t hdr_size; =20 - if (s->guest_note_size !=3D sizeof(WinDumpHeader64) + - VMCOREINFO_ELF_NOTE_HDR_SIZE) { + if (s->guest_note_size !=3D VMCOREINFO_WIN_DUMP_NOTE_SIZE32 && + s->guest_note_size !=3D VMCOREINFO_WIN_DUMP_NOTE_SIZE64) { error_setg(errp, "win-dump: invalid vmcoreinfo note size"); return; } =20 - check_header(h, &local_err); + check_header(h, &x64, &local_err); if (local_err) { error_propagate(errp, local_err); return; } =20 + hdr_size =3D x64 ? sizeof(WinDumpHeader64) : sizeof(WinDumpHeader32); + /* * Further access to kernel structures by virtual addresses * should be made from system context. @@ -370,13 +423,13 @@ void create_win_dump(DumpState *s, Error **errp) =20 first_x86_cpu->env.cr[3] =3D WIN_DUMP_FIELD(DirectoryTableBase); =20 - check_kdbg(h, &local_err); + check_kdbg(h, x64, &local_err); if (local_err) { error_propagate(errp, local_err); goto out_cr3; } =20 - patch_header(h); + patch_header(h, x64); =20 saved_ctx =3D g_new(struct saved_context, WIN_DUMP_FIELD(NumberProcess= ors)); =20 @@ -385,7 +438,7 @@ void create_win_dump(DumpState *s, Error **errp) * to determine if the system-saved context is valid */ =20 - patch_and_save_context(h, saved_ctx, &local_err); + patch_and_save_context(h, x64, saved_ctx, &local_err); if (local_err) { error_propagate(errp, local_err); goto out_free; @@ -393,20 +446,20 @@ void create_win_dump(DumpState *s, Error **errp) =20 s->total_size =3D WIN_DUMP_FIELD(RequiredDumpSpace); =20 - s->written_size =3D qemu_write_full(s->fd, h, sizeof(*h)); - if (s->written_size !=3D sizeof(*h)) { + s->written_size =3D qemu_write_full(s->fd, h, hdr_size); + if (s->written_size !=3D hdr_size) { error_setg(errp, QERR_IO_ERROR); goto out_restore; } =20 - write_runs(s, h, &local_err); + write_runs(s, h, x64, &local_err); if (local_err) { error_propagate(errp, local_err); goto out_restore; } =20 out_restore: - restore_context(h, saved_ctx); + restore_context(h, x64, saved_ctx); out_free: g_free(saved_ctx); out_cr3: diff --git a/hmp-commands.hx b/hmp-commands.hx index 8476277aa9..dd4006d355 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1064,7 +1064,7 @@ ERST "-l: dump in kdump-compressed format, with lzo compr= ession.\n\t\t\t" "-s: dump in kdump-compressed format, with snappy co= mpression.\n\t\t\t" "-w: dump in Windows crashdump format (can be used i= nstead of ELF-dump converting),\n\t\t\t" - " for Windows x64 guests with vmcoreinfo driver o= nly.\n\t\t\t" + " for Windows x86 and x64 guests with vmcoreinfo = driver only.\n\t\t\t" "begin: the starting physical address.\n\t\t\t" "length: the memory size, in bytes.", .cmd =3D hmp_dump_guest_memory, --=20 2.35.1