From 1f97a7e017e09c60ca5b81062308cb951c5972a1 Mon Sep 17 00:00:00 2001

From: "plai@redhat.com" <plai@redhat.com>

Date: Wed, 3 Apr 2019 15:54:31 +0100

Subject: [PATCH 07/10] x86: Data structure changes to support MSR based

 features

RH-Author: plai@redhat.com

Message-id: <1554306874-28796-8-git-send-email-plai@redhat.com>

Patchwork-id: 85389

O-Subject: [RHEL8.1 qemu-kvm PATCH resend 07/10] x86: Data structure changes to support MSR based features

Bugzilla: 1561761

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

RH-Acked-by: Igor Mammedov <imammedo@redhat.com>

RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>

From: Robert Hoo <robert.hu@linux.intel.com>

Add FeatureWordType indicator in struct FeatureWordInfo.

Change feature_word_info[] accordingly.

Change existing functions that refer to feature_word_info[] accordingly.

Signed-off-by: Robert Hoo <robert.hu@linux.intel.com>

Message-Id: <1539578845-37944-3-git-send-email-robert.hu@linux.intel.com>

[ehabkost: fixed hvf_enabled() case]

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

(cherry picked from commit 07585923485952bf4cb7da563c9f91fecc85d09c)

Signed-off-by: Paul Lai <plai@redhat.com>

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

---

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

 1 file changed, 142 insertions(+), 55 deletions(-)

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

index d86b744..a0fdd3a 100644

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

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

