Commit 5668821a authored Jul 09, 2020 by Xiaoyao Li Committed by Paolo Bonzini Jul 09, 2020

KVM: x86: Move kvm_x86_ops.vcpu_after_set_cpuid() into kvm_vcpu_after_set_cpuid()



kvm_x86_ops.vcpu_after_set_cpuid() is used to update vmx/svm specific
vcpu settings based on updated CPUID settings. So it's supposed to be
called after CPUIDs are updated, i.e., kvm_update_cpuid_runtime().

Currently, kvm_update_cpuid_runtime() only updates CPUID bits of OSXSAVE,
APIC, OSPKE, MWAIT, KVM_FEATURE_PV_UNHALT and CPUID(0xD,0).ebx and
CPUID(0xD, 1).ebx. None of them is consumed by vmx/svm's
update_vcpu_after_set_cpuid(). So there is no dependency between them.

Move kvm_x86_ops.vcpu_after_set_cpuid() into kvm_vcpu_after_set_cpuid() is
obviously more reasonable.

Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
Message-Id: <20200709043426.92712-6-xiaoyao.li@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 7c1b761b

arch/x86/kvm/cpuid.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -121,6 +121,8 @@ static void kvm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu)
		struct kvm_lapic *apic = vcpu->arch.apic;
		struct kvm_cpuid_entry2 *best;

		kvm_x86_ops.vcpu_after_set_cpuid(vcpu);

		best = kvm_find_cpuid_entry(vcpu, 1, 0);
		if (best && apic) {
		if (cpuid_entry_has(best, X86_FEATURE_TSC_DEADLINE_TIMER))
		@@ -228,7 +230,6 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu,
		}

		cpuid_fix_nx_cap(vcpu);
		kvm_x86_ops.vcpu_after_set_cpuid(vcpu);
		kvm_update_cpuid_runtime(vcpu);
		kvm_vcpu_after_set_cpuid(vcpu);

		@@ -257,7 +258,6 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
		goto out;
		}

		kvm_x86_ops.vcpu_after_set_cpuid(vcpu);
		kvm_update_cpuid_runtime(vcpu);
		kvm_vcpu_after_set_cpuid(vcpu);
		out:

Admin message