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

Commit 9db59599 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:
 - PPC bugfixes
 - RCU splat fix
 - swait races fix
 - pointless userspace-triggerable BUG() fix
 - misc fixes for KVM_RUN corner cases
 - nested virt correctness fixes + one host DoS
 - some cleanups
 - clang build fix
 - fix AMD AVIC with default QEMU command line options
 - x86 bugfixes

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (28 commits)
  kvm: nVMX: Handle deferred early VMLAUNCH/VMRESUME failure properly
  kvm: vmx: Handle VMLAUNCH/VMRESUME failure properly
  kvm: nVMX: Remove nested_vmx_succeed after successful VM-entry
  kvm,mips: Fix potential swait_active() races
  kvm,powerpc: Serialize wq active checks in ops->vcpu_kick
  kvm: Serialize wq active checks in kvm_vcpu_wake_up()
  kvm,x86: Fix apf_task_wake_one() wq serialization
  kvm,lapic: Justify use of swait_active()
  kvm,async_pf: Use swq_has_sleeper()
  sched/wait: Add swq_has_sleeper()
  KVM: VMX: Do not BUG() on out-of-bounds guest IRQ
  KVM: Don't accept obviously wrong gsi values via KVM_IRQFD
  kvm: nVMX: Don't allow L2 to access the hardware CR8
  KVM: trace events: update list of exit reasons
  KVM: async_pf: Fix #DF due to inject "Page not Present" and "Page Ready" exceptions simultaneously
  KVM: X86: Don't block vCPU if there is pending exception
  KVM: SVM: Add irqchip_split() checks before enabling AVIC
  KVM: Add struct kvm_vcpu pointer parameter to get_enable_apicv()
  KVM: SVM: Refactor AVIC vcpu initialization into avic_init_vcpu()
  KVM: x86: fix clang build
  ...
parents b38923a0 4f350c6d

arch/mips/kvm/mips.c

+2 −2
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, 


	dvcpu->arch.wait = 0;



	if (swait_active(&dvcpu->wq))

	if (swq_has_sleeper(&dvcpu->wq))

		swake_up(&dvcpu->wq);



	return 0;
@@ -1179,7 +1179,7 @@ static void kvm_mips_comparecount_func(unsigned long data) 
	kvm_mips_callbacks->queue_timer_int(vcpu);



	vcpu->arch.wait = 0;

	if (swait_active(&vcpu->wq))

	if (swq_has_sleeper(&vcpu->wq))

		swake_up(&vcpu->wq);

}

arch/powerpc/kvm/book3s_hv.c

+3 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static void kvmppc_fast_vcpu_kick_hv(struct kvm_vcpu *vcpu) 
	struct swait_queue_head *wqp;



	wqp = kvm_arch_vcpu_wq(vcpu);

	if (swait_active(wqp)) {

	if (swq_has_sleeper(wqp)) {

		swake_up(wqp);

		++vcpu->stat.halt_wakeup;

	}
@@ -4212,11 +4212,13 @@ static int kvmhv_configure_mmu(struct kvm *kvm, struct kvm_ppc_mmuv3_cfg *cfg) 
	if ((cfg->process_table & PRTS_MASK) > 24)

		return -EINVAL;



	mutex_lock(&kvm->lock);

	kvm->arch.process_table = cfg->process_table;

	kvmppc_setup_partition_table(kvm);



	lpcr = (cfg->flags & KVM_PPC_MMUV3_GTSE) ? LPCR_GTSE : 0;

	kvmppc_update_lpcr(kvm, lpcr, LPCR_GTSE);

	mutex_unlock(&kvm->lock);



	return 0;

}

arch/powerpc/kvm/book3s_hv_rm_xive.c

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ static inline void __iomem *get_tima_phys(void) 
#define __x_tima		get_tima_phys()

#define __x_eoi_page(xd)	((void __iomem *)((xd)->eoi_page))

#define __x_trig_page(xd)	((void __iomem *)((xd)->trig_page))

#define __x_readb	__raw_rm_readb

#define __x_writeb	__raw_rm_writeb

#define __x_readw	__raw_rm_readw

#define __x_readq	__raw_rm_readq

arch/powerpc/kvm/book3s_hv_rmhandlers.S

+16 −1
Original line number Diff line number Diff line
@@ -771,6 +771,9 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_207S) 


#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

BEGIN_FTR_SECTION

	/*

	 * NOTE THAT THIS TRASHES ALL NON-VOLATILE REGISTERS INCLUDING CR

	 */

	bl	kvmppc_restore_tm

END_FTR_SECTION_IFSET(CPU_FTR_TM)

#endif
@@ -1630,6 +1633,9 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_300) 


#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

BEGIN_FTR_SECTION

	/*

	 * NOTE THAT THIS TRASHES ALL NON-VOLATILE REGISTERS INCLUDING CR

	 */

	bl	kvmppc_save_tm

END_FTR_SECTION_IFSET(CPU_FTR_TM)

#endif
@@ -1749,6 +1755,9 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300) 
	/*

	 * Are we running hash or radix ?

	 */

	ld	r5, VCPU_KVM(r9)

	lbz	r0, KVM_RADIX(r5)

	cmpwi	cr2, r0, 0

	beq	cr2, 3f



	/* Radix: Handle the case where the guest used an illegal PID */
@@ -2466,6 +2475,9 @@ _GLOBAL(kvmppc_h_cede) /* r3 = vcpu pointer, r11 = msr, r13 = paca */ 


#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

BEGIN_FTR_SECTION

	/*

	 * NOTE THAT THIS TRASHES ALL NON-VOLATILE REGISTERS INCLUDING CR

	 */

	ld	r9, HSTATE_KVM_VCPU(r13)

	bl	kvmppc_save_tm

END_FTR_SECTION_IFSET(CPU_FTR_TM)
@@ -2578,6 +2590,9 @@ kvm_end_cede: 


#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

BEGIN_FTR_SECTION

	/*

	 * NOTE THAT THIS TRASHES ALL NON-VOLATILE REGISTERS INCLUDING CR

	 */

	bl	kvmppc_restore_tm

END_FTR_SECTION_IFSET(CPU_FTR_TM)

#endif

arch/powerpc/kvm/book3s_xive.c

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 
#define __x_tima		xive_tima

#define __x_eoi_page(xd)	((void __iomem *)((xd)->eoi_mmio))

#define __x_trig_page(xd)	((void __iomem *)((xd)->trig_mmio))

#define __x_readb	__raw_readb

#define __x_writeb	__raw_writeb

#define __x_readw	__raw_readw

#define __x_readq	__raw_readq