|
 |
9ae3a8 |
From 91e436476830a82f429e1df848ea751280580b46 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Date: Thu, 23 Feb 2017 14:29:45 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 15/17] target-i386: Loop-based feature word filtering in TCG
|
|
|
9ae3a8 |
mode
|
|
|
9ae3a8 |
MIME-Version: 1.0
|
|
|
9ae3a8 |
Content-Type: text/plain; charset=UTF-8
|
|
|
9ae3a8 |
Content-Transfer-Encoding: 8bit
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Message-id: <20170223142945.17790-15-ehabkost@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 74046
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.4 qemu-kvm PATCH v2 14/14] target-i386: Loop-based feature word filtering in TCG mode
|
|
|
9ae3a8 |
Bugzilla: 1382122
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Instead of manually filtering each feature word, add a tcg_features
|
|
|
9ae3a8 |
field to FeatureWordInfo, and use that field to filter all feature words
|
|
|
9ae3a8 |
in TCG mode.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Reviewed-by: Richard Henderson <rth@twiddle.net>
|
|
|
9ae3a8 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
|
9ae3a8 |
(cherry picked from commit 37ce3522cb88c524caec57cb52a4bfbb880abbe5)
|
|
|
9ae3a8 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
target-i386/cpu.c | 26 +++++++++++++++-----------
|
|
|
9ae3a8 |
1 file changed, 15 insertions(+), 11 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
|
|
|
9ae3a8 |
index 010b95f..38056eb 100644
|
|
|
9ae3a8 |
--- a/target-i386/cpu.c
|
|
|
9ae3a8 |
+++ b/target-i386/cpu.c
|
|
|
9ae3a8 |
@@ -254,54 +254,65 @@ typedef struct FeatureWordInfo {
|
|
|
9ae3a8 |
bool cpuid_needs_ecx; /* CPUID instruction uses ECX as input */
|
|
|
9ae3a8 |
uint32_t cpuid_ecx; /* Input ECX value for CPUID */
|
|
|
9ae3a8 |
int cpuid_reg; /* output register (R_* constant) */
|
|
|
9ae3a8 |
+ uint32_t tcg_features; /* Feature flags supported by TCG */
|
|
|
9ae3a8 |
} FeatureWordInfo;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {
|
|
|
9ae3a8 |
[FEAT_1_EDX] = {
|
|
|
9ae3a8 |
.feat_names = feature_name,
|
|
|
9ae3a8 |
.cpuid_eax = 1, .cpuid_reg = R_EDX,
|
|
|
9ae3a8 |
+ .tcg_features = TCG_FEATURES,
|
|
|
9ae3a8 |
},
|
|
|
9ae3a8 |
[FEAT_1_ECX] = {
|
|
|
9ae3a8 |
.feat_names = ext_feature_name,
|
|
|
9ae3a8 |
.cpuid_eax = 1, .cpuid_reg = R_ECX,
|
|
|
9ae3a8 |
+ .tcg_features = TCG_EXT_FEATURES,
|
|
|
9ae3a8 |
},
|
|
|
9ae3a8 |
[FEAT_8000_0001_EDX] = {
|
|
|
9ae3a8 |
.feat_names = ext2_feature_name,
|
|
|
9ae3a8 |
.cpuid_eax = 0x80000001, .cpuid_reg = R_EDX,
|
|
|
9ae3a8 |
+ .tcg_features = TCG_EXT2_FEATURES,
|
|
|
9ae3a8 |
},
|
|
|
9ae3a8 |
[FEAT_8000_0001_ECX] = {
|
|
|
9ae3a8 |
.feat_names = ext3_feature_name,
|
|
|
9ae3a8 |
.cpuid_eax = 0x80000001, .cpuid_reg = R_ECX,
|
|
|
9ae3a8 |
+ .tcg_features = TCG_EXT3_FEATURES,
|
|
|
9ae3a8 |
},
|
|
|
9ae3a8 |
[FEAT_C000_0001_EDX] = {
|
|
|
9ae3a8 |
.feat_names = ext4_feature_name,
|
|
|
9ae3a8 |
.cpuid_eax = 0xC0000001, .cpuid_reg = R_EDX,
|
|
|
9ae3a8 |
+ .tcg_features = TCG_EXT4_FEATURES,
|
|
|
9ae3a8 |
},
|
|
|
9ae3a8 |
[FEAT_KVM] = {
|
|
|
9ae3a8 |
.feat_names = kvm_feature_name,
|
|
|
9ae3a8 |
.cpuid_eax = KVM_CPUID_FEATURES, .cpuid_reg = R_EAX,
|
|
|
9ae3a8 |
+ .tcg_features = TCG_KVM_FEATURES,
|
|
|
9ae3a8 |
},
|
|
|
9ae3a8 |
[FEAT_SVM] = {
|
|
|
9ae3a8 |
.feat_names = svm_feature_name,
|
|
|
9ae3a8 |
.cpuid_eax = 0x8000000A, .cpuid_reg = R_EDX,
|
|
|
9ae3a8 |
+ .tcg_features = TCG_SVM_FEATURES,
|
|
|
9ae3a8 |
},
|
|
|
9ae3a8 |
[FEAT_7_0_EBX] = {
|
|
|
9ae3a8 |
.feat_names = cpuid_7_0_ebx_feature_name,
|
|
|
9ae3a8 |
.cpuid_eax = 7,
|
|
|
9ae3a8 |
.cpuid_needs_ecx = true, .cpuid_ecx = 0,
|
|
|
9ae3a8 |
.cpuid_reg = R_EBX,
|
|
|
9ae3a8 |
+ .tcg_features = TCG_7_0_EBX_FEATURES,
|
|
|
9ae3a8 |
},
|
|
|
9ae3a8 |
[FEAT_7_0_ECX] = {
|
|
|
9ae3a8 |
.feat_names = cpuid_7_0_ecx_feature_name,
|
|
|
9ae3a8 |
.cpuid_eax = 7,
|
|
|
9ae3a8 |
.cpuid_needs_ecx = true, .cpuid_ecx = 0,
|
|
|
9ae3a8 |
.cpuid_reg = R_ECX,
|
|
|
9ae3a8 |
+ .tcg_features = TCG_7_0_ECX_FEATURES,
|
|
|
9ae3a8 |
},
|
|
|
9ae3a8 |
[FEAT_7_0_EDX] = {
|
|
|
9ae3a8 |
.feat_names = cpuid_7_0_edx_feature_name,
|
|
|
9ae3a8 |
.cpuid_eax = 7,
|
|
|
9ae3a8 |
.cpuid_needs_ecx = true, .cpuid_ecx = 0,
|
|
|
9ae3a8 |
.cpuid_reg = R_EDX,
|
|
|
9ae3a8 |
+ .tcg_features = TCG_7_0_EDX_FEATURES,
|
|
|
9ae3a8 |
},
|
|
|
9ae3a8 |
[FEAT_XSAVE] = {
|
|
|
9ae3a8 |
.feat_names = cpuid_xsave_feature_name,
|
|
|
9ae3a8 |
@@ -2617,17 +2628,10 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
if (!kvm_enabled()) {
|
|
|
9ae3a8 |
- env->features[FEAT_1_EDX] &= TCG_FEATURES;
|
|
|
9ae3a8 |
- env->features[FEAT_1_ECX] &= TCG_EXT_FEATURES;
|
|
|
9ae3a8 |
- env->features[FEAT_7_0_EBX] &= TCG_7_0_EBX_FEATURES;
|
|
|
9ae3a8 |
- env->features[FEAT_8000_0001_EDX] &= TCG_EXT2_FEATURES;
|
|
|
9ae3a8 |
- env->features[FEAT_8000_0001_ECX] &= TCG_EXT3_FEATURES;
|
|
|
9ae3a8 |
- env->features[FEAT_SVM] &= TCG_SVM_FEATURES;
|
|
|
9ae3a8 |
- env->features[FEAT_KVM] &= TCG_KVM_FEATURES;
|
|
|
9ae3a8 |
- env->features[FEAT_C000_0001_EDX] &= TCG_EXT4_FEATURES;
|
|
|
9ae3a8 |
- env->features[FEAT_XSAVE] = 0;
|
|
|
9ae3a8 |
- env->features[FEAT_7_0_ECX] &= TCG_7_0_ECX_FEATURES;
|
|
|
9ae3a8 |
- env->features[FEAT_7_0_EDX] &= TCG_7_0_EDX_FEATURES;
|
|
|
9ae3a8 |
+ FeatureWord w;
|
|
|
9ae3a8 |
+ for (w = 0; w < FEATURE_WORDS; w++) {
|
|
|
9ae3a8 |
+ env->features[w] &= feature_word_info[w].tcg_features;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
} else {
|
|
|
9ae3a8 |
KVMState *s = kvm_state;
|
|
|
9ae3a8 |
if ((cpu->check_cpuid || cpu->enforce_cpuid)
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|