Commit 26e122e9 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:
 "All bugfixes except for a couple cleanup patches"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: VMX: Remove vcpu_vmx's defunct copy of host_pkru
  KVM: x86: allow TSC to differ by NTP correction bounds without TSC scaling
  KVM: X86: Fix MSR range of APIC registers in X2APIC mode
  KVM: VMX: Stop context switching MSR_IA32_UMWAIT_CONTROL
  KVM: nVMX: Plumb L2 GPA through to PML emulation
  KVM: x86/mmu: Avoid mixing gpa_t with gfn_t in walk_addr_generic()
  KVM: LAPIC: ensure APIC map is up to date on concurrent update requests
  kvm: lapic: fix broken vcpu hotplug
  Revert "KVM: VMX: Micro-optimize vmexit time when not exposing PMU"
  KVM: VMX: Add helpers to identify interrupt type from intr_info
  kvm/svm: disable KCSAN for svm_vcpu_run()
  KVM: MIPS: Fix a build error for !CPU_LOONGSON64
parents 3e08a952 e4553b49

arch/mips/kvm/mips.c

+2 −0
Original line number Diff line number Diff line
@@ -67,7 +67,9 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { 
	VCPU_STAT("vz_ghfc", vz_ghfc_exits),

	VCPU_STAT("vz_gpa", vz_gpa_exits),

	VCPU_STAT("vz_resvd", vz_resvd_exits),

#ifdef CONFIG_CPU_LOONGSON64

	VCPU_STAT("vz_cpucfg", vz_cpucfg_exits),

#endif

#endif

	VCPU_STAT("halt_successful_poll", halt_successful_poll),

	VCPU_STAT("halt_attempted_poll", halt_attempted_poll),

arch/x86/include/asm/kvm_host.h

+2 −2
Original line number Diff line number Diff line
@@ -943,7 +943,7 @@ struct kvm_arch { 
	atomic_t vapics_in_nmi_mode;

	struct mutex apic_map_lock;

	struct kvm_apic_map *apic_map;

	bool apic_map_dirty;

	atomic_t apic_map_dirty;



	bool apic_access_page_done;

	unsigned long apicv_inhibit_reasons;
@@ -1220,7 +1220,7 @@ struct kvm_x86_ops { 
	void (*enable_log_dirty_pt_masked)(struct kvm *kvm,

					   struct kvm_memory_slot *slot,

					   gfn_t offset, unsigned long mask);

	int (*write_log_dirty)(struct kvm_vcpu *vcpu);

	int (*write_log_dirty)(struct kvm_vcpu *vcpu, gpa_t l2_gpa);



	/* pmu operations of sub-arch */

	const struct kvm_pmu_ops *pmu_ops;

arch/x86/include/asm/mwait.h

+0 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
#define TPAUSE_C01_STATE		1

#define TPAUSE_C02_STATE		0



u32 get_umwait_control_msr(void);



static inline void __monitor(const void *eax, unsigned long ecx,

			     unsigned long edx)

{

arch/x86/kernel/cpu/umwait.c

+0 −6
Original line number Diff line number Diff line
@@ -18,12 +18,6 @@ 
 */

static u32 umwait_control_cached = UMWAIT_CTRL_VAL(100000, UMWAIT_C02_ENABLE);



u32 get_umwait_control_msr(void)

{

	return umwait_control_cached;

}

EXPORT_SYMBOL_GPL(get_umwait_control_msr);



/*

 * Cache the original IA32_UMWAIT_CONTROL MSR value which is configured by

 * hardware or BIOS before kernel boot.

arch/x86/kvm/lapic.c

+31 −19
Original line number Diff line number Diff line
@@ -169,6 +169,18 @@ static void kvm_apic_map_free(struct rcu_head *rcu) 
	kvfree(map);

}



/*

 * CLEAN -> DIRTY and UPDATE_IN_PROGRESS -> DIRTY changes happen without a lock.

 *

 * DIRTY -> UPDATE_IN_PROGRESS and UPDATE_IN_PROGRESS -> CLEAN happen with

 * apic_map_lock_held.

 */

enum {

	CLEAN,

	UPDATE_IN_PROGRESS,

	DIRTY

};



void kvm_recalculate_apic_map(struct kvm *kvm)

{

	struct kvm_apic_map *new, *old = NULL;
@@ -176,17 +188,17 @@ void kvm_recalculate_apic_map(struct kvm *kvm) 
	int i;

	u32 max_id = 255; /* enough space for any xAPIC ID */



	if (!kvm->arch.apic_map_dirty) {

		/*

		 * Read kvm->arch.apic_map_dirty before

		 * kvm->arch.apic_map

		 */

		smp_rmb();

	/* Read kvm->arch.apic_map_dirty before kvm->arch.apic_map.  */

	if (atomic_read_acquire(&kvm->arch.apic_map_dirty) == CLEAN)

		return;

	}



	mutex_lock(&kvm->arch.apic_map_lock);

	if (!kvm->arch.apic_map_dirty) {

	/*

	 * Read kvm->arch.apic_map_dirty before kvm->arch.apic_map

	 * (if clean) or the APIC registers (if dirty).

	 */

	if (atomic_cmpxchg_acquire(&kvm->arch.apic_map_dirty,

				   DIRTY, UPDATE_IN_PROGRESS) == CLEAN) {

		/* Someone else has updated the map. */

		mutex_unlock(&kvm->arch.apic_map_lock);

		return;
@@ -256,11 +268,11 @@ out: 
			lockdep_is_held(&kvm->arch.apic_map_lock));

	rcu_assign_pointer(kvm->arch.apic_map, new);

	/*

	 * Write kvm->arch.apic_map before

	 * clearing apic->apic_map_dirty

	 * Write kvm->arch.apic_map before clearing apic->apic_map_dirty.

	 * If another update has come in, leave it DIRTY.

	 */

	smp_wmb();

	kvm->arch.apic_map_dirty = false;

	atomic_cmpxchg_release(&kvm->arch.apic_map_dirty,

			       UPDATE_IN_PROGRESS, CLEAN);

	mutex_unlock(&kvm->arch.apic_map_lock);



	if (old)
@@ -282,20 +294,20 @@ static inline void apic_set_spiv(struct kvm_lapic *apic, u32 val) 
		else

			static_key_slow_inc(&apic_sw_disabled.key);



		apic->vcpu->kvm->arch.apic_map_dirty = true;

		atomic_set_release(&apic->vcpu->kvm->arch.apic_map_dirty, DIRTY);

	}

}



static inline void kvm_apic_set_xapic_id(struct kvm_lapic *apic, u8 id)

{

	kvm_lapic_set_reg(apic, APIC_ID, id << 24);

	apic->vcpu->kvm->arch.apic_map_dirty = true;

	atomic_set_release(&apic->vcpu->kvm->arch.apic_map_dirty, DIRTY);

}



static inline void kvm_apic_set_ldr(struct kvm_lapic *apic, u32 id)

{

	kvm_lapic_set_reg(apic, APIC_LDR, id);

	apic->vcpu->kvm->arch.apic_map_dirty = true;

	atomic_set_release(&apic->vcpu->kvm->arch.apic_map_dirty, DIRTY);

}



static inline u32 kvm_apic_calc_x2apic_ldr(u32 id)
@@ -311,7 +323,7 @@ static inline void kvm_apic_set_x2apic_id(struct kvm_lapic *apic, u32 id) 


	kvm_lapic_set_reg(apic, APIC_ID, id);

	kvm_lapic_set_reg(apic, APIC_LDR, ldr);

	apic->vcpu->kvm->arch.apic_map_dirty = true;

	atomic_set_release(&apic->vcpu->kvm->arch.apic_map_dirty, DIRTY);

}



static inline int apic_lvt_enabled(struct kvm_lapic *apic, int lvt_type)
@@ -1976,7 +1988,7 @@ int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val) 
	case APIC_DFR:

		if (!apic_x2apic_mode(apic)) {

			kvm_lapic_set_reg(apic, APIC_DFR, val | 0x0FFFFFFF);

			apic->vcpu->kvm->arch.apic_map_dirty = true;

			atomic_set_release(&apic->vcpu->kvm->arch.apic_map_dirty, DIRTY);

		} else

			ret = 1;

		break;
@@ -2232,7 +2244,7 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value) 
			static_key_slow_dec_deferred(&apic_hw_disabled);

		} else {

			static_key_slow_inc(&apic_hw_disabled.key);

			vcpu->kvm->arch.apic_map_dirty = true;

			atomic_set_release(&apic->vcpu->kvm->arch.apic_map_dirty, DIRTY);

		}

	}
@@ -2273,7 +2285,6 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu, bool init_event) 
	if (!apic)

		return;



	vcpu->kvm->arch.apic_map_dirty = false;

	/* Stop the timer in case it's a reset to an active apic */

	hrtimer_cancel(&apic->lapic_timer.timer);
@@ -2567,6 +2578,7 @@ int kvm_apic_set_state(struct kvm_vcpu *vcpu, struct kvm_lapic_state *s) 
	}

	memcpy(vcpu->arch.apic->regs, s->regs, sizeof(*s));



	atomic_set_release(&apic->vcpu->kvm->arch.apic_map_dirty, DIRTY);

	kvm_recalculate_apic_map(vcpu->kvm);

	kvm_apic_set_version(vcpu);

CRA Git | Maintained and supported by SUSTech CRA and CCSE