KVM: x86: Restore caching of KVM CPUID base

This mostly reverts commit a5b32718081e ("KVM: x86: Remove unnecessary
caching of KVM's PV CPUID base").

Sure, caching state which might change has certain risks, but KVM
already does cache the CPUID contents, and the whole point of calling
kvm_apply_cpuid_pv_features_quirk() from kvm_vcpu_after_set_cpuid() is
to cache the contents of that leaf too, so that guest_pv_has() can
access them quickly.

An upcoming commit is going to want to use vcpu->arch.kvm_cpuid from
kvm_cpuid() at runtime too, so put it back.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index f19a76d3ca0ed265f50d8976d386852bd4392596..50febd333f5f09c44aae383f64ae3ed085734421 100644 (file)
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -897,6 +897,7 @@ struct kvm_vcpu_arch {
 
        int cpuid_nent;
        struct kvm_cpuid_entry2 *cpuid_entries;
+       struct kvm_hypervisor_cpuid kvm_cpuid;
        bool cpuid_dynamic_bits_dirty;
        bool is_amd_compatible;
 

diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index e2836a255b1679de1ef76a6869fdf25217b8b201..bcce3a75c3f22b5c71095fcfff31aaee51d464fa 100644 (file)
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -178,7 +178,12 @@ static int kvm_cpuid_check_equal(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2
 
        /*
         * Apply runtime CPUID updates to the incoming CPUID entries to avoid
-        * false positives due mismatches on KVM-owned feature flags.
+        * false positives due mismatches on KVM-owned feature flags.  Note,
+        * runtime CPUID updates may consume other CPUID-driven vCPU state,
+        * e.g. KVM or Xen CPUID bases.  Updating runtime state before full
+        * CPUID processing is functionally correct only because any change in
+        * CPUID is disallowed, i.e. using stale data is ok because the below
+        * checks will reject the change.
         *
         * Note!  @e2 and @nent track the _old_ CPUID entries!
         */
@@ -231,14 +236,14 @@ static struct kvm_hypervisor_cpuid kvm_get_hypervisor_cpuid(struct kvm_vcpu *vcp
 
 static u32 kvm_apply_cpuid_pv_features_quirk(struct kvm_vcpu *vcpu)
 {
-       struct kvm_hypervisor_cpuid kvm_cpuid;
        struct kvm_cpuid_entry2 *best;
+       u32 features_leaf = vcpu->arch.kvm_cpuid.base | KVM_CPUID_FEATURES;
 
-       kvm_cpuid = kvm_get_hypervisor_cpuid(vcpu, KVM_SIGNATURE);
-       if (!kvm_cpuid.base)
+       if (!vcpu->arch.kvm_cpuid.base ||
+           vcpu->arch.kvm_cpuid.limit < features_leaf)
                return 0;
 
-       best = kvm_find_cpuid_entry(vcpu, kvm_cpuid.base | KVM_CPUID_FEATURES);
+       best = kvm_find_cpuid_entry(vcpu, features_leaf);
        if (!best)
                return 0;
 
@@ -541,6 +546,7 @@ static int kvm_set_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *e2,
        if (r)
                goto err;
 
+       vcpu->arch.kvm_cpuid = kvm_get_hypervisor_cpuid(vcpu, KVM_SIGNATURE);
 #ifdef CONFIG_KVM_XEN
        vcpu->arch.xen.cpuid = kvm_get_hypervisor_cpuid(vcpu, XEN_SIGNATURE);
 #endif