c1cd6a6221
Most importantly the first one "Revert "monitor: use aio_co_reschedule_self()"", fixing a crash when doing hotplug+resize with a disk using io_uring. Other fixes (likely not too important) for TCG emulation of x86(_64) and ARM. Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
52 lines
2.1 KiB
Diff
52 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Richard Henderson <richard.henderson@linaro.org>
|
|
Date: Mon, 22 Apr 2024 10:07:22 -0700
|
|
Subject: [PATCH] target/arm: Restrict translation disabled alignment check to
|
|
VMSA
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
For cpus using PMSA, when the MPU is disabled, the default memory
|
|
type is Normal, Non-cachable. This means that it should not
|
|
have alignment restrictions enforced.
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Fixes: 59754f85ed3 ("target/arm: Do memory type alignment check when translation disabled")
|
|
Reported-by: Clément Chigot <chigot@adacore.com>
|
|
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
Tested-by: Clément Chigot <chigot@adacore.com>
|
|
Message-id: 20240422170722.117409-1-richard.henderson@linaro.org
|
|
[PMM: trivial comment, commit message tweaks]
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
(cherry picked from commit 7b19a3554d2df22d29c75319a1dac17615d1b20e)
|
|
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|
---
|
|
target/arm/tcg/hflags.c | 12 ++++++++++--
|
|
1 file changed, 10 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/target/arm/tcg/hflags.c b/target/arm/tcg/hflags.c
|
|
index 5da1b0fc1d..f03977b4b0 100644
|
|
--- a/target/arm/tcg/hflags.c
|
|
+++ b/target/arm/tcg/hflags.c
|
|
@@ -38,8 +38,16 @@ static bool aprofile_require_alignment(CPUARMState *env, int el, uint64_t sctlr)
|
|
}
|
|
|
|
/*
|
|
- * If translation is disabled, then the default memory type is
|
|
- * Device(-nGnRnE) instead of Normal, which requires that alignment
|
|
+ * With PMSA, when the MPU is disabled, all memory types in the
|
|
+ * default map are Normal, so don't need aligment enforcing.
|
|
+ */
|
|
+ if (arm_feature(env, ARM_FEATURE_PMSA)) {
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ /*
|
|
+ * With VMSA, if translation is disabled, then the default memory type
|
|
+ * is Device(-nGnRnE) instead of Normal, which requires that alignment
|
|
* be enforced. Since this affects all ram, it is most efficient
|
|
* to handle this during translation.
|
|
*/
|