From: Frediano Ziglio Date: Tue, 7 Aug 2012 17:17:27 +0000 (+0100) Subject: mapcache: Fix invalidate if memory requested was not bucket aligned X-Git-Tag: xen-4.2.0-rc2^0 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d94efd9aa814f17f3243dae91476dc42b5ad052e;p=qemu-xen-4.3-testing.git mapcache: Fix invalidate if memory requested was not bucket aligned When memory is mapped in qemu_map_cache with lock != 0 a reverse mapping is created pointing to the virtual address of location requested. The cached mapped entry is saved in last_address_vaddr with the memory location of the base virtual address (without bucket offset). However when this entry is invalidated the virtual address saved in the reverse mapping is used. This cause that the mapping is freed but the last_address_vaddr is not reset. Signed-off-by: Frediano Ziglio Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff --git a/hw/xen_machine_fv.c b/hw/xen_machine_fv.c index fdad42ae4..b385d6a55 100644 --- a/hw/xen_machine_fv.c +++ b/hw/xen_machine_fv.c @@ -181,9 +181,6 @@ void qemu_invalidate_entry(uint8_t *buffer) unsigned long paddr_index; int found = 0; - if (last_address_vaddr == buffer) - last_address_page = ~0UL; - TAILQ_FOREACH(reventry, &locked_entries, next) { if (reventry->vaddr_req == buffer) { paddr_index = reventry->paddr_index; @@ -201,6 +198,10 @@ void qemu_invalidate_entry(uint8_t *buffer) TAILQ_REMOVE(&locked_entries, reventry, next); qemu_free(reventry); + if (last_address_page >> (MCACHE_BUCKET_SHIFT - XC_PAGE_SHIFT) == paddr_index) { + last_address_page = ~0UL; + } + entry = &mapcache_entry[paddr_index % nr_buckets]; while (entry && entry->paddr_index != paddr_index) { pentry = entry;