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

Commit 72573481 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 KVM fixes from Radim Krčmář:
 "PPC:
   - Fix a bug causing occasional machine check exceptions on POWER8
     hosts (introduced in 4.16-rc1)

  x86:
   - Fix a guest crashing regression with nested VMX and restricted
     guest (introduced in 4.16-rc1)

   - Fix dependency check for pv tlb flush (the wrong dependency that
     effectively disabled the feature was added in 4.16-rc4, the
     original feature in 4.16-rc1, so it got decent testing)"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: Fix pv tlb flush dependencies
  KVM: nVMX: sync vmcs02 segment regs prior to vmx_set_cr0
  KVM: PPC: Book3S HV: Fix duplication of host SLB entries
parents bd886137 17a1079d

arch/powerpc/kvm/book3s_hv_rmhandlers.S

+18 −17
Original line number Diff line number Diff line
@@ -1557,6 +1557,24 @@ mc_cont: 
	ptesync

3:	stw	r5,VCPU_SLB_MAX(r9)



	/* load host SLB entries */

BEGIN_MMU_FTR_SECTION

	b	0f

END_MMU_FTR_SECTION_IFSET(MMU_FTR_TYPE_RADIX)

	ld	r8,PACA_SLBSHADOWPTR(r13)



	.rept	SLB_NUM_BOLTED

	li	r3, SLBSHADOW_SAVEAREA

	LDX_BE	r5, r8, r3

	addi	r3, r3, 8

	LDX_BE	r6, r8, r3

	andis.	r7,r5,SLB_ESID_V@h

	beq	1f

	slbmte	r6,r5

1:	addi	r8,r8,16

	.endr

0:



guest_bypass:

	stw	r12, STACK_SLOT_TRAP(r1)

	mr 	r3, r12
@@ -2018,23 +2036,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300) 
	mtspr	SPRN_LPCR,r8

	isync

48:

	/* load host SLB entries */

BEGIN_MMU_FTR_SECTION

	b	0f

END_MMU_FTR_SECTION_IFSET(MMU_FTR_TYPE_RADIX)

	ld	r8,PACA_SLBSHADOWPTR(r13)



	.rept	SLB_NUM_BOLTED

	li	r3, SLBSHADOW_SAVEAREA

	LDX_BE	r5, r8, r3

	addi	r3, r3, 8

	LDX_BE	r6, r8, r3

	andis.	r7,r5,SLB_ESID_V@h

	beq	1f

	slbmte	r6,r5

1:	addi	r8,r8,16

	.endr

0:

#ifdef CONFIG_KVM_BOOK3S_HV_EXIT_TIMING

	/* Finish timing, if we have a vcpu */

	ld	r4, HSTATE_KVM_VCPU(r13)

arch/x86/kernel/kvm.c

+2 −2
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ static void __init kvm_guest_init(void) 
	}



	if (kvm_para_has_feature(KVM_FEATURE_PV_TLB_FLUSH) &&

	    !kvm_para_has_feature(KVM_FEATURE_STEAL_TIME))

	    kvm_para_has_feature(KVM_FEATURE_STEAL_TIME))

		pv_mmu_ops.flush_tlb_others = kvm_flush_tlb_others;



	if (kvm_para_has_feature(KVM_FEATURE_PV_EOI))
@@ -635,7 +635,7 @@ static __init int kvm_setup_pv_tlb_flush(void) 
	int cpu;



	if (kvm_para_has_feature(KVM_FEATURE_PV_TLB_FLUSH) &&

	    !kvm_para_has_feature(KVM_FEATURE_STEAL_TIME)) {

	    kvm_para_has_feature(KVM_FEATURE_STEAL_TIME)) {

		for_each_possible_cpu(cpu) {

			zalloc_cpumask_var_node(per_cpu_ptr(&__pv_tlb_mask, cpu),

				GFP_KERNEL, cpu_to_node(cpu));

arch/x86/kvm/vmx.c

+5 −5
Original line number Diff line number Diff line
@@ -10711,6 +10711,11 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, 
	struct vcpu_vmx *vmx = to_vmx(vcpu);

	u32 exec_control, vmcs12_exec_ctrl;



	if (vmx->nested.dirty_vmcs12) {

		prepare_vmcs02_full(vcpu, vmcs12, from_vmentry);

		vmx->nested.dirty_vmcs12 = false;

	}



	/*

	 * First, the fields that are shadowed.  This must be kept in sync

	 * with vmx_shadow_fields.h.
@@ -10948,11 +10953,6 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, 
	/* Note: modifies VM_ENTRY/EXIT_CONTROLS and GUEST/HOST_IA32_EFER */

	vmx_set_efer(vcpu, vcpu->arch.efer);



	if (vmx->nested.dirty_vmcs12) {

		prepare_vmcs02_full(vcpu, vmcs12, from_vmentry);

		vmx->nested.dirty_vmcs12 = false;

	}



	/* Shadow page tables on either EPT or shadow page tables. */

	if (nested_vmx_load_cr3(vcpu, vmcs12->guest_cr3, nested_cpu_has_ept(vmcs12),

				entry_failure_code))