diff options
authorMax Filippov <>2012-05-27 20:21:08 +0400
committerMichael Roth <>2012-06-25 08:48:46 -0500
commit07ff37597bee726681c94c650568870bd4ff94d1 (patch)
parenttarget-xtensa: add MMU pagewalking tests (diff)
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 <> Signed-off-by: Jan Kiszka <> Signed-off-by: Max Filippov <> Signed-off-by: Blue Swirl <> (cherry picked from commit 9d70c4b7b8a580959cc4f739e7c9a04964d00d46) Signed-off-by: Michael Roth <>
1 files changed, 2 insertions, 1 deletions
diff --git a/exec.c b/exec.c
index a0494c72b..0a67f078c 100644
--- a/exec.c
+++ b/exec.c
@@ -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 /* TARGET_HAS_ICE */