53 lines
2.1 KiB
Diff
53 lines
2.1 KiB
Diff
|
From 378d79fa6b9410af702776ffa93865219f273380 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Anton Johansson <anjo@rev.ng>
|
||
|
|
Date: Wed, 12 Jun 2024 15:30:31 +0200
|
||
|
|
Subject: [PATCH] accel/tcg: Fix typo causing tb->page_addr[1] to not be
|
||
|
|
recorded
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
For TBs crossing page boundaries, the 2nd page will never be
|
||
|
|
recorded/removed, as the index of the 2nd page is computed from the
|
||
|
|
address of the 1st page. This is due to a typo, fix it.
|
||
|
|
|
||
|
|
Cc: qemu-stable@nongnu.org
|
||
|
|
Fixes: deba78709a ("accel/tcg: Always lock pages before translation")
|
||
|
|
Signed-off-by: Anton Johansson <anjo@rev.ng>
|
||
|
|
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
|
||
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
||
|
|
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
|
||
|
|
Message-Id: <20240612133031.15298-1-anjo@rev.ng>
|
||
|
|
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
|
||
|
|
(cherry picked from commit 3b279f73fa37bec8d3ba04a15f5153d6491cffaf)
|
||
|
|
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
accel/tcg/tb-maint.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/accel/tcg/tb-maint.c b/accel/tcg/tb-maint.c
|
||
|
|
index 3d2a896220..eb37f9e8a8 100644
|
||
|
|
--- a/accel/tcg/tb-maint.c
|
||
|
|
+++ b/accel/tcg/tb-maint.c
|
||
|
|
@@ -712,7 +712,7 @@ static void tb_record(TranslationBlock *tb)
|
||
|
|
tb_page_addr_t paddr0 = tb_page_addr0(tb);
|
||
|
|
tb_page_addr_t paddr1 = tb_page_addr1(tb);
|
||
|
|
tb_page_addr_t pindex0 = paddr0 >> TARGET_PAGE_BITS;
|
||
|
|
- tb_page_addr_t pindex1 = paddr0 >> TARGET_PAGE_BITS;
|
||
|
|
+ tb_page_addr_t pindex1 = paddr1 >> TARGET_PAGE_BITS;
|
||
|
|
|
||
|
|
assert(paddr0 != -1);
|
||
|
|
if (unlikely(paddr1 != -1) && pindex0 != pindex1) {
|
||
|
|
@@ -744,7 +744,7 @@ static void tb_remove(TranslationBlock *tb)
|
||
|
|
tb_page_addr_t paddr0 = tb_page_addr0(tb);
|
||
|
|
tb_page_addr_t paddr1 = tb_page_addr1(tb);
|
||
|
|
tb_page_addr_t pindex0 = paddr0 >> TARGET_PAGE_BITS;
|
||
|
|
- tb_page_addr_t pindex1 = paddr0 >> TARGET_PAGE_BITS;
|
||
|
|
+ tb_page_addr_t pindex1 = paddr1 >> TARGET_PAGE_BITS;
|
||
|
|
|
||
|
|
assert(paddr0 != -1);
|
||
|
|
if (unlikely(paddr1 != -1) && pindex0 != pindex1) {
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|