[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/35] target/arm: Don't get MDCR_EL2 in pmu_counter_enabled() bef
From: |
Peter Maydell |
Subject: |
[PULL 16/35] target/arm: Don't get MDCR_EL2 in pmu_counter_enabled() before checking ARM_FEATURE_PMU |
Date: |
Thu, 15 Feb 2024 17:35:19 +0000 |
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:
#6 0x00007ffff4b95e96 in __GI___assert_fail
(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
#7 0x0000555555ebf412 in arm_security_space_below_el3 (env=0x555557bc8190) at
../../target/arm/helper.c:12600
#8 0x0000555555ea6f89 in arm_is_el2_enabled (env=0x555557bc8190) at
../../target/arm/cpu.h:2595
#9 0x0000555555ea942f in arm_mdcr_el2_eff (env=0x555557bc8190) at
../../target/arm/internals.h:1512
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
---
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 8c1ff16f0d9..7c531ee9cff 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -1187,13 +1187,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.34.1
- [PULL 00/35] target-arm queue, Peter Maydell, 2024/02/15
- [PULL 01/35] hw/arm/xilinx_zynq: Wire FIQ between CPU <> GIC, Peter Maydell, 2024/02/15
- [PULL 02/35] linux-user/aarch64: Choose SYNC as the preferred MTE mode, Peter Maydell, 2024/02/15
- [PULL 04/35] target/arm: Adjust and validate mtedesc sizem1, Peter Maydell, 2024/02/15
- [PULL 10/35] tests/qtest/meson.build: Don't include qtests_npcm7xx in qtests_aarch64, Peter Maydell, 2024/02/15
- [PULL 08/35] hw/pci-host/raven.c: Mark raven_io_ops as implementing unaligned accesses, Peter Maydell, 2024/02/15
- [PULL 13/35] tests/qtest/bios-tables-tests: Update virt golden reference, Peter Maydell, 2024/02/15
- [PULL 24/35] target/arm: The Cortex-R52 has a read-only CBAR, Peter Maydell, 2024/02/15
- [PULL 14/35] hw/arm/npcm7xx: Call qemu_configure_nic_device() for GMAC modules, Peter Maydell, 2024/02/15
- [PULL 16/35] target/arm: Don't get MDCR_EL2 in pmu_counter_enabled() before checking ARM_FEATURE_PMU,
Peter Maydell <=
- [PULL 11/35] tests/qtest/bios-tables-test: Allow changes to virt GTDT, Peter Maydell, 2024/02/15
- [PULL 22/35] hw/arm/stellaris: Add missing QOM 'SoC' parent, Peter Maydell, 2024/02/15
- [PULL 05/35] target/arm: Split out make_svemte_desc, Peter Maydell, 2024/02/15
- [PULL 18/35] hw/arm/smmuv3: add support for stage 1 access fault, Peter Maydell, 2024/02/15
- [PULL 09/35] hw/block/tc58128: Don't emit deprecation warning under qtest, Peter Maydell, 2024/02/15
- [PULL 17/35] tests/qtest: Fix GMAC test to run on a machine in upstream QEMU, Peter Maydell, 2024/02/15
- [PULL 12/35] hw/arm/virt: Wire up non-secure EL2 virtual timer IRQ, Peter Maydell, 2024/02/15
- [PULL 15/35] tests/qtest/npcm7xx_emc-test: Connect all NICs to a backend, Peter Maydell, 2024/02/15
- [PULL 19/35] hw/arm/stellaris: Convert ADC controller to Resettable interface, Peter Maydell, 2024/02/15
- [PULL 21/35] hw/arm/stellaris: Add missing QOM 'machine' parent, Peter Maydell, 2024/02/15