Skip to content

Commit 040113f

Browse files
willdeaconMarc Zyngier
authored andcommitted
KVM: arm64: Add missing memory barriers when switching to pKVM's hyp pgd
In commit f320bc7 ("KVM: arm64: Prepare the creation of s1 mappings at EL2"), pKVM switches from a temporary host-provided page-table to its own page-table at EL2. Since there is only a single TTBR for the nVHE hypervisor, this involves disabling and re-enabling the MMU in __pkvm_init_switch_pgd(). Unfortunately, the memory barriers here are not quite correct. Specifically: - A DSB is required to complete the TLB invalidation executed while the MMU is disabled. - An ISB is required to make the new TTBR value visible to the page-table walker before the MMU is enabled in the SCTLR. An earlier version of the patch actually got this correct: https://lore.kernel.org/lkml/20210304184717.GB21795@willie-the-truck/ but thanks to some badly worded review comments from yours truly, these were dropped for the version that was eventually merged. Bring back the barriers and fix the potential issue (but note that this was found by code inspection). Cc: Quentin Perret <qperret@google.com> Fixes: f320bc7 ("KVM: arm64: Prepare the creation of s1 mappings at EL2") Signed-off-by: Will Deacon <will@kernel.org> Reviewed-by: Oliver Upton <oliver.upton@linux.dev> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20240104164220.7968-1-will@kernel.org
1 parent f4af13b commit 040113f

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

arch/arm64/kvm/hyp/nvhe/hyp-init.S

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,8 @@ alternative_else_nop_endif
288288
mov sp, x0
289289

290290
/* And turn the MMU back on! */
291+
dsb nsh
292+
isb
291293
set_sctlr_el2 x2
292294
ret x1
293295
SYM_FUNC_END(__pkvm_init_switch_pgd)

0 commit comments

Comments
 (0)