mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

address_space_translate: do not cross page boundaries

Browse Source 
The following commit:

commit 149f54b53b
Author: Paolo Bonzini <pbonzini@redhat.com>
Date:   Fri May 24 12:59:37 2013 +0200

    memory: add address_space_translate

breaks Xen support in QEMU, in particular the Xen mapcache. The effect
is that one Windows XP installation out of ten would end up with BSOD.

The reason is that after this commit l in address_space_rw can span a
page boundary, however qemu_get_ram_ptr still calls xen_map_cache asking
to map a single page (if block->offset == 0).

Fix the issue by reverting to the previous behaviour: do not return a
length from address_space_translate_internal that can span a page
boundary.

Also in address_space_translate do not ignore the length returned by
address_space_translate_internal.

This patch should be backported to QEMU 1.6.x.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Anthony Perard <anthony.perard@citrix.com>
Tested-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-stable@nongnu.org
This commit is contained in:
Stefano Stabellini 2014-01-30 12:46:05 +00:00 committed by Stefano Stabellini
parent 0169c51155
commit 360e607b88
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
exec.c
View File

@ -325,7 +325,7 @@ address_space_translate_internal(AddressSpaceDispatch *d, hwaddr addr, hwaddr *x
hwaddr *plen, bool resolve_subpage) hwaddr *plen, bool resolve_subpage)
{ {
MemoryRegionSection *section; MemoryRegionSection *section;
Int128 diff; Int128 diff, diff_page;
section = address_space_lookup_region(d, addr, resolve_subpage); section = address_space_lookup_region(d, addr, resolve_subpage);
/* Compute offset within MemoryRegionSection */ /* Compute offset within MemoryRegionSection */
@ -334,7 +334,9 @@ address_space_translate_internal(AddressSpaceDispatch *d, hwaddr addr, hwaddr *x
/* Compute offset within MemoryRegion */ /* Compute offset within MemoryRegion */
*xlat = addr + section->offset_within_region; *xlat = addr + section->offset_within_region;
diff_page = int128_make64(((addr & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE) - addr);
diff = int128_sub(section->mr->size, int128_make64(addr)); diff = int128_sub(section->mr->size, int128_make64(addr));
diff = int128_min(diff, diff_page);
*plen = int128_get64(int128_min(diff, int128_make64(*plen))); *plen = int128_get64(int128_min(diff, int128_make64(*plen)));
return section; return section;
} }
@ -349,7 +351,7 @@ MemoryRegion *address_space_translate(AddressSpace *as, hwaddr addr,
hwaddr len = *plen; hwaddr len = *plen;
for (;;) { for (;;) {
section = address_space_translate_internal(as->dispatch, addr, &addr, plen, true); section = address_space_translate_internal(as->dispatch, addr, &addr, &len, true);
mr = section->mr; mr = section->mr;
if (!mr->iommu_ops) { if (!mr->iommu_ops) {