From e28f00e1077068cee3adfa59332bb075b9cb9a23 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:49:20 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: Don't remove shadow table entry twice on teardown" This reverts commit 9515eed842d305bc599f50ede4dc9750aa49456b. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: Ia2fc456c8a6f43c95daf41a78de7e29321f252dc --- arch/arm64/kvm/hyp/nvhe/pkvm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index e19af9e891f7..57e1304c3713 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -655,6 +655,7 @@ int __pkvm_teardown_shadow(struct kvm *kvm) /* Reclaim guest pages, and page-table pages */ mc = &vm->host_kvm->arch.pkvm.teardown_mc; reclaim_guest_pages(vm, mc); + remove_shadow_table(shadow_handle); unpin_host_vcpus(vm); /* Push the metadata pages to the teardown memcache */