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

Commit 519f526d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull more kvm updates from Paolo Bonzini:
 "ARM:
   - Full debug support for arm64
   - Active state switching for timer interrupts
   - Lazy FP/SIMD save/restore for arm64
   - Generic ARMv8 target

  PPC:
   - Book3S: A few bug fixes
   - Book3S: Allow micro-threading on POWER8

  x86:
   - Compiler warnings

  Generic:
   - Adaptive polling for guest halt"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (49 commits)
  kvm: irqchip: fix memory leak
  kvm: move new trace event outside #ifdef CONFIG_KVM_ASYNC_PF
  KVM: trace kvm_halt_poll_ns grow/shrink
  KVM: dynamic halt-polling
  KVM: make halt_poll_ns per-vCPU
  Silence compiler warning in arch/x86/kvm/emulate.c
  kvm: compile process_smi_save_seg_64() only for x86_64
  KVM: x86: avoid uninitialized variable warning
  KVM: PPC: Book3S: Fix typo in top comment about locking
  KVM: PPC: Book3S: Fix size of the PSPB register
  KVM: PPC: Book3S HV: Exit on H_DOORBELL if HOST_IPI is set
  KVM: PPC: Book3S HV: Fix race in starting secondary threads
  KVM: PPC: Book3S: correct width in XER handling
  KVM: PPC: Book3S HV: Fix preempted vcore stolen time calculation
  KVM: PPC: Book3S HV: Fix preempted vcore list locking
  KVM: PPC: Book3S HV: Implement H_CLEAR_REF and H_CLEAR_MOD
  KVM: PPC: Book3S HV: Fix bug in dirty page tracking
  KVM: PPC: Book3S HV: Fix race in reading change bit when removing HPTE
  KVM: PPC: Book3S HV: Implement dynamic micro-threading on POWER8
  KVM: PPC: Book3S HV: Make use of unused threads when running guests
  ...
parents 06ab838c ba60c41a

Documentation/virtual/kvm/api.txt

+11 −4
Original line number Diff line number Diff line
@@ -2671,7 +2671,7 @@ handled. 
4.87 KVM_SET_GUEST_DEBUG



Capability: KVM_CAP_SET_GUEST_DEBUG

Architectures: x86, s390, ppc

Architectures: x86, s390, ppc, arm64

Type: vcpu ioctl

Parameters: struct kvm_guest_debug (in)

Returns: 0 on success; -1 on error
@@ -2693,8 +2693,8 @@ when running. Common control bits are: 
The top 16 bits of the control field are architecture specific control

flags which can include the following:



  - KVM_GUESTDBG_USE_SW_BP:     using software breakpoints [x86]

  - KVM_GUESTDBG_USE_HW_BP:     using hardware breakpoints [x86, s390]

  - KVM_GUESTDBG_USE_SW_BP:     using software breakpoints [x86, arm64]

  - KVM_GUESTDBG_USE_HW_BP:     using hardware breakpoints [x86, s390, arm64]

  - KVM_GUESTDBG_INJECT_DB:     inject DB type exception [x86]

  - KVM_GUESTDBG_INJECT_BP:     inject BP type exception [x86]

  - KVM_GUESTDBG_EXIT_PENDING:  trigger an immediate guest exit [s390]
@@ -2709,6 +2709,11 @@ updated to the correct (supplied) values. 
The second part of the structure is architecture specific and

typically contains a set of debug registers.



For arm64 the number of debug registers is implementation defined and

can be determined by querying the KVM_CAP_GUEST_DEBUG_HW_BPS and

KVM_CAP_GUEST_DEBUG_HW_WPS capabilities which return a positive number

indicating the number of supported registers.



When debug events exit the main run loop with the reason

KVM_EXIT_DEBUG with the kvm_debug_exit_arch part of the kvm_run

structure containing architecture specific debug information.
@@ -3111,11 +3116,13 @@ data_offset describes where the data is located (KVM_EXIT_IO_OUT) or 
where kvm expects application code to place the data for the next

KVM_RUN invocation (KVM_EXIT_IO_IN).  Data format is a packed array.



		/* KVM_EXIT_DEBUG */

		struct {

			struct kvm_debug_exit_arch arch;

		} debug;



Unused.

If the exit_reason is KVM_EXIT_DEBUG, then a vcpu is processing a debug event

for which architecture specific information is returned.



		/* KVM_EXIT_MMIO */

		struct {

arch/arm/include/asm/kvm_host.h

+5 −0
Original line number Diff line number Diff line
@@ -231,4 +231,9 @@ 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) {}

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



