Received: from eggs.gnu.org ([2001:4830:134:3::10]:46020) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZX9El-0006R0-At for qemu-devel@nongnu.org; Wed, 02 Sep 2015 10:42:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZX9Ef-00075u-Ho for qemu-devel@nongnu.org; Wed, 02 Sep 2015 10:42:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37365) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZX9Ef-000737-BN for qemu-devel@nongnu.org; Wed, 02 Sep 2015 10:42:01 -0400 Date: Wed, 2 Sep 2015 16:41:57 +0200 From: Igor Mammedov Message-ID: <20150902164157.7b33ddc8@nial.brq.redhat.com> In-Reply-To: <1441203551-15403-1-git-send-email-ehabkost@redhat.com> References: <1441203551-15403-1-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2] target-i386: Disable cache info passthrough by default List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: Paolo Bonzini , qemu-devel@nongnu.org, =?UTF-8?B?QmVub8OudA==?= Canet On Wed, 2 Sep 2015 11:19:11 -0300 Eduardo Habkost 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. >=20 > Cc: Beno=C3=AEt Canet > Signed-off-by: Eduardo Habkost Reviewed-by: Igor Mammedov > --- > Changes v1 -> v2: > * Rebased on top of: > Subject: [PATCH 0/3] pc-*-2.5 machine-types > * Added host-cache-info=3Don to PC_COMPAT_2_4 to keep compatibility > on migration > Reported-by: Igor Mammedov > --- > include/hw/i386/pc.h | 7 ++++++- > target-i386/cpu.c | 4 +--- > 2 files changed, 7 insertions(+), 4 deletions(-) >=20 > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 21c1cff..d41b901 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -285,7 +285,12 @@ int e820_get_num_entries(void); > bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); > =20 > #define PC_COMPAT_2_4 \ > - HW_COMPAT_2_4 > + HW_COMPAT_2_4 \ > + {\ > + .driver =3D "host" "-" TYPE_X86_CPU,\ > + .property =3D "host-cache-info",\ > + .value =3D "on",\ > + }, > =20 > #define PC_COMPAT_2_3 \ > PC_COMPAT_2_4 \ > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index 32fee00..152ced2 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -689,7 +689,6 @@ struct X86CPUDefinition { > int stepping; > FeatureWordArray features; > char model_id[48]; > - bool cache_info_passthrough; > }; > =20 > static X86CPUDefinition builtin_x86_defs[] =3D { > @@ -1416,6 +1415,7 @@ static X86CPUDefinition host_cpudef; > =20 > static Property host_x86_cpu_properties[] =3D { > DEFINE_PROP_BOOL("migratable", X86CPU, migratable, true), > + DEFINE_PROP_BOOL("host-cache-info", X86CPU, cache_info_passthrough, = false), > DEFINE_PROP_END_OF_LIST() > }; > =20 > @@ -1442,7 +1442,6 @@ static void host_x86_cpu_class_init(ObjectClass *oc= , void *data) > cpu_x86_fill_model_id(host_cpudef.model_id); > =20 > xcc->cpu_def =3D &host_cpudef; > - host_cpudef.cache_info_passthrough =3D true; > =20 > /* 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, X86CPUDef= inition *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 =3D def->cache_info_passthrough; > object_property_set_str(OBJECT(cpu), def->model_id, "model-id", errp= ); > for (w =3D 0; w < FEATURE_WORDS; w++) { > env->features[w] =3D def->features[w];