accel/tcg/tb-maint.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
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>
---
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 19ae6793f3..cc0f5afd47 100644
--- a/accel/tcg/tb-maint.c
+++ b/accel/tcg/tb-maint.c
@@ -713,7 +713,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) {
@@ -745,7 +745,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.45.0
On 6/12/24 06:30, Anton Johansson wrote: > 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> > --- > accel/tcg/tb-maint.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Brown paper bag time. Queued, thanks. r~ > > diff --git a/accel/tcg/tb-maint.c b/accel/tcg/tb-maint.c > index 19ae6793f3..cc0f5afd47 100644 > --- a/accel/tcg/tb-maint.c > +++ b/accel/tcg/tb-maint.c > @@ -713,7 +713,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) { > @@ -745,7 +745,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) {
Anton Johansson via <qemu-devel@nongnu.org> writes: > 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> -- Alex Bennée Virtualisation Tech Lead @ Linaro
© 2016 - 2025 Red Hat, Inc.