Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5d8184d authored by Christoffer Dall's avatar Christoffer Dall
Browse files

KVM: ARM: Memory virtualization setup 



This commit introduces the framework for guest memory management
through the use of 2nd stage translation. Each VM has a pointer
to a level-1 table (the pgd field in struct kvm_arch) which is
used for the 2nd stage translations. Entries are added when handling
guest faults (later patch) and the table itself can be allocated and
freed through the following functions implemented in
arch/arm/kvm/arm_mmu.c:
 - kvm_alloc_stage2_pgd(struct kvm *kvm);
 - kvm_free_stage2_pgd(struct kvm *kvm);

Each entry in TLBs and caches are tagged with a VMID identifier in
addition to ASIDs. The VMIDs are assigned consecutively to VMs in the
order that VMs are executed, and caches and tlbs are invalidated when
the VMID space has been used to allow for more than 255 simultaenously
running guests.

The 2nd stage pgd is allocated in kvm_arch_init_vm(). The table is
freed in kvm_arch_destroy_vm(). Both functions are called from the main
KVM code.

We pre-allocate page table memory to be able to synchronize using a
spinlock and be called under rcu_read_lock from the MMU notifiers.  We
steal the mmu_memory_cache implementation from x86 and adapt for our
specific usage.

We support MMU notifiers (thanks to Marc Zyngier) through
kvm_unmap_hva and kvm_set_spte_hva.

Finally, define kvm_phys_addr_ioremap() to map a device at a guest IPA,
which is used by VGIC support to map the virtual CPU interface registers
to the guest. This support is added by Marc Zyngier.

Reviewed-by: default avatarWill Deacon <will.deacon@arm.com>
Reviewed-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <c.dall@virtualopensystems.com>
parent 342cd0ab

arch/arm/include/asm/kvm_asm.h

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#define ARM_EXCEPTION_HVC	  7



#ifndef __ASSEMBLY__

struct kvm;

struct kvm_vcpu;



extern char __kvm_hyp_init[];
@@ -71,6 +72,7 @@ extern char __kvm_hyp_code_start[]; 
extern char __kvm_hyp_code_end[];



extern void __kvm_flush_vm_context(void);

extern void __kvm_tlb_flush_vmid(struct kvm *kvm);



extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu);

#endif

arch/arm/include/asm/kvm_host.h

+18 −0
Original line number Diff line number Diff line
@@ -112,4 +112,22 @@ struct kvm_one_reg; 
int kvm_arm_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg);

int kvm_arm_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg);

u64 kvm_call_hyp(void *hypfn, ...);



#define KVM_ARCH_WANT_MMU_NOTIFIER

struct kvm;

int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);

int kvm_unmap_hva_range(struct kvm *kvm,

			unsigned long start, unsigned long end);

void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);



/* We do not have shadow page tables, hence the empty hooks */

static inline int kvm_age_hva(struct kvm *kvm, unsigned long hva)

{

	return 0;

}



static inline int kvm_test_age_hva(struct kvm *kvm, unsigned long hva)

{

	return 0;

}

#endif /* __ARM_KVM_HOST_H__ */

arch/arm/include/asm/kvm_mmu.h

+9 −0
Original line number Diff line number Diff line
@@ -23,6 +23,15 @@ int create_hyp_mappings(void *from, void *to); 
int create_hyp_io_mappings(void *from, void *to, phys_addr_t);

void free_hyp_pmds(void);



int kvm_alloc_stage2_pgd(struct kvm *kvm);

void kvm_free_stage2_pgd(struct kvm *kvm);

int kvm_phys_addr_ioremap(struct kvm *kvm, phys_addr_t guest_ipa,

			  phys_addr_t pa, unsigned long size);



int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run);



void kvm_mmu_free_memory_caches(struct kvm_vcpu *vcpu);



phys_addr_t kvm_mmu_get_httbr(void);

int kvm_mmu_init(void);

void kvm_clear_hyp_idmap(void);

arch/arm/kvm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ config KVM_ARM_HOST 
	bool "KVM host support for ARM cpus."

	depends on KVM

	depends on MMU

	select	MMU_NOTIFIER

	---help---

	  Provides host support for ARM processors.

arch/arm/kvm/arm.c

+36 −1
Original line number Diff line number Diff line
@@ -81,12 +81,33 @@ void kvm_arch_sync_events(struct kvm *kvm) 
{

}



/**

 * kvm_arch_init_vm - initializes a VM data structure

 * @kvm:	pointer to the KVM struct

 */

int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)

{

	int ret = 0;



	if (type)

		return -EINVAL;



	return 0;

	ret = kvm_alloc_stage2_pgd(kvm);

	if (ret)

		goto out_fail_alloc;



	ret = create_hyp_mappings(kvm, kvm + 1);

	if (ret)

		goto out_free_stage2_pgd;



	/* Mark the initial VMID generation invalid */

	kvm->arch.vmid_gen = 0;



	return ret;

out_free_stage2_pgd:

	kvm_free_stage2_pgd(kvm);

out_fail_alloc:

	return ret;

}



int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)
@@ -104,10 +125,16 @@ int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages) 
	return 0;

}



/**

 * kvm_arch_destroy_vm - destroy the VM data structure

 * @kvm:	pointer to the KVM struct

 */

void kvm_arch_destroy_vm(struct kvm *kvm)

{

	int i;



	kvm_free_stage2_pgd(kvm);



	for (i = 0; i < KVM_MAX_VCPUS; ++i) {

		if (kvm->vcpus[i]) {

			kvm_arch_vcpu_free(kvm->vcpus[i]);
@@ -196,7 +223,13 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id) 
	if (err)

		goto free_vcpu;



	err = create_hyp_mappings(vcpu, vcpu + 1);

	if (err)

		goto vcpu_uninit;



	return vcpu;

vcpu_uninit:

	kvm_vcpu_uninit(vcpu);

free_vcpu:

	kmem_cache_free(kvm_vcpu_cache, vcpu);

out:
@@ -210,6 +243,8 @@ int kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) 


void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)

{

	kvm_mmu_free_memory_caches(vcpu);

	kmem_cache_free(kvm_vcpu_cache, vcpu);

}



void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)