diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2024-11-11 06:45:40 -0800 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2024-11-16 08:42:24 -0800 |
| commit | 2a339fee450638b512c5122281cb5ab49331cfb8 (patch) | |
| tree | 2ab8a289bdb27b3f56ea28c92a767a05a41c8b60 | |
| parent | f27550804688da43c6e0d87b2f9e143adbf76271 (diff) | |
accel/tcg: Fix user-only probe_access_internal plugin check
The acc_flag check for write should have been against PAGE_WRITE_ORG,
not PAGE_WRITE. But it is better to combine two acc_flag checks
to a single check against access_type. This matches the system code
in cputlb.c.
Cc: qemu-stable@nongnu.org
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2647
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: 20241111145002.144995-1-richard.henderson@linaro.org
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
| -rw-r--r-- | accel/tcg/user-exec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index aa8af52cc3..06016eb030 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -800,7 +800,7 @@ static int probe_access_internal(CPUArchState *env, vaddr addr, if (guest_addr_valid_untagged(addr)) { int page_flags = page_get_flags(addr); if (page_flags & acc_flag) { - if ((acc_flag == PAGE_READ || acc_flag == PAGE_WRITE) + if (access_type != MMU_INST_FETCH && cpu_plugin_mem_cbs_enabled(env_cpu(env))) { return TLB_MMIO; } |