From effcb9d307b0c056c5a967a7d054e655f461eb18 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:51:18 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: pkvm: Share memory with non-protected guests" This reverts commit 8d6a327d52d98f84bb448e808f8ea27bd5ed77ac. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I09b2c8ab0cca2e02680c1194d403b6eb04fc565c --- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c index c3faad28e701..ff0a4f9fb09f 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -734,12 +734,8 @@ static void handle___pkvm_host_donate_guest(struct kvm_cpu_context *host_ctxt) /* Topup shadow memcache with the host's */ ret = pkvm_refill_memcache(state->vcpu, vcpu); - if (!ret) { - if (state->is_protected) - ret = __pkvm_host_donate_guest(pfn, gfn, state->vcpu); - else - ret = __pkvm_host_share_guest(pfn, gfn, state->vcpu); - } + if (!ret) + ret = __pkvm_host_donate_guest(pfn, gfn, state->vcpu); out: cpu_reg(host_ctxt, 1) = ret; }