From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SYgE1-0005Nu-HL for qemu-devel@nongnu.org; Sun, 27 May 2012 12:21:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SYgDz-0001RY-Lx for qemu-devel@nongnu.org; Sun, 27 May 2012 12:21:49 -0400 Received: from mail-lpp01m010-f45.google.com ([209.85.215.45]:63984) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SYgDz-0001RK-Bq for qemu-devel@nongnu.org; Sun, 27 May 2012 12:21:47 -0400 Received: by lahc1 with SMTP id c1so1850797lah.4 for ; Sun, 27 May 2012 09:21:45 -0700 (PDT) From: Max Filippov Date: Sun, 27 May 2012 20:21:08 +0400 Message-Id: <1338135668-17795-1-git-send-email-jcmvbkbc@gmail.com> Subject: [Qemu-devel] [PATCH 1.1] exec: fix TB invalidation after breakpoint insertion/deletion List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , Jan Kiszka , Max Filippov , Avi Kivity , TeLeMan 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 --- exec.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/exec.c b/exec.c index a0494c7..0a67f07 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 #endif /* TARGET_HAS_ICE */ -- 1.7.7.6