#endif /* __ARM_KVM_HOST_H__ */

arch/arm/kvm/arm.c

+25 −11
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) 
	if (ret)

		goto out_free_stage2_pgd;



	kvm_vgic_early_init(kvm);

	kvm_timer_init(kvm);



	/* Mark the initial VMID generation invalid */
@@ -249,6 +250,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id) 


void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)

{

	kvm_vgic_vcpu_early_init(vcpu);

}



void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)
@@ -278,6 +280,8 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) 
	/* Set up the timer */

	kvm_timer_vcpu_init(vcpu);



	kvm_arm_reset_debug_ptr(vcpu);



	return 0;

}
@@ -301,13 +305,6 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) 
	kvm_arm_set_running_vcpu(NULL);

}



int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,

					struct kvm_guest_debug *dbg)

{

	return -EINVAL;

}





int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,

				    struct kvm_mp_state *mp_state)

{
@@ -528,10 +525,20 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) 
		if (vcpu->arch.pause)

			vcpu_pause(vcpu);



		kvm_vgic_flush_hwstate(vcpu);

		/*

		 * Disarming the background timer must be done in a

		 * preemptible context, as this call may sleep.

		 */

		kvm_timer_flush_hwstate(vcpu);



		/*

		 * Preparing the interrupts to be injected also

		 * involves poking the GIC, which must be done in a

		 * non-preemptible context.

		 */

		preempt_disable();

		kvm_vgic_flush_hwstate(vcpu);



		local_irq_disable();



		/*
@@ -544,12 +551,14 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) 


		if (ret <= 0 || need_new_vmid_gen(vcpu->kvm)) {

			local_irq_enable();

			kvm_vgic_sync_hwstate(vcpu);

			preempt_enable();

			kvm_timer_sync_hwstate(vcpu);

			kvm_vgic_sync_hwstate(vcpu);

			continue;

		}



		kvm_arm_setup_debug(vcpu);



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

		 * Enter the guest

		 */
@@ -564,6 +573,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
@@ -586,11 +597,12 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) 
		 */

		kvm_guest_exit();

		trace_kvm_exit(kvm_vcpu_trap_get_class(vcpu), *vcpu_pc(vcpu));

		preempt_enable();



		kvm_vgic_sync_hwstate(vcpu);



		preempt_enable();



		kvm_timer_sync_hwstate(vcpu);

		kvm_vgic_sync_hwstate(vcpu);



		ret = handle_exit(vcpu, run, ret);

	}
@@ -921,6 +933,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/arm/kvm/guest.c

+6 −0
Original line number Diff line number Diff line
@@ -290,3 +290,9 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, 
{

	return -EINVAL;

}



int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,

					struct kvm_guest_debug *dbg)

{

	return -EINVAL;

}

arch/arm/kvm/interrupts.S

+8 −6
Original line number Diff line number Diff line
@@ -361,10 +361,6 @@ hyp_hvc: 
	@ Check syndrome register

	mrc	p15, 4, r1, c5, c2, 0	@ HSR

	lsr	r0, r1, #HSR_EC_SHIFT

#ifdef CONFIG_VFPv3

	cmp	r0, #HSR_EC_CP_0_13

	beq	switch_to_guest_vfp

#endif

	cmp	r0, #HSR_EC_HVC

	bne	guest_trap		@ Not HVC instr.
@@ -378,7 +374,10 @@ hyp_hvc: 
	cmp     r2, #0

	bne	guest_trap		@ Guest called HVC



host_switch_to_hyp:

	/*

	 * Getting here means host called HVC, we shift parameters and branch

	 * to Hyp function.

	 */

	pop	{r0, r1, r2}



	/* Check for __hyp_get_vectors */
@@ -409,6 +408,10 @@ guest_trap: 


	@ Check if we need the fault information

	lsr	r1, r1, #HSR_EC_SHIFT

#ifdef CONFIG_VFPv3

	cmp	r1, #HSR_EC_CP_0_13

	beq	switch_to_guest_vfp

#endif

	cmp	r1, #HSR_EC_IABT

	mrceq	p15, 4, r2, c6, c0, 2	@ HIFAR

	beq	2f
@@ -477,7 +480,6 @@ guest_trap: 
 */

#ifdef CONFIG_VFPv3

switch_to_guest_vfp:

	load_vcpu			@ Load VCPU pointer to r0

	push	{r3-r7}



	@ NEON/VFP used.  Turn on VFP access.