Commit e562c0f7 authored by Will Deacon's avatar Will Deacon Committed by ZhangPeng
Browse files

KVM: arm64: Don't pass a TLBI level hint when zapping table entries 

stable inclusion
from stable-v6.6.47
commit 60d90e158261b5258fba7b02eea729cd91545b66
bugzilla: https://gitee.com/openeuler/kernel/issues/IAHMJO

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=60d90e158261b5258fba7b02eea729cd91545b66



--------------------------------

commit 36e008323926036650299cfbb2dca704c7aba849 upstream.

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: 82bb0244 ("KVM: arm64: Implement kvm_pgtable_hyp_unmap() at EL2")
Fixes: 6d9d2115 ("KVM: arm64: Add support for stage-2 map()/unmap() in generic page-table")
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-3-will@kernel.org


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
Cc: <stable@vger.kernel.org> # 6.6.y only
[will@: Use '0' instead of TLBI_TTL_UNKNOWN to indicate "no level"]
Signed-off-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent d0c04a9a

arch/arm64/kvm/hyp/pgtable.c

+7 −5
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ static int hyp_unmap_walker(const struct kvm_pgtable_visit_ctx *ctx, 


		kvm_clear_pte(ctx->ptep);

		dsb(ishst);

		__tlbi_level(vae2is, __TLBI_VADDR(ctx->addr, 0), ctx->level);

		__tlbi_level(vae2is, __TLBI_VADDR(ctx->addr, 0), 0);

	} else {

		if (ctx->end - ctx->addr < granule)

			return -EINVAL;
@@ -861,10 +861,12 @@ static void stage2_unmap_put_pte(const struct kvm_pgtable_visit_ctx *ctx, 
	if (kvm_pte_valid(ctx->old)) {

		kvm_clear_pte(ctx->ptep);



		if (!stage2_unmap_defer_tlb_flush(pgt) ||

		    kvm_pte_table(ctx->old, ctx->level)) {

			kvm_call_hyp(__kvm_tlb_flush_vmid_ipa, mmu,

					ctx->addr, ctx->level);

		if (kvm_pte_table(ctx->old, ctx->level)) {

			kvm_call_hyp(__kvm_tlb_flush_vmid_ipa, mmu, ctx->addr,

				     0);

		} else if (!stage2_unmap_defer_tlb_flush(pgt)) {

			kvm_call_hyp(__kvm_tlb_flush_vmid_ipa, mmu, ctx->addr,

				     ctx->level);

		}

	}