69 lines
2.6 KiB
Diff
69 lines
2.6 KiB
Diff
|
From 42a30e10bada5f034b0b2bfe8760482c972a4e61 Mon Sep 17 00:00:00 2001
|
||
|
|
From: gubin <gubin_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Thu, 28 Nov 2024 14:14:21 +0800
|
||
|
|
Subject: [PATCH] target/arm: Don't get MDCR_EL2 in pmu_counter_enabled()
|
||
|
|
before checking ARM_FEATURE_PMU
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
cherry-pick from ac1d88e9e7ca0bed83e91e07ce6d0597f10cc77d
|
||
|
|
|
||
|
|
It doesn't make sense to read the value of MDCR_EL2 on a non-A-profile
|
||
|
|
CPU, and in fact if you try to do it we will assert:
|
||
|
|
|
||
|
|
(assertion=0x5555565a8c70 "!arm_feature(env, ARM_FEATURE_M)", file=0x5555565a6e5c "../../target/arm/helper.c", line=12600, function=0x5555565a9560 <__PRETTY_FUNCTION__.0> "arm_security_space_below_el3") at ./assert/assert.c:101
|
||
|
|
|
||
|
|
We might call pmu_counter_enabled() on an M-profile CPU (for example
|
||
|
|
from the migration pre/post hooks in machine.c); this should always
|
||
|
|
return false because these CPUs don't set ARM_FEATURE_PMU.
|
||
|
|
|
||
|
|
Avoid the assertion by not calling arm_mdcr_el2_eff() before we
|
||
|
|
have done the early return for "PMU not present".
|
||
|
|
|
||
|
|
This fixes an assertion failure if you try to do a loadvm or
|
||
|
|
savevm for an M-profile board.
|
||
|
|
|
||
|
|
Cc: qemu-stable@nongnu.org
|
||
|
|
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2155
|
||
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
||
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
||
|
|
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
||
|
|
Message-id: 20240208153346.970021-1-peter.maydell@linaro.org
|
||
|
|
Signed-off-by: gubin <gubin_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
target/arm/helper.c | 12 ++++++++++--
|
||
|
|
1 file changed, 10 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/target/arm/helper.c b/target/arm/helper.c
|
||
|
|
index 793aa89cc6..762eb086c5 100644
|
||
|
|
--- a/target/arm/helper.c
|
||
|
|
+++ b/target/arm/helper.c
|
||
|
|
@@ -1182,13 +1182,21 @@ static bool pmu_counter_enabled(CPUARMState *env, uint8_t counter)
|
||
|
|
bool enabled, prohibited = false, filtered;
|
||
|
|
bool secure = arm_is_secure(env);
|
||
|
|
int el = arm_current_el(env);
|
||
|
|
- uint64_t mdcr_el2 = arm_mdcr_el2_eff(env);
|
||
|
|
- uint8_t hpmn = mdcr_el2 & MDCR_HPMN;
|
||
|
|
+ uint64_t mdcr_el2;
|
||
|
|
+ uint8_t hpmn;
|
||
|
|
|
||
|
|
+ /*
|
||
|
|
+ * We might be called for M-profile cores where MDCR_EL2 doesn't
|
||
|
|
+ * exist and arm_mdcr_el2_eff() will assert, so this early-exit check
|
||
|
|
+ * must be before we read that value.
|
||
|
|
+ */
|
||
|
|
if (!arm_feature(env, ARM_FEATURE_PMU)) {
|
||
|
|
return false;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ mdcr_el2 = arm_mdcr_el2_eff(env);
|
||
|
|
+ hpmn = mdcr_el2 & MDCR_HPMN;
|
||
|
|
+
|
||
|
|
if (!arm_feature(env, ARM_FEATURE_EL2) ||
|
||
|
|
(counter < hpmn || counter == 31)) {
|
||
|
|
e = env->cp15.c9_pmcr & PMCRE;
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|