[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 11/11] memory: ref/unref memory across address_sp
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 11/11] memory: ref/unref memory across address_space_map/unmap |
Date: |
Fri, 28 Jun 2013 18:58:22 +0200 |
The iothread mutex might be released between map and unmap, so the
mapped region might disappear.
Signed-off-by: Paolo Bonzini <address@hidden>
---
exec.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/exec.c b/exec.c
index ea79aea..d28403b 100644
--- a/exec.c
+++ b/exec.c
@@ -1994,6 +1994,7 @@ void cpu_physical_memory_write_rom(hwaddr addr,
}
typedef struct {
+ MemoryRegion *mr;
void *buffer;
hwaddr addr;
hwaddr len;
@@ -2091,6 +2092,9 @@ void *address_space_map(AddressSpace *as,
bounce.buffer = qemu_memalign(TARGET_PAGE_SIZE, TARGET_PAGE_SIZE);
bounce.addr = addr;
bounce.len = l;
+
+ memory_region_ref(mr);
+ bounce.mr = mr;
if (!is_write) {
address_space_read(as, addr, bounce.buffer, l);
}
@@ -2117,6 +2121,7 @@ void *address_space_map(AddressSpace *as,
}
}
+ memory_region_ref(mr);
*plen = done;
return qemu_ram_ptr_length(raddr + base, plen);
}
@@ -2129,9 +2134,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;
@@ -2145,6 +2153,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) {
@@ -2152,6 +2161,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
- [Qemu-devel] [PATCH v2 00/11] Memory patches, part 4: region ownership, Paolo Bonzini, 2013/06/28
- [Qemu-devel] [PATCH v2 02/11] memory: destroy phys_sections one by one, Paolo Bonzini, 2013/06/28
- [Qemu-devel] [PATCH v2 03/11] exec: simplify destruction of the phys map, Paolo Bonzini, 2013/06/28
- [Qemu-devel] [PATCH v2 04/11] memory: add getter for owner, Paolo Bonzini, 2013/06/28
- [Qemu-devel] [PATCH v2 07/11] exec: check MRU in qemu_ram_addr_from_host, Paolo Bonzini, 2013/06/28
- [Qemu-devel] [PATCH v2 05/11] memory: add ref/unref, Paolo Bonzini, 2013/06/28
- [Qemu-devel] [PATCH v2 06/11] memory: add ref/unref calls, Paolo Bonzini, 2013/06/28
- [Qemu-devel] [PATCH v2 08/11] exec: move qemu_ram_addr_from_host_nofail to cputlb.c, Paolo Bonzini, 2013/06/28
- [Qemu-devel] [PATCH v2 09/11] memory: return MemoryRegion from qemu_ram_addr_from_host, Paolo Bonzini, 2013/06/28
- [Qemu-devel] [PATCH v2 10/11] exec: reorganize address_space_map, Paolo Bonzini, 2013/06/28
- [Qemu-devel] [PATCH v2 11/11] memory: ref/unref memory across address_space_map/unmap,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 01/11] memory: add owner argument to initialization functions, Paolo Bonzini, 2013/06/28