iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KVM: arm64: Introduce wrappers for host and hyp spin lock accessors

Browse Source 
In preparation for adding additional locked sections for manipulating
page-tables at EL2, introduce some simple wrappers around the host and
hypervisor locks so that it's a bit easier to read and bit more difficult
to take the wrong lock (or even take them in the wrong order).

Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Quentin Perret <qperret@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20211215161232.1480836-10-qperret@google.com
This commit is contained in:
Will Deacon 2021-12-15 16:12:26 +00:00 committed by Marc Zyngier
parent 3d467f7b8c
commit 61d99e33e7
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
arch/arm64/kvm/hyp/nvhe/mem_protect.c
View File

@ -27,6 +27,26 @@ static struct hyp_pool host_s2_pool;
const u8 pkvm_hyp_id = 1; 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) static void *host_s2_zalloc_pages_exact(size_t size)
{ {
void *addr = hyp_alloc_pages(&host_s2_pool, get_order(size)); void *addr = hyp_alloc_pages(&host_s2_pool, get_order(size));
@ -338,14 +358,14 @@ static int host_stage2_idmap(u64 addr)
prot = is_memory ? PKVM_HOST_MEM_PROT : PKVM_HOST_MMIO_PROT; prot = is_memory ? PKVM_HOST_MEM_PROT : PKVM_HOST_MMIO_PROT;
hyp_spin_lock(&host_kvm.lock); host_lock_component();
ret = host_stage2_adjust_range(addr, &range); ret = host_stage2_adjust_range(addr, &range);
if (ret) if (ret)
goto unlock; goto unlock;
ret = host_stage2_idmap_locked(range.start, range.end - range.start, prot); ret = host_stage2_idmap_locked(range.start, range.end - range.start, prot);
unlock: unlock:
hyp_spin_unlock(&host_kvm.lock); host_unlock_component();
return ret; return ret;
} }
@ -369,8 +389,8 @@ int __pkvm_host_share_hyp(u64 pfn)
if (!addr_is_memory(addr)) if (!addr_is_memory(addr))
return -EINVAL; return -EINVAL;
hyp_spin_lock(&host_kvm.lock); host_lock_component();
hyp_spin_lock(&pkvm_pgd_lock); hyp_lock_component();
ret = kvm_pgtable_get_leaf(&host_kvm.pgt, addr, &pte, NULL); ret = kvm_pgtable_get_leaf(&host_kvm.pgt, addr, &pte, NULL);
if (ret) if (ret)
@ -432,8 +452,8 @@ map_shared:
BUG_ON(ret); BUG_ON(ret);
unlock: unlock:
hyp_spin_unlock(&pkvm_pgd_lock); hyp_unlock_component();
hyp_spin_unlock(&host_kvm.lock); host_unlock_component();
return ret; return ret;
} }