shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ANDROID: KVM: arm64: Factor out private range VA allocation"

Browse Source 
This reverts commit c9cc94723b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I657204a15aa35ad0b2856ec682523abc1bf5aeaf
This commit is contained in:
Will Deacon
2022-07-07 15:51:31 +01:00
parent 7846bb7095
commit be1a18f4ae
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
arch/arm64/kvm/hyp/nvhe/mm.c
View File

@@ -38,22 +38,6 @@ static int __pkvm_create_mappings(unsigned long start, unsigned long size,
return err;
}
static unsigned long hyp_alloc_private_va_range(size_t size)
{
unsigned long addr = __io_map_base;
hyp_assert_lock_held(&pkvm_pgd_lock);
__io_map_base += PAGE_ALIGN(size);
/* Are we overflowing on the vmemmap ? */
if (__io_map_base > __hyp_vmemmap) {
__io_map_base = addr;
addr = (unsigned long)ERR_PTR(-ENOMEM);
}
return addr;
}
unsigned long __pkvm_create_private_mapping(phys_addr_t phys, size_t size,
enum kvm_pgtable_prot prot)
{
@@ -62,10 +46,16 @@ unsigned long __pkvm_create_private_mapping(phys_addr_t phys, size_t size,
hyp_spin_lock(&pkvm_pgd_lock);
size = size + offset_in_page(phys);
addr = hyp_alloc_private_va_range(size);
if (IS_ERR((void *)addr))
size = PAGE_ALIGN(size + offset_in_page(phys));
addr = __io_map_base;
__io_map_base += size;
/* Are we overflowing on the vmemmap ? */
if (__io_map_base > __hyp_vmemmap) {
__io_map_base -= size;
addr = (unsigned long)ERR_PTR(-ENOMEM);
goto out;
}
err = kvm_pgtable_hyp_map(&pkvm_pgtable, addr, size, phys, prot);
if (err) {