From 04987aa1d8099e5f8f5dd8c68e65f315b3f1fd6c Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Wed, 13 May 2026 12:33:52 -0400 Subject: [PATCH] arm64/vmm: Enforce a data barrier before tlbi for non-VHE Exception entry does not include an implicit, architectural data barrier. Reported by: Ben Simner Reviewed by: andrew Fixes: 5577bb2f67ff ("arm64/vmm: Support tlbi from VHE") Differential Revision: https://reviews.freebsd.org/D56855 --- sys/arm64/vmm/vmm_hyp.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/arm64/vmm/vmm_hyp.c b/sys/arm64/vmm/vmm_hyp.c index 75c15f06dd0..27fdf18e470 100644 --- a/sys/arm64/vmm/vmm_hyp.c +++ b/sys/arm64/vmm/vmm_hyp.c @@ -708,9 +708,7 @@ VMM_HYP_FUNC(s2_tlbi_range)(uint64_t vttbr, vm_offset_t sva, vm_offset_t eva, uint64_t host_tcr; #endif -#ifdef VMM_VHE dsb(ishst); -#endif #define TLBI_VA_SHIFT 12 #define TLBI_VA_MASK ((1ul << 44) - 1) @@ -768,9 +766,7 @@ VMM_HYP_FUNC(s2_tlbi_all)(uint64_t vttbr) { uint64_t host_vttbr; -#ifdef VMM_VHE dsb(ishst); -#endif /* Switch to the guest vttbr */ /* TODO: Handle Cortex-A57/A72 erratum 131936 */