From 55e91d79da8831a4299587fcbc4800d3848c5e38 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:51:30 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: Add __pkvm_host_share_guest hypercall" This reverts commit 2570e98d667b0bffe9bf22a5e88ed10fc90e68b6. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I90168fb7c16e743da75c19edce7edc8c29ea2002 --- arch/arm64/include/asm/kvm_asm.h | 1 - arch/arm64/include/asm/kvm_host.h | 8 +- arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 1 - arch/arm64/kvm/hyp/nvhe/hyp-main.c | 28 ----- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 107 ------------------ 5 files changed, 2 insertions(+), 143 deletions(-) diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h index 7c1143deeb0a..3bfb5c916d09 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -64,7 +64,6 @@ enum __kvm_host_smccc_func { /* Hypercalls available after pKVM finalisation */ __KVM_HOST_SMCCC_FUNC___pkvm_host_share_hyp, __KVM_HOST_SMCCC_FUNC___pkvm_host_unshare_hyp, - __KVM_HOST_SMCCC_FUNC___pkvm_host_share_guest, __KVM_HOST_SMCCC_FUNC___kvm_adjust_pc, __KVM_HOST_SMCCC_FUNC___kvm_vcpu_run, __KVM_HOST_SMCCC_FUNC___kvm_flush_vm_context, diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 822e152ad712..62d8ed3995da 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -452,12 +452,8 @@ struct kvm_vcpu_arch { /* Don't run the guest (internal implementation need) */ bool pause; - union { - /* Cache some mmu pages needed inside spinlock regions */ - struct kvm_mmu_memory_cache mmu_page_cache; - /* Pages to be donated to pkvm/EL2e if it runs out */ - struct kvm_hyp_memcache pkvm_memcache; - }; + /* Cache some mmu pages needed inside spinlock regions */ + struct kvm_mmu_memory_cache mmu_page_cache; /* Target CPU and feature flags */ int target; diff --git a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h index d1db0b29d27f..64b3c8d8a21d 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h @@ -60,7 +60,6 @@ int __pkvm_host_share_hyp(u64 pfn); int __pkvm_host_unshare_hyp(u64 pfn); int __pkvm_host_donate_hyp(u64 pfn, u64 nr_pages); int __pkvm_hyp_donate_host(u64 pfn, u64 nr_pages); -int __pkvm_host_share_guest(u64 pfn, u64 gfn, struct kvm_vcpu *vcpu); bool addr_is_memory(phys_addr_t phys); int host_stage2_idmap_locked(phys_addr_t addr, u64 size, enum kvm_pgtable_prot prot); diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c index 1d6d8a740d3e..15edc7b99035 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -579,33 +579,6 @@ static void handle___kvm_vcpu_run(struct kvm_cpu_context *host_ctxt) cpu_reg(host_ctxt, 1) = ret; } -static void handle___pkvm_host_share_guest(struct kvm_cpu_context *host_ctxt) -{ - DECLARE_REG(u64, pfn, host_ctxt, 1); - DECLARE_REG(u64, gfn, host_ctxt, 2); - DECLARE_REG(struct kvm_vcpu *, vcpu, host_ctxt, 3); - struct pkvm_loaded_state *state; - int ret = -EINVAL; - u64 nr_pages; - - if (!is_protected_kvm_enabled()) - goto out; - - vcpu = kern_hyp_va(vcpu); - state = this_cpu_ptr(&loaded_state); - if (!state->vcpu || !state->is_shadow) - goto out; - - /* Topup shadow memcache with the host's */ - nr_pages = VTCR_EL2_LVLS(state->vcpu->arch.pkvm.shadow_vm->arch.vtcr) - 1; - ret = refill_memcache(&state->vcpu->arch.pkvm_memcache, nr_pages, - &vcpu->arch.pkvm_memcache); - if (!ret) - ret = __pkvm_host_share_guest(pfn, gfn, state->vcpu); -out: - cpu_reg(host_ctxt, 1) = ret; -} - static void handle___kvm_adjust_pc(struct kvm_cpu_context *host_ctxt) { DECLARE_REG(struct kvm_vcpu *, vcpu, host_ctxt, 1); @@ -845,7 +818,6 @@ static const hcall_t host_hcall[] = { HANDLE_FUNC(__pkvm_host_share_hyp), HANDLE_FUNC(__pkvm_host_unshare_hyp), - HANDLE_FUNC(__pkvm_host_share_guest), HANDLE_FUNC(__kvm_adjust_pc), HANDLE_FUNC(__kvm_vcpu_run), HANDLE_FUNC(__kvm_flush_vm_context), diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index ba30c9d0d9c5..68cdf5f50aea 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -66,16 +66,6 @@ static void hyp_unlock_component(void) hyp_spin_unlock(&pkvm_pgd_lock); } -static void guest_lock_component(struct kvm_vcpu *vcpu) -{ - __guest_lock(vcpu->arch.pkvm.shadow_vm); -} - -static void guest_unlock_component(struct kvm_vcpu *vcpu) -{ - __guest_unlock(vcpu->arch.pkvm.shadow_vm); -} - static void *host_s2_zalloc_pages_exact(size_t size) { void *addr = hyp_alloc_pages(&host_s2_pool, get_order(size)); @@ -635,7 +625,6 @@ void handle_host_mem_abort(struct kvm_cpu_context *host_ctxt) enum pkvm_component_id { PKVM_ID_HOST, PKVM_ID_HYP, - PKVM_ID_GUEST, }; struct pkvm_mem_transition { @@ -659,13 +648,6 @@ struct pkvm_mem_transition { struct { enum pkvm_component_id id; - - union { - struct { - struct kvm_vcpu *vcpu; - phys_addr_t phys; - } guest; - }; } completer; }; @@ -936,52 +918,6 @@ static int hyp_complete_donation(u64 addr, return pkvm_create_mappings_locked(start, end, prot); } -static enum pkvm_page_state guest_get_page_state(kvm_pte_t pte) -{ - if (!kvm_pte_valid(pte)) - return PKVM_NOPAGE; - - return pkvm_getstate(kvm_pgtable_stage2_pte_prot(pte)); -} - -static int __guest_check_page_state_range(struct kvm_vcpu *vcpu, u64 addr, - u64 size, enum pkvm_page_state state) -{ - struct kvm_shadow_vm *vm = vcpu->arch.pkvm.shadow_vm; - struct check_walk_data d = { - .desired = state, - .get_page_state = guest_get_page_state, - }; - - hyp_assert_lock_held(&vm->lock); - return check_page_state_range(&vm->pgt, addr, size, &d); -} - -static int guest_ack_share(u64 addr, const struct pkvm_mem_transition *tx, - enum kvm_pgtable_prot perms) -{ - u64 size = tx->nr_pages * PAGE_SIZE; - - if (perms != KVM_PGTABLE_PROT_RWX) - return -EPERM; - - return __guest_check_page_state_range(tx->completer.guest.vcpu, addr, - size, PKVM_NOPAGE); -} - -static int guest_complete_share(u64 addr, const struct pkvm_mem_transition *tx, - enum kvm_pgtable_prot perms) -{ - struct kvm_vcpu *vcpu = tx->completer.guest.vcpu; - struct kvm_shadow_vm *vm = vcpu->arch.pkvm.shadow_vm; - u64 size = tx->nr_pages * PAGE_SIZE; - enum kvm_pgtable_prot prot; - - prot = pkvm_mkstate(perms, PKVM_PAGE_SHARED_BORROWED); - return kvm_pgtable_stage2_map(&vm->pgt, addr, size, tx->completer.guest.phys, - prot, &vcpu->arch.pkvm_memcache); -} - static int check_share(struct pkvm_mem_share *share) { const struct pkvm_mem_transition *tx = &share->tx; @@ -1003,9 +939,6 @@ static int check_share(struct pkvm_mem_share *share) case PKVM_ID_HYP: ret = hyp_ack_share(completer_addr, tx, share->completer_prot); break; - case PKVM_ID_GUEST: - ret = guest_ack_share(completer_addr, tx, share->completer_prot); - break; default: ret = -EINVAL; } @@ -1034,9 +967,6 @@ static int __do_share(struct pkvm_mem_share *share) case PKVM_ID_HYP: ret = hyp_complete_share(completer_addr, tx, share->completer_prot); break; - case PKVM_ID_GUEST: - ret = guest_complete_share(completer_addr, tx, share->completer_prot); - break; default: ret = -EINVAL; } @@ -1402,40 +1332,3 @@ void hyp_unpin_shared_mem(void *from, void *to) hyp_unlock_component(); host_unlock_component(); } - -int __pkvm_host_share_guest(u64 pfn, u64 gfn, struct kvm_vcpu *vcpu) -{ - int ret; - u64 host_addr = hyp_pfn_to_phys(pfn); - u64 guest_addr = hyp_pfn_to_phys(gfn); - struct pkvm_mem_share share = { - .tx = { - .nr_pages = 1, - .initiator = { - .id = PKVM_ID_HOST, - .addr = host_addr, - .host = { - .completer_addr = guest_addr, - }, - }, - .completer = { - .id = PKVM_ID_GUEST, - .guest = { - .vcpu = vcpu, - .phys = host_addr, - }, - }, - }, - .completer_prot = KVM_PGTABLE_PROT_RWX, - }; - - host_lock_component(); - guest_lock_component(vcpu); - - ret = do_share(&share); - - guest_unlock_component(vcpu); - host_unlock_component(); - - return ret; -}