Commit 0f0ff097 authored by Will Deacon's avatar Will Deacon Committed by Oliver Upton
Browse files

KVM: arm64: Use TLBI_TTL_UNKNOWN in __kvm_tlb_flush_vmid_range() 



Commit c910f2b6 ("arm64/mm: Update tlb invalidation routines for
FEAT_LPA2") updated the __tlbi_level() macro to take the target level
as an argument, with TLBI_TTL_UNKNOWN (rather than 0) indicating that
the caller cannot provide level information. Unfortunately, the two
implementations of __kvm_tlb_flush_vmid_range() were not updated and so
now ask for an level 0 invalidation if FEAT_LPA2 is implemented.

Fix the problem by passing TLBI_TTL_UNKNOWN instead of 0 as the level
argument to __flush_s2_tlb_range_op() in __kvm_tlb_flush_vmid_range().

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Oliver Upton <oliver.upton@linux.dev>
Cc: Marc Zyngier <maz@kernel.org>
Reviewed-by: default avatarRyan Roberts <ryan.roberts@arm.com>
Fixes: c910f2b6 ("arm64/mm: Update tlb invalidation routines for FEAT_LPA2")
Signed-off-by: default avatarWill Deacon <will@kernel.org>
Reviewed-by: default avatarShaoqin Huang <shahuang@redhat.com>
Reviewed-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20240327124853.11206-4-will@kernel.org


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent 36e00832

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

+2 −1
Original line number Diff line number Diff line
@@ -154,7 +154,8 @@ void __kvm_tlb_flush_vmid_range(struct kvm_s2_mmu *mmu, 
	/* Switch to requested VMID */

	__tlb_switch_to_guest(mmu, &cxt, false);



	__flush_s2_tlb_range_op(ipas2e1is, start, pages, stride, 0);

	__flush_s2_tlb_range_op(ipas2e1is, start, pages, stride,

				TLBI_TTL_UNKNOWN);



	dsb(ish);

	__tlbi(vmalle1is);

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

+2 −1
Original line number Diff line number Diff line
@@ -171,7 +171,8 @@ void __kvm_tlb_flush_vmid_range(struct kvm_s2_mmu *mmu, 
	/* Switch to requested VMID */

	__tlb_switch_to_guest(mmu, &cxt);



	__flush_s2_tlb_range_op(ipas2e1is, start, pages, stride, 0);

	__flush_s2_tlb_range_op(ipas2e1is, start, pages, stride,

				TLBI_TTL_UNKNOWN);



	dsb(ish);

	__tlbi(vmalle1is);