OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

exec: reorganize address_space_map

Browse Source 
First of all, rename "todo" to "done".

Second, clearly separate the case of done == 0 with the case of done != 0.
This will help handling reference counting in the next patch.

Third, this test:

             if (memory_region_get_ram_addr(mr) + xlat != raddr + todo) {

does not guarantee that the memory region is the same across two iterations
of the while loop.  For example, you could have two blocks:

A) size 640 K, mapped at physical address 0, ram_addr_t 0
B) size 64 K, mapped at physical address 0xa0000, ram_addr_t 0xa0000

then mapping 1 M starting at physical address zero will erroneously treat
B as the continuation of block A.  qemu_ram_ptr_length ensures that no
invalid memory is accessed, but it is still a pointless complication of
the algorithm.  The patch makes the logic clearer with an explicit test
that the memory region is the same.

Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-06-28 17:29:27 +02:00
parent 1b5ec23467
commit e3127ae0cd
1 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
exec.c
View File

@ -2065,20 +2065,20 @@ void *address_space_map(AddressSpace *as,
bool is_write) bool is_write)
{ {
hwaddr len = *plen; hwaddr len = *plen;
hwaddr todo = 0; hwaddr done = 0;
hwaddr l, xlat; hwaddr l, xlat, base;
MemoryRegion *mr; MemoryRegion *mr, *this_mr;
ram_addr_t raddr = RAM_ADDR_MAX; ram_addr_t raddr;
ram_addr_t rlen;
void *ret; if (len == 0) {
return NULL;
}
while (len > 0) {
l = len; l = len;
mr = address_space_translate(as, addr, &xlat, &l, is_write); mr = address_space_translate(as, addr, &xlat, &l, is_write);
if (!memory_access_is_direct(mr, is_write)) { if (!memory_access_is_direct(mr, is_write)) {
if (todo || bounce.buffer) { if (bounce.buffer) {
break; return NULL;
} }
bounce.buffer = qemu_memalign(TARGET_PAGE_SIZE, TARGET_PAGE_SIZE); bounce.buffer = qemu_memalign(TARGET_PAGE_SIZE, TARGET_PAGE_SIZE);
bounce.addr = addr; bounce.addr = addr;
@ -2090,22 +2090,27 @@ void *address_space_map(AddressSpace *as,
*plen = l; *plen = l;
return bounce.buffer; return bounce.buffer;
} }
if (!todo) {
raddr = memory_region_get_ram_addr(mr) + xlat; base = xlat;
} else { raddr = memory_region_get_ram_addr(mr);
if (memory_region_get_ram_addr(mr) + xlat != raddr + todo) {
for (;;) {
len -= l;
addr += l;
done += l;
if (len == 0) {
break;
}
l = len;
this_mr = address_space_translate(as, addr, &xlat, &l, is_write);
if (this_mr != mr || xlat != base + done) {
break; break;
} }
} }
len -= l; *plen = done;
addr += l; return qemu_ram_ptr_length(raddr + base, plen);
todo += l;
}
rlen = todo;
ret = qemu_ram_ptr_length(raddr, &rlen);
*plen = rlen;
return ret;
} }
/* Unmaps a memory region previously mapped by address_space_map(). /* Unmaps a memory region previously mapped by address_space_map().