From patchwork Wed Sep 13 14:20:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 813471 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xskSZ6kRXz9sNr for ; Thu, 14 Sep 2017 00:24:30 +1000 (AEST) Received: from localhost ([::1]:42789 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ds8ab-0007Tp-0R for incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 10:24:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35538) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ds8X8-0004bm-Kr for qemu-devel@nongnu.org; Wed, 13 Sep 2017 10:21:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ds8X5-0003Qr-GE for qemu-devel@nongnu.org; Wed, 13 Sep 2017 10:20:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52114) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ds8Wz-0003MC-6J; Wed, 13 Sep 2017 10:20:45 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DFB3A5D5EA; Wed, 13 Sep 2017 14:20:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DFB3A5D5EA Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=lvivier@redhat.com Received: from thinkpad.redhat.com (ovpn-116-49.ams2.redhat.com [10.36.116.49]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4FC1117F48; Wed, 13 Sep 2017 14:20:41 +0000 (UTC) From: Laurent Vivier To: "Dr . David Alan Gilbert" , qemu-devel@nongnu.org Date: Wed, 13 Sep 2017 16:20:33 +0200 Message-Id: <20170913142036.2469-2-lvivier@redhat.com> In-Reply-To: <20170913142036.2469-1-lvivier@redhat.com> References: <20170913142036.2469-1-lvivier@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 13 Sep 2017 14:20:44 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 1/4] hmp: fix "dump-quest-memory" segfault (ppc) 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: Laurent Vivier , Peter Maydell , Thomas Huth , Cornelia Huck , Greg Kurz , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Running QEMU with qemu-system-ppc64 -M none -nographic -m 256 and executing dump-guest-memory /dev/null 0 8192 results in segfault Fix by checking if we have CPU, and exit with error if there is no CPU: (qemu) dump-guest-memory /dev/null this feature or command is not currently supported Signed-off-by: Laurent Vivier Reviewed-by: Greg Kurz Reviewed-by: Thomas Huth Acked-by: David Gibson --- target/ppc/arch_dump.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/target/ppc/arch_dump.c b/target/ppc/arch_dump.c index 8e9397aa58..95b9ab6f29 100644 --- a/target/ppc/arch_dump.c +++ b/target/ppc/arch_dump.c @@ -224,8 +224,15 @@ typedef struct NoteFuncDescStruct NoteFuncDesc; int cpu_get_dump_info(ArchDumpInfo *info, const struct GuestPhysBlockList *guest_phys_blocks) { - PowerPCCPU *cpu = POWERPC_CPU(first_cpu); - PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu); + PowerPCCPU *cpu; + PowerPCCPUClass *pcc; + + if (first_cpu == NULL) { + return -1; + } + + cpu = POWERPC_CPU(first_cpu); + pcc = POWERPC_CPU_GET_CLASS(cpu); info->d_machine = PPC_ELF_MACHINE; info->d_class = ELFCLASS; From patchwork Wed Sep 13 14:20:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 813468 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xskPY5gcLz9sNr for ; Thu, 14 Sep 2017 00:21:53 +1000 (AEST) Received: from localhost ([::1]:42777 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ds8Y3-0004hb-Pr for incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 10:21:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35599) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ds8XD-0004eq-5U for qemu-devel@nongnu.org; Wed, 13 Sep 2017 10:21:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ds8XC-0003Xj-6o for qemu-devel@nongnu.org; Wed, 13 Sep 2017 10:20:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55396) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ds8X1-0003Nn-S2; Wed, 13 Sep 2017 10:20:48 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DD5E47EA84; Wed, 13 Sep 2017 14:20:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DD5E47EA84 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=lvivier@redhat.com Received: from thinkpad.redhat.com (ovpn-116-49.ams2.redhat.com [10.36.116.49]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4DC866062A; Wed, 13 Sep 2017 14:20:44 +0000 (UTC) From: Laurent Vivier To: "Dr . David Alan Gilbert" , qemu-devel@nongnu.org Date: Wed, 13 Sep 2017 16:20:34 +0200 Message-Id: <20170913142036.2469-3-lvivier@redhat.com> In-Reply-To: <20170913142036.2469-1-lvivier@redhat.com> References: <20170913142036.2469-1-lvivier@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 13 Sep 2017 14:20:47 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 2/4] hmp: fix "dump-quest-memory" segfault (arm) 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: Laurent Vivier , Peter Maydell , Thomas Huth , Cornelia Huck , Greg Kurz , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Running QEMU with qemu-system-aarch64 -M none -nographic -m 256 and executing dump-guest-memory /dev/null 0 8192 results in segfault Fix by checking if we have CPU, and exit with error if there is no CPU: (qemu) dump-guest-memory /dev/null this feature or command is not currently supported Signed-off-by: Laurent Vivier Reviewed-by: Thomas Huth Reviewed-by: Greg Kurz Reviewed-by: Eric Auger Tested-by: Eric Auger --- target/arm/arch_dump.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/target/arm/arch_dump.c b/target/arm/arch_dump.c index 1a9861f69b..9e5b2fb31c 100644 --- a/target/arm/arch_dump.c +++ b/target/arm/arch_dump.c @@ -273,11 +273,18 @@ int arm_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs, int cpu_get_dump_info(ArchDumpInfo *info, const GuestPhysBlockList *guest_phys_blocks) { - ARMCPU *cpu = ARM_CPU(first_cpu); - CPUARMState *env = &cpu->env; + ARMCPU *cpu; + CPUARMState *env; GuestPhysBlock *block; hwaddr lowest_addr = ULLONG_MAX; + if (first_cpu == NULL) { + return -1; + } + + cpu = ARM_CPU(first_cpu); + env = &cpu->env; + /* Take a best guess at the phys_base. If we get it wrong then crash * will need '--machdep phys_offset=' added to its command * line, which isn't any worse than assuming we can use zero, but being From patchwork Wed Sep 13 14:20:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 813472 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xskVb1596z9sNr for ; Thu, 14 Sep 2017 00:26:15 +1000 (AEST) Received: from localhost ([::1]:42803 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ds8cH-0000v1-8y for incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 10:26:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35643) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ds8XJ-0004jW-NB for qemu-devel@nongnu.org; Wed, 13 Sep 2017 10:21:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ds8XG-0003bN-Qj for qemu-devel@nongnu.org; Wed, 13 Sep 2017 10:21:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56052) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ds8X6-0003RA-Hs; Wed, 13 Sep 2017 10:20:52 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9DE69C04B94B; Wed, 13 Sep 2017 14:20:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9DE69C04B94B Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=lvivier@redhat.com Received: from thinkpad.redhat.com (ovpn-116-49.ams2.redhat.com [10.36.116.49]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F2096F993; Wed, 13 Sep 2017 14:20:47 +0000 (UTC) From: Laurent Vivier To: "Dr . David Alan Gilbert" , qemu-devel@nongnu.org Date: Wed, 13 Sep 2017 16:20:35 +0200 Message-Id: <20170913142036.2469-4-lvivier@redhat.com> In-Reply-To: <20170913142036.2469-1-lvivier@redhat.com> References: <20170913142036.2469-1-lvivier@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 13 Sep 2017 14:20:51 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 3/4] dump: do not dump non-existent guest memory 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: Peter Maydell , Thomas Huth , Cornelia Huck , Greg Kurz , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Cornelia Huck It does not really make sense to dump memory that is not there. Moreover, that fixes a segmentation fault when calling dump-guest-memory with no filter for a machine with no memory defined. New behaviour is: (qemu) dump-guest-memory /dev/null dump: no guest memory to dump (qemu) dump-guest-memory /dev/null 0 4096 dump: no guest memory to dump Signed-off-by: Cornelia Huck Tested-by: Laurent Vivier Reviewed-by: Laurent Vivier Reviewed-by: Greg Kurz Reviewed-by: Peter Xu Signed-off-by: Laurent Vivier --- dump.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dump.c b/dump.c index a79773d0f7..d2093e141b 100644 --- a/dump.c +++ b/dump.c @@ -1536,6 +1536,12 @@ static void dump_init(DumpState *s, int fd, bool has_format, fprintf(stderr, "DUMP: total memory to dump: %lu\n", s->total_size); #endif + /* it does not make sense to dump non-existent memory */ + if (!s->total_size) { + error_setg(errp, "dump: no guest memory to dump"); + goto cleanup; + } + s->start = get_start_block(s); if (s->start == -1) { error_setg(errp, QERR_INVALID_PARAMETER, "begin"); From patchwork Wed Sep 13 14:20:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 813469 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xskPh0d1Xz9sNr for ; Thu, 14 Sep 2017 00:22:00 +1000 (AEST) Received: from localhost ([::1]:42778 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ds8YA-0004r5-3Z for incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 10:21:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ds8XJ-0004jc-Pt for qemu-devel@nongnu.org; Wed, 13 Sep 2017 10:21:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ds8XD-0003Yr-Rv for qemu-devel@nongnu.org; Wed, 13 Sep 2017 10:21:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35264) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ds8XB-0003VR-Fx; Wed, 13 Sep 2017 10:20:57 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8A1AD4A6FC; Wed, 13 Sep 2017 14:20:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8A1AD4A6FC Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=lvivier@redhat.com Received: from thinkpad.redhat.com (ovpn-116-49.ams2.redhat.com [10.36.116.49]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1039D17F58; Wed, 13 Sep 2017 14:20:51 +0000 (UTC) From: Laurent Vivier To: "Dr . David Alan Gilbert" , qemu-devel@nongnu.org Date: Wed, 13 Sep 2017 16:20:36 +0200 Message-Id: <20170913142036.2469-5-lvivier@redhat.com> In-Reply-To: <20170913142036.2469-1-lvivier@redhat.com> References: <20170913142036.2469-1-lvivier@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 13 Sep 2017 14:20:56 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 4/4] tests/hmp: test "none" machine with memory 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: Laurent Vivier , Peter Maydell , Thomas Huth , Cornelia Huck , Greg Kurz , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" and add a test case of dump-guest-memory without "[begin length]" parameters. Signed-off-by: Laurent Vivier Reviewed-by: Thomas Huth Reviewed-by: Cornelia Huck --- tests/test-hmp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/test-hmp.c b/tests/test-hmp.c index 729c0339f7..d124e81850 100644 --- a/tests/test-hmp.c +++ b/tests/test-hmp.c @@ -35,6 +35,7 @@ static const char *hmp_cmds[] = { "mouse_button 0", "device_del mouse1", "dump-guest-memory /dev/null 0 4096", + "dump-guest-memory /dev/null", "gdbserver", "host_net_add user id=net0", "hostfwd_add tcp::43210-:43210", @@ -159,5 +160,8 @@ int main(int argc, char **argv) qtest_cb_for_every_machine(add_machine_test_case); + /* as none machine has no memory by default, add a test case with memory */ + qtest_add_data_func("hmp/none+2MB", g_strdup("none -m 2"), test_machine); + return g_test_run(); }