[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/53] accel/tcg: Fix atomic_mmu_lookup for reads
From: |
Richard Henderson |
Subject: |
[PULL 02/53] accel/tcg: Fix atomic_mmu_lookup for reads |
Date: |
Thu, 11 May 2023 09:03:59 +0100 |
A copy-paste bug had us looking at the victim cache for writes.
Cc: qemu-stable@nongnu.org
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Fixes: 08dff435e2 ("tcg: Probe the proper permissions for atomic ops")
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20230505204049.352469-1-richard.henderson@linaro.org>
---
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);
--
2.34.1
- [PULL 01/53] target/m68k: Fix gen_load_fp for OS_LONG, (continued)
- [PULL 01/53] target/m68k: Fix gen_load_fp for OS_LONG, Richard Henderson, 2023/05/11
- [PULL 05/53] disas: Remove target_ulong from the interface, Richard Henderson, 2023/05/11
- [PULL 04/53] disas: Move disas.c to disas/, Richard Henderson, 2023/05/11
- [PULL 07/53] disas: Move softmmu specific code to separate file, Richard Henderson, 2023/05/11
- [PULL 11/53] tcg/i386: Introduce prepare_host_addr, Richard Henderson, 2023/05/11
- [PULL 13/53] tcg/aarch64: Introduce prepare_host_addr, Richard Henderson, 2023/05/11
- [PULL 08/53] disas: Move disas.c into the target-independent source set, Richard Henderson, 2023/05/11
- [PULL 14/53] tcg/arm: Introduce prepare_host_addr, Richard Henderson, 2023/05/11
- [PULL 18/53] tcg/riscv: Introduce prepare_host_addr, Richard Henderson, 2023/05/11
- [PULL 09/53] cpu: expose qemu_cpu_list_lock for lock-guard use, Richard Henderson, 2023/05/11
- [PULL 02/53] accel/tcg: Fix atomic_mmu_lookup for reads,
Richard Henderson <=
- [PULL 17/53] tcg/ppc: Introduce prepare_host_addr, Richard Henderson, 2023/05/11
- [PULL 06/53] disas: Remove target-specific headers, Richard Henderson, 2023/05/11
- [PULL 10/53] accel/tcg/tcg-accel-ops-rr: ensure fairness with icount, Richard Henderson, 2023/05/11
- [PULL 12/53] tcg/i386: Use indexed addressing for softmmu fast path, Richard Henderson, 2023/05/11
- [PULL 25/53] tcg/loongarch64: Convert tcg_out_qemu_{ld,st}_slow_path, Richard Henderson, 2023/05/11
- [PULL 26/53] tcg/mips: Convert tcg_out_qemu_{ld,st}_slow_path, Richard Henderson, 2023/05/11
- [PULL 31/53] tcg/mips: Remove MO_BSWAP handling, Richard Henderson, 2023/05/11
- [PULL 34/53] tcg/ppc: Reorg tcg_out_tlb_read, Richard Henderson, 2023/05/11
- [PULL 15/53] tcg/loongarch64: Introduce prepare_host_addr, Richard Henderson, 2023/05/11
- [PULL 21/53] tcg/i386: Convert tcg_out_qemu_ld_slow_path, Richard Henderson, 2023/05/11