[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/11] memory: ref/unref memory across address_space
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 11/11] memory: ref/unref memory across address_space_map/unmap |
Date: |
Tue, 25 Jun 2013 13:13:27 +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 | 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
- [Qemu-devel] [PATCH 02/11] memory: destroy phys_sections one by one, (continued)
- [Qemu-devel] [PATCH 02/11] memory: destroy phys_sections one by one, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 03/11] exec: simplify destruction of the phys map, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 05/11] memory: add ref/unref, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 04/11] memory: add getter for owner, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 06/11] memory: add ref/unref calls, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 07/11] exec: add a reference to the region returned by address_space_translate, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 08/11] exec: check MRU in qemu_ram_addr_from_host, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 09/11] exec: move qemu_ram_addr_from_host_nofail to cputlb.c, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 11/11] memory: ref/unref memory across address_space_map/unmap,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 10/11] memory: return MemoryRegion from qemu_ram_addr_from_host, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 01/11] memory: add owner argument to initialization functions, Paolo Bonzini, 2013/06/25
- Re: [Qemu-devel] [PATCH 00/11] Memory patches, part 4: region ownership, Jan Kiszka, 2013/06/28