Commit 98a05fe8 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 Paolo Bonzini:
 "x86:

   - Do not register IRQ bypass consumer if posted interrupts not
     supported

   - Fix missed device interrupt due to non-atomic update of IRR

   - Use GFP_KERNEL_ACCOUNT for pid_table in ipiv

   - Make VMREAD error path play nice with noinstr

   - x86: Acquire SRCU read lock when handling fastpath MSR writes

   - Support linking rseq tests statically against glibc 2.35+

   - Fix reference count for stats file descriptors

   - Detect userspace setting invalid CR0

  Non-KVM:

   - Remove coccinelle script that has caused multiple confusion
     ("debugfs, coccinelle: check for obsolete DEFINE_SIMPLE_ATTRIBUTE()
     usage", acked by Greg)"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (21 commits)
  KVM: selftests: Expand x86's sregs test to cover illegal CR0 values
  KVM: VMX: Don't fudge CR0 and CR4 for restricted L2 guest
  KVM: x86: Disallow KVM_SET_SREGS{2} if incoming CR0 is invalid
  Revert "debugfs, coccinelle: check for obsolete DEFINE_SIMPLE_ATTRIBUTE() usage"
  KVM: selftests: Verify stats fd is usable after VM fd has been closed
  KVM: selftests: Verify stats fd can be dup()'d and read
  KVM: selftests: Verify userspace can create "redundant" binary stats files
  KVM: selftests: Explicitly free vcpus array in binary stats test
  KVM: selftests: Clean up stats fd in common stats_test() helper
  KVM: selftests: Use pread() to read binary stats header
  KVM: Grab a reference to KVM for VM and vCPU stats file descriptors
  selftests/rseq: Play nice with binaries statically linked against glibc 2.35+
  Revert "KVM: SVM: Skip WRMSR fastpath on VM-Exit if next RIP isn't valid"
  KVM: x86: Acquire SRCU read lock when handling fastpath MSR writes
  KVM: VMX: Use vmread_error() to report VM-Fail in "goto" path
  KVM: VMX: Make VMREAD error path play nice with noinstr
  KVM: x86/irq: Conditionally register IRQ bypass consumer again
  KVM: X86: Use GFP_KERNEL_ACCOUNT for pid_table in ipiv
  KVM: x86: check the kvm_cpu_get_interrupt result before using it
  KVM: x86: VMX: set irr_pending in kvm_apic_update_irr
  ...
parents c959e900 5a759117

arch/x86/include/asm/kvm-x86-ops.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ KVM_X86_OP(get_segment) 
KVM_X86_OP(get_cpl)

KVM_X86_OP(set_segment)

KVM_X86_OP(get_cs_db_l_bits)

KVM_X86_OP(is_valid_cr0)

KVM_X86_OP(set_cr0)

KVM_X86_OP_OPTIONAL(post_set_cr3)

KVM_X86_OP(is_valid_cr4)

arch/x86/include/asm/kvm_host.h

+2 −1
Original line number Diff line number Diff line
@@ -1566,9 +1566,10 @@ struct kvm_x86_ops { 
	void (*set_segment)(struct kvm_vcpu *vcpu,

			    struct kvm_segment *var, int seg);

	void (*get_cs_db_l_bits)(struct kvm_vcpu *vcpu, int *db, int *l);

	bool (*is_valid_cr0)(struct kvm_vcpu *vcpu, unsigned long cr0);

	void (*set_cr0)(struct kvm_vcpu *vcpu, unsigned long cr0);

	void (*post_set_cr3)(struct kvm_vcpu *vcpu, unsigned long cr3);

	bool (*is_valid_cr4)(struct kvm_vcpu *vcpu, unsigned long cr0);

	bool (*is_valid_cr4)(struct kvm_vcpu *vcpu, unsigned long cr4);

	void (*set_cr4)(struct kvm_vcpu *vcpu, unsigned long cr4);

	int (*set_efer)(struct kvm_vcpu *vcpu, u64 efer);

	void (*get_idt)(struct kvm_vcpu *vcpu, struct desc_ptr *dt);

arch/x86/kvm/lapic.c

+17 −8
Original line number Diff line number Diff line
@@ -637,16 +637,22 @@ bool __kvm_apic_update_irr(u32 *pir, void *regs, int *max_irr) 
	*max_irr = -1;



	for (i = vec = 0; i <= 7; i++, vec += 32) {

		u32 *p_irr = (u32 *)(regs + APIC_IRR + i * 0x10);



		irr_val = *p_irr;

		pir_val = READ_ONCE(pir[i]);

		irr_val = *((u32 *)(regs + APIC_IRR + i * 0x10));



		if (pir_val) {

			pir_val = xchg(&pir[i], 0);



			prev_irr_val = irr_val;

			irr_val |= xchg(&pir[i], 0);

			*((u32 *)(regs + APIC_IRR + i * 0x10)) = irr_val;

			if (prev_irr_val != irr_val) {

				max_updated_irr =

					__fls(irr_val ^ prev_irr_val) + vec;

			}

			do {

				irr_val = prev_irr_val | pir_val;

			} while (prev_irr_val != irr_val &&

				 !try_cmpxchg(p_irr, &prev_irr_val, irr_val));



			if (prev_irr_val != irr_val)

				max_updated_irr = __fls(irr_val ^ prev_irr_val) + vec;

		}

		if (irr_val)

			*max_irr = __fls(irr_val) + vec;
@@ -660,8 +666,11 @@ EXPORT_SYMBOL_GPL(__kvm_apic_update_irr); 
bool kvm_apic_update_irr(struct kvm_vcpu *vcpu, u32 *pir, int *max_irr)

{

	struct kvm_lapic *apic = vcpu->arch.apic;

	bool irr_updated = __kvm_apic_update_irr(pir, apic->regs, max_irr);



	return __kvm_apic_update_irr(pir, apic->regs, max_irr);

	if (unlikely(!apic->apicv_active && irr_updated))

		apic->irr_pending = true;

	return irr_updated;

}

EXPORT_SYMBOL_GPL(kvm_apic_update_irr);

arch/x86/kvm/svm/svm.c

+8 −8
Original line number Diff line number Diff line
@@ -1786,6 +1786,11 @@ static void sev_post_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3) 
	}

}



