Commit f9370010 authored by Quentin Perret's avatar Quentin Perret Committed by Marc Zyngier
Browse files

KVM: arm64: Refactor protected nVHE stage-1 locking 



Refactor the hypervisor stage-1 locking in nVHE protected mode to expose
a new pkvm_create_mappings_locked() function. This will be used in later
patches to allow walking and changing the hypervisor stage-1 without
releasing the lock.

Signed-off-by: default avatarQuentin Perret <qperret@google.com>
Reviewed-by: default avatarFuad Tabba <tabba@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210809152448.1810400-20-qperret@google.com
parent ad0e0139

arch/arm64/kvm/hyp/include/nvhe/mm.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ int hyp_map_vectors(void); 
int hyp_back_vmemmap(phys_addr_t phys, unsigned long size, phys_addr_t back);

int pkvm_cpu_set_vector(enum arm64_hyp_spectre_vector slot);

int pkvm_create_mappings(void *from, void *to, enum kvm_pgtable_prot prot);

int pkvm_create_mappings_locked(void *from, void *to, enum kvm_pgtable_prot prot);

int __pkvm_create_mappings(unsigned long start, unsigned long size,

			   unsigned long phys, enum kvm_pgtable_prot prot);

unsigned long __pkvm_create_private_mapping(phys_addr_t phys, size_t size,

arch/arm64/kvm/hyp/nvhe/mm.c

+16 −2
Original line number Diff line number Diff line
@@ -67,13 +67,15 @@ unsigned long __pkvm_create_private_mapping(phys_addr_t phys, size_t size, 
	return addr;

}



int pkvm_create_mappings(void *from, void *to, enum kvm_pgtable_prot prot)

int pkvm_create_mappings_locked(void *from, void *to, enum kvm_pgtable_prot prot)

{

	unsigned long start = (unsigned long)from;

	unsigned long end = (unsigned long)to;

	unsigned long virt_addr;

	phys_addr_t phys;



	hyp_assert_lock_held(&pkvm_pgd_lock);



	start = start & PAGE_MASK;

	end = PAGE_ALIGN(end);
@@ -81,7 +83,8 @@ int pkvm_create_mappings(void *from, void *to, enum kvm_pgtable_prot prot) 
		int err;



		phys = hyp_virt_to_phys((void *)virt_addr);

		err = __pkvm_create_mappings(virt_addr, PAGE_SIZE, phys, prot);

		err = kvm_pgtable_hyp_map(&pkvm_pgtable, virt_addr, PAGE_SIZE,

					  phys, prot);

		if (err)

			return err;

	}
@@ -89,6 +92,17 @@ int pkvm_create_mappings(void *from, void *to, enum kvm_pgtable_prot prot) 
	return 0;

}



int pkvm_create_mappings(void *from, void *to, enum kvm_pgtable_prot prot)

{

	int ret;



	hyp_spin_lock(&pkvm_pgd_lock);

	ret = pkvm_create_mappings_locked(from, to, prot);

	hyp_spin_unlock(&pkvm_pgd_lock);



	return ret;

}



int hyp_back_vmemmap(phys_addr_t phys, unsigned long size, phys_addr_t back)

{

	unsigned long start, end;