05fcc90d20
- hw/misc/mos6522: Fix bad class definition of the MOS6522 device - target/i386: Fix minor typo in NO_NESTED_DATA_BP feature bit - cpu: ensure we don't call start_exclusive from cpu_exec - Avoid unaligned fetch in ladr_match() - audio/audio.c: remove trailing newline in error_setg - acpi/tests/avocado/bits: wait for 200 seconds for SHUTDOWN event from bits VM - linux-user: Tolerate CONFIG_LSM_MMAP_MIN_ADDR - accel/tcg: Fix user-only probe_access_internal plugin - linux-user: Honor elf alignment when placing images - Reserve address for MSI mapping in the CVM scenario. Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 3ab56c27fe6b593be9a24f27b52b2730efa05304)
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From b611bd7f3f4525c8373f2e504594414e1ed5b058 Mon Sep 17 00:00:00 2001
|
|
From: guping <guping_yewu@cmss.chinamobile.com>
|
|
Date: Mon, 18 Nov 2024 02:50:17 +0000
|
|
Subject: [PATCH] accel/tcg: Fix user-only probe_access_internal plugin check
|
|
cherry-pick from 2a339fee450638b512c5122281cb5ab49331cfb8
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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: #2647
|
|
|
|
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
|
|
Message-Id: 20241111145002.144995-1-richard.henderson@linaro.org
|
|
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
|
|
|
|
Signed-off-by: guping <guping_yewu@cmss.chinamobile.com>
|
|
---
|
|
accel/tcg/user-exec.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
|
|
index 68b252cb8e..e87848a5e2 100644
|
|
--- a/accel/tcg/user-exec.c
|
|
+++ b/accel/tcg/user-exec.c
|
|
@@ -794,7 +794,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;
|
|
}
|
|
--
|
|
2.41.0.windows.1
|
|
|