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

Commit 56c7f5e7 authored by Alex Bennée's avatar Alex Bennée Committed by Marc Zyngier
Browse files

KVM: arm: introduce kvm_arm_init/setup/clear_debug 



This is a precursor for later patches which will need to do more to
setup debug state before entering the hyp.S switch code. The existing
functionality for setting mdcr_el2 has been moved out of hyp.S and now
uses the value kept in vcpu->arch.mdcr_el2.

As the assembler used to previously mask and preserve MDCR_EL2.HPMN I've
had to add a mechanism to save the value of mdcr_el2 as a per-cpu
variable during the initialisation code. The kernel never sets this
number so we are assuming the bootcode has set up the correct value
here.

This also moves the conditional setting of the TDA bit from the hyp code
into the C code which is currently used for the lazy debug register
context switch code.

Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 0e6f07f2

arch/arm/include/asm/kvm_host.h

+4 −0
Original line number Diff line number Diff line
@@ -231,4 +231,8 @@ static inline void kvm_arch_sync_events(struct kvm *kvm) {} 
static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {}

static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {}



static inline void kvm_arm_init_debug(void) {}

static inline void kvm_arm_setup_debug(struct kvm_vcpu *vcpu) {}

static inline void kvm_arm_clear_debug(struct kvm_vcpu *vcpu) {}



#endif /* __ARM_KVM_HOST_H__ */

arch/arm/kvm/arm.c

+6 −0
Original line number Diff line number Diff line
@@ -543,6 +543,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) 
			continue;

		}



		kvm_arm_setup_debug(vcpu);



		/**************************************************************

		 * Enter the guest

		 */
@@ -557,6 +559,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) 
		 * Back from guest

		 *************************************************************/



		kvm_arm_clear_debug(vcpu);



		/*

		 * We may have taken a host interrupt in HYP mode (ie

		 * while executing the guest). This interrupt is still
@@ -914,6 +918,8 @@ static void cpu_init_hyp_mode(void *dummy) 
	vector_ptr = (unsigned long)__kvm_hyp_vector;



	__cpu_init_hyp_mode(boot_pgd_ptr, pgd_ptr, hyp_stack_ptr, vector_ptr);



	kvm_arm_init_debug();

}



static int hyp_init_cpu_notify(struct notifier_block *self,

arch/arm64/include/asm/kvm_asm.h

+2 −0
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu); 


extern u64 __vgic_v3_get_ich_vtr_el2(void);



extern u32 __kvm_get_mdcr_el2(void);



#endif



#endif /* __ARM_KVM_ASM_H__ */

arch/arm64/include/asm/kvm_host.h

+5 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ struct kvm_vcpu_arch { 


	/* HYP configuration */

	u64 hcr_el2;

	u32 mdcr_el2;



	/* Exception Information */

	struct kvm_vcpu_fault_info fault;
@@ -227,4 +228,8 @@ static inline void kvm_arch_sync_events(struct kvm *kvm) {} 
static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {}

static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {}



void kvm_arm_init_debug(void);

void kvm_arm_setup_debug(struct kvm_vcpu *vcpu);

void kvm_arm_clear_debug(struct kvm_vcpu *vcpu);



#endif /* __ARM64_KVM_HOST_H__ */

arch/arm64/kernel/asm-offsets.c

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ int main(void) 
  DEFINE(VCPU_HPFAR_EL2,	offsetof(struct kvm_vcpu, arch.fault.hpfar_el2));

  DEFINE(VCPU_DEBUG_FLAGS,	offsetof(struct kvm_vcpu, arch.debug_flags));

  DEFINE(VCPU_HCR_EL2,		offsetof(struct kvm_vcpu, arch.hcr_el2));

  DEFINE(VCPU_MDCR_EL2,	offsetof(struct kvm_vcpu, arch.mdcr_el2));

  DEFINE(VCPU_IRQ_LINES,	offsetof(struct kvm_vcpu, arch.irq_lines));

  DEFINE(VCPU_HOST_CONTEXT,	offsetof(struct kvm_vcpu, arch.host_cpu_context));

  DEFINE(VCPU_TIMER_CNTV_CTL,	offsetof(struct kvm_vcpu, arch.timer_cpu.cntv_ctl));