static bool svm_is_valid_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)

{

	return true;

}



void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)

{

	struct vcpu_svm *svm = to_svm(vcpu);
@@ -3986,14 +3991,8 @@ static int svm_vcpu_pre_run(struct kvm_vcpu *vcpu) 


static fastpath_t svm_exit_handlers_fastpath(struct kvm_vcpu *vcpu)

{

	struct vmcb_control_area *control = &to_svm(vcpu)->vmcb->control;



	/*

	 * Note, the next RIP must be provided as SRCU isn't held, i.e. KVM

	 * can't read guest memory (dereference memslots) to decode the WRMSR.

	 */

	if (control->exit_code == SVM_EXIT_MSR && control->exit_info_1 &&

	    nrips && control->next_rip)

	if (to_svm(vcpu)->vmcb->control.exit_code == SVM_EXIT_MSR &&

	    to_svm(vcpu)->vmcb->control.exit_info_1)

		return handle_fastpath_set_msr_irqoff(vcpu);



	return EXIT_FASTPATH_NONE;
@@ -4815,6 +4814,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { 
	.set_segment = svm_set_segment,

	.get_cpl = svm_get_cpl,

	.get_cs_db_l_bits = svm_get_cs_db_l_bits,

	.is_valid_cr0 = svm_is_valid_cr0,

	.set_cr0 = svm_set_cr0,

	.post_set_cr3 = sev_post_set_cr3,

	.is_valid_cr4 = svm_is_valid_cr4,

arch/x86/kvm/vmx/vmenter.S

+4 −4
Original line number Diff line number Diff line
@@ -303,10 +303,8 @@ SYM_FUNC_START(vmx_do_nmi_irqoff) 
	VMX_DO_EVENT_IRQOFF call asm_exc_nmi_kvm_vmx

SYM_FUNC_END(vmx_do_nmi_irqoff)





.section .text, "ax"



#ifndef CONFIG_CC_HAS_ASM_GOTO_OUTPUT



/**

 * vmread_error_trampoline - Trampoline from inline asm to vmread_error()

 * @field:	VMCS field encoding that failed
@@ -335,7 +333,7 @@ SYM_FUNC_START(vmread_error_trampoline) 
	mov 3*WORD_SIZE(%_ASM_BP), %_ASM_ARG2

	mov 2*WORD_SIZE(%_ASM_BP), %_ASM_ARG1



	call vmread_error

	call vmread_error_trampoline2



	/* Zero out @fault, which will be popped into the result register. */

	_ASM_MOV $0, 3*WORD_SIZE(%_ASM_BP)
@@ -357,6 +355,8 @@ SYM_FUNC_START(vmread_error_trampoline) 
SYM_FUNC_END(vmread_error_trampoline)

#endif



.section .text, "ax"



SYM_FUNC_START(vmx_do_interrupt_irqoff)

	VMX_DO_EVENT_IRQOFF CALL_NOSPEC _ASM_ARG1

SYM_FUNC_END(vmx_do_interrupt_irqoff)