Re: [PATCH] accel/tcg: Fix atomic_mmu_lookup for reads

[Philippe Mathieu-Daudé]

On 5/5/23 22:40, Richard Henderson wrote:

A copy-paste bug had us looking at the victim cache for writes.

Reported-by: Peter Maydell <peter.mayd...@linaro.org>
Signed-off-by: Richard Henderson <richard.hender...@linaro.org>

Fixes: 08dff435e2 ("tcg: Probe the proper permissions for atomic ops")
Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>

---

To be inserted before patch 3 in

https://lore.kernel.org/qemu-devel/45cba357-ba20-399a-27e6-5e9974117...@linaro.org/T/#m5dc55cf04d564f4a8f97bc95e7f0e427c24a4f0b

r~

---
  accel/tcg/cputlb.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 3117886af1..0b8a5f93d2 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -1835,7 +1835,7 @@ static void *atomic_mmu_lookup(CPUArchState *env, 
target_ulong addr,
      } else /* if (prot & PAGE_READ) */ {
          tlb_addr = tlbe->addr_read;
          if (!tlb_hit(tlb_addr, addr)) {
-            if (!VICTIM_TLB_HIT(addr_write, addr)) {
+            if (!VICTIM_TLB_HIT(addr_read, addr)) {
                  tlb_fill(env_cpu(env), addr, size,
                           MMU_DATA_LOAD, mmu_idx, retaddr);
                  index = tlb_index(env, mmu_idx, addr);