qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Anton Johansson" <anjo@rev.ng>,
	qemu-stable@nongnu.org,
	"Manos Pitsidianakis" <manos.pitsidianakis@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PULL 21/24] accel/tcg: Fix typo causing tb->page_addr[1] to not be recorded
Date: Wed, 19 Jun 2024 13:59:49 -0700	[thread overview]
Message-ID: <20240619205952.235946-22-richard.henderson@linaro.org> (raw)
In-Reply-To: <20240619205952.235946-1-richard.henderson@linaro.org>

From: Anton Johansson <anjo@rev.ng>

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>
---
 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.34.1



  parent reply	other threads:[~2024-06-19 21:04 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-19 20:59 [PULL 00/24] tcg patch queue Richard Henderson
2024-06-19 20:59 ` [PULL 01/24] tcg/loongarch64: Import LASX, FP insns Richard Henderson
2024-06-19 20:59 ` [PULL 02/24] tcg/loongarch64: Use fp load/store for I32 and I64 into vector regs Richard Henderson
2024-06-19 20:59 ` [PULL 03/24] tcg/loongarch64: Handle i32 and i64 moves between gr and fr Richard Henderson
2024-06-19 20:59 ` [PULL 04/24] tcg/loongarch64: Support TCG_TYPE_V64 Richard Henderson
2024-06-19 20:59 ` [PULL 05/24] util/loongarch64: Detect LASX vector support Richard Henderson
2024-06-19 20:59 ` [PULL 06/24] tcg/loongarch64: Simplify tcg_out_dup_vec Richard Henderson
2024-06-19 20:59 ` [PULL 07/24] tcg/loongarch64: Support LASX in tcg_out_dup_vec Richard Henderson
2024-06-19 20:59 ` [PULL 08/24] tcg/loongarch64: Support LASX in tcg_out_dupm_vec Richard Henderson
2024-06-19 20:59 ` [PULL 09/24] tcg/loongarch64: Use tcg_out_dup_vec in tcg_out_dupi_vec Richard Henderson
2024-06-19 20:59 ` [PULL 10/24] tcg/loongarch64: Support LASX " Richard Henderson
2024-06-19 20:59 ` [PULL 11/24] tcg/loongarch64: Simplify tcg_out_addsub_vec Richard Henderson
2024-06-19 20:59 ` [PULL 12/24] tcg/loongarch64: Support LASX in tcg_out_addsub_vec Richard Henderson
2024-06-19 20:59 ` [PULL 13/24] tcg/loongarch64: Split out vdvjvk in tcg_out_vec_op Richard Henderson
2024-06-19 20:59 ` [PULL 14/24] tcg/loongarch64: Support LASX in tcg_out_{mov,ld,st} Richard Henderson
2024-06-19 20:59 ` [PULL 15/24] tcg/loongarch64: Remove temp_vec from tcg_out_vec_op Richard Henderson
2024-06-19 20:59 ` [PULL 16/24] tcg/loongarch64: Split out vdvjukN in tcg_out_vec_op Richard Henderson
2024-06-19 20:59 ` [PULL 17/24] tcg/loongarch64: Support LASX " Richard Henderson
2024-06-19 20:59 ` [PULL 18/24] tcg/loongarch64: Enable v256 with LASX Richard Henderson
2024-06-19 20:59 ` [PULL 19/24] util/bufferiszero: Split out host include files Richard Henderson
2024-06-19 20:59 ` [PULL 20/24] util/bufferiszero: Add loongarch64 vector acceleration Richard Henderson
2024-06-19 20:59 ` Richard Henderson [this message]
2024-06-19 20:59 ` [PULL 22/24] linux-user: Make TARGET_NR_setgroups affect only the current thread Richard Henderson
2024-06-19 20:59 ` [PULL 23/24] target/sparc: use signed denominator in sdiv helper Richard Henderson
2024-06-19 20:59 ` [PULL 24/24] tcg/loongarch64: Fix tcg_out_movi vs some pcrel pointers Richard Henderson
2024-06-20  4:45 ` [PULL 00/24] tcg patch queue Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240619205952.235946-22-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=alex.bennee@linaro.org \
    --cc=anjo@rev.ng \
    --cc=manos.pitsidianakis@linaro.org \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-stable@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).