Commit 0d56099e authored Aug 27, 2024 by Marc Zyngier

Merge branch kvm-arm64/tlbi-fixes-6.12 into kvmarm-master/next



* kvm-arm64/tlbi-fixes-6.12:
  : .
  : A couple of TLB invalidation fixes, only affecting pKVM
  : out of tree, courtesy of Will Deacon.
  : .
  KVM: arm64: Ensure TLBI uses correct VMID after changing context
  KVM: arm64: Invalidate EL1&0 TLB entries for all VMIDs in nvhe hyp init

Signed-off-by: Marc Zyngier <maz@kernel.org>

parents 5be63fc1 ed49fe5a

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ alternative_else_nop_endif

		/* Invalidate the stale TLBs from Bootloader */
		tlbi alle2
		tlbi vmalls12e1
		tlbi alle1
		dsb sy

		mov_q x0, INIT_SCTLR_EL2_MMU_ON

arch/arm64/kvm/hyp/nvhe/tlb.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -132,10 +132,10 @@ static void exit_vmid_context(struct tlb_inv_context *cxt)
		else
		__load_host_stage2();

		if (cpus_have_final_cap(ARM64_WORKAROUND_SPECULATIVE_AT)) {
		/* Ensure write of the old VMID */
		isb();

		if (cpus_have_final_cap(ARM64_WORKAROUND_SPECULATIVE_AT)) {
		if (!(cxt->sctlr & SCTLR_ELx_M)) {
		write_sysreg_el1(cxt->sctlr, SYS_SCTLR);
		isb();