From 62d2bb0336569e1a0fe42c64fd0e813783809eec Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:51:17 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: pkvm: Allow the shadows to be destroyed on teardown" This reverts commit 88c46ab100bbe7618f6dffaaa11eae994ea5fc89. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: Ia915c2511df615f86dcc1f9ee6db3a5a2f1fb5ea --- arch/arm64/kvm/arm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 2f2050b5d942..f603ab667cea 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -197,6 +197,9 @@ static void kvm_shadow_destroy(struct kvm *kvm) struct mm_struct *mm = current->mm; struct list_head *ppages; + if (!kvm_vm_is_protected(kvm)) + return; + if (kvm->arch.pkvm.shadow_handle) WARN_ON(kvm_call_hyp_nvhe(__pkvm_teardown_shadow, kvm));