Commit 636b5284 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:
 "Generic:

   - selftest compilation fix for non-x86

   - KVM: avoid warning on s390 in mark_page_dirty

 x86:

   - fix page write-protection bug and improve comments

   - use binary search to lookup the PMU event filter, add test

   - enable_pmu module parameter support for Intel CPUs

   - switch blocked_vcpu_on_cpu_lock to raw spinlock

   - cleanups of blocked vCPU logic

   - partially allow KVM_SET_CPUID{,2} after KVM_RUN (5.16 regression)

   - various small fixes"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (46 commits)
  docs: kvm: fix WARNINGs from api.rst
  selftests: kvm/x86: Fix the warning in lib/x86_64/processor.c
  selftests: kvm/x86: Fix the warning in pmu_event_filter_test.c
  kvm: selftests: Do not indent with spaces
  kvm: selftests: sync uapi/linux/kvm.h with Linux header
  selftests: kvm: add amx_test to .gitignore
  KVM: SVM: Nullify vcpu_(un)blocking() hooks if AVIC is disabled
  KVM: SVM: Move svm_hardware_setup() and its helpers below svm_x86_ops
  KVM: SVM: Drop AVIC's intermediate avic_set_running() helper
  KVM: VMX: Don't do full kick when handling posted interrupt wakeup
  KVM: VMX: Fold fallback path into triggering posted IRQ helper
  KVM: VMX: Pass desired vector instead of bool for triggering posted IRQ
  KVM: VMX: Don't do full kick when triggering posted interrupt "fails"
  KVM: SVM: Skip AVIC and IRTE updates when loading blocking vCPU
  KVM: SVM: Use kvm_vcpu_is_blocking() in AVIC load to handle preemption
  KVM: SVM: Remove unnecessary APICv/AVIC update in vCPU unblocking path
  KVM: SVM: Don't bother checking for "running" AVIC when kicking for IPIs
  KVM: SVM: Signal AVIC doorbell iff vCPU is in guest mode
  KVM: x86: Remove defunct pre_block/post_block kvm_x86_ops hooks
  KVM: x86: Unexport LAPIC's switch_to_{hv,sw}_timer() helpers
  ...
parents dc5341f4 e2e83a73

Documentation/virt/kvm/api.rst

+3 −3
Original line number Diff line number Diff line
@@ -5545,8 +5545,8 @@ the trailing ``'\0'``, is indicated by ``name_size`` in the header. 
The Stats Data block contains an array of 64-bit values in the same order

as the descriptors in Descriptors block.



4.42 KVM_GET_XSAVE2

------------------

4.134 KVM_GET_XSAVE2

--------------------



:Capability: KVM_CAP_XSAVE2

:Architectures: x86
@@ -7363,7 +7363,7 @@ trap and emulate MSRs that are outside of the scope of KVM as well as 
limit the attack surface on KVM's MSR emulation code.



8.28 KVM_CAP_ENFORCE_PV_FEATURE_CPUID

-----------------------------

-------------------------------------



Architectures: x86

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

+1 −2
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ KVM_X86_OP_NULL(tlb_remote_flush) 
KVM_X86_OP_NULL(tlb_remote_flush_with_range)

KVM_X86_OP(tlb_flush_gva)

KVM_X86_OP(tlb_flush_guest)

KVM_X86_OP(vcpu_pre_run)

KVM_X86_OP(run)

KVM_X86_OP_NULL(handle_exit)

KVM_X86_OP_NULL(skip_emulated_instruction)
@@ -98,8 +99,6 @@ KVM_X86_OP(handle_exit_irqoff) 
KVM_X86_OP_NULL(request_immediate_exit)

KVM_X86_OP(sched_in)

KVM_X86_OP_NULL(update_cpu_dirty_logging)

KVM_X86_OP_NULL(pre_block)

KVM_X86_OP_NULL(post_block)

KVM_X86_OP_NULL(vcpu_blocking)

KVM_X86_OP_NULL(vcpu_unblocking)

KVM_X86_OP_NULL(update_pi_irte)

arch/x86/include/asm/kvm_host.h

