From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZB7sJ-0006mo-Vd for qemu-devel@nongnu.org; Fri, 03 Jul 2015 16:47:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZB7sI-0003au-8D for qemu-devel@nongnu.org; Fri, 03 Jul 2015 16:47:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53523) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZB7sH-0003af-U8 for qemu-devel@nongnu.org; Fri, 03 Jul 2015 16:47:54 -0400 From: Eduardo Habkost Date: Fri, 3 Jul 2015 17:47:39 -0300 Message-Id: <1435956459-18454-4-git-send-email-ehabkost@redhat.com> In-Reply-To: <1435956459-18454-1-git-send-email-ehabkost@redhat.com> References: <1435956459-18454-1-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 3/3] target-i386: emulate CPUID level of real hardware List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Peter Maydell Cc: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Richard Henderson From: Radim Kr=C4=8Dm=C3=A1=C5=99 W10 insider has a bug where it ignores CPUID level and interprets CPUID.(EAX=3D07H, ECX=3D0H) incorrectly, because CPUID in fact returned CPUID.(EAX=3D04H, ECX=3D0H); this resulted in execution of unsupported instructions. While it's a Windows bug, there is no reason to emulate incorrect level. I used http://instlatx64.atw.hu/ as a source of CPUID and checked that it matches Penryn Xeon X5472, Westmere Xeon W3520, SandyBridge i5-2540M, and Haswell i5-4670T. kvm64 and qemu64 were bumped to 0xD to allow all available features for them (and to avoid the same Windows bug). Signed-off-by: Radim Kr=C4=8Dm=C3=A1=C5=99 Reviewed-by: Eduardo Habkost Signed-off-by: Eduardo Habkost --- include/hw/compat.h | 70 +++++++++++++++++++++++++++++++++++++++++++++++= +++++- target-i386/cpu.c | 37 ++++++++++++++-------------- 2 files changed, 87 insertions(+), 20 deletions(-) diff --git a/include/hw/compat.h b/include/hw/compat.h index 4a43466..55cfcd5 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -2,7 +2,75 @@ #define HW_COMPAT_H =20 #define HW_COMPAT_2_3 \ - /* empty */ + {\ + .driver =3D "qemu64" "-" TYPE_X86_CPU,\ + .property =3D "level",\ + .value =3D stringify(4),\ + },{\ + .driver =3D "kvm64" "-" TYPE_X86_CPU,\ + .property =3D "level",\ + .value =3D stringify(5),\ + },{\ + .driver =3D "pentium3" "-" TYPE_X86_CPU,\ + .property =3D "level",\ + .value =3D stringify(2),\ + },{\ + .driver =3D "n270" "-" TYPE_X86_CPU,\ + .property =3D "level",\ + .value =3D stringify(5),\ + },{\ + .driver =3D "Conroe" "-" TYPE_X86_CPU,\ + .property =3D "level",\ + .value =3D stringify(4),\ + },{\ + .driver =3D "Penryn" "-" TYPE_X86_CPU,\ + .property =3D "level",\ + .value =3D stringify(4),\ + },{\ + .driver =3D "Nehalem" "-" TYPE_X86_CPU,\ + .property =3D "level",\ + .value =3D stringify(4),\ + },{\ + .driver =3D "n270" "-" TYPE_X86_CPU,\ + .property =3D "xlevel",\ + .value =3D stringify(0x8000000a),\ + },{\ + .driver =3D "Penryn" "-" TYPE_X86_CPU,\ + .property =3D "xlevel",\ + .value =3D stringify(0x8000000a),\ + },{\ + .driver =3D "Conroe" "-" TYPE_X86_CPU,\ + .property =3D "xlevel",\ + .value =3D stringify(0x8000000a),\ + },{\ + .driver =3D "Nehalem" "-" TYPE_X86_CPU,\ + .property =3D "xlevel",\ + .value =3D stringify(0x8000000a),\ + },{\ + .driver =3D "Westmere" "-" TYPE_X86_CPU,\ + .property =3D "xlevel",\ + .value =3D stringify(0x8000000a),\ + },{\ + .driver =3D "SandyBridge" "-" TYPE_X86_CPU,\ + .property =3D "xlevel",\ + .value =3D stringify(0x8000000a),\ + },{\ + .driver =3D "Haswell" "-" TYPE_X86_CPU,\ + .property =3D "xlevel",\ + .value =3D stringify(0x8000000a),\ + },{\ + .driver =3D "Haswell-noTSX" "-" TYPE_X86_CPU,\ + .property =3D "xlevel",\ + .value =3D stringify(0x8000000a),\ + },{\ + .driver =3D "Broadwell" "-" TYPE_X86_CPU,\ + .property =3D "xlevel",\ + .value =3D stringify(0x8000000a),\ + },{\ + .driver =3D "Broadwell-noTSX" "-" TYPE_X86_CPU,\ + .property =3D "xlevel",\ + .value =3D stringify(0x8000000a),\ + }, =20 #define HW_COMPAT_2_2 \ /* empty */ diff --git a/target-i386/cpu.c b/target-i386/cpu.c index b4f9461..dfae721 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -695,7 +695,7 @@ struct X86CPUDefinition { static X86CPUDefinition builtin_x86_defs[] =3D { { .name =3D "qemu64", - .level =3D 4, + .level =3D 0xd, .vendor =3D CPUID_VENDOR_AMD, .family =3D 6, .model =3D 6, @@ -771,7 +771,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { }, { .name =3D "kvm64", - .level =3D 5, + .level =3D 0xd, .vendor =3D CPUID_VENDOR_INTEL, .family =3D 15, .model =3D 6, @@ -882,7 +882,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { }, { .name =3D "pentium3", - .level =3D 2, + .level =3D 3, .vendor =3D CPUID_VENDOR_INTEL, .family =3D 6, .model =3D 7, @@ -907,8 +907,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { }, { .name =3D "n270", - /* original is on level 10 */ - .level =3D 5, + .level =3D 10, .vendor =3D CPUID_VENDOR_INTEL, .family =3D 6, .model =3D 28, @@ -928,12 +927,12 @@ static X86CPUDefinition builtin_x86_defs[] =3D { CPUID_EXT2_NX, .features[FEAT_8000_0001_ECX] =3D CPUID_EXT3_LAHF_LM, - .xlevel =3D 0x8000000A, + .xlevel =3D 0x80000008, .model_id =3D "Intel(R) Atom(TM) CPU N270 @ 1.60GHz", }, { .name =3D "Conroe", - .level =3D 4, + .level =3D 10, .vendor =3D CPUID_VENDOR_INTEL, .family =3D 6, .model =3D 15, @@ -950,12 +949,12 @@ static X86CPUDefinition builtin_x86_defs[] =3D { CPUID_EXT2_LM | CPUID_EXT2_NX | CPUID_EXT2_SYSCALL, .features[FEAT_8000_0001_ECX] =3D CPUID_EXT3_LAHF_LM, - .xlevel =3D 0x8000000A, + .xlevel =3D 0x80000008, .model_id =3D "Intel Celeron_4x0 (Conroe/Merom Class Core 2)", }, { .name =3D "Penryn", - .level =3D 4, + .level =3D 10, .vendor =3D CPUID_VENDOR_INTEL, .family =3D 6, .model =3D 23, @@ -973,12 +972,12 @@ static X86CPUDefinition builtin_x86_defs[] =3D { CPUID_EXT2_LM | CPUID_EXT2_NX | CPUID_EXT2_SYSCALL, .features[FEAT_8000_0001_ECX] =3D CPUID_EXT3_LAHF_LM, - .xlevel =3D 0x8000000A, + .xlevel =3D 0x80000008, .model_id =3D "Intel Core 2 Duo P9xxx (Penryn Class Core 2)", }, { .name =3D "Nehalem", - .level =3D 4, + .level =3D 11, .vendor =3D CPUID_VENDOR_INTEL, .family =3D 6, .model =3D 26, @@ -996,7 +995,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX, .features[FEAT_8000_0001_ECX] =3D CPUID_EXT3_LAHF_LM, - .xlevel =3D 0x8000000A, + .xlevel =3D 0x80000008, .model_id =3D "Intel Core i7 9xx (Nehalem Class Core i7)", }, { @@ -1022,7 +1021,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { CPUID_EXT3_LAHF_LM, .features[FEAT_6_EAX] =3D CPUID_6_EAX_ARAT, - .xlevel =3D 0x8000000A, + .xlevel =3D 0x80000008, .model_id =3D "Westmere E56xx/L56xx/X56xx (Nehalem-C)", }, { @@ -1053,7 +1052,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { CPUID_XSAVE_XSAVEOPT, .features[FEAT_6_EAX] =3D CPUID_6_EAX_ARAT, - .xlevel =3D 0x8000000A, + .xlevel =3D 0x80000008, .model_id =3D "Intel Xeon E312xx (Sandy Bridge)", }, { @@ -1087,7 +1086,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { CPUID_XSAVE_XSAVEOPT, .features[FEAT_6_EAX] =3D CPUID_6_EAX_ARAT, - .xlevel =3D 0x8000000A, + .xlevel =3D 0x80000008, .model_id =3D "Intel Xeon E3-12xx v2 (Ivy Bridge)", }, { @@ -1123,7 +1122,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { CPUID_XSAVE_XSAVEOPT, .features[FEAT_6_EAX] =3D CPUID_6_EAX_ARAT, - .xlevel =3D 0x8000000A, + .xlevel =3D 0x80000008, .model_id =3D "Intel Core Processor (Haswell, no TSX)", }, { .name =3D "Haswell", @@ -1159,7 +1158,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { CPUID_XSAVE_XSAVEOPT, .features[FEAT_6_EAX] =3D CPUID_6_EAX_ARAT, - .xlevel =3D 0x8000000A, + .xlevel =3D 0x80000008, .model_id =3D "Intel Core Processor (Haswell)", }, { @@ -1197,7 +1196,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { CPUID_XSAVE_XSAVEOPT, .features[FEAT_6_EAX] =3D CPUID_6_EAX_ARAT, - .xlevel =3D 0x8000000A, + .xlevel =3D 0x80000008, .model_id =3D "Intel Core Processor (Broadwell, no TSX)", }, { @@ -1235,7 +1234,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { CPUID_XSAVE_XSAVEOPT, .features[FEAT_6_EAX] =3D CPUID_6_EAX_ARAT, - .xlevel =3D 0x8000000A, + .xlevel =3D 0x80000008, .model_id =3D "Intel Core Processor (Broadwell)", }, { --=20 2.1.0