From 87b9bddc649b10f93b53d78766f34f38f0d43308 Mon Sep 17 00:00:00 2001 From: Mostafa Saleh Date: Fri, 20 Dec 2024 13:59:49 +0000 Subject: [PATCH] ANDROID: Revert "BACKPORT: FROMLIST: KVM: arm64: pkvm: Add __pkvm_host_add_remove_page()" This reverts commit 61dced62ffb33fb85b930bc26337a186ca7ce503. This function is not used anymore. Bug: 357781595 Bug: 384432312 Change-Id: Ib6a3202f8d3ebd57e325ff597a757bb0342e048a Signed-off-by: Mostafa Saleh --- arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 1 - arch/arm64/kvm/hyp/nvhe/mem_protect.c | 17 ----------------- 2 files changed, 18 deletions(-) diff --git a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h index c5f5e96573e9..9fab66e8c70c 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h @@ -62,7 +62,6 @@ int __pkvm_guest_relinquish_to_host(struct pkvm_hyp_vcpu *vcpu, u64 ipa, u64 *ppa); int __pkvm_host_use_dma(u64 phys_addr, size_t size); int __pkvm_host_unuse_dma(u64 phys_addr, size_t size); -int __pkvm_host_add_remove_page(u64 pfn, bool remove); 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/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index 10cef39924ff..3a17a6127787 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -2600,20 +2600,3 @@ int host_stage2_get_leaf(phys_addr_t phys, kvm_pte_t *ptep, s8 *level) return ret; } - -/* - * Temporarily unmap a page from the host stage-2, if @remove is true, or put it - * back. After restoring the ownership to host, the page will be lazy-mapped. - */ -int __pkvm_host_add_remove_page(u64 pfn, bool remove) -{ - int ret; - u64 host_addr = hyp_pfn_to_phys(pfn); - u8 owner = remove ? PKVM_ID_HYP : PKVM_ID_HOST; - - host_lock_component(); - ret = host_stage2_set_owner_locked(host_addr, PAGE_SIZE, owner); - host_unlock_component(); - - return ret; -}