+1 −12
Original line number Diff line number Diff line
@@ -1381,6 +1381,7 @@ struct kvm_x86_ops { 
	 */

	void (*tlb_flush_guest)(struct kvm_vcpu *vcpu);



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

	enum exit_fastpath_completion (*run)(struct kvm_vcpu *vcpu);

	int (*handle_exit)(struct kvm_vcpu *vcpu,

		enum exit_fastpath_completion exit_fastpath);
@@ -1454,18 +1455,6 @@ struct kvm_x86_ops { 
	const struct kvm_pmu_ops *pmu_ops;

	const struct kvm_x86_nested_ops *nested_ops;



	/*

	 * Architecture specific hooks for vCPU blocking due to

	 * HLT instruction.

	 * Returns for .pre_block():

	 *    - 0 means continue to block the vCPU.

	 *    - 1 means we cannot block the vCPU since some event

	 *        happens during this period, such as, 'ON' bit in

	 *        posted-interrupts descriptor is set.

	 */

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

	void (*post_block)(struct kvm_vcpu *vcpu);



	void (*vcpu_blocking)(struct kvm_vcpu *vcpu);

	void (*vcpu_unblocking)(struct kvm_vcpu *vcpu);

arch/x86/kvm/cpuid.c

+66 −13
Original line number Diff line number Diff line
@@ -119,6 +119,28 @@ static int kvm_check_cpuid(struct kvm_vcpu *vcpu, 
	return fpu_enable_guest_xfd_features(&vcpu->arch.guest_fpu, xfeatures);

}



/* Check whether the supplied CPUID data is equal to what is already set for the vCPU. */

static int kvm_cpuid_check_equal(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *e2,

				 int nent)

{

	struct kvm_cpuid_entry2 *orig;

	int i;



	if (nent != vcpu->arch.cpuid_nent)

		return -EINVAL;



	for (i = 0; i < nent; i++) {

		orig = &vcpu->arch.cpuid_entries[i];

		if (e2[i].function != orig->function ||

		    e2[i].index != orig->index ||

		    e2[i].eax != orig->eax || e2[i].ebx != orig->ebx ||

		    e2[i].ecx != orig->ecx || e2[i].edx != orig->edx)

			return -EINVAL;

	}



	return 0;

}



static void kvm_update_kvm_cpuid_base(struct kvm_vcpu *vcpu)

{

	u32 function;
@@ -145,14 +167,21 @@ static void kvm_update_kvm_cpuid_base(struct kvm_vcpu *vcpu) 
	}

}



static struct kvm_cpuid_entry2 *kvm_find_kvm_cpuid_features(struct kvm_vcpu *vcpu)

static struct kvm_cpuid_entry2 *__kvm_find_kvm_cpuid_features(struct kvm_vcpu *vcpu,

					      struct kvm_cpuid_entry2 *entries, int nent)

{

	u32 base = vcpu->arch.kvm_cpuid_base;



	if (!base)

		return NULL;



	return kvm_find_cpuid_entry(vcpu, base | KVM_CPUID_FEATURES, 0);

	return cpuid_entry2_find(entries, nent, base | KVM_CPUID_FEATURES, 0);

}



static struct kvm_cpuid_entry2 *kvm_find_kvm_cpuid_features(struct kvm_vcpu *vcpu)

{

	return __kvm_find_kvm_cpuid_features(vcpu, vcpu->arch.cpuid_entries,

					     vcpu->arch.cpuid_nent);

}



void kvm_update_pv_runtime(struct kvm_vcpu *vcpu)
@@ -167,11 +196,12 @@ void kvm_update_pv_runtime(struct kvm_vcpu *vcpu) 
		vcpu->arch.pv_cpuid.features = best->eax;

}



void kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu)

static void __kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *entries,

				       int nent)

{

	struct kvm_cpuid_entry2 *best;



	best = kvm_find_cpuid_entry(vcpu, 1, 0);

	best = cpuid_entry2_find(entries, nent, 1, 0);

	if (best) {

		/* Update OSXSAVE bit */

		if (boot_cpu_has(X86_FEATURE_XSAVE))
@@ -182,33 +212,38 @@ void kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu) 
			   vcpu->arch.apic_base & MSR_IA32_APICBASE_ENABLE);

	}



	best = kvm_find_cpuid_entry(vcpu, 7, 0);

	best = cpuid_entry2_find(entries, nent, 7, 0);

	if (best && boot_cpu_has(X86_FEATURE_PKU) && best->function == 0x7)

		cpuid_entry_change(best, X86_FEATURE_OSPKE,

				   kvm_read_cr4_bits(vcpu, X86_CR4_PKE));



	best = kvm_find_cpuid_entry(vcpu, 0xD, 0);

	best = cpuid_entry2_find(entries, nent, 0xD, 0);

	if (best)

		best->ebx = xstate_required_size(vcpu->arch.xcr0, false);



	best = kvm_find_cpuid_entry(vcpu, 0xD, 1);

	best = cpuid_entry2_find(entries, nent, 0xD, 1);

	if (best && (cpuid_entry_has(best, X86_FEATURE_XSAVES) ||

		     cpuid_entry_has(best, X86_FEATURE_XSAVEC)))

		best->ebx = xstate_required_size(vcpu->arch.xcr0, true);



	best = kvm_find_kvm_cpuid_features(vcpu);

	best = __kvm_find_kvm_cpuid_features(vcpu, entries, nent);

	if (kvm_hlt_in_guest(vcpu->kvm) && best &&

		(best->eax & (1 << KVM_FEATURE_PV_UNHALT)))

		best->eax &= ~(1 << KVM_FEATURE_PV_UNHALT);



	if (!kvm_check_has_quirk(vcpu->kvm, KVM_X86_QUIRK_MISC_ENABLE_NO_MWAIT)) {

		best = kvm_find_cpuid_entry(vcpu, 0x1, 0);

		best = cpuid_entry2_find(entries, nent, 0x1, 0);

		if (best)

			cpuid_entry_change(best, X86_FEATURE_MWAIT,

					   vcpu->arch.ia32_misc_enable_msr &

					   MSR_IA32_MISC_ENABLE_MWAIT);

	}

}



void kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu)

{

	__kvm_update_cpuid_runtime(vcpu, vcpu->arch.cpuid_entries, vcpu->arch.cpuid_nent);

}

EXPORT_SYMBOL_GPL(kvm_update_cpuid_runtime);



static void kvm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu)
@@ -298,6 +333,22 @@ static int kvm_set_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *e2, 
{

	int r;



	__kvm_update_cpuid_runtime(vcpu, e2, nent);



	/*

	 * KVM does not correctly handle changing guest CPUID after KVM_RUN, as

	 * MAXPHYADDR, GBPAGES support, AMD reserved bit behavior, etc.. aren't

	 * tracked in kvm_mmu_page_role.  As a result, KVM may miss guest page

	 * faults due to reusing SPs/SPTEs. In practice no sane VMM mucks with

	 * the core vCPU model on the fly. It would've been better to forbid any

	 * KVM_SET_CPUID{,2} calls after KVM_RUN altogether but unfortunately

	 * some VMMs (e.g. QEMU) reuse vCPU fds for CPU hotplug/unplug and do

	 * KVM_SET_CPUID{,2} again. To support this legacy behavior, check

	 * whether the supplied CPUID data is equal to what's already set.

	 */

	if (vcpu->arch.last_vmentry_cpu != -1)

		return kvm_cpuid_check_equal(vcpu, e2, nent);



	r = kvm_check_cpuid(vcpu, e2, nent);

	if (r)

		return r;
@@ -307,7 +358,6 @@ static int kvm_set_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *e2, 
	vcpu->arch.cpuid_nent = nent;



	kvm_update_kvm_cpuid_base(vcpu);

	kvm_update_cpuid_runtime(vcpu);

	kvm_vcpu_after_set_cpuid(vcpu);



	return 0;
@@ -795,10 +845,10 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) 
		perf_get_x86_pmu_capability(&cap);



		/*

		 * Only support guest architectural pmu on a host

		 * with architectural pmu.

		 * The guest architecture pmu is only supported if the architecture

		 * pmu exists on the host and the module parameters allow it.

		 */

		if (!cap.version)

		if (!cap.version || !enable_pmu)

			memset(&cap, 0, sizeof(cap));



		eax.split.version_id = min(cap.version, 2);
@@ -886,6 +936,9 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) 
				--array->nent;

				continue;

			}



			if (!kvm_cpu_cap_has(X86_FEATURE_XFD))

				entry->ecx &= ~BIT_ULL(2);

			entry->edx = 0;

		}

		break;

arch/x86/kvm/lapic.c

+0 −2
Original line number Diff line number Diff line
@@ -1950,7 +1950,6 @@ void kvm_lapic_switch_to_hv_timer(struct kvm_vcpu *vcpu) 
{

	restart_apic_timer(vcpu->arch.apic);

}

EXPORT_SYMBOL_GPL(kvm_lapic_switch_to_hv_timer);



void kvm_lapic_switch_to_sw_timer(struct kvm_vcpu *vcpu)

{
@@ -1962,7 +1961,6 @@ void kvm_lapic_switch_to_sw_timer(struct kvm_vcpu *vcpu) 
		start_sw_timer(apic);

	preempt_enable();

}

EXPORT_SYMBOL_GPL(kvm_lapic_switch_to_sw_timer);



void kvm_lapic_restart_hv_timer(struct kvm_vcpu *vcpu)

{