From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDAIj-00055T-2L for qemu-devel@nongnu.org; Thu, 09 Jul 2015 07:47:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZDAIh-0005kM-Sr for qemu-devel@nongnu.org; Thu, 09 Jul 2015 07:47:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41559) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDAIh-0005kH-OH for qemu-devel@nongnu.org; Thu, 09 Jul 2015 07:47:35 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 5BF4D3A811F for ; Thu, 9 Jul 2015 11:47:35 +0000 (UTC) From: Igor Mammedov Date: Thu, 9 Jul 2015 13:47:23 +0200 Message-Id: <1436442444-132020-7-git-send-email-imammedo@redhat.com> In-Reply-To: <1436442444-132020-1-git-send-email-imammedo@redhat.com> References: <1436442444-132020-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH v4 6/7] exec: add qemu_ram_unmap_hva() API for unmapping memory from HVA area List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mst@redhat.com it will allow to return atomically return RAMBlock's host address range into continuos HVA area so that no hole would appear in there. also mark RAMBlock with RAM_PREALLOC flag so it won't be umapped as conventional memory by reclaim_ramblock()->qemu_anon_ram_free() Signed-off-by: Igor Mammedov --- v2: * add madvise(DONTNEED) on unmapping --- exec.c | 12 ++++++++++++ include/exec/cpu-common.h | 1 + 2 files changed, 13 insertions(+) diff --git a/exec.c b/exec.c index 08767ab..70ced86 100644 --- a/exec.c +++ b/exec.c @@ -1346,11 +1346,23 @@ void *qemu_ram_reserve_hva(ram_addr_t length) MAP_NORESERVE | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); } +void qemu_ram_unmap_hva(ram_addr_t addr) +{ + RAMBlock *block = find_ram_block(addr); + + assert(block); + mmap(block->host, block->used_length, PROT_NONE, + MAP_FIXED | MAP_NORESERVE | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); + qemu_madvise(block->host, block->used_length, QEMU_MADV_DONTNEED); +} + void qemu_ram_remap_hva(ram_addr_t addr, void *new_hva) { RAMBlock *block = find_ram_block(addr); assert(block); + assert(!(block->flags & RAM_PREALLOC)); + block->flags |= RAM_PREALLOC; block->host = mremap(block->host, block->used_length, block->used_length, MREMAP_MAYMOVE | MREMAP_FIXED, new_hva); diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 301f50b..4da5cd7 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -64,6 +64,7 @@ typedef uint32_t CPUReadMemoryFunc(void *opaque, hwaddr addr); void qemu_ram_remap(ram_addr_t addr, ram_addr_t length); void *qemu_ram_reserve_hva(ram_addr_t length); void qemu_ram_remap_hva(ram_addr_t addr, void *new_hva); +void qemu_ram_unmap_hva(ram_addr_t addr); /* This should not be used by devices. */ MemoryRegion *qemu_ram_addr_from_host(void *ptr, ram_addr_t *ram_addr); void qemu_ram_set_idstr(ram_addr_t addr, const char *name, DeviceState *dev); -- 1.8.3.1