diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2023-05-19 15:58:08 +0100 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2023-05-19 08:01:15 -0700 |
| commit | d009607d08d22f91ca399b72828c6693855e7325 (patch) | |
| tree | 9d1adfaa9d51bcb4111fbeeba37c8eebb4c0ba19 /target/arm/kvm_arm.h | |
| parent | 449d6d9eb44772e69f11d002e3c1e2be8a91c350 (diff) | |
Revert "arm/kvm: add support for MTE"
This reverts commit b320e21c48ce64853904bea6631c0158cc2ef227,
which accidentally broke TCG, because it made the TCG -cpu max
report the presence of MTE to the guest even if the board hadn't
enabled MTE by wiring up the tag RAM. This meant that if the guest
then tried to use MTE QEMU would segfault accessing the
non-existent tag RAM:
==346473==ERROR: UndefinedBehaviorSanitizer: SEGV on unknown address (pc 0x55f328952a4a bp 0x00000213a400 sp 0x7f7871859b80 T346476)
==346473==The signal is caused by a READ memory access.
==346473==Hint: this fault was caused by a dereference of a high value address (see register values below). Disassemble the provided pc to learn which register was used.
#0 0x55f328952a4a in address_space_to_flatview /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/include/exec/memory.h:1108:12
#1 0x55f328952a4a in address_space_translate /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/include/exec/memory.h:2797:31
#2 0x55f328952a4a in allocation_tag_mem /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/arm-clang/../../target/arm/tcg/mte_helper.c:176:10
#3 0x55f32895366c in helper_stgm /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/arm-clang/../../target/arm/tcg/mte_helper.c:461:15
#4 0x7f782431a293 (<unknown module>)
It's also not clear that the KVM logic is correct either:
MTE defaults to on there, rather than being only on if the
board wants it on.
Revert the whole commit for now so we can sort out the issues.
(We didn't catch this in CI because we have no test cases in
avocado that use guests with MTE support.)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20230519145808.348701-1-peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target/arm/kvm_arm.h')
| -rw-r--r-- | target/arm/kvm_arm.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 2083547bf6..330fbe5c72 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -314,13 +314,6 @@ bool kvm_arm_pmu_supported(void); bool kvm_arm_sve_supported(void); /** - * kvm_arm_mte_supported: - * - * Returns: true if KVM can enable MTE, and false otherwise. - */ -bool kvm_arm_mte_supported(void); - -/** * kvm_arm_get_max_vm_ipa_size: * @ms: Machine state handle * @fixed_ipa: True when the IPA limit is fixed at 40. This is the case @@ -384,8 +377,6 @@ void kvm_arm_pvtime_init(CPUState *cs, uint64_t ipa); int kvm_arm_set_irq(int cpu, int irqtype, int irq, int level); -void kvm_arm_enable_mte(Object *cpuobj, Error **errp); - #else /* @@ -412,11 +403,6 @@ static inline bool kvm_arm_steal_time_supported(void) return false; } -static inline bool kvm_arm_mte_supported(void) -{ - return false; -} - /* * These functions should never actually be called without KVM support. */ @@ -465,11 +451,6 @@ static inline uint32_t kvm_arm_sve_get_vls(CPUState *cs) g_assert_not_reached(); } -static inline void kvm_arm_enable_mte(Object *cpuobj, Error **errp) -{ - g_assert_not_reached(); -} - #endif static inline const char *gic_class_name(void) |