From a31ce6a9fa171f677bf52dd0b0076e7b92d9ae33 Mon Sep 17 00:00:00 2001

From: Paolo Bonzini <pbonzini@redhat.com>

Date: Fri, 22 Nov 2019 11:53:41 +0000

Subject: [PATCH 08/16] target/i386: expand feature words to 64 bits

RH-Author: Paolo Bonzini <pbonzini@redhat.com>

Message-id: <20191122115348.25000-9-pbonzini@redhat.com>

Patchwork-id: 92612

O-Subject: [RHEL8.2/rhel qemu-kvm PATCH 08/15] target/i386: expand feature words to 64 bits

Bugzilla: 1689270

RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>

RH-Acked-by: Maxim Levitsky <mlevitsk@redhat.com>

VMX requires 64-bit feature words for the IA32_VMX_EPT_VPID_CAP

and IA32_VMX_BASIC MSRs.  (The VMX control MSRs are 64-bit wide but

actually have only 32 bits of information).

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

(cherry picked from commit ede146c2e720b670350c7ef5e9af44e80a73fe97)

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 include/sysemu/kvm.h |  2 +-

 target/i386/cpu.c    | 71 +++++++++++++++++++++++++++-------------------------

 target/i386/cpu.h    |  2 +-

 target/i386/kvm.c    |  2 +-

 4 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h

index 3cf04cf..2c7f841 100644

--- a/include/sysemu/kvm.h

+++ b/include/sysemu/kvm.h

@@ -466,7 +466,7 @@ int kvm_vm_check_extension(KVMState *s, unsigned int extension);

 uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function,

                                       uint32_t index, int reg);

-uint32_t kvm_arch_get_supported_msr_feature(KVMState *s, uint32_t index);

+uint64_t kvm_arch_get_supported_msr_feature(KVMState *s, uint32_t index);

 void kvm_set_sigmask_len(KVMState *s, unsigned int sigmask_len);

diff --git a/target/i386/cpu.c b/target/i386/cpu.c

index a7360b3..3e77830 100644

--- a/target/i386/cpu.c

+++ b/target/i386/cpu.c

