From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33047) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UrRCI-0007LW-T3 for qemu-devel@nongnu.org; Tue, 25 Jun 2013 07:14:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UrRCH-0000Ha-NG for qemu-devel@nongnu.org; Tue, 25 Jun 2013 07:14:06 -0400 Received: from mail-ea0-x236.google.com ([2a00:1450:4013:c01::236]:44492) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UrRCH-0000HR-8B for qemu-devel@nongnu.org; Tue, 25 Jun 2013 07:14:05 -0400 Received: by mail-ea0-f182.google.com with SMTP id d10so6777568eaj.41 for ; Tue, 25 Jun 2013 04:14:04 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 25 Jun 2013 13:13:27 +0200 Message-Id: <1372158807-19715-12-git-send-email-pbonzini@redhat.com> In-Reply-To: <1372158807-19715-1-git-send-email-pbonzini@redhat.com> References: <1372158807-19715-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 11/11] memory: ref/unref memory across address_space_map/unmap List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org The iothread mutex might be released between map and unmap, so the mapped region might disappear. Signed-off-by: Paolo Bonzini --- exec.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index 62c2f90..db91f87 100644 --- a/exec.c +++ b/exec.c @@ -2023,6 +2023,7 @@ void cpu_physical_memory_write_rom(hwaddr addr, } typedef struct { + MemoryRegion *mr; void *buffer; hwaddr addr; hwaddr len; @@ -2120,15 +2121,18 @@ void *address_space_map(AddressSpace *as, bounce.buffer = qemu_memalign(TARGET_PAGE_SIZE, TARGET_PAGE_SIZE); bounce.addr = addr; bounce.len = l; + bounce.mr = mr; if (!is_write) { address_space_read(as, addr, bounce.buffer, l); } *plen = l; + memory_region_ref(mr); return bounce.buffer; } if (!todo) { raddr = memory_region_get_ram_addr(mr) + xlat; + memory_region_ref(mr); } else { if (memory_region_get_ram_addr(mr) + xlat != raddr + todo) { memory_region_unref(mr); @@ -2155,9 +2159,12 @@ void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len, int is_write, hwaddr access_len) { if (buffer != bounce.buffer) { + MemoryRegion *mr; + ram_addr_t addr1; + + mr = qemu_ram_addr_from_host(buffer, &addr1); + assert(mr); if (is_write) { - ram_addr_t addr1; - qemu_ram_addr_from_host(buffer, &addr1); while (access_len) { unsigned l; l = TARGET_PAGE_SIZE; @@ -2171,6 +2178,7 @@ void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len, if (xen_enabled()) { xen_invalidate_map_cache_entry(buffer); } + memory_region_unref(mr); return; } if (is_write) { @@ -2178,6 +2186,7 @@ void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len, } qemu_vfree(bounce.buffer); bounce.buffer = NULL; + memory_region_unref(bounce.mr); cpu_notify_map_clients(); } -- 1.8.1.4