From a5fa58c648eec3aac8aa1bbf2f464799c375016c Mon Sep 17 00:00:00 2001 From: Quentin Perret Date: Thu, 6 Jan 2022 11:08:59 +0000 Subject: [PATCH] Revert "BACKPORT: FROMLIST: KVM: arm64: Introduce wrappers for host and hyp spin lock accessors" This reverts commit fb29cc8de3dec6557f49d87d265c7af48583d6ac. This will be replaced by a FROMGIT patch shortly. Signed-off-by: Quentin Perret Change-Id: Ia67b33b36bcaf49a77b654ff62fbd604eaa959fc --- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 32 +++++---------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index edf362459874..8a344c8b7fe8 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -29,26 +29,6 @@ static struct hyp_pool host_s2_pool; const u8 pkvm_hyp_id = 1; -static void host_lock_component(void) -{ - hyp_spin_lock(&host_kvm.lock); -} - -static void host_unlock_component(void) -{ - hyp_spin_unlock(&host_kvm.lock); -} - -static void hyp_lock_component(void) -{ - hyp_spin_lock(&pkvm_pgd_lock); -} - -static void hyp_unlock_component(void) -{ - hyp_spin_unlock(&pkvm_pgd_lock); -} - static void *host_s2_zalloc_pages_exact(size_t size) { void *addr = hyp_alloc_pages(&host_s2_pool, get_order(size)); @@ -378,14 +358,14 @@ static int host_stage2_idmap(u64 addr) return ret; } - host_lock_component(); + hyp_spin_lock(&host_kvm.lock); ret = host_stage2_adjust_range(addr, &range); if (ret) goto unlock; ret = host_stage2_idmap_locked(range.start, range.end - range.start, prot); unlock: - host_unlock_component(); + hyp_spin_unlock(&host_kvm.lock); return ret; } @@ -409,8 +389,8 @@ int __pkvm_host_share_hyp(u64 pfn) if (!addr_is_memory(addr)) return -EINVAL; - host_lock_component(); - hyp_lock_component(); + hyp_spin_lock(&host_kvm.lock); + hyp_spin_lock(&pkvm_pgd_lock); ret = kvm_pgtable_get_leaf(&host_kvm.pgt, addr, &pte, NULL); if (ret) @@ -472,8 +452,8 @@ map_shared: BUG_ON(ret); unlock: - hyp_unlock_component(); - host_unlock_component(); + hyp_spin_unlock(&pkvm_pgd_lock); + hyp_spin_unlock(&host_kvm.lock); return ret; }