Skip to content

Commit 36e0083

Browse files
willdeaconoupton
authored andcommitted
KVM: arm64: Don't pass a TLBI level hint when zapping table entries
The TLBI level hints are for leaf entries only, so take care not to pass them incorrectly after clearing a table entry. Cc: Gavin Shan <gshan@redhat.com> Cc: Marc Zyngier <maz@kernel.org> Cc: Quentin Perret <qperret@google.com> Fixes: 82bb024 ("KVM: arm64: Implement kvm_pgtable_hyp_unmap() at EL2") Fixes: 6d9d211 ("KVM: arm64: Add support for stage-2 map()/unmap() in generic page-table") Signed-off-by: Will Deacon <will@kernel.org> Reviewed-by: Shaoqin Huang <shahuang@redhat.com> Reviewed-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20240327124853.11206-3-will@kernel.org Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
1 parent f62d4c3 commit 36e0083

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

arch/arm64/kvm/hyp/pgtable.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ static int hyp_unmap_walker(const struct kvm_pgtable_visit_ctx *ctx,
528528

529529
kvm_clear_pte(ctx->ptep);
530530
dsb(ishst);
531-
__tlbi_level(vae2is, __TLBI_VADDR(ctx->addr, 0), ctx->level);
531+
__tlbi_level(vae2is, __TLBI_VADDR(ctx->addr, 0), TLBI_TTL_UNKNOWN);
532532
} else {
533533
if (ctx->end - ctx->addr < granule)
534534
return -EINVAL;
@@ -896,10 +896,12 @@ static void stage2_unmap_put_pte(const struct kvm_pgtable_visit_ctx *ctx,
896896
if (kvm_pte_valid(ctx->old)) {
897897
kvm_clear_pte(ctx->ptep);
898898

899-
if (!stage2_unmap_defer_tlb_flush(pgt) ||
900-
kvm_pte_table(ctx->old, ctx->level)) {
901-
kvm_call_hyp(__kvm_tlb_flush_vmid_ipa, mmu,
902-
ctx->addr, ctx->level);
899+
if (kvm_pte_table(ctx->old, ctx->level)) {
900+
kvm_call_hyp(__kvm_tlb_flush_vmid_ipa, mmu, ctx->addr,
901+
TLBI_TTL_UNKNOWN);
902+
} else if (!stage2_unmap_defer_tlb_flush(pgt)) {
903+
kvm_call_hyp(__kvm_tlb_flush_vmid_ipa, mmu, ctx->addr,
904+
ctx->level);
903905
}
904906
}
905907

0 commit comments

Comments
 (0)