openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

target-i386: Move xsave component mask to features array 

This will reuse the existing check/enforce logic in
x86_cpu_filter_features() to check the xsave component bits
against GET_SUPPORTED_CPUID.

Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2016-09-22 17:41:35 -03:00
parent 2ca8a8becc
commit 96193c22ab
2 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
target-i386/cpu.c
View File

@ -489,6 +489,18 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {
.cpuid_eax = 6, .cpuid_reg = R_EAX, .cpuid_eax = 6, .cpuid_reg = R_EAX,
.tcg_features = TCG_6_EAX_FEATURES, .tcg_features = TCG_6_EAX_FEATURES,
}, },
[FEAT_XSAVE_COMP_LO] = {
.cpuid_eax = 0xD,
.cpuid_needs_ecx = true, .cpuid_ecx = 0,
.cpuid_reg = R_EAX,
.tcg_features = ~0U,
},
[FEAT_XSAVE_COMP_HI] = {
.cpuid_eax = 0xD,
.cpuid_needs_ecx = true, .cpuid_ecx = 0,
.cpuid_reg = R_EDX,
.tcg_features = ~0U,
},
}; };
typedef struct X86RegisterInfo32 { typedef struct X86RegisterInfo32 {
@ -562,6 +574,12 @@ static uint32_t xsave_area_size(uint64_t mask)
return ret; return ret;
} }
static inline uint64_t x86_cpu_xsave_components(X86CPU *cpu)
{
return ((uint64_t)cpu->env.features[FEAT_XSAVE_COMP_HI]) << 32 |
cpu->env.features[FEAT_XSAVE_COMP_LO];
}
const char *get_register_name_32(unsigned int reg) const char *get_register_name_32(unsigned int reg)
{ {
if (reg >= CPU_NB_REGS32) { if (reg >= CPU_NB_REGS32) {
@ -2514,15 +2532,15 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
} }
if (count == 0) { if (count == 0) {
*ecx = xsave_area_size(env->xsave_components); *ecx = xsave_area_size(x86_cpu_xsave_components(cpu));
*eax = env->xsave_components; *eax = env->features[FEAT_XSAVE_COMP_LO];
*edx = env->xsave_components >> 32; *edx = env->features[FEAT_XSAVE_COMP_HI];
*ebx = *ecx; *ebx = *ecx;
} else if (count == 1) { } else if (count == 1) {
*eax = env->features[FEAT_XSAVE]; *eax = env->features[FEAT_XSAVE];
} else if (count < ARRAY_SIZE(x86_ext_save_areas)) { } else if (count < ARRAY_SIZE(x86_ext_save_areas)) {
const ExtSaveArea *esa = &x86_ext_save_areas[count]; if ((x86_cpu_xsave_components(cpu) >> count) & 1) {
if ((env->xsave_components >> count) & 1) { const ExtSaveArea *esa = &x86_ext_save_areas[count];
*eax = esa->size; *eax = esa->size;
*ebx = esa->offset; *ebx = esa->offset;
} }
@ -2957,26 +2975,22 @@ static void x86_cpu_enable_xsave_components(X86CPU *cpu)
{ {
CPUX86State *env = &cpu->env; CPUX86State *env = &cpu->env;
int i; int i;
uint64_t mask;
if (!(env->features[FEAT_1_ECX] & CPUID_EXT_XSAVE)) { if (!(env->features[FEAT_1_ECX] & CPUID_EXT_XSAVE)) {
return; return;
} }
env->xsave_components = (XSTATE_FP_MASK | XSTATE_SSE_MASK); mask = (XSTATE_FP_MASK | XSTATE_SSE_MASK);
for (i = 2; i < ARRAY_SIZE(x86_ext_save_areas); i++) { for (i = 2; i < ARRAY_SIZE(x86_ext_save_areas); i++) {
const ExtSaveArea *esa = &x86_ext_save_areas[i]; const ExtSaveArea *esa = &x86_ext_save_areas[i];
if (env->features[esa->feature] & esa->bits) { if (env->features[esa->feature] & esa->bits) {
env->xsave_components |= (1ULL << i); mask |= (1ULL << i);
} }
} }
if (kvm_enabled()) { env->features[FEAT_XSAVE_COMP_LO] = mask;
KVMState *s = kvm_state; env->features[FEAT_XSAVE_COMP_HI] = mask >> 32;
uint64_t kvm_mask = kvm_arch_get_supported_cpuid(s, 0xd, 0, R_EDX);
kvm_mask <<= 32;
kvm_mask |= kvm_arch_get_supported_cpuid(s, 0xd, 0, R_EAX);
env->xsave_components &= kvm_mask;
}
} }
#define IS_INTEL_CPU(env) ((env)->cpuid_vendor1 == CPUID_VENDOR_INTEL_1 && \ #define IS_INTEL_CPU(env) ((env)->cpuid_vendor1 == CPUID_VENDOR_INTEL_1 && \

3
target-i386/cpu.h
View File

@ -453,6 +453,8 @@ typedef enum FeatureWord {
FEAT_SVM, /* CPUID[8000_000A].EDX */ FEAT_SVM, /* CPUID[8000_000A].EDX */
FEAT_XSAVE, /* CPUID[EAX=0xd,ECX=1].EAX */ FEAT_XSAVE, /* CPUID[EAX=0xd,ECX=1].EAX */
FEAT_6_EAX, /* CPUID[6].EAX */ FEAT_6_EAX, /* CPUID[6].EAX */
FEAT_XSAVE_COMP_LO, /* CPUID[EAX=0xd,ECX=0].EAX */
FEAT_XSAVE_COMP_HI, /* CPUID[EAX=0xd,ECX=0].EDX */
FEATURE_WORDS, FEATURE_WORDS,
} FeatureWord; } FeatureWord;
@ -1122,7 +1124,6 @@ typedef struct CPUX86State {
uint32_t cpuid_vendor3; uint32_t cpuid_vendor3;
uint32_t cpuid_version; uint32_t cpuid_version;
FeatureWordArray features; FeatureWordArray features;
uint64_t xsave_components;
uint32_t cpuid_model[12]; uint32_t cpuid_model[12];
/* MTRRs */ /* MTRRs */