@@ -773,17 +773,36 @@ static void x86_cpu_vendor_words2str(char *dst, uint32_t vendor1,

           /* missing:

           CPUID_XSAVE_XSAVEC, CPUID_XSAVE_XSAVES */

+typedef enum FeatureWordType {

+   CPUID_FEATURE_WORD,

+   MSR_FEATURE_WORD,

+} FeatureWordType;

+

 typedef struct FeatureWordInfo {

+    FeatureWordType type;

     /* feature flags names are taken from "Intel Processor Identification and

      * the CPUID Instruction" and AMD's "CPUID Specification".

      * In cases of disagreement between feature naming conventions,

      * aliases may be added.

      */

     const char *feat_names[32];

-    uint32_t cpuid_eax;   /* Input EAX for CPUID */

-    bool cpuid_needs_ecx; /* CPUID instruction uses ECX as input */

-    uint32_t cpuid_ecx;   /* Input ECX value for CPUID */

-    int cpuid_reg;        /* output register (R_* constant) */

+    union {

+        /* If type==CPUID_FEATURE_WORD */

+        struct {

+            uint32_t eax;   /* Input EAX for CPUID */

+            bool needs_ecx; /* CPUID instruction uses ECX as input */

+            uint32_t ecx;   /* Input ECX value for CPUID */

+            int reg;        /* output register (R_* constant) */

+        } cpuid;

+        /* If type==MSR_FEATURE_WORD */

+        struct {

+            uint32_t index;

+            struct {   /*CPUID that enumerate this MSR*/

+                FeatureWord cpuid_class;

+                uint32_t    cpuid_flag;

+            } cpuid_dep;

+        } 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 */

@@ -793,6 +812,7 @@ typedef struct FeatureWordInfo {

 static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

     [FEAT_1_EDX] = {

+        .type = CPUID_FEATURE_WORD,

         .feat_names = {

             "fpu", "vme", "de", "pse",

             "tsc", "msr", "pae", "mce",

@@ -803,10 +823,11 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

             "fxsr", "sse", "sse2", "ss",

             "ht" /* Intel htt */, "tm", "ia64", "pbe",

         },

-        .cpuid_eax = 1, .cpuid_reg = R_EDX,

+        .cpuid = {.eax = 1, .reg = R_EDX, },

         .tcg_features = TCG_FEATURES,

     },

     [FEAT_1_ECX] = {

+        .type = CPUID_FEATURE_WORD,

         .feat_names = {

             "pni" /* Intel,AMD sse3 */, "pclmulqdq", "dtes64", "monitor",

             "ds-cpl", "vmx", "smx", "est",

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

             "tsc-deadline", "aes", "xsave", "osxsave",

             "avx", "f16c", "rdrand", "hypervisor",

         },

-        .cpuid_eax = 1, .cpuid_reg = R_ECX,

+        .cpuid = { .eax = 1, .reg = R_ECX, },

         .tcg_features = TCG_EXT_FEATURES,

     },

     /* Feature names that are already defined on feature_name[] but

@@ -826,6 +847,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

      * to features[FEAT_8000_0001_EDX] if and only if CPU vendor is AMD.

      */

     [FEAT_8000_0001_EDX] = {

+        .type = CPUID_FEATURE_WORD,

         .feat_names = {

             NULL /* fpu */, NULL /* vme */, NULL /* de */, NULL /* pse */,

             NULL /* tsc */, NULL /* msr */, NULL /* pae */, NULL /* mce */,

@@ -836,10 +858,11 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

             NULL /* fxsr */, "fxsr-opt", "pdpe1gb", "rdtscp",

             NULL, "lm", "3dnowext", "3dnow",

         },

-        .cpuid_eax = 0x80000001, .cpuid_reg = R_EDX,

+        .cpuid = { .eax = 0x80000001, .reg = R_EDX, },

         .tcg_features = TCG_EXT2_FEATURES,

     },

     [FEAT_8000_0001_ECX] = {

+        .type = CPUID_FEATURE_WORD,

         .feat_names = {

             "lahf-lm", "cmp-legacy", "svm", "extapic",

             "cr8legacy", "abm", "sse4a", "misalignsse",

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

             "perfctr-nb", NULL, NULL, NULL,

             NULL, NULL, NULL, NULL,

         },

-        .cpuid_eax = 0x80000001, .cpuid_reg = R_ECX,

+        .cpuid = { .eax = 0x80000001, .reg = R_ECX, },

         .tcg_features = TCG_EXT3_FEATURES,

         /*

          * TOPOEXT is always allowed but can't be enabled blindly by

@@ -860,6 +883,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

         .no_autoenable_flags = CPUID_EXT3_TOPOEXT,

     },

     [FEAT_C000_0001_EDX] = {

+        .type = CPUID_FEATURE_WORD,

         .feat_names = {

             NULL, NULL, "xstore", "xstore-en",

             NULL, NULL, "xcrypt", "xcrypt-en",

@@ -870,10 +894,11 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

             NULL, NULL, NULL, NULL,

             NULL, NULL, NULL, NULL,

         },

-        .cpuid_eax = 0xC0000001, .cpuid_reg = R_EDX,

+        .cpuid = { .eax = 0xC0000001, .reg = R_EDX, },

         .tcg_features = TCG_EXT4_FEATURES,

     },

     [FEAT_KVM] = {

+        .type = CPUID_FEATURE_WORD,

         .feat_names = {

             "kvmclock", "kvm-nopiodelay", "kvm-mmu", "kvmclock",

             "kvm-asyncpf", "kvm-steal-time", "kvm-pv-eoi", "kvm-pv-unhalt",

@@ -884,10 +909,11 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

             "kvmclock-stable-bit", NULL, NULL, NULL,

             NULL, NULL, NULL, NULL,

         },

-        .cpuid_eax = KVM_CPUID_FEATURES, .cpuid_reg = R_EAX,

+        .cpuid = { .eax = KVM_CPUID_FEATURES, .reg = R_EAX, },

         .tcg_features = TCG_KVM_FEATURES,

     },

     [FEAT_KVM_HINTS] = {

+        .type = CPUID_FEATURE_WORD,

         .feat_names = {

             "kvm-hint-dedicated", NULL, NULL, NULL,

             NULL, NULL, NULL, NULL,

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

             NULL, NULL, NULL, NULL,

             NULL, NULL, NULL, NULL,

         },

-        .cpuid_eax = KVM_CPUID_FEATURES, .cpuid_reg = R_EDX,

+        .cpuid = { .eax = KVM_CPUID_FEATURES, .reg = R_EDX, },

         .tcg_features = TCG_KVM_FEATURES,

         /*

          * KVM hints aren't auto-enabled by -cpu host, they need to be

@@ -907,6 +933,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

         .no_autoenable_flags = ~0U,

     },

     [FEAT_HYPERV_EAX] = {

+        .type = CPUID_FEATURE_WORD,

         .feat_names = {

             NULL /* hv_msr_vp_runtime_access */, NULL /* hv_msr_time_refcount_access */,

             NULL /* hv_msr_synic_access */, NULL /* hv_msr_stimer_access */,

@@ -920,9 +947,10 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

             NULL, NULL, NULL, NULL,

             NULL, NULL, NULL, NULL,

         },

-        .cpuid_eax = 0x40000003, .cpuid_reg = R_EAX,

+        .cpuid = { .eax = 0x40000003, .reg = R_EAX, },

     },

     [FEAT_HYPERV_EBX] = {

+        .type = CPUID_FEATURE_WORD,

         .feat_names = {

             NULL /* hv_create_partitions */, NULL /* hv_access_partition_id */,

             NULL /* hv_access_memory_pool */, NULL /* hv_adjust_message_buffers */,

@@ -936,9 +964,10 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

             NULL, NULL, NULL, NULL,

             NULL, NULL, NULL, NULL,

         },

-        .cpuid_eax = 0x40000003, .cpuid_reg = R_EBX,

+        .cpuid = { .eax = 0x40000003, .reg = R_EBX, },

     },

     [FEAT_HYPERV_EDX] = {

+        .type = CPUID_FEATURE_WORD,

         .feat_names = {

             NULL /* hv_mwait */, NULL /* hv_guest_debugging */,

             NULL /* hv_perf_monitor */, NULL /* hv_cpu_dynamic_part */,

@@ -951,9 +980,10 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

             NULL, NULL, NULL, NULL,

             NULL, NULL, NULL, NULL,

         },

-        .cpuid_eax = 0x40000003, .cpuid_reg = R_EDX,

+        .cpuid = { .eax = 0x40000003, .reg = R_EDX, },

     },

     [FEAT_SVM] = {

+        .type = CPUID_FEATURE_WORD,

         .feat_names = {

             "npt", "lbrv", "svm-lock", "nrip-save",

             "tsc-scale", "vmcb-clean",  "flushbyasid", "decodeassists",

@@ -964,10 +994,11 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

             NULL, NULL, NULL, NULL,

             NULL, NULL, NULL, NULL,

         },

-        .cpuid_eax = 0x8000000A, .cpuid_reg = R_EDX,

+        .cpuid = { .eax = 0x8000000A, .reg = R_EDX, },

         .tcg_features = TCG_SVM_FEATURES,

     },

     [FEAT_7_0_EBX] = {

+        .type = CPUID_FEATURE_WORD,

         .feat_names = {

             "fsgsbase", "tsc-adjust", NULL, "bmi1",

             "hle", "avx2", NULL, "smep",

@@ -978,12 +1009,15 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

             "clwb", "intel-pt", "avx512pf", "avx512er",

             "avx512cd", "sha-ni", "avx512bw", "avx512vl",

         },

-        .cpuid_eax = 7,

-        .cpuid_needs_ecx = true, .cpuid_ecx = 0,

-        .cpuid_reg = R_EBX,

+        .cpuid = {

+            .eax = 7,

+            .needs_ecx = true, .ecx = 0,

+            .reg = R_EBX,

+        },

         .tcg_features = TCG_7_0_EBX_FEATURES,

     },

     [FEAT_7_0_ECX] = {

+        .type = CPUID_FEATURE_WORD,

         .feat_names = {

             NULL, "avx512vbmi", "umip", "pku",

             "ospke", NULL, "avx512vbmi2", NULL,

@@ -994,12 +1028,15 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

             NULL, NULL, NULL, NULL,

             NULL, NULL, NULL, NULL,

         },

-        .cpuid_eax = 7,

-        .cpuid_needs_ecx = true, .cpuid_ecx = 0,

-        .cpuid_reg = R_ECX,

+        .cpuid = {

+            .eax = 7,

+            .needs_ecx = true, .ecx = 0,

+            .reg = R_ECX,

+        },

         .tcg_features = TCG_7_0_ECX_FEATURES,

     },

     [FEAT_7_0_EDX] = {

+        .type = CPUID_FEATURE_WORD,

         .feat_names = {

             NULL, NULL, "avx512-4vnniw", "avx512-4fmaps",

             NULL, NULL, NULL, NULL,

@@ -1010,13 +1047,16 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

             NULL, NULL, "spec-ctrl", "stibp",

             NULL, "arch-capabilities", NULL, "ssbd",

         },

-        .cpuid_eax = 7,

-        .cpuid_needs_ecx = true, .cpuid_ecx = 0,

-        .cpuid_reg = R_EDX,

+        .cpuid = {

+            .eax = 7,

+            .needs_ecx = true, .ecx = 0,

+            .reg = R_EDX,

+        },

         .tcg_features = TCG_7_0_EDX_FEATURES,

         .unmigratable_flags = CPUID_7_0_EDX_ARCH_CAPABILITIES,

     },

     [FEAT_8000_0007_EDX] = {

+        .type = CPUID_FEATURE_WORD,

         .feat_names = {

             NULL, NULL, NULL, NULL,

             NULL, NULL, NULL, NULL,

@@ -1027,12 +1067,12 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

             NULL, NULL, NULL, NULL,

             NULL, NULL, NULL, NULL,

         },

-        .cpuid_eax = 0x80000007,

-        .cpuid_reg = R_EDX,

+        .cpuid = { .eax = 0x80000007, .reg = R_EDX, },

         .tcg_features = TCG_APM_FEATURES,

         .unmigratable_flags = CPUID_APM_INVTSC,

     },

     [FEAT_8000_0008_EBX] = {

+        .type = CPUID_FEATURE_WORD,

         .feat_names = {

             NULL, NULL, NULL, NULL,

             NULL, NULL, NULL, NULL,

@@ -1043,12 +1083,12 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

             NULL, "virt-ssbd", NULL, NULL,

             NULL, NULL, NULL, NULL,

         },

-        .cpuid_eax = 0x80000008,

-        .cpuid_reg = R_EBX,

+        .cpuid = { .eax = 0x80000008, .reg = R_EBX, },

         .tcg_features = 0,

         .unmigratable_flags = 0,

     },

     [FEAT_XSAVE] = {

+        .type = CPUID_FEATURE_WORD,

         .feat_names = {

             "xsaveopt", "xsavec", "xgetbv1", "xsaves",

             NULL, NULL, NULL, NULL,

@@ -1059,12 +1099,15 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

             NULL, NULL, NULL, NULL,

             NULL, NULL, NULL, NULL,

         },

-        .cpuid_eax = 0xd,

-        .cpuid_needs_ecx = true, .cpuid_ecx = 1,

-        .cpuid_reg = R_EAX,

+        .cpuid = {

+            .eax = 0xd,

+            .needs_ecx = true, .ecx = 1,

+            .reg = R_EAX,

+        },

         .tcg_features = TCG_XSAVE_FEATURES,

     },

     [FEAT_6_EAX] = {

+        .type = CPUID_FEATURE_WORD,

         .feat_names = {

             NULL, NULL, "arat", NULL,

             NULL, NULL, NULL, NULL,

@@ -1075,13 +1118,16 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

             NULL, NULL, NULL, NULL,

             NULL, NULL, NULL, NULL,

         },

-        .cpuid_eax = 6, .cpuid_reg = R_EAX,

+        .cpuid = { .eax = 6, .reg = R_EAX, },

         .tcg_features = TCG_6_EAX_FEATURES,

     },

     [FEAT_XSAVE_COMP_LO] = {

-        .cpuid_eax = 0xD,

-        .cpuid_needs_ecx = true, .cpuid_ecx = 0,

-        .cpuid_reg = R_EAX,

+        .type = CPUID_FEATURE_WORD,

+        .cpuid = {

+            .eax = 0xD,

+            .needs_ecx = true, .ecx = 0,

+            .reg = R_EAX,

+        },

         .tcg_features = ~0U,

         .migratable_flags = XSTATE_FP_MASK | XSTATE_SSE_MASK |

             XSTATE_YMM_MASK | XSTATE_BNDREGS_MASK | XSTATE_BNDCSR_MASK |

@@ -1089,9 +1135,12 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

             XSTATE_PKRU_MASK,

     },

     [FEAT_XSAVE_COMP_HI] = {

-        .cpuid_eax = 0xD,

-        .cpuid_needs_ecx = true, .cpuid_ecx = 0,

-        .cpuid_reg = R_EDX,

+        .type = CPUID_FEATURE_WORD,

+        .cpuid = {

+            .eax = 0xD,

+            .needs_ecx = true, .ecx = 0,

+            .reg = R_EDX,

+        },

         .tcg_features = ~0U,

     },

 };

@@ -2961,21 +3010,41 @@ static const TypeInfo host_x86_cpu_type_info = {

 #endif

+static char *feature_word_description(FeatureWordInfo *f, uint32_t bit)

+{

+    assert(f->type == CPUID_FEATURE_WORD || f->type == MSR_FEATURE_WORD);

+

+    switch (f->type) {

+    case CPUID_FEATURE_WORD:

+        {

+            const char *reg = get_register_name_32(f->cpuid.reg);

+            assert(reg);

+            return g_strdup_printf("CPUID.%02XH:%s",

+                                   f->cpuid.eax, reg);

+        }

+    case MSR_FEATURE_WORD:

+        return g_strdup_printf("MSR(%02XH)",

+                               f->msr.index);

+    }

+

+    return NULL;

+}

+

 static void report_unavailable_features(FeatureWord w, uint32_t mask)

 {

     FeatureWordInfo *f = &feature_word_info[w];

     int i;

+    char *feat_word_str;

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

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

-            const char *reg = get_register_name_32(f->cpuid_reg);

-            assert(reg);

-            warn_report("%s doesn't support requested feature: "

-                        "CPUID.%02XH:%s%s%s [bit %d]",

+            feat_word_str = feature_word_description(f, i);

+            warn_report("%s doesn't support requested feature: %s%s%s [bit %d]",

                         accel_uses_host_cpuid() ? "host" : "TCG",

-                        f->cpuid_eax, reg,

+                        feat_word_str,

                         f->feat_names[i] ? "." : "",

                         f->feat_names[i] ? f->feat_names[i] : "", i);

+            g_free(feat_word_str);

         }

     }

 }

@@ -3219,11 +3288,18 @@ static void x86_cpu_get_feature_words(Object *obj, Visitor *v,

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

         FeatureWordInfo *wi = &feature_word_info[w];

+        /*

+                * We didn't have MSR features when "feature-words" was

+                *  introduced. Therefore skipped other type entries.

+                */

+        if (wi->type != CPUID_FEATURE_WORD) {

+            continue;

+        }

         X86CPUFeatureWordInfo *qwi = &word_infos[w];

-        qwi->cpuid_input_eax = wi->cpuid_eax;

-        qwi->has_cpuid_input_ecx = wi->cpuid_needs_ecx;

-        qwi->cpuid_input_ecx = wi->cpuid_ecx;

-        qwi->cpuid_register = x86_reg_info_32[wi->cpuid_reg].qapi_enum;

+        qwi->cpuid_input_eax = wi->cpuid.eax;

+        qwi->has_cpuid_input_ecx = wi->cpuid.needs_ecx;

+        qwi->cpuid_input_ecx = wi->cpuid.ecx;

+        qwi->cpuid_register = x86_reg_info_32[wi->cpuid.reg].qapi_enum;

         qwi->features = array[w];

         /* List will be in reverse order, but order shouldn't matter */

@@ -3579,16 +3655,26 @@ static uint32_t x86_cpu_get_supported_feature_word(FeatureWord w,

                                                    bool migratable_only)

 {

     FeatureWordInfo *wi = &feature_word_info[w];

-    uint32_t r;

+    uint32_t r = 0;

     if (kvm_enabled()) {

-        r = kvm_arch_get_supported_cpuid(kvm_state, wi->cpuid_eax,

-                                                    wi->cpuid_ecx,

-                                                    wi->cpuid_reg);

+        switch (wi->type) {

+        case CPUID_FEATURE_WORD:

+            r = kvm_arch_get_supported_cpuid(kvm_state, wi->cpuid.eax,

+                                                        wi->cpuid.ecx,

+                                                        wi->cpuid.reg);

+            break;

+        case MSR_FEATURE_WORD:

+            r = kvm_arch_get_supported_msr_feature(kvm_state, wi->msr.index);

+            break;

+        }

     } else if (hvf_enabled()) {

-        r = hvf_get_supported_cpuid(wi->cpuid_eax,

-                                    wi->cpuid_ecx,

-                                    wi->cpuid_reg);

+        if (wi->type != CPUID_FEATURE_WORD) {

+            return 0;

+        }

+        r = hvf_get_supported_cpuid(wi->cpuid.eax,

+                                    wi->cpuid.ecx,

+                                    wi->cpuid.reg);

     } else if (tcg_enabled()) {

         r = wi->tcg_features;

     } else {

@@ -4649,9 +4735,10 @@ static void x86_cpu_adjust_feat_level(X86CPU *cpu, FeatureWord w)

 {

     CPUX86State *env = &cpu->env;

     FeatureWordInfo *fi = &feature_word_info[w];

-    uint32_t eax = fi->cpuid_eax;

+    uint32_t eax = fi->cpuid.eax;

     uint32_t region = eax & 0xF0000000;

+    assert(feature_word_info[w].type == CPUID_FEATURE_WORD);

     if (!env->features[w]) {

         return;

     }

-- 

1.8.3.1