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

Commit 12fda812 authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

arm/arm64: KVM: Drop boot_pgd 



Since we now only have one set of page tables, the concept of
boot_pgd is useless and can be removed. We still keep it as
an element of the "extended idmap" thing.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 3421e9d8

arch/arm/include/asm/kvm_host.h

+3 −5
Original line number Diff line number Diff line
@@ -241,8 +241,7 @@ int kvm_arm_coproc_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *); 
int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run,

		int exception_index);



static inline void __cpu_init_hyp_mode(phys_addr_t boot_pgd_ptr,

				       phys_addr_t pgd_ptr,

static inline void __cpu_init_hyp_mode(phys_addr_t pgd_ptr,

				       unsigned long hyp_stack_ptr,

				       unsigned long vector_ptr)

{
@@ -272,12 +271,11 @@ static inline void __cpu_init_stage2(void) 
	kvm_call_hyp(__init_stage2_translation);

}



static inline void __cpu_reset_hyp_mode(phys_addr_t boot_pgd_ptr,

					phys_addr_t phys_idmap_start)

static inline void __cpu_reset_hyp_mode(phys_addr_t phys_idmap_start)

{

	/*

	 * TODO

	 * kvm_call_reset(boot_pgd_ptr, phys_idmap_start);

	 * kvm_call_reset(phys_idmap_start);

	 */

}

arch/arm/include/asm/kvm_mmu.h

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ 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);

phys_addr_t kvm_mmu_get_boot_httbr(void);

phys_addr_t kvm_get_idmap_vector(void);

phys_addr_t kvm_get_idmap_start(void);

int kvm_mmu_init(void);

arch/arm/kvm/arm.c

+3 −12
Original line number Diff line number Diff line
@@ -1038,7 +1038,6 @@ long kvm_arch_vm_ioctl(struct file *filp, 


static void cpu_init_hyp_mode(void *dummy)

{

	phys_addr_t boot_pgd_ptr;

	phys_addr_t pgd_ptr;

	unsigned long hyp_stack_ptr;

	unsigned long stack_page;
@@ -1047,13 +1046,12 @@ static void cpu_init_hyp_mode(void *dummy) 
	/* Switch from the HYP stub to our own HYP init vector */

	__hyp_set_vectors(kvm_get_idmap_vector());



	boot_pgd_ptr = kvm_mmu_get_boot_httbr();

	pgd_ptr = kvm_mmu_get_httbr();

	stack_page = __this_cpu_read(kvm_arm_hyp_stack_page);

	hyp_stack_ptr = stack_page + PAGE_SIZE;

	vector_ptr = (unsigned long)kvm_ksym_ref(__kvm_hyp_vector);



	__cpu_init_hyp_mode(boot_pgd_ptr, pgd_ptr, hyp_stack_ptr, vector_ptr);

	__cpu_init_hyp_mode(pgd_ptr, hyp_stack_ptr, vector_ptr);

	__cpu_init_stage2();



	kvm_arm_init_debug();
@@ -1075,15 +1073,8 @@ static void cpu_hyp_reinit(void) 


static void cpu_hyp_reset(void)

{

	phys_addr_t boot_pgd_ptr;

	phys_addr_t phys_idmap_start;



	if (!is_kernel_in_hyp_mode()) {

		boot_pgd_ptr = kvm_mmu_get_boot_httbr();

		phys_idmap_start = kvm_get_idmap_start();



		__cpu_reset_hyp_mode(boot_pgd_ptr, phys_idmap_start);

	}

	if (!is_kernel_in_hyp_mode())

		__cpu_reset_hyp_mode(kvm_get_idmap_start());

}



static void _kvm_arch_hardware_enable(void *discard)

arch/arm/kvm/mmu.c

+0 −8
Original line number Diff line number Diff line
@@ -1685,14 +1685,6 @@ phys_addr_t kvm_mmu_get_httbr(void) 
		return virt_to_phys(hyp_pgd);

}



phys_addr_t kvm_mmu_get_boot_httbr(void)

{

	if (__kvm_cpu_uses_extended_idmap())

		return virt_to_phys(merged_hyp_pgd);

	else

		return virt_to_phys(hyp_pgd);

}



phys_addr_t kvm_get_idmap_vector(void)

{

	return hyp_idmap_vector;

arch/arm64/include/asm/kvm_host.h

+2 −4
Original line number Diff line number Diff line
@@ -347,8 +347,7 @@ int kvm_perf_teardown(void); 


struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr);



static inline void __cpu_init_hyp_mode(phys_addr_t boot_pgd_ptr,

				       phys_addr_t pgd_ptr,

static inline void __cpu_init_hyp_mode(phys_addr_t pgd_ptr,

				       unsigned long hyp_stack_ptr,

				       unsigned long vector_ptr)

{
@@ -360,8 +359,7 @@ static inline void __cpu_init_hyp_mode(phys_addr_t boot_pgd_ptr, 
}



void __kvm_hyp_teardown(void);

static inline void __cpu_reset_hyp_mode(phys_addr_t boot_pgd_ptr,

					phys_addr_t phys_idmap_start)

static inline void __cpu_reset_hyp_mode(phys_addr_t phys_idmap_start)

{

	kvm_call_hyp(__kvm_hyp_teardown, phys_idmap_start);

}