@@ -785,7 +785,7 @@ typedef struct FeatureWordInfo {

      * In cases of disagreement between feature naming conventions,

      * aliases may be added.

      */

-    const char *feat_names[32];

+    const char *feat_names[64];

     union {

         /* If type==CPUID_FEATURE_WORD */

         struct {

@@ -799,11 +799,11 @@ typedef struct FeatureWordInfo {

             uint32_t index;

         } msr;

     };

-    uint32_t tcg_features; /* Feature flags supported by TCG */

-    uint32_t unmigratable_flags; /* Feature flags known to be unmigratable */

-    uint32_t migratable_flags; /* Feature flags known to be migratable */

+    uint64_t tcg_features; /* Feature flags supported by TCG */

+    uint64_t unmigratable_flags; /* Feature flags known to be unmigratable */

+    uint64_t migratable_flags; /* Feature flags known to be migratable */

     /* Features that shouldn't be auto-enabled by "-cpu host" */

-    uint32_t no_autoenable_flags;

+    uint64_t no_autoenable_flags;

 } FeatureWordInfo;

 static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

@@ -1175,7 +1175,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

 typedef struct FeatureMask {

     FeatureWord index;

-    uint32_t mask;

+    uint64_t mask;

 } FeatureMask;

 typedef struct FeatureDep {

@@ -1185,11 +1185,11 @@ typedef struct FeatureDep {

 static FeatureDep feature_dependencies[] = {

     {

         .from = { FEAT_7_0_EDX,             CPUID_7_0_EDX_ARCH_CAPABILITIES },

-        .to = { FEAT_ARCH_CAPABILITIES,     ~0u },

+        .to = { FEAT_ARCH_CAPABILITIES,     ~0ull },

     },

     {

         .from = { FEAT_7_0_EDX,             CPUID_7_0_EDX_CORE_CAPABILITY },

-        .to = { FEAT_CORE_CAPABILITY,       ~0u },

+        .to = { FEAT_CORE_CAPABILITY,       ~0ull },

     },

 };

@@ -1301,14 +1301,14 @@ const char *get_register_name_32(unsigned int reg)

  * Returns the set of feature flags that are supported and migratable by

  * QEMU, for a given FeatureWord.

  */

-static uint32_t x86_cpu_get_migratable_flags(FeatureWord w)

+static uint64_t x86_cpu_get_migratable_flags(FeatureWord w)

 {

     FeatureWordInfo *wi = &feature_word_info[w];

-    uint32_t r = 0;

+    uint64_t r = 0;

     int i;

-    for (i = 0; i < 32; i++) {

-        uint32_t f = 1U << i;

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

+        uint64_t f = 1ULL << i;

         /* If the feature name is known, it is implicitly considered migratable,

          * unless it is explicitly set in unmigratable_flags */

@@ -2948,7 +2948,7 @@ void x86_cpu_change_kvm_default(const char *prop, const char *value)

     assert(pv->prop);

 }

-static uint32_t x86_cpu_get_supported_feature_word(FeatureWord w,

+static uint64_t x86_cpu_get_supported_feature_word(FeatureWord w,

                                                    bool migratable_only);

 static bool lmce_supported(void)

@@ -3142,7 +3142,7 @@ static bool x86_cpu_have_filtered_features(X86CPU *cpu)

     return false;

 }

-static void mark_unavailable_features(X86CPU *cpu, FeatureWord w, uint32_t mask,

+static void mark_unavailable_features(X86CPU *cpu, FeatureWord w, uint64_t mask,

                                       const char *verbose_prefix)

 {

     CPUX86State *env = &cpu->env;

@@ -3159,8 +3159,8 @@ static void mark_unavailable_features(X86CPU *cpu, FeatureWord w, uint32_t mask,

         return;

     }

-    for (i = 0; i < 32; ++i) {

-        if ((1UL << i) & mask) {

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

+        if ((1ULL << i) & mask) {

             feat_word_str = feature_word_description(f, i);

             warn_report("%s: %s%s%s [bit %d]",

                         verbose_prefix,

@@ -3403,7 +3403,7 @@ static void x86_cpu_get_feature_words(Object *obj, Visitor *v,

                                       const char *name, void *opaque,

                                       Error **errp)

 {

-    uint32_t *array = (uint32_t *)opaque;

+    uint64_t *array = (uint64_t *)opaque;

     FeatureWord w;

     X86CPUFeatureWordInfo word_infos[FEATURE_WORDS] = { };

     X86CPUFeatureWordInfoList list_entries[FEATURE_WORDS] = { };

@@ -3487,6 +3487,7 @@ static inline void feat2prop(char *s)

 /* Return the feature property name for a feature flag bit */

 static const char *x86_cpu_feature_name(FeatureWord w, int bitnr)

 {

+    const char *name;

     /* XSAVE components are automatically enabled by other features,

      * so return the original feature name instead

      */

@@ -3500,9 +3501,11 @@ static const char *x86_cpu_feature_name(FeatureWord w, int bitnr)

         }

     }

-    assert(bitnr < 32);

+    assert(bitnr < 64);

     assert(w < FEATURE_WORDS);

-    return feature_word_info[w].feat_names[bitnr];

+    name = feature_word_info[w].feat_names[bitnr];

+    assert(bitnr < 32 || !(name && feature_word_info[w].type == CPUID_FEATURE_WORD));

+    return name;

 }

 /* Compatibily hack to maintain legacy +-feat semantic,

@@ -3619,10 +3622,10 @@ static void x86_cpu_list_feature_names(FeatureWordArray features,

     strList **next = feat_names;

     for (w = 0; w < FEATURE_WORDS; w++) {

-        uint32_t filtered = features[w];

+        uint64_t filtered = features[w];

         int i;

-        for (i = 0; i < 32; i++) {

-            if (filtered & (1UL << i)) {

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

+            if (filtered & (1ULL << i)) {

                 strList *new = g_new0(strList, 1);

                 new->value = g_strdup(x86_cpu_feature_name(w, i));

                 *next = new;

@@ -3760,7 +3763,7 @@ void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf)

     names = NULL;

     for (i = 0; i < ARRAY_SIZE(feature_word_info); i++) {

         FeatureWordInfo *fw = &feature_word_info[i];

-        for (j = 0; j < 32; j++) {

+        for (j = 0; j < 64; j++) {

             if (fw->feat_names[j]) {

                 names = g_list_append(names, (gpointer)fw->feat_names[j]);

             }

@@ -3807,11 +3810,11 @@ CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp)

     return cpu_list;

 }

-static uint32_t x86_cpu_get_supported_feature_word(FeatureWord w,

+static uint64_t x86_cpu_get_supported_feature_word(FeatureWord w,

                                                    bool migratable_only)

 {

     FeatureWordInfo *wi = &feature_word_info[w];

-    uint32_t r = 0;

+    uint64_t r = 0;

     if (kvm_enabled()) {

         switch (wi->type) {

@@ -3950,7 +3953,7 @@ static QDict *x86_cpu_static_props(void)

     for (w = 0; w < FEATURE_WORDS; w++) {

         FeatureWordInfo *fi = &feature_word_info[w];

         int bit;

-        for (bit = 0; bit < 32; bit++) {

+        for (bit = 0; bit < 64; bit++) {

             if (!fi->feat_names[bit]) {

                 continue;

             }

@@ -5015,7 +5018,7 @@ static void x86_cpu_expand_features(X86CPU *cpu, Error **errp)

     for (i = 0; i < ARRAY_SIZE(feature_dependencies); i++) {

         FeatureDep *d = &feature_dependencies[i];

         if (!(env->features[d->from.index] & d->from.mask)) {

-            uint32_t unavailable_features = env->features[d->to.index] & d->to.mask;

+            uint64_t unavailable_features = env->features[d->to.index] & d->to.mask;

             /* Not an error unless the dependent feature was added explicitly.  */

             mark_unavailable_features(cpu, d->to.index,

@@ -5094,10 +5097,10 @@ static void x86_cpu_filter_features(X86CPU *cpu, bool verbose)

     }

     for (w = 0; w < FEATURE_WORDS; w++) {

-        uint32_t host_feat =

+        uint64_t host_feat =

             x86_cpu_get_supported_feature_word(w, false);

-        uint32_t requested_features = env->features[w];

-        uint32_t unavailable_features = requested_features & ~host_feat;

+        uint64_t requested_features = env->features[w];

+        uint64_t unavailable_features = requested_features & ~host_feat;

         mark_unavailable_features(cpu, w, unavailable_features, prefix);

     }

@@ -5380,7 +5383,7 @@ static void x86_cpu_unrealizefn(DeviceState *dev, Error **errp)

 typedef struct BitProperty {

     FeatureWord w;

-    uint32_t mask;

+    uint64_t mask;

 } BitProperty;

 static void x86_cpu_get_bit_prop(Object *obj, Visitor *v, const char *name,

@@ -5388,7 +5391,7 @@ static void x86_cpu_get_bit_prop(Object *obj, Visitor *v, const char *name,

 {

     X86CPU *cpu = X86_CPU(obj);

     BitProperty *fp = opaque;

-    uint32_t f = cpu->env.features[fp->w];

+    uint64_t f = cpu->env.features[fp->w];

     bool value = (f & fp->mask) == fp->mask;

     visit_type_bool(v, name, &value, errp);

 }

@@ -5441,7 +5444,7 @@ static void x86_cpu_register_bit_prop(X86CPU *cpu,

 {

     BitProperty *fp;

     ObjectProperty *op;

-    uint32_t mask = (1UL << bitnr);

+    uint64_t mask = (1ULL << bitnr);

     op = object_property_find(OBJECT(cpu), prop_name, NULL);

     if (op) {

@@ -5577,7 +5580,7 @@ static void x86_cpu_initfn(Object *obj)

     for (w = 0; w < FEATURE_WORDS; w++) {

         int bitnr;

-        for (bitnr = 0; bitnr < 32; bitnr++) {

+        for (bitnr = 0; bitnr < 64; bitnr++) {

             x86_cpu_register_feature_bit_props(cpu, w, bitnr);

         }

     }

diff --git a/target/i386/cpu.h b/target/i386/cpu.h

index f9b93be..edba84e 100644

--- a/target/i386/cpu.h

+++ b/target/i386/cpu.h

@@ -506,7 +506,7 @@ typedef enum FeatureWord {

     FEATURE_WORDS,

 } FeatureWord;

-typedef uint32_t FeatureWordArray[FEATURE_WORDS];

+typedef uint64_t FeatureWordArray[FEATURE_WORDS];

 /* cpuid_features bits */

 #define CPUID_FP87 (1U << 0)

diff --git a/target/i386/kvm.c b/target/i386/kvm.c

index 2290c5d..85abd37 100644

--- a/target/i386/kvm.c

+++ b/target/i386/kvm.c

@@ -423,7 +423,7 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function,

     return ret;

 }

-uint32_t kvm_arch_get_supported_msr_feature(KVMState *s, uint32_t index)

+uint64_t kvm_arch_get_supported_msr_feature(KVMState *s, uint32_t index)

 {

     struct {

         struct kvm_msrs info;

-- 

1.8.3.1