From patchwork Fri Sep 12 04:42:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikunj A Dadhania X-Patchwork-Id: 388485 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 D6E2E14013B for ; Fri, 12 Sep 2014 14:44:19 +1000 (EST) Received: from localhost ([::1]:42593 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSIiX-0000Uq-Py for incoming@patchwork.ozlabs.org; Fri, 12 Sep 2014 00:44:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46075) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSIi4-0008JB-EI for qemu-devel@nongnu.org; Fri, 12 Sep 2014 00:43:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XSIhv-0008TG-Bg for qemu-devel@nongnu.org; Fri, 12 Sep 2014 00:43:48 -0400 Received: from e23smtp01.au.ibm.com ([202.81.31.143]:43211) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSIhu-0008P2-Ow for qemu-devel@nongnu.org; Fri, 12 Sep 2014 00:43:39 -0400 Received: from /spool/local by e23smtp01.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 12 Sep 2014 14:43:14 +1000 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp01.au.ibm.com (202.81.31.207) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 12 Sep 2014 14:43:11 +1000 Received: from d23relay07.au.ibm.com (d23relay07.au.ibm.com [9.190.26.37]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 14A512BB0040; Fri, 12 Sep 2014 14:43:11 +1000 (EST) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay07.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id s8C4iPfA29622296; Fri, 12 Sep 2014 14:44:25 +1000 Received: from d23av04.au.ibm.com (localhost [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s8C4hAfO009701; Fri, 12 Sep 2014 14:43:10 +1000 Received: from abhimanyu.in.ibm.com ([9.79.177.212]) by d23av04.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s8C4h7Gt009648; Fri, 12 Sep 2014 14:43:08 +1000 From: Nikunj A Dadhania To: qemu-devel@nongnu.org, agraf@suse.de Date: Fri, 12 Sep 2014 10:12:55 +0530 Message-Id: <1410496975-13257-1-git-send-email-nikunj@linux.vnet.ibm.com> X-Mailer: git-send-email 1.8.3.1 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14091204-1618-0000-0000-000000E1E557 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 202.81.31.143 Cc: aik@ozlabs.ru, qemu-ppc@nongnu.org, nikunj@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH] Skip vfio mmap bar regions during memory dump X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The PCI MMIO might be disabled or the device in the reset state. Make sure we do not dump these memory regions. Signed-off-by: Nikunj A Dadhania --- hw/misc/vfio.c | 2 +- include/exec/memory.h | 27 +++++++++++++++++++++++++++ memory.c | 16 ++++++++++++++++ memory_mapping.c | 3 ++- 4 files changed, 46 insertions(+), 2 deletions(-) diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c index d69bb29..fd6dbe9 100644 --- a/hw/misc/vfio.c +++ b/hw/misc/vfio.c @@ -2721,7 +2721,7 @@ static int vfio_mmap_bar(VFIODevice *vdev, VFIOBAR *bar, goto empty_region; } - memory_region_init_ram_ptr(submem, OBJECT(vdev), name, size, *map); + memory_region_init_vfio_mmap(submem, OBJECT(vdev), name, size, *map); } else { empty_region: /* Create a zero sized sub-region to make cleanup easy. */ diff --git a/include/exec/memory.h b/include/exec/memory.h index fc6e93d..e184df6 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -144,6 +144,7 @@ struct MemoryRegion { bool terminates; bool romd_mode; bool ram; + bool vfio_mmap; bool readonly; /* For RAM regions */ bool enabled; bool rom_device; @@ -329,6 +330,23 @@ void memory_region_init_ram_ptr(MemoryRegion *mr, void *ptr); /** + * memory_region_init_vfio_mmap: Initialize VFIO mmap memory region from a + * user-provided pointer. Accesses into the + * region will modify memory directly. + * + * @mr: the #MemoryRegion to be initialized. + * @owner: the object that tracks the region's reference count + * @name: the name of the region. + * @size: size of the region. + * @ptr: memory to be mapped; must contain at least @size bytes. + */ +void memory_region_init_vfio_mmap(MemoryRegion *mr, + struct Object *owner, + const char *name, + uint64_t size, + void *ptr); + +/** * memory_region_init_alias: Initialize a memory region that aliases all or a * part of another memory region. * @@ -434,6 +452,15 @@ uint64_t memory_region_size(MemoryRegion *mr); bool memory_region_is_ram(MemoryRegion *mr); /** + * memory_region_is_vfio_mmap: check whether a memory region is VFIO mmap + * + * Returns %true is a memory region is VFIO. + * + * @mr: the memory region being queried + */ +bool memory_region_is_vfio_mmap(MemoryRegion *mr); + +/** * memory_region_is_romd: check whether a memory region is in ROMD mode * * Returns %true if a memory region is a ROM device and currently set to allow diff --git a/memory.c b/memory.c index 664d3e6..63eadaa 100644 --- a/memory.c +++ b/memory.c @@ -847,6 +847,7 @@ void memory_region_init(MemoryRegion *mr, mr->enabled = true; mr->terminates = false; mr->ram = false; + mr->vfio_mmap = false; mr->romd_mode = true; mr->readonly = false; mr->rom_device = false; @@ -1032,6 +1033,16 @@ void memory_region_init_ram_ptr(MemoryRegion *mr, mr->ram_addr = qemu_ram_alloc_from_ptr(size, ptr, mr); } +void memory_region_init_vfio_mmap(MemoryRegion *mr, + Object *owner, + const char *name, + uint64_t size, + void *ptr) +{ + memory_region_init_ram_ptr(mr, owner, name, size, ptr); + mr->vfio_mmap = true; +} + void memory_region_init_alias(MemoryRegion *mr, Object *owner, const char *name, @@ -1129,6 +1140,11 @@ bool memory_region_is_ram(MemoryRegion *mr) return mr->ram; } +bool memory_region_is_vfio_mmap(MemoryRegion *mr) +{ + return mr->vfio_mmap; +} + bool memory_region_is_logging(MemoryRegion *mr) { return mr->dirty_log_mask; diff --git a/memory_mapping.c b/memory_mapping.c index 87a6ed5..64ef46d 100644 --- a/memory_mapping.c +++ b/memory_mapping.c @@ -203,7 +203,8 @@ static void guest_phys_blocks_region_add(MemoryListener *listener, GuestPhysBlock *predecessor; /* we only care about RAM */ - if (!memory_region_is_ram(section->mr)) { + if (!memory_region_is_ram(section->mr) || + memory_region_is_vfio_mmap(section->mr)) { return; }