Commit 1b3618b6 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:
 "Except for the preempt notifiers fix, these are all small bugfixes
  that could have been waited for -rc2.  Sending them now since I was
  taking care of Peter's patch anyway"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  kvm: add hyper-v crash msrs values
  KVM: x86: remove data variable from kvm_get_msr_common
  KVM: s390: virtio-ccw: don't overwrite config space values
  KVM: x86: keep track of LVT0 changes under APICv
  KVM: x86: properly restore LVT0
  KVM: x86: make vapics_in_nmi_mode atomic
  sched, preempt_notifier: separate notifier registration from static_key inc/dec
parents 14a6f198 a88464a8

arch/x86/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ struct kvm_arch { 
	struct kvm_pic *vpic;

	struct kvm_ioapic *vioapic;

	struct kvm_pit *vpit;

	int vapics_in_nmi_mode;

	atomic_t vapics_in_nmi_mode;

	struct mutex apic_map_lock;

	struct kvm_apic_map *apic_map;

arch/x86/include/uapi/asm/hyperv.h

+11 −0
Original line number Diff line number Diff line
@@ -199,6 +199,17 @@ 
#define HV_X64_MSR_STIMER3_CONFIG		0x400000B6

#define HV_X64_MSR_STIMER3_COUNT		0x400000B7



/* Hyper-V guest crash notification MSR's */

#define HV_X64_MSR_CRASH_P0			0x40000100

#define HV_X64_MSR_CRASH_P1			0x40000101

#define HV_X64_MSR_CRASH_P2			0x40000102

#define HV_X64_MSR_CRASH_P3			0x40000103

#define HV_X64_MSR_CRASH_P4			0x40000104

#define HV_X64_MSR_CRASH_CTL			0x40000105

#define HV_X64_MSR_CRASH_CTL_NOTIFY		(1ULL << 63)

#define HV_X64_MSR_CRASH_PARAMS		\

		(1 + (HV_X64_MSR_CRASH_P4 - HV_X64_MSR_CRASH_P0))



#define HV_X64_MSR_HYPERCALL_ENABLE		0x00000001

#define HV_X64_MSR_HYPERCALL_PAGE_ADDRESS_SHIFT	12

#define HV_X64_MSR_HYPERCALL_PAGE_ADDRESS_MASK	\

arch/x86/kvm/i8254.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static void pit_do_work(struct kthread_work *work) 
		 * LVT0 to NMI delivery. Other PIC interrupts are just sent to

		 * VCPU0, and only if its LVT0 is in EXTINT mode.

		 */

		if (kvm->arch.vapics_in_nmi_mode > 0)

		if (atomic_read(&kvm->arch.vapics_in_nmi_mode) > 0)

			kvm_for_each_vcpu(i, vcpu, kvm)

				kvm_apic_nmi_wd_deliver(vcpu);

	}

arch/x86/kvm/lapic.c

+10 −7
Original line number Diff line number Diff line
@@ -1257,16 +1257,17 @@ static void start_apic_timer(struct kvm_lapic *apic) 


static void apic_manage_nmi_watchdog(struct kvm_lapic *apic, u32 lvt0_val)

{

	int nmi_wd_enabled = apic_lvt_nmi_mode(kvm_apic_get_reg(apic, APIC_LVT0));

	bool lvt0_in_nmi_mode = apic_lvt_nmi_mode(lvt0_val);



	if (apic_lvt_nmi_mode(lvt0_val)) {

		if (!nmi_wd_enabled) {

	if (apic->lvt0_in_nmi_mode != lvt0_in_nmi_mode) {

		apic->lvt0_in_nmi_mode = lvt0_in_nmi_mode;

		if (lvt0_in_nmi_mode) {

			apic_debug("Receive NMI setting on APIC_LVT0 "

				   "for cpu %d\n", apic->vcpu->vcpu_id);

			apic->vcpu->kvm->arch.vapics_in_nmi_mode++;

			atomic_inc(&apic->vcpu->kvm->arch.vapics_in_nmi_mode);

		} else

			atomic_dec(&apic->vcpu->kvm->arch.vapics_in_nmi_mode);

	}

	} else if (nmi_wd_enabled)

		apic->vcpu->kvm->arch.vapics_in_nmi_mode--;

}



static int apic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val)
@@ -1597,6 +1598,7 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu, bool init_event) 
	if (!(vcpu->kvm->arch.disabled_quirks & KVM_QUIRK_LINT0_REENABLED))

		apic_set_reg(apic, APIC_LVT0,

			     SET_APIC_DELIVERY_MODE(0, APIC_MODE_EXTINT));

	apic_manage_nmi_watchdog(apic, kvm_apic_get_reg(apic, APIC_LVT0));



	apic_set_reg(apic, APIC_DFR, 0xffffffffU);

	apic_set_spiv(apic, 0xff);
@@ -1822,6 +1824,7 @@ void kvm_apic_post_state_restore(struct kvm_vcpu *vcpu, 
	apic_update_ppr(apic);

	hrtimer_cancel(&apic->lapic_timer.timer);

	apic_update_lvtt(apic);

	apic_manage_nmi_watchdog(apic, kvm_apic_get_reg(apic, APIC_LVT0));

	update_divide_count(apic);

	start_apic_timer(apic);

	apic->irr_pending = true;

arch/x86/kvm/lapic.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ struct kvm_lapic { 
	struct kvm_vcpu *vcpu;

	bool sw_enabled;

	bool irr_pending;

	bool lvt0_in_nmi_mode;

	/* Number of bits set in ISR. */

	s16 isr_count;

	/* The highest vector set in ISR; if -1 - invalid, must scan ISR. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE