target-i386: Disable cache info passthrough by default
PATCH v2 1/1 target-i386: Disable cache info passthrough by default
The host cache information may not make sense for the guest if the VM CPU topology doesn't match the host CPU topology. To make sure we won't expose broken cache information to the guest, disable cache info passthrough by default, and add a new "host-cache-info" property that can be used to enable the old behavior for users that really need it.
---
Changes v1 -> v2:
* Rebased on top of:
Subject: [PATCH 0/3] pc-*-2.5 machine-types
* Added host-cache-info=on to PC_COMPAT_2_4 to keep compatibility on migration
--- include/hw/i386/pc.h | 7 ++++++- target-i386/cpu.c | 4 +--- 2 files changed, 7 insertions(+), 4 deletions(-)
include/hw/i386/pc.h +6 -1
@@ -285,7 +285,12 @@ int e820_get_num_entries(void);bool e820_get_entry (int ,uint32_t ,uint64_t *,uint64_t *);#define PC_COMPAT_2_4 \ - HW_COMPAT_2_4 + HW_COMPAT_2_4 \ + {\ + .driver = "host" "-" TYPE_X86_CPU,\ + .property = "host-cache-info",\ + .value = "on",\ + },#define PC_COMPAT_2_3 \ PC_COMPAT_2_4 \
target-i386/cpu.c +1 -3
@@ -689,7 +689,6 @@ struct X86CPUDefinition {int stepping;FeatureWordArray features;char model_id[48 ]; -bool cache_info_passthrough; };static X86CPUDefinition builtin_x86_defs[] = {
@@ -1416,6 +1415,7 @@ static X86CPUDefinition host_cpudef;static Property host_x86_cpu_properties[] = {DEFINE_PROP_BOOL ("migratable" ,X86CPU , migratable, true), +DEFINE_PROP_BOOL ("host-cache-info" ,X86CPU , cache_info_passthrough, false),DEFINE_PROP_END_OF_LIST () };
@@ -1442,7 +1442,6 @@ static void host_x86_cpu_class_init(ObjectClass *oc, void *data)cpu_x86_fill_model_id (host_cpudef.model_id); xcc->cpu_def = &host_cpudef; - host_cpudef.cache_info_passthrough = true;/* level, xlevel, xlevel2, and the feature words are initialized on * instance_init, because they require KVM to be initialized.
@@ -2076,7 +2075,6 @@ static void x86_cpu_load_def(X86CPU *cpu, X86CPUDefinition *def, Error **errp)object_property_set_int (OBJECT (cpu), def->stepping,"stepping" , errp);object_property_set_int (OBJECT (cpu), def->xlevel,"xlevel" , errp);object_property_set_int (OBJECT (cpu), def->xlevel2,"xlevel2" , errp); - cpu->cache_info_passthrough = def->cache_info_passthrough;object_property_set_str (OBJECT (cpu), def->model_id,"model-id" , errp);for (w =0 ; w <FEATURE_WORDS ; w++) { env->features[w] = def->features[w];
Signature · 1 line
2.1.0
Quoted 8 lines · On Wed, 2 Sep 2015 11:19:11 -0300 Eduardo Habkost <[email protected]> wrote:
The host cache information may not make sense for the guest if the VM CPU topology doesn't match the host CPU topology. To make sure we won't expose broken cache information to the guest, disable cache info passthrough by default, and add a new "host-cache-info" property that can be used to enable the old behavior for users that really need it.
Cc Benoît Canet <[email protected]>Signed-off-by Eduardo Habkost <[email protected]>
Quoted 66 lines
---
Changes v1 -> v2:
* Rebased on top of:
Subject: [PATCH 0/3] pc-*-2.5 machine-types
* Added host-cache-info=on toPC_COMPAT_2_4to keep compatibility on migrationReported-by Igor Mammedov <[email protected]>--- include/hw/i386/pc.h | 7 ++++++- target-i386/cpu.c | 4 +--- 2 files changed, 7 insertions(+), 4 deletions(-)include/hw/i386/pc.h +6
-1@@ -285,7 +285,12 @@ int e820_get_num_entries(void);bool e820_get_entry (int ,uint32_t ,uint64_t *,uint64_t *);#define PC_COMPAT_2_4 \ - HW_COMPAT_2_4 + HW_COMPAT_2_4 \ + {\ + .driver = "host" "-" TYPE_X86_CPU,\ + .property = "host-cache-info",\ + .value = "on",\ + },#define PC_COMPAT_2_3 \ PC_COMPAT_2_4 \target-i386/cpu.c +1
-3@@ -689,7 +689,6 @@ struct X86CPUDefinition {int stepping;FeatureWordArray features;char model_id[48 ]; -bool cache_info_passthrough; };static X86CPUDefinition builtin_x86_defs[] = {@@ -1416,6 +1415,7 @@ static X86CPUDefinition host_cpudef;static Property host_x86_cpu_properties[] = {DEFINE_PROP_BOOL ("migratable" ,X86CPU , migratable, true), +DEFINE_PROP_BOOL ("host-cache-info" ,X86CPU , cache_info_passthrough, false),DEFINE_PROP_END_OF_LIST () };@@ -1442,7 +1442,6 @@ static void host_x86_cpu_class_init(ObjectClass *oc, void *data)cpu_x86_fill_model_id (host_cpudef.model_id); xcc->cpu_def = &host_cpudef; - host_cpudef.cache_info_passthrough = true;/* level, xlevel, xlevel2, and the feature words are initialized on * instance_init, because they require KVM to be initialized. @@ -2076,7 +2075,6 @@ static void x86_cpu_load_def(X86CPU *cpu, X86CPUDefinition *def, Error **errp)object_property_set_int (OBJECT (cpu), def->stepping,"stepping" , errp);object_property_set_int (OBJECT (cpu), def->xlevel,"xlevel" , errp);object_property_set_int (OBJECT (cpu), def->xlevel2,"xlevel2" , errp); - cpu->cache_info_passthrough = def->cache_info_passthrough;object_property_set_str (OBJECT (cpu), def->model_id,"model-id" , errp);for (w =0 ; w <FEATURE_WORDS ; w++) { env->features[w] = def->features[w];
Eduardo Habkost
AppliedQuoted 8 lines · Eduardo Habkost
The host cache information may not make sense for the guest if the VM CPU topology doesn't match the host CPU topology. To make sure we won't expose broken cache information to the guest, disable cache info passthrough by default, and add a new "host-cache-info" property that can be used to enable the old behavior for users that really need it.
Cc Benoît Canet <[email protected]>Signed-off-by Eduardo Habkost <[email protected]>
Oops, I was waiting for the pc-2.5 series to get in, then I forgot about it.
Applied to x86 tree.
Signature · 1 line
Eduardo