diff options
author | Max Filippov <jcmvbkbc@gmail.com> | 2012-05-27 20:21:08 +0400 |
---|---|---|
committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2012-06-25 08:48:46 -0500 |
commit | 07ff37597bee726681c94c650568870bd4ff94d1 (patch) | |
tree | 6b7e2ff82769e4c51a06dcf70728508fc641cf6f | |
parent | target-xtensa: add MMU pagewalking tests (diff) | |
download | qemu-kvm-07ff37597bee726681c94c650568870bd4ff94d1.tar.gz qemu-kvm-07ff37597bee726681c94c650568870bd4ff94d1.tar.bz2 qemu-kvm-07ff37597bee726681c94c650568870bd4ff94d1.zip |
exec: fix TB invalidation after breakpoint insertion/deletion
tb_invalidate_phys_addr has to be called with the exact physical address of
the breakpoint we add/remove, not just the page's base address.
Otherwise we easily fail to flush the right TB.
This breakage was introduced by the commit f3705d5329 "memory: make
phys_page_find() return an unadjusted".
This appeared to work for some guest architectures because their
cpu_get_phys_page_debug implementation returns full translated physical
address, not just the base of the TARGET_PAGE_SIZE-sized page.
Reported-by: TeLeMan <geleman@gmail.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
(cherry picked from commit 9d70c4b7b8a580959cc4f739e7c9a04964d00d46)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r-- | exec.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1492,7 +1492,8 @@ void tb_invalidate_phys_addr(target_phys_addr_t addr) static void breakpoint_invalidate(CPUArchState *env, target_ulong pc) { - tb_invalidate_phys_addr(cpu_get_phys_page_debug(env, pc)); + tb_invalidate_phys_addr(cpu_get_phys_page_debug(env, pc) | + (pc & ~TARGET_PAGE_MASK)); } #endif #endif /* TARGET_HAS_ICE */ |