2010-03-11 14:38:55 +01:00
|
|
|
/*
|
|
|
|
* i386 CPUID helper functions
|
|
|
|
*
|
|
|
|
* Copyright (c) 2003 Fabrice Bellard
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <inttypes.h>
|
|
|
|
|
|
|
|
#include "cpu.h"
|
2012-12-17 18:20:04 +01:00
|
|
|
#include "sysemu/kvm.h"
|
2013-01-22 21:25:09 +01:00
|
|
|
#include "sysemu/cpus.h"
|
|
|
|
#include "topology.h"
|
2010-03-11 14:38:55 +01:00
|
|
|
|
2012-12-17 18:20:00 +01:00
|
|
|
#include "qemu/option.h"
|
|
|
|
#include "qemu/config-file.h"
|
2012-12-17 18:19:43 +01:00
|
|
|
#include "qapi/qmp/qerror.h"
|
2010-03-11 14:38:55 +01:00
|
|
|
|
2012-12-17 18:19:43 +01:00
|
|
|
#include "qapi/visitor.h"
|
2012-12-17 18:20:04 +01:00
|
|
|
#include "sysemu/arch_init.h"
|
2012-04-17 12:10:29 +02:00
|
|
|
|
2011-12-18 21:48:13 +01:00
|
|
|
#include "hyperv.h"
|
|
|
|
|
2012-07-23 15:22:28 +02:00
|
|
|
#include "hw/hw.h"
|
2012-08-30 22:28:31 +02:00
|
|
|
#if defined(CONFIG_KVM)
|
2012-08-29 16:32:41 +02:00
|
|
|
#include <linux/kvm_para.h>
|
2012-08-30 22:28:31 +02:00
|
|
|
#endif
|
2012-07-23 15:22:28 +02:00
|
|
|
|
2012-12-17 18:20:04 +01:00
|
|
|
#include "sysemu/sysemu.h"
|
2012-10-13 22:35:39 +02:00
|
|
|
#ifndef CONFIG_USER_ONLY
|
|
|
|
#include "hw/xen.h"
|
|
|
|
#include "hw/sysbus.h"
|
2012-10-10 12:18:02 +02:00
|
|
|
#include "hw/apic_internal.h"
|
2012-10-13 22:35:39 +02:00
|
|
|
#endif
|
|
|
|
|
2013-01-21 15:06:36 +01:00
|
|
|
static void x86_cpu_vendor_words2str(char *dst, uint32_t vendor1,
|
|
|
|
uint32_t vendor2, uint32_t vendor3)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
|
dst[i] = vendor1 >> (8 * i);
|
|
|
|
dst[i + 4] = vendor2 >> (8 * i);
|
|
|
|
dst[i + 8] = vendor3 >> (8 * i);
|
|
|
|
}
|
|
|
|
dst[CPUID_VENDOR_SZ] = '\0';
|
|
|
|
}
|
|
|
|
|
2010-03-11 14:38:55 +01:00
|
|
|
/* feature flags taken from "Intel Processor Identification and the CPUID
|
|
|
|
* Instruction" and AMD's "CPUID Specification". In cases of disagreement
|
|
|
|
* between feature naming conventions, aliases may be added.
|
|
|
|
*/
|
|
|
|
static const char *feature_name[] = {
|
|
|
|
"fpu", "vme", "de", "pse",
|
|
|
|
"tsc", "msr", "pae", "mce",
|
|
|
|
"cx8", "apic", NULL, "sep",
|
|
|
|
"mtrr", "pge", "mca", "cmov",
|
|
|
|
"pat", "pse36", "pn" /* Intel psn */, "clflush" /* Intel clfsh */,
|
|
|
|
NULL, "ds" /* Intel dts */, "acpi", "mmx",
|
|
|
|
"fxsr", "sse", "sse2", "ss",
|
|
|
|
"ht" /* Intel htt */, "tm", "ia64", "pbe",
|
|
|
|
};
|
|
|
|
static const char *ext_feature_name[] = {
|
2012-02-17 17:41:20 +01:00
|
|
|
"pni|sse3" /* Intel,AMD sse3 */, "pclmulqdq|pclmuldq", "dtes64", "monitor",
|
2010-03-11 14:38:59 +01:00
|
|
|
"ds_cpl", "vmx", "smx", "est",
|
2010-03-11 14:38:55 +01:00
|
|
|
"tm2", "ssse3", "cid", NULL,
|
2010-03-11 14:38:59 +01:00
|
|
|
"fma", "cx16", "xtpr", "pdcm",
|
2012-07-20 09:08:21 +02:00
|
|
|
NULL, "pcid", "dca", "sse4.1|sse4_1",
|
2010-03-11 14:38:59 +01:00
|
|
|
"sse4.2|sse4_2", "x2apic", "movbe", "popcnt",
|
2012-03-06 19:11:30 +01:00
|
|
|
"tsc-deadline", "aes", "xsave", "osxsave",
|
target-i386/cpu: Name new CPUID bits
Update QEMU's knowledge of CPUID bit names. This allows to
enable/disable those new features on QEMU's command line when
using KVM and prepares future feature enablement in QEMU.
This adds F16C, RDRAND, LWP, TBM, TopoExt, PerfCtr_Core, PerfCtr_NB,
FSGSBASE, BMI1, AVX2, BMI2, ERMS, PCID, InvPCID, RTM, RDSeed and ADX.
Sources where the AMD BKDG for Family 15h/Model 10h, Intel Software
Developer Manual, and the Linux kernel for the leaf 7 bits.
Signed-off-by: Andre Przywara <osp@andrep.de>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@amd.com>
[ehabkost: added CPUID_EXT_PCID]
[ehabkost: edited commit message]
[ehabkost: rebased against latest qemu.git master]
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2012-11-14 19:28:52 +01:00
|
|
|
"avx", "f16c", "rdrand", "hypervisor",
|
2010-03-11 14:38:55 +01:00
|
|
|
};
|
2012-09-06 12:05:38 +02:00
|
|
|
/* Feature names that are already defined on feature_name[] but are set on
|
|
|
|
* CPUID[8000_0001].EDX on AMD CPUs don't have their names on
|
|
|
|
* ext2_feature_name[]. They are copied automatically to cpuid_ext2_features
|
|
|
|
* if and only if CPU vendor is AMD.
|
|
|
|
*/
|
2010-03-11 14:38:55 +01:00
|
|
|
static const char *ext2_feature_name[] = {
|
2012-09-06 12:05:38 +02:00
|
|
|
NULL /* fpu */, NULL /* vme */, NULL /* de */, NULL /* pse */,
|
|
|
|
NULL /* tsc */, NULL /* msr */, NULL /* pae */, NULL /* mce */,
|
|
|
|
NULL /* cx8 */ /* AMD CMPXCHG8B */, NULL /* apic */, NULL, "syscall",
|
|
|
|
NULL /* mtrr */, NULL /* pge */, NULL /* mca */, NULL /* cmov */,
|
|
|
|
NULL /* pat */, NULL /* pse36 */, NULL, NULL /* Linux mp */,
|
|
|
|
"nx|xd", NULL, "mmxext", NULL /* mmx */,
|
|
|
|
NULL /* fxsr */, "fxsr_opt|ffxsr", "pdpe1gb" /* AMD Page1GB */, "rdtscp",
|
2012-10-24 16:10:33 +02:00
|
|
|
NULL, "lm|i64", "3dnowext", "3dnow",
|
2010-03-11 14:38:55 +01:00
|
|
|
};
|
|
|
|
static const char *ext3_feature_name[] = {
|
|
|
|
"lahf_lm" /* AMD LahfSahf */, "cmp_legacy", "svm", "extapic" /* AMD ExtApicSpace */,
|
|
|
|
"cr8legacy" /* AMD AltMovCr8 */, "abm", "sse4a", "misalignsse",
|
2010-03-11 14:38:59 +01:00
|
|
|
"3dnowprefetch", "osvw", "ibs", "xop",
|
target-i386/cpu: Name new CPUID bits
Update QEMU's knowledge of CPUID bit names. This allows to
enable/disable those new features on QEMU's command line when
using KVM and prepares future feature enablement in QEMU.
This adds F16C, RDRAND, LWP, TBM, TopoExt, PerfCtr_Core, PerfCtr_NB,
FSGSBASE, BMI1, AVX2, BMI2, ERMS, PCID, InvPCID, RTM, RDSeed and ADX.
Sources where the AMD BKDG for Family 15h/Model 10h, Intel Software
Developer Manual, and the Linux kernel for the leaf 7 bits.
Signed-off-by: Andre Przywara <osp@andrep.de>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@amd.com>
[ehabkost: added CPUID_EXT_PCID]
[ehabkost: edited commit message]
[ehabkost: rebased against latest qemu.git master]
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2012-11-14 19:28:52 +01:00
|
|
|
"skinit", "wdt", NULL, "lwp",
|
|
|
|
"fma4", "tce", NULL, "nodeid_msr",
|
|
|
|
NULL, "tbm", "topoext", "perfctr_core",
|
|
|
|
"perfctr_nb", NULL, NULL, NULL,
|
2010-03-11 14:38:55 +01:00
|
|
|
NULL, NULL, NULL, NULL,
|
|
|
|
};
|
|
|
|
|
2013-01-07 19:20:47 +01:00
|
|
|
static const char *ext4_feature_name[] = {
|
|
|
|
NULL, NULL, "xstore", "xstore-en",
|
|
|
|
NULL, NULL, "xcrypt", "xcrypt-en",
|
|
|
|
"ace2", "ace2-en", "phe", "phe-en",
|
|
|
|
"pmm", "pmm-en", NULL, NULL,
|
|
|
|
NULL, NULL, NULL, NULL,
|
|
|
|
NULL, NULL, NULL, NULL,
|
|
|
|
NULL, NULL, NULL, NULL,
|
|
|
|
NULL, NULL, NULL, NULL,
|
|
|
|
};
|
|
|
|
|
2010-03-11 14:38:55 +01:00
|
|
|
static const char *kvm_feature_name[] = {
|
2012-10-12 21:43:23 +02:00
|
|
|
"kvmclock", "kvm_nopiodelay", "kvm_mmu", "kvmclock",
|
|
|
|
"kvm_asyncpf", "kvm_steal_time", "kvm_pv_eoi", NULL,
|
|
|
|
NULL, NULL, NULL, NULL,
|
|
|
|
NULL, NULL, NULL, NULL,
|
|
|
|
NULL, NULL, NULL, NULL,
|
|
|
|
NULL, NULL, NULL, NULL,
|
|
|
|
NULL, NULL, NULL, NULL,
|
|
|
|
NULL, NULL, NULL, NULL,
|
2010-03-11 14:38:55 +01:00
|
|
|
};
|
|
|
|
|
2010-09-27 15:16:17 +02:00
|
|
|
static const char *svm_feature_name[] = {
|
|
|
|
"npt", "lbrv", "svm_lock", "nrip_save",
|
|
|
|
"tsc_scale", "vmcb_clean", "flushbyasid", "decodeassists",
|
|
|
|
NULL, NULL, "pause_filter", NULL,
|
|
|
|
"pfthreshold", NULL, NULL, NULL,
|
|
|
|
NULL, NULL, NULL, NULL,
|
|
|
|
NULL, NULL, NULL, NULL,
|
|
|
|
NULL, NULL, NULL, NULL,
|
|
|
|
NULL, NULL, NULL, NULL,
|
|
|
|
};
|
|
|
|
|
2012-09-26 22:18:43 +02:00
|
|
|
static const char *cpuid_7_0_ebx_feature_name[] = {
|
2012-10-09 16:03:59 +02:00
|
|
|
"fsgsbase", NULL, NULL, "bmi1", "hle", "avx2", NULL, "smep",
|
|
|
|
"bmi2", "erms", "invpcid", "rtm", NULL, NULL, NULL, NULL,
|
target-i386/cpu: Name new CPUID bits
Update QEMU's knowledge of CPUID bit names. This allows to
enable/disable those new features on QEMU's command line when
using KVM and prepares future feature enablement in QEMU.
This adds F16C, RDRAND, LWP, TBM, TopoExt, PerfCtr_Core, PerfCtr_NB,
FSGSBASE, BMI1, AVX2, BMI2, ERMS, PCID, InvPCID, RTM, RDSeed and ADX.
Sources where the AMD BKDG for Family 15h/Model 10h, Intel Software
Developer Manual, and the Linux kernel for the leaf 7 bits.
Signed-off-by: Andre Przywara <osp@andrep.de>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@amd.com>
[ehabkost: added CPUID_EXT_PCID]
[ehabkost: edited commit message]
[ehabkost: rebased against latest qemu.git master]
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2012-11-14 19:28:52 +01:00
|
|
|
NULL, NULL, "rdseed", "adx", "smap", NULL, NULL, NULL,
|
2012-09-26 22:18:43 +02:00
|
|
|
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
|
|
|
|
};
|
|
|
|
|
2013-01-07 19:20:45 +01:00
|
|
|
typedef struct FeatureWordInfo {
|
|
|
|
const char **feat_names;
|
2013-01-07 19:20:46 +01:00
|
|
|
uint32_t cpuid_eax; /* Input EAX for CPUID */
|
|
|
|
int cpuid_reg; /* R_* register constant */
|
2013-01-07 19:20:45 +01:00
|
|
|
} FeatureWordInfo;
|
|
|
|
|
|
|
|
static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {
|
2013-01-07 19:20:46 +01:00
|
|
|
[FEAT_1_EDX] = {
|
|
|
|
.feat_names = feature_name,
|
|
|
|
.cpuid_eax = 1, .cpuid_reg = R_EDX,
|
|
|
|
},
|
|
|
|
[FEAT_1_ECX] = {
|
|
|
|
.feat_names = ext_feature_name,
|
|
|
|
.cpuid_eax = 1, .cpuid_reg = R_ECX,
|
|
|
|
},
|
|
|
|
[FEAT_8000_0001_EDX] = {
|
|
|
|
.feat_names = ext2_feature_name,
|
|
|
|
.cpuid_eax = 0x80000001, .cpuid_reg = R_EDX,
|
|
|
|
},
|
|
|
|
[FEAT_8000_0001_ECX] = {
|
|
|
|
.feat_names = ext3_feature_name,
|
|
|
|
.cpuid_eax = 0x80000001, .cpuid_reg = R_ECX,
|
|
|
|
},
|
2013-01-07 19:20:47 +01:00
|
|
|
[FEAT_C000_0001_EDX] = {
|
|
|
|
.feat_names = ext4_feature_name,
|
|
|
|
.cpuid_eax = 0xC0000001, .cpuid_reg = R_EDX,
|
|
|
|
},
|
2013-01-07 19:20:46 +01:00
|
|
|
[FEAT_KVM] = {
|
|
|
|
.feat_names = kvm_feature_name,
|
|
|
|
.cpuid_eax = KVM_CPUID_FEATURES, .cpuid_reg = R_EAX,
|
|
|
|
},
|
|
|
|
[FEAT_SVM] = {
|
|
|
|
.feat_names = svm_feature_name,
|
|
|
|
.cpuid_eax = 0x8000000A, .cpuid_reg = R_EDX,
|
|
|
|
},
|
|
|
|
[FEAT_7_0_EBX] = {
|
|
|
|
.feat_names = cpuid_7_0_ebx_feature_name,
|
|
|
|
.cpuid_eax = 7, .cpuid_reg = R_EBX,
|
|
|
|
},
|
2013-01-07 19:20:45 +01:00
|
|
|
};
|
|
|
|
|
2013-01-04 23:01:06 +01:00
|
|
|
const char *get_register_name_32(unsigned int reg)
|
|
|
|
{
|
|
|
|
static const char *reg_names[CPU_NB_REGS32] = {
|
|
|
|
[R_EAX] = "EAX",
|
|
|
|
[R_ECX] = "ECX",
|
|
|
|
[R_EDX] = "EDX",
|
|
|
|
[R_EBX] = "EBX",
|
|
|
|
[R_ESP] = "ESP",
|
|
|
|
[R_EBP] = "EBP",
|
|
|
|
[R_ESI] = "ESI",
|
|
|
|
[R_EDI] = "EDI",
|
|
|
|
};
|
|
|
|
|
|
|
|
if (reg > CPU_NB_REGS32) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return reg_names[reg];
|
|
|
|
}
|
|
|
|
|
2010-03-11 14:38:55 +01:00
|
|
|
/* collects per-function cpuid data
|
|
|
|
*/
|
|
|
|
typedef struct model_features_t {
|
|
|
|
uint32_t *guest_feat;
|
|
|
|
uint32_t *host_feat;
|
2013-01-07 19:20:46 +01:00
|
|
|
FeatureWord feat_word;
|
2013-01-04 23:01:06 +01:00
|
|
|
} model_features_t;
|
2010-03-11 14:38:55 +01:00
|
|
|
|
|
|
|
int check_cpuid = 0;
|
|
|
|
int enforce_cpuid = 0;
|
|
|
|
|
2012-10-18 00:15:48 +02:00
|
|
|
static uint32_t kvm_default_features = (1 << KVM_FEATURE_CLOCKSOURCE) |
|
|
|
|
(1 << KVM_FEATURE_NOP_IO_DELAY) |
|
|
|
|
(1 << KVM_FEATURE_CLOCKSOURCE2) |
|
|
|
|
(1 << KVM_FEATURE_ASYNC_PF) |
|
|
|
|
(1 << KVM_FEATURE_STEAL_TIME) |
|
2013-01-17 21:59:29 +01:00
|
|
|
(1 << KVM_FEATURE_PV_EOI) |
|
2012-10-18 00:15:48 +02:00
|
|
|
(1 << KVM_FEATURE_CLOCKSOURCE_STABLE_BIT);
|
|
|
|
|
2013-01-17 21:59:29 +01:00
|
|
|
void disable_kvm_pv_eoi(void)
|
2012-10-18 00:15:48 +02:00
|
|
|
{
|
2013-01-17 21:59:29 +01:00
|
|
|
kvm_default_features &= ~(1UL << KVM_FEATURE_PV_EOI);
|
2012-10-18 00:15:48 +02:00
|
|
|
}
|
|
|
|
|
2011-01-21 21:48:07 +01:00
|
|
|
void host_cpuid(uint32_t function, uint32_t count,
|
|
|
|
uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx)
|
2010-03-11 14:38:58 +01:00
|
|
|
{
|
|
|
|
#if defined(CONFIG_KVM)
|
2011-11-27 18:13:01 +01:00
|
|
|
uint32_t vec[4];
|
|
|
|
|
|
|
|
#ifdef __x86_64__
|
|
|
|
asm volatile("cpuid"
|
|
|
|
: "=a"(vec[0]), "=b"(vec[1]),
|
|
|
|
"=c"(vec[2]), "=d"(vec[3])
|
|
|
|
: "0"(function), "c"(count) : "cc");
|
|
|
|
#else
|
|
|
|
asm volatile("pusha \n\t"
|
|
|
|
"cpuid \n\t"
|
|
|
|
"mov %%eax, 0(%2) \n\t"
|
|
|
|
"mov %%ebx, 4(%2) \n\t"
|
|
|
|
"mov %%ecx, 8(%2) \n\t"
|
|
|
|
"mov %%edx, 12(%2) \n\t"
|
|
|
|
"popa"
|
|
|
|
: : "a"(function), "c"(count), "S"(vec)
|
|
|
|
: "memory", "cc");
|
|
|
|
#endif
|
|
|
|
|
2010-03-11 14:38:58 +01:00
|
|
|
if (eax)
|
2011-11-27 18:13:01 +01:00
|
|
|
*eax = vec[0];
|
2010-03-11 14:38:58 +01:00
|
|
|
if (ebx)
|
2011-11-27 18:13:01 +01:00
|
|
|
*ebx = vec[1];
|
2010-03-11 14:38:58 +01:00
|
|
|
if (ecx)
|
2011-11-27 18:13:01 +01:00
|
|
|
*ecx = vec[2];
|
2010-03-11 14:38:58 +01:00
|
|
|
if (edx)
|
2011-11-27 18:13:01 +01:00
|
|
|
*edx = vec[3];
|
2010-03-11 14:38:58 +01:00
|
|
|
#endif
|
|
|
|
}
|
2010-03-11 14:38:55 +01:00
|
|
|
|
|
|
|
#define iswhite(c) ((c) && ((c) <= ' ' || '~' < (c)))
|
|
|
|
|
|
|
|
/* general substring compare of *[s1..e1) and *[s2..e2). sx is start of
|
|
|
|
* a substring. ex if !NULL points to the first char after a substring,
|
|
|
|
* otherwise the string is assumed to sized by a terminating nul.
|
|
|
|
* Return lexical ordering of *s1:*s2.
|
|
|
|
*/
|
|
|
|
static int sstrcmp(const char *s1, const char *e1, const char *s2,
|
|
|
|
const char *e2)
|
|
|
|
{
|
|
|
|
for (;;) {
|
|
|
|
if (!*s1 || !*s2 || *s1 != *s2)
|
|
|
|
return (*s1 - *s2);
|
|
|
|
++s1, ++s2;
|
|
|
|
if (s1 == e1 && s2 == e2)
|
|
|
|
return (0);
|
|
|
|
else if (s1 == e1)
|
|
|
|
return (*s2);
|
|
|
|
else if (s2 == e2)
|
|
|
|
return (*s1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* compare *[s..e) to *altstr. *altstr may be a simple string or multiple
|
|
|
|
* '|' delimited (possibly empty) strings in which case search for a match
|
|
|
|
* within the alternatives proceeds left to right. Return 0 for success,
|
|
|
|
* non-zero otherwise.
|
|
|
|
*/
|
|
|
|
static int altcmp(const char *s, const char *e, const char *altstr)
|
|
|
|
{
|
|
|
|
const char *p, *q;
|
|
|
|
|
|
|
|
for (q = p = altstr; ; ) {
|
|
|
|
while (*p && *p != '|')
|
|
|
|
++p;
|
|
|
|
if ((q == p && !*s) || (q != p && !sstrcmp(s, e, q, p)))
|
|
|
|
return (0);
|
|
|
|
if (!*p)
|
|
|
|
return (1);
|
|
|
|
else
|
|
|
|
q = ++p;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* search featureset for flag *[s..e), if found set corresponding bit in
|
2011-04-19 13:06:06 +02:00
|
|
|
* *pval and return true, otherwise return false
|
2010-03-11 14:38:55 +01:00
|
|
|
*/
|
2011-04-19 13:06:06 +02:00
|
|
|
static bool lookup_feature(uint32_t *pval, const char *s, const char *e,
|
|
|
|
const char **featureset)
|
2010-03-11 14:38:55 +01:00
|
|
|
{
|
|
|
|
uint32_t mask;
|
|
|
|
const char **ppc;
|
2011-04-19 13:06:06 +02:00
|
|
|
bool found = false;
|
2010-03-11 14:38:55 +01:00
|
|
|
|
2011-04-19 13:06:06 +02:00
|
|
|
for (mask = 1, ppc = featureset; mask; mask <<= 1, ++ppc) {
|
2010-03-11 14:38:55 +01:00
|
|
|
if (*ppc && !altcmp(s, e, *ppc)) {
|
|
|
|
*pval |= mask;
|
2011-04-19 13:06:06 +02:00
|
|
|
found = true;
|
2010-03-11 14:38:55 +01:00
|
|
|
}
|
2011-04-19 13:06:06 +02:00
|
|
|
}
|
|
|
|
return found;
|
2010-03-11 14:38:55 +01:00
|
|
|
}
|
|
|
|
|
2013-01-07 19:20:45 +01:00
|
|
|
static void add_flagname_to_bitmaps(const char *flagname,
|
|
|
|
FeatureWordArray words)
|
2010-03-11 14:38:55 +01:00
|
|
|
{
|
2013-01-07 19:20:45 +01:00
|
|
|
FeatureWord w;
|
|
|
|
for (w = 0; w < FEATURE_WORDS; w++) {
|
|
|
|
FeatureWordInfo *wi = &feature_word_info[w];
|
|
|
|
if (wi->feat_names &&
|
|
|
|
lookup_feature(&words[w], flagname, NULL, wi->feat_names)) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (w == FEATURE_WORDS) {
|
|
|
|
fprintf(stderr, "CPU feature %s not found\n", flagname);
|
|
|
|
}
|
2010-03-11 14:38:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct x86_def_t {
|
|
|
|
const char *name;
|
|
|
|
uint32_t level;
|
2013-01-21 15:06:36 +01:00
|
|
|
/* vendor is zero-terminated, 12 character ASCII string */
|
|
|
|
char vendor[CPUID_VENDOR_SZ + 1];
|
2010-03-11 14:38:55 +01:00
|
|
|
int family;
|
|
|
|
int model;
|
|
|
|
int stepping;
|
2010-09-27 15:16:17 +02:00
|
|
|
uint32_t features, ext_features, ext2_features, ext3_features;
|
|
|
|
uint32_t kvm_features, svm_features;
|
2010-03-11 14:38:55 +01:00
|
|
|
uint32_t xlevel;
|
|
|
|
char model_id[48];
|
2011-06-01 03:59:52 +02:00
|
|
|
/* Store the results of Centaur's CPUID instructions */
|
|
|
|
uint32_t ext4_features;
|
|
|
|
uint32_t xlevel2;
|
Expose CPUID leaf 7 only for -cpu host
Changes v2 -> v3;
- Check for kvm_enabled() before setting cpuid_7_0_ebx_features
Changes v1 -> v2:
- Use kvm_arch_get_supported_cpuid() instead of host_cpuid() on
cpu_x86_fill_host().
We should use GET_SUPPORTED_CPUID for all bits on "-cpu host"
eventually, but I am not changing all the other CPUID leaves because
we may not be able to test such an intrusive change in time for 1.1.
Description of the bug:
Since QEMU 0.15, the CPUID information on CPUID[EAX=7,ECX=0] is being
returned unfiltered to the guest, directly from the GET_SUPPORTED_CPUID
return value.
The problem is that this makes the resulting CPU feature flags
unpredictable and dependent on the host CPU and kernel version. This
breaks live-migration badly if migrating from a host CPU that supports
some features on that CPUID leaf (running a recent kernel) to a kernel
or host CPU that doesn't support it.
Migration also is incorrect (the virtual CPU changes under the guest's
feet) if you migrate in the opposite direction (from an old CPU/kernel
to a new CPU/kernel), but with less serious consequences (guests
normally query CPUID information only once on boot).
Fortunately, the bug affects only users using cpudefs with level >= 7.
The right behavior should be to explicitly enable those features on
[cpudef] config sections or on the "-cpu" command-line arguments. Right
now there is no predefined CPU model on QEMU that has those features:
the latest Intel model we have is Sandy Bridge.
I would like to get this fixed on 1.1, so I am submitting this patch,
that enables those features only if "-cpu host" is being used (as we
don't have any pre-defined CPU model that actually have those features).
After 1.1 is released, we can make those features properly configurable
on [cpudef] and -cpu configuration.
One problem is: with this patch, users with the following setup:
- Running QEMU 1.0;
- Using a cpudef having level >= 7;
- Running a kernel that supports the features on CPUID leaf 7; and
- Running on a CPU that supports some features on CPUID leaf 7
won't be able to live-migrate to QEMU 1.1. But for these users
live-migration is already broken (they can't live-migrate to hosts with
older CPUs or older kernels, already), I don't see how to avoid this
problem.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-05-21 16:27:02 +02:00
|
|
|
/* The feature bits on CPUID[EAX=7,ECX=0].EBX */
|
|
|
|
uint32_t cpuid_7_0_ebx_features;
|
2010-03-11 14:38:55 +01:00
|
|
|
} x86_def_t;
|
|
|
|
|
|
|
|
#define I486_FEATURES (CPUID_FP87 | CPUID_VME | CPUID_PSE)
|
|
|
|
#define PENTIUM_FEATURES (I486_FEATURES | CPUID_DE | CPUID_TSC | \
|
|
|
|
CPUID_MSR | CPUID_MCE | CPUID_CX8 | CPUID_MMX | CPUID_APIC)
|
|
|
|
#define PENTIUM2_FEATURES (PENTIUM_FEATURES | CPUID_PAE | CPUID_SEP | \
|
|
|
|
CPUID_MTRR | CPUID_PGE | CPUID_MCA | CPUID_CMOV | CPUID_PAT | \
|
|
|
|
CPUID_PSE36 | CPUID_FXSR)
|
|
|
|
#define PENTIUM3_FEATURES (PENTIUM2_FEATURES | CPUID_SSE)
|
|
|
|
#define PPRO_FEATURES (CPUID_FP87 | CPUID_DE | CPUID_PSE | CPUID_TSC | \
|
|
|
|
CPUID_MSR | CPUID_MCE | CPUID_CX8 | CPUID_PGE | CPUID_CMOV | \
|
|
|
|
CPUID_PAT | CPUID_FXSR | CPUID_MMX | CPUID_SSE | CPUID_SSE2 | \
|
|
|
|
CPUID_PAE | CPUID_SEP | CPUID_APIC)
|
|
|
|
|
2010-03-11 14:39:03 +01:00
|
|
|
#define TCG_FEATURES (CPUID_FP87 | CPUID_PSE | CPUID_TSC | CPUID_MSR | \
|
|
|
|
CPUID_PAE | CPUID_MCE | CPUID_CX8 | CPUID_APIC | CPUID_SEP | \
|
|
|
|
CPUID_MTRR | CPUID_PGE | CPUID_MCA | CPUID_CMOV | CPUID_PAT | \
|
|
|
|
CPUID_PSE36 | CPUID_CLFLUSH | CPUID_ACPI | CPUID_MMX | \
|
|
|
|
CPUID_FXSR | CPUID_SSE | CPUID_SSE2 | CPUID_SS)
|
2010-03-13 16:43:15 +01:00
|
|
|
/* partly implemented:
|
|
|
|
CPUID_MTRR, CPUID_MCA, CPUID_CLFLUSH (needed for Win64)
|
|
|
|
CPUID_PSE36 (needed for Solaris) */
|
|
|
|
/* missing:
|
|
|
|
CPUID_VME, CPUID_DTS, CPUID_SS, CPUID_HT, CPUID_TM, CPUID_PBE */
|
2010-03-11 14:39:03 +01:00
|
|
|
#define TCG_EXT_FEATURES (CPUID_EXT_SSE3 | CPUID_EXT_MONITOR | \
|
2012-11-24 15:07:01 +01:00
|
|
|
CPUID_EXT_SSSE3 | CPUID_EXT_CX16 | CPUID_EXT_POPCNT | \
|
2010-03-11 14:39:03 +01:00
|
|
|
CPUID_EXT_HYPERVISOR)
|
2010-03-13 16:43:15 +01:00
|
|
|
/* missing:
|
|
|
|
CPUID_EXT_DTES64, CPUID_EXT_DSCPL, CPUID_EXT_VMX, CPUID_EXT_EST,
|
2010-06-26 22:54:21 +02:00
|
|
|
CPUID_EXT_TM2, CPUID_EXT_XTPR, CPUID_EXT_PDCM, CPUID_EXT_XSAVE */
|
2012-09-06 12:05:37 +02:00
|
|
|
#define TCG_EXT2_FEATURES ((TCG_FEATURES & CPUID_EXT2_AMD_ALIASES) | \
|
2010-03-11 14:39:03 +01:00
|
|
|
CPUID_EXT2_NX | CPUID_EXT2_MMXEXT | CPUID_EXT2_RDTSCP | \
|
|
|
|
CPUID_EXT2_3DNOW | CPUID_EXT2_3DNOWEXT)
|
2010-03-13 16:43:15 +01:00
|
|
|
/* missing:
|
|
|
|
CPUID_EXT2_PDPE1GB */
|
2010-03-11 14:39:03 +01:00
|
|
|
#define TCG_EXT3_FEATURES (CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM | \
|
|
|
|
CPUID_EXT3_CR8LEG | CPUID_EXT3_ABM | CPUID_EXT3_SSE4A)
|
2010-09-27 15:16:17 +02:00
|
|
|
#define TCG_SVM_FEATURES 0
|
2012-09-26 22:18:43 +02:00
|
|
|
#define TCG_7_0_EBX_FEATURES (CPUID_7_0_EBX_SMEP | CPUID_7_0_EBX_SMAP)
|
2010-03-11 14:39:03 +01:00
|
|
|
|
2013-01-21 01:02:28 +01:00
|
|
|
/* built-in CPU model definitions
|
2010-03-11 14:38:55 +01:00
|
|
|
*/
|
|
|
|
static x86_def_t builtin_x86_defs[] = {
|
|
|
|
{
|
|
|
|
.name = "qemu64",
|
|
|
|
.level = 4,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_AMD,
|
2010-03-11 14:38:55 +01:00
|
|
|
.family = 6,
|
|
|
|
.model = 2,
|
|
|
|
.stepping = 3,
|
|
|
|
.features = PPRO_FEATURES |
|
|
|
|
CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA |
|
|
|
|
CPUID_PSE36,
|
|
|
|
.ext_features = CPUID_EXT_SSE3 | CPUID_EXT_CX16 | CPUID_EXT_POPCNT,
|
2012-09-06 12:05:37 +02:00
|
|
|
.ext2_features = (PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES) |
|
2010-03-11 14:38:55 +01:00
|
|
|
CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX,
|
|
|
|
.ext3_features = CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM |
|
|
|
|
CPUID_EXT3_ABM | CPUID_EXT3_SSE4A,
|
|
|
|
.xlevel = 0x8000000A,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "phenom",
|
|
|
|
.level = 5,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_AMD,
|
2010-03-11 14:38:55 +01:00
|
|
|
.family = 16,
|
|
|
|
.model = 2,
|
|
|
|
.stepping = 3,
|
|
|
|
.features = PPRO_FEATURES |
|
|
|
|
CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA |
|
2010-03-13 16:43:15 +01:00
|
|
|
CPUID_PSE36 | CPUID_VME | CPUID_HT,
|
2010-03-11 14:38:55 +01:00
|
|
|
.ext_features = CPUID_EXT_SSE3 | CPUID_EXT_MONITOR | CPUID_EXT_CX16 |
|
|
|
|
CPUID_EXT_POPCNT,
|
2012-09-06 12:05:37 +02:00
|
|
|
.ext2_features = (PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES) |
|
2010-03-11 14:38:55 +01:00
|
|
|
CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX |
|
|
|
|
CPUID_EXT2_3DNOW | CPUID_EXT2_3DNOWEXT | CPUID_EXT2_MMXEXT |
|
2010-03-13 16:43:15 +01:00
|
|
|
CPUID_EXT2_FFXSR | CPUID_EXT2_PDPE1GB | CPUID_EXT2_RDTSCP,
|
2010-03-11 14:38:55 +01:00
|
|
|
/* Missing: CPUID_EXT3_CMP_LEG, CPUID_EXT3_EXTAPIC,
|
|
|
|
CPUID_EXT3_CR8LEG,
|
|
|
|
CPUID_EXT3_MISALIGNSSE, CPUID_EXT3_3DNOWPREFETCH,
|
|
|
|
CPUID_EXT3_OSVW, CPUID_EXT3_IBS */
|
|
|
|
.ext3_features = CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM |
|
|
|
|
CPUID_EXT3_ABM | CPUID_EXT3_SSE4A,
|
2010-09-27 15:16:17 +02:00
|
|
|
.svm_features = CPUID_SVM_NPT | CPUID_SVM_LBRV,
|
2010-03-11 14:38:55 +01:00
|
|
|
.xlevel = 0x8000001A,
|
|
|
|
.model_id = "AMD Phenom(tm) 9550 Quad-Core Processor"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "core2duo",
|
|
|
|
.level = 10,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_INTEL,
|
2010-03-11 14:38:55 +01:00
|
|
|
.family = 6,
|
|
|
|
.model = 15,
|
|
|
|
.stepping = 11,
|
|
|
|
.features = PPRO_FEATURES |
|
|
|
|
CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA |
|
2010-03-13 16:43:15 +01:00
|
|
|
CPUID_PSE36 | CPUID_VME | CPUID_DTS | CPUID_ACPI | CPUID_SS |
|
|
|
|
CPUID_HT | CPUID_TM | CPUID_PBE,
|
|
|
|
.ext_features = CPUID_EXT_SSE3 | CPUID_EXT_MONITOR | CPUID_EXT_SSSE3 |
|
|
|
|
CPUID_EXT_DTES64 | CPUID_EXT_DSCPL | CPUID_EXT_VMX | CPUID_EXT_EST |
|
|
|
|
CPUID_EXT_TM2 | CPUID_EXT_CX16 | CPUID_EXT_XTPR | CPUID_EXT_PDCM,
|
2010-03-11 14:38:55 +01:00
|
|
|
.ext2_features = CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX,
|
|
|
|
.ext3_features = CPUID_EXT3_LAHF_LM,
|
|
|
|
.xlevel = 0x80000008,
|
|
|
|
.model_id = "Intel(R) Core(TM)2 Duo CPU T7700 @ 2.40GHz",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "kvm64",
|
|
|
|
.level = 5,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_INTEL,
|
2010-03-11 14:38:55 +01:00
|
|
|
.family = 15,
|
|
|
|
.model = 6,
|
|
|
|
.stepping = 1,
|
|
|
|
/* Missing: CPUID_VME, CPUID_HT */
|
|
|
|
.features = PPRO_FEATURES |
|
|
|
|
CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA |
|
|
|
|
CPUID_PSE36,
|
|
|
|
/* Missing: CPUID_EXT_POPCNT, CPUID_EXT_MONITOR */
|
|
|
|
.ext_features = CPUID_EXT_SSE3 | CPUID_EXT_CX16,
|
|
|
|
/* Missing: CPUID_EXT2_PDPE1GB, CPUID_EXT2_RDTSCP */
|
2012-09-06 12:05:37 +02:00
|
|
|
.ext2_features = (PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES) |
|
2010-03-11 14:38:55 +01:00
|
|
|
CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX,
|
|
|
|
/* Missing: CPUID_EXT3_LAHF_LM, CPUID_EXT3_CMP_LEG, CPUID_EXT3_EXTAPIC,
|
|
|
|
CPUID_EXT3_CR8LEG, CPUID_EXT3_ABM, CPUID_EXT3_SSE4A,
|
|
|
|
CPUID_EXT3_MISALIGNSSE, CPUID_EXT3_3DNOWPREFETCH,
|
|
|
|
CPUID_EXT3_OSVW, CPUID_EXT3_IBS, CPUID_EXT3_SVM */
|
|
|
|
.ext3_features = 0,
|
|
|
|
.xlevel = 0x80000008,
|
|
|
|
.model_id = "Common KVM processor"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "qemu32",
|
|
|
|
.level = 4,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_INTEL,
|
2010-03-11 14:38:55 +01:00
|
|
|
.family = 6,
|
|
|
|
.model = 3,
|
|
|
|
.stepping = 3,
|
|
|
|
.features = PPRO_FEATURES,
|
|
|
|
.ext_features = CPUID_EXT_SSE3 | CPUID_EXT_POPCNT,
|
2010-03-11 14:39:06 +01:00
|
|
|
.xlevel = 0x80000004,
|
2010-03-11 14:38:55 +01:00
|
|
|
},
|
2010-05-21 09:50:51 +02:00
|
|
|
{
|
|
|
|
.name = "kvm32",
|
|
|
|
.level = 5,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_INTEL,
|
2010-05-21 09:50:51 +02:00
|
|
|
.family = 15,
|
|
|
|
.model = 6,
|
|
|
|
.stepping = 1,
|
|
|
|
.features = PPRO_FEATURES |
|
|
|
|
CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA | CPUID_PSE36,
|
|
|
|
.ext_features = CPUID_EXT_SSE3,
|
2012-09-06 12:05:37 +02:00
|
|
|
.ext2_features = PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES,
|
2010-05-21 09:50:51 +02:00
|
|
|
.ext3_features = 0,
|
|
|
|
.xlevel = 0x80000008,
|
|
|
|
.model_id = "Common 32-bit KVM processor"
|
|
|
|
},
|
2010-03-11 14:38:55 +01:00
|
|
|
{
|
|
|
|
.name = "coreduo",
|
|
|
|
.level = 10,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_INTEL,
|
2010-03-11 14:38:55 +01:00
|
|
|
.family = 6,
|
|
|
|
.model = 14,
|
|
|
|
.stepping = 8,
|
|
|
|
.features = PPRO_FEATURES | CPUID_VME |
|
2010-03-13 16:43:15 +01:00
|
|
|
CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA | CPUID_DTS | CPUID_ACPI |
|
|
|
|
CPUID_SS | CPUID_HT | CPUID_TM | CPUID_PBE,
|
|
|
|
.ext_features = CPUID_EXT_SSE3 | CPUID_EXT_MONITOR | CPUID_EXT_VMX |
|
|
|
|
CPUID_EXT_EST | CPUID_EXT_TM2 | CPUID_EXT_XTPR | CPUID_EXT_PDCM,
|
2010-03-11 14:38:55 +01:00
|
|
|
.ext2_features = CPUID_EXT2_NX,
|
|
|
|
.xlevel = 0x80000008,
|
|
|
|
.model_id = "Genuine Intel(R) CPU T2600 @ 2.16GHz",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "486",
|
2010-03-11 14:39:06 +01:00
|
|
|
.level = 1,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_INTEL,
|
2010-03-11 14:38:55 +01:00
|
|
|
.family = 4,
|
|
|
|
.model = 0,
|
|
|
|
.stepping = 0,
|
|
|
|
.features = I486_FEATURES,
|
|
|
|
.xlevel = 0,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "pentium",
|
|
|
|
.level = 1,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_INTEL,
|
2010-03-11 14:38:55 +01:00
|
|
|
.family = 5,
|
|
|
|
.model = 4,
|
|
|
|
.stepping = 3,
|
|
|
|
.features = PENTIUM_FEATURES,
|
|
|
|
.xlevel = 0,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "pentium2",
|
|
|
|
.level = 2,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_INTEL,
|
2010-03-11 14:38:55 +01:00
|
|
|
.family = 6,
|
|
|
|
.model = 5,
|
|
|
|
.stepping = 2,
|
|
|
|
.features = PENTIUM2_FEATURES,
|
|
|
|
.xlevel = 0,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "pentium3",
|
|
|
|
.level = 2,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_INTEL,
|
2010-03-11 14:38:55 +01:00
|
|
|
.family = 6,
|
|
|
|
.model = 7,
|
|
|
|
.stepping = 3,
|
|
|
|
.features = PENTIUM3_FEATURES,
|
|
|
|
.xlevel = 0,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "athlon",
|
|
|
|
.level = 2,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_AMD,
|
2010-03-11 14:38:55 +01:00
|
|
|
.family = 6,
|
|
|
|
.model = 2,
|
|
|
|
.stepping = 3,
|
2012-09-06 12:05:37 +02:00
|
|
|
.features = PPRO_FEATURES | CPUID_PSE36 | CPUID_VME | CPUID_MTRR |
|
|
|
|
CPUID_MCA,
|
|
|
|
.ext2_features = (PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES) |
|
|
|
|
CPUID_EXT2_MMXEXT | CPUID_EXT2_3DNOW | CPUID_EXT2_3DNOWEXT,
|
2010-03-11 14:38:55 +01:00
|
|
|
.xlevel = 0x80000008,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "n270",
|
|
|
|
/* original is on level 10 */
|
|
|
|
.level = 5,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_INTEL,
|
2010-03-11 14:38:55 +01:00
|
|
|
.family = 6,
|
|
|
|
.model = 28,
|
|
|
|
.stepping = 2,
|
|
|
|
.features = PPRO_FEATURES |
|
2010-03-13 16:43:15 +01:00
|
|
|
CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA | CPUID_VME | CPUID_DTS |
|
|
|
|
CPUID_ACPI | CPUID_SS | CPUID_HT | CPUID_TM | CPUID_PBE,
|
2010-03-11 14:38:55 +01:00
|
|
|
/* Some CPUs got no CPUID_SEP */
|
2010-03-13 16:43:15 +01:00
|
|
|
.ext_features = CPUID_EXT_SSE3 | CPUID_EXT_MONITOR | CPUID_EXT_SSSE3 |
|
|
|
|
CPUID_EXT_DSCPL | CPUID_EXT_EST | CPUID_EXT_TM2 | CPUID_EXT_XTPR,
|
2012-09-06 12:05:37 +02:00
|
|
|
.ext2_features = (PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES) |
|
|
|
|
CPUID_EXT2_NX,
|
2010-03-13 16:43:15 +01:00
|
|
|
.ext3_features = CPUID_EXT3_LAHF_LM,
|
2010-03-11 14:38:55 +01:00
|
|
|
.xlevel = 0x8000000A,
|
|
|
|
.model_id = "Intel(R) Atom(TM) CPU N270 @ 1.60GHz",
|
|
|
|
},
|
2012-09-05 22:41:10 +02:00
|
|
|
{
|
|
|
|
.name = "Conroe",
|
|
|
|
.level = 2,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_INTEL,
|
2012-09-05 22:41:10 +02:00
|
|
|
.family = 6,
|
|
|
|
.model = 2,
|
|
|
|
.stepping = 3,
|
|
|
|
.features = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
|
CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
|
CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
|
CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
|
CPUID_DE | CPUID_FP87,
|
|
|
|
.ext_features = CPUID_EXT_SSSE3 | CPUID_EXT_SSE3,
|
|
|
|
.ext2_features = CPUID_EXT2_LM | CPUID_EXT2_NX | CPUID_EXT2_SYSCALL,
|
|
|
|
.ext3_features = CPUID_EXT3_LAHF_LM,
|
|
|
|
.xlevel = 0x8000000A,
|
|
|
|
.model_id = "Intel Celeron_4x0 (Conroe/Merom Class Core 2)",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "Penryn",
|
|
|
|
.level = 2,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_INTEL,
|
2012-09-05 22:41:10 +02:00
|
|
|
.family = 6,
|
|
|
|
.model = 2,
|
|
|
|
.stepping = 3,
|
|
|
|
.features = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
|
CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
|
CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
|
CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
|
CPUID_DE | CPUID_FP87,
|
|
|
|
.ext_features = CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 |
|
|
|
|
CPUID_EXT_SSE3,
|
|
|
|
.ext2_features = CPUID_EXT2_LM | CPUID_EXT2_NX | CPUID_EXT2_SYSCALL,
|
|
|
|
.ext3_features = CPUID_EXT3_LAHF_LM,
|
|
|
|
.xlevel = 0x8000000A,
|
|
|
|
.model_id = "Intel Core 2 Duo P9xxx (Penryn Class Core 2)",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "Nehalem",
|
|
|
|
.level = 2,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_INTEL,
|
2012-09-05 22:41:10 +02:00
|
|
|
.family = 6,
|
|
|
|
.model = 2,
|
|
|
|
.stepping = 3,
|
|
|
|
.features = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
|
CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
|
CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
|
CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
|
CPUID_DE | CPUID_FP87,
|
|
|
|
.ext_features = CPUID_EXT_POPCNT | CPUID_EXT_SSE42 | CPUID_EXT_SSE41 |
|
|
|
|
CPUID_EXT_CX16 | CPUID_EXT_SSSE3 | CPUID_EXT_SSE3,
|
|
|
|
.ext2_features = CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX,
|
|
|
|
.ext3_features = CPUID_EXT3_LAHF_LM,
|
|
|
|
.xlevel = 0x8000000A,
|
|
|
|
.model_id = "Intel Core i7 9xx (Nehalem Class Core i7)",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "Westmere",
|
|
|
|
.level = 11,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_INTEL,
|
2012-09-05 22:41:10 +02:00
|
|
|
.family = 6,
|
|
|
|
.model = 44,
|
|
|
|
.stepping = 1,
|
|
|
|
.features = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
|
CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
|
CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
|
CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
|
CPUID_DE | CPUID_FP87,
|
|
|
|
.ext_features = CPUID_EXT_AES | CPUID_EXT_POPCNT | CPUID_EXT_SSE42 |
|
|
|
|
CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 |
|
|
|
|
CPUID_EXT_SSE3,
|
|
|
|
.ext2_features = CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX,
|
|
|
|
.ext3_features = CPUID_EXT3_LAHF_LM,
|
|
|
|
.xlevel = 0x8000000A,
|
|
|
|
.model_id = "Westmere E56xx/L56xx/X56xx (Nehalem-C)",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "SandyBridge",
|
|
|
|
.level = 0xd,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_INTEL,
|
2012-09-05 22:41:10 +02:00
|
|
|
.family = 6,
|
|
|
|
.model = 42,
|
|
|
|
.stepping = 1,
|
|
|
|
.features = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
|
CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
|
CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
|
CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
|
CPUID_DE | CPUID_FP87,
|
|
|
|
.ext_features = CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES |
|
|
|
|
CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_POPCNT |
|
|
|
|
CPUID_EXT_X2APIC | CPUID_EXT_SSE42 | CPUID_EXT_SSE41 |
|
|
|
|
CPUID_EXT_CX16 | CPUID_EXT_SSSE3 | CPUID_EXT_PCLMULQDQ |
|
|
|
|
CPUID_EXT_SSE3,
|
|
|
|
.ext2_features = CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_NX |
|
|
|
|
CPUID_EXT2_SYSCALL,
|
|
|
|
.ext3_features = CPUID_EXT3_LAHF_LM,
|
|
|
|
.xlevel = 0x8000000A,
|
|
|
|
.model_id = "Intel Xeon E312xx (Sandy Bridge)",
|
|
|
|
},
|
target-i386: Add Haswell CPU model
Features added to the model, in relation to SandyBridge:
fma CPUID[1].ECX[12]
pcid CPUID[1].ECX[17]
movbe CPUID[1].ECX[22]
fsgsbase CPUID[EAX=7,ECX=0].EBX[0]
bmi1 CPUID[EAX=7,ECX=0].EBX[3]
hle CPUID[EAX=7,ECX=0].EBX[4]
avx2 CPUID[EAX=7,ECX=0].EBX[5]
smep CPUID[EAX=7,ECX=0].EBX[7]
bmi2 CPUID[EAX=7,ECX=0].EBX[8]
erms CPUID[EAX=7,ECX=0].EBX[9]
invpcid CPUID[EAX=7,ECX=0].EBX[10]
rtm CPUID[EAX=7,ECX=0].EBX[11]
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2012-11-14 19:28:54 +01:00
|
|
|
{
|
|
|
|
.name = "Haswell",
|
|
|
|
.level = 0xd,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_INTEL,
|
target-i386: Add Haswell CPU model
Features added to the model, in relation to SandyBridge:
fma CPUID[1].ECX[12]
pcid CPUID[1].ECX[17]
movbe CPUID[1].ECX[22]
fsgsbase CPUID[EAX=7,ECX=0].EBX[0]
bmi1 CPUID[EAX=7,ECX=0].EBX[3]
hle CPUID[EAX=7,ECX=0].EBX[4]
avx2 CPUID[EAX=7,ECX=0].EBX[5]
smep CPUID[EAX=7,ECX=0].EBX[7]
bmi2 CPUID[EAX=7,ECX=0].EBX[8]
erms CPUID[EAX=7,ECX=0].EBX[9]
invpcid CPUID[EAX=7,ECX=0].EBX[10]
rtm CPUID[EAX=7,ECX=0].EBX[11]
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2012-11-14 19:28:54 +01:00
|
|
|
.family = 6,
|
|
|
|
.model = 60,
|
|
|
|
.stepping = 1,
|
|
|
|
.features = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
|
CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
2012-11-22 16:31:03 +01:00
|
|
|
CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
target-i386: Add Haswell CPU model
Features added to the model, in relation to SandyBridge:
fma CPUID[1].ECX[12]
pcid CPUID[1].ECX[17]
movbe CPUID[1].ECX[22]
fsgsbase CPUID[EAX=7,ECX=0].EBX[0]
bmi1 CPUID[EAX=7,ECX=0].EBX[3]
hle CPUID[EAX=7,ECX=0].EBX[4]
avx2 CPUID[EAX=7,ECX=0].EBX[5]
smep CPUID[EAX=7,ECX=0].EBX[7]
bmi2 CPUID[EAX=7,ECX=0].EBX[8]
erms CPUID[EAX=7,ECX=0].EBX[9]
invpcid CPUID[EAX=7,ECX=0].EBX[10]
rtm CPUID[EAX=7,ECX=0].EBX[11]
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2012-11-14 19:28:54 +01:00
|
|
|
CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
|
CPUID_DE | CPUID_FP87,
|
|
|
|
.ext_features = CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES |
|
|
|
|
CPUID_EXT_POPCNT | CPUID_EXT_X2APIC | CPUID_EXT_SSE42 |
|
|
|
|
CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 |
|
|
|
|
CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3 |
|
|
|
|
CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_FMA | CPUID_EXT_MOVBE |
|
|
|
|
CPUID_EXT_PCID,
|
2012-11-22 16:31:03 +01:00
|
|
|
.ext2_features = CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_NX |
|
|
|
|
CPUID_EXT2_SYSCALL,
|
target-i386: Add Haswell CPU model
Features added to the model, in relation to SandyBridge:
fma CPUID[1].ECX[12]
pcid CPUID[1].ECX[17]
movbe CPUID[1].ECX[22]
fsgsbase CPUID[EAX=7,ECX=0].EBX[0]
bmi1 CPUID[EAX=7,ECX=0].EBX[3]
hle CPUID[EAX=7,ECX=0].EBX[4]
avx2 CPUID[EAX=7,ECX=0].EBX[5]
smep CPUID[EAX=7,ECX=0].EBX[7]
bmi2 CPUID[EAX=7,ECX=0].EBX[8]
erms CPUID[EAX=7,ECX=0].EBX[9]
invpcid CPUID[EAX=7,ECX=0].EBX[10]
rtm CPUID[EAX=7,ECX=0].EBX[11]
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2012-11-14 19:28:54 +01:00
|
|
|
.ext3_features = CPUID_EXT3_LAHF_LM,
|
|
|
|
.cpuid_7_0_ebx_features = CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 |
|
|
|
|
CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |
|
|
|
|
CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCID |
|
|
|
|
CPUID_7_0_EBX_RTM,
|
|
|
|
.xlevel = 0x8000000A,
|
|
|
|
.model_id = "Intel Core Processor (Haswell)",
|
|
|
|
},
|
2012-09-05 22:41:10 +02:00
|
|
|
{
|
|
|
|
.name = "Opteron_G1",
|
|
|
|
.level = 5,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_AMD,
|
2012-09-05 22:41:10 +02:00
|
|
|
.family = 15,
|
|
|
|
.model = 6,
|
|
|
|
.stepping = 1,
|
|
|
|
.features = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
|
CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
|
CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
|
CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
|
CPUID_DE | CPUID_FP87,
|
|
|
|
.ext_features = CPUID_EXT_SSE3,
|
|
|
|
.ext2_features = CPUID_EXT2_LM | CPUID_EXT2_FXSR | CPUID_EXT2_MMX |
|
|
|
|
CPUID_EXT2_NX | CPUID_EXT2_PSE36 | CPUID_EXT2_PAT |
|
|
|
|
CPUID_EXT2_CMOV | CPUID_EXT2_MCA | CPUID_EXT2_PGE |
|
|
|
|
CPUID_EXT2_MTRR | CPUID_EXT2_SYSCALL | CPUID_EXT2_APIC |
|
|
|
|
CPUID_EXT2_CX8 | CPUID_EXT2_MCE | CPUID_EXT2_PAE | CPUID_EXT2_MSR |
|
|
|
|
CPUID_EXT2_TSC | CPUID_EXT2_PSE | CPUID_EXT2_DE | CPUID_EXT2_FPU,
|
|
|
|
.xlevel = 0x80000008,
|
|
|
|
.model_id = "AMD Opteron 240 (Gen 1 Class Opteron)",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "Opteron_G2",
|
|
|
|
.level = 5,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_AMD,
|
2012-09-05 22:41:10 +02:00
|
|
|
.family = 15,
|
|
|
|
.model = 6,
|
|
|
|
.stepping = 1,
|
|
|
|
.features = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
|
CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
|
CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
|
CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
|
CPUID_DE | CPUID_FP87,
|
|
|
|
.ext_features = CPUID_EXT_CX16 | CPUID_EXT_SSE3,
|
|
|
|
.ext2_features = CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_FXSR |
|
|
|
|
CPUID_EXT2_MMX | CPUID_EXT2_NX | CPUID_EXT2_PSE36 |
|
|
|
|
CPUID_EXT2_PAT | CPUID_EXT2_CMOV | CPUID_EXT2_MCA |
|
|
|
|
CPUID_EXT2_PGE | CPUID_EXT2_MTRR | CPUID_EXT2_SYSCALL |
|
|
|
|
CPUID_EXT2_APIC | CPUID_EXT2_CX8 | CPUID_EXT2_MCE |
|
|
|
|
CPUID_EXT2_PAE | CPUID_EXT2_MSR | CPUID_EXT2_TSC | CPUID_EXT2_PSE |
|
|
|
|
CPUID_EXT2_DE | CPUID_EXT2_FPU,
|
|
|
|
.ext3_features = CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM,
|
|
|
|
.xlevel = 0x80000008,
|
|
|
|
.model_id = "AMD Opteron 22xx (Gen 2 Class Opteron)",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "Opteron_G3",
|
|
|
|
.level = 5,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_AMD,
|
2012-09-05 22:41:10 +02:00
|
|
|
.family = 15,
|
|
|
|
.model = 6,
|
|
|
|
.stepping = 1,
|
|
|
|
.features = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
|
CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
|
CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
|
CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
|
CPUID_DE | CPUID_FP87,
|
|
|
|
.ext_features = CPUID_EXT_POPCNT | CPUID_EXT_CX16 | CPUID_EXT_MONITOR |
|
|
|
|
CPUID_EXT_SSE3,
|
|
|
|
.ext2_features = CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_FXSR |
|
|
|
|
CPUID_EXT2_MMX | CPUID_EXT2_NX | CPUID_EXT2_PSE36 |
|
|
|
|
CPUID_EXT2_PAT | CPUID_EXT2_CMOV | CPUID_EXT2_MCA |
|
|
|
|
CPUID_EXT2_PGE | CPUID_EXT2_MTRR | CPUID_EXT2_SYSCALL |
|
|
|
|
CPUID_EXT2_APIC | CPUID_EXT2_CX8 | CPUID_EXT2_MCE |
|
|
|
|
CPUID_EXT2_PAE | CPUID_EXT2_MSR | CPUID_EXT2_TSC | CPUID_EXT2_PSE |
|
|
|
|
CPUID_EXT2_DE | CPUID_EXT2_FPU,
|
|
|
|
.ext3_features = CPUID_EXT3_MISALIGNSSE | CPUID_EXT3_SSE4A |
|
|
|
|
CPUID_EXT3_ABM | CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM,
|
|
|
|
.xlevel = 0x80000008,
|
|
|
|
.model_id = "AMD Opteron 23xx (Gen 3 Class Opteron)",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "Opteron_G4",
|
|
|
|
.level = 0xd,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_AMD,
|
2012-09-05 22:41:10 +02:00
|
|
|
.family = 21,
|
|
|
|
.model = 1,
|
|
|
|
.stepping = 2,
|
|
|
|
.features = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
|
CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
|
CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
|
CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
|
CPUID_DE | CPUID_FP87,
|
|
|
|
.ext_features = CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES |
|
|
|
|
CPUID_EXT_POPCNT | CPUID_EXT_SSE42 | CPUID_EXT_SSE41 |
|
|
|
|
CPUID_EXT_CX16 | CPUID_EXT_SSSE3 | CPUID_EXT_PCLMULQDQ |
|
|
|
|
CPUID_EXT_SSE3,
|
|
|
|
.ext2_features = CPUID_EXT2_LM | CPUID_EXT2_RDTSCP |
|
|
|
|
CPUID_EXT2_PDPE1GB | CPUID_EXT2_FXSR | CPUID_EXT2_MMX |
|
|
|
|
CPUID_EXT2_NX | CPUID_EXT2_PSE36 | CPUID_EXT2_PAT |
|
|
|
|
CPUID_EXT2_CMOV | CPUID_EXT2_MCA | CPUID_EXT2_PGE |
|
|
|
|
CPUID_EXT2_MTRR | CPUID_EXT2_SYSCALL | CPUID_EXT2_APIC |
|
|
|
|
CPUID_EXT2_CX8 | CPUID_EXT2_MCE | CPUID_EXT2_PAE | CPUID_EXT2_MSR |
|
|
|
|
CPUID_EXT2_TSC | CPUID_EXT2_PSE | CPUID_EXT2_DE | CPUID_EXT2_FPU,
|
|
|
|
.ext3_features = CPUID_EXT3_FMA4 | CPUID_EXT3_XOP |
|
|
|
|
CPUID_EXT3_3DNOWPREFETCH | CPUID_EXT3_MISALIGNSSE |
|
|
|
|
CPUID_EXT3_SSE4A | CPUID_EXT3_ABM | CPUID_EXT3_SVM |
|
|
|
|
CPUID_EXT3_LAHF_LM,
|
|
|
|
.xlevel = 0x8000001A,
|
|
|
|
.model_id = "AMD Opteron 62xx class CPU",
|
|
|
|
},
|
2012-11-14 19:28:53 +01:00
|
|
|
{
|
|
|
|
.name = "Opteron_G5",
|
|
|
|
.level = 0xd,
|
2013-01-21 15:06:36 +01:00
|
|
|
.vendor = CPUID_VENDOR_AMD,
|
2012-11-14 19:28:53 +01:00
|
|
|
.family = 21,
|
|
|
|
.model = 2,
|
|
|
|
.stepping = 0,
|
|
|
|
.features = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
|
CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
|
CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
|
CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
|
CPUID_DE | CPUID_FP87,
|
|
|
|
.ext_features = CPUID_EXT_F16C | CPUID_EXT_AVX | CPUID_EXT_XSAVE |
|
|
|
|
CPUID_EXT_AES | CPUID_EXT_POPCNT | CPUID_EXT_SSE42 |
|
|
|
|
CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_FMA |
|
|
|
|
CPUID_EXT_SSSE3 | CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3,
|
|
|
|
.ext2_features = CPUID_EXT2_LM | CPUID_EXT2_RDTSCP |
|
|
|
|
CPUID_EXT2_PDPE1GB | CPUID_EXT2_FXSR | CPUID_EXT2_MMX |
|
|
|
|
CPUID_EXT2_NX | CPUID_EXT2_PSE36 | CPUID_EXT2_PAT |
|
|
|
|
CPUID_EXT2_CMOV | CPUID_EXT2_MCA | CPUID_EXT2_PGE |
|
|
|
|
CPUID_EXT2_MTRR | CPUID_EXT2_SYSCALL | CPUID_EXT2_APIC |
|
|
|
|
CPUID_EXT2_CX8 | CPUID_EXT2_MCE | CPUID_EXT2_PAE | CPUID_EXT2_MSR |
|
|
|
|
CPUID_EXT2_TSC | CPUID_EXT2_PSE | CPUID_EXT2_DE | CPUID_EXT2_FPU,
|
|
|
|
.ext3_features = CPUID_EXT3_TBM | CPUID_EXT3_FMA4 | CPUID_EXT3_XOP |
|
|
|
|
CPUID_EXT3_3DNOWPREFETCH | CPUID_EXT3_MISALIGNSSE |
|
|
|
|
CPUID_EXT3_SSE4A | CPUID_EXT3_ABM | CPUID_EXT3_SVM |
|
|
|
|
CPUID_EXT3_LAHF_LM,
|
|
|
|
.xlevel = 0x8000001A,
|
|
|
|
.model_id = "AMD Opteron 63xx class CPU",
|
|
|
|
},
|
2010-03-11 14:38:55 +01:00
|
|
|
};
|
|
|
|
|
2012-11-02 17:25:15 +01:00
|
|
|
#ifdef CONFIG_KVM
|
2010-03-11 14:38:55 +01:00
|
|
|
static int cpu_x86_fill_model_id(char *str)
|
|
|
|
{
|
|
|
|
uint32_t eax = 0, ebx = 0, ecx = 0, edx = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 3; i++) {
|
|
|
|
host_cpuid(0x80000002 + i, 0, &eax, &ebx, &ecx, &edx);
|
|
|
|
memcpy(str + i * 16 + 0, &eax, 4);
|
|
|
|
memcpy(str + i * 16 + 4, &ebx, 4);
|
|
|
|
memcpy(str + i * 16 + 8, &ecx, 4);
|
|
|
|
memcpy(str + i * 16 + 12, &edx, 4);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2012-11-02 17:25:15 +01:00
|
|
|
#endif
|
2010-03-11 14:38:55 +01:00
|
|
|
|
2012-10-24 23:44:06 +02:00
|
|
|
/* Fill a x86_def_t struct with information about the host CPU, and
|
|
|
|
* the CPU features supported by the host hardware + host kernel
|
|
|
|
*
|
|
|
|
* This function may be called only if KVM is enabled.
|
|
|
|
*/
|
|
|
|
static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def)
|
2010-03-11 14:38:55 +01:00
|
|
|
{
|
2012-11-02 17:25:15 +01:00
|
|
|
#ifdef CONFIG_KVM
|
2012-10-24 23:44:07 +02:00
|
|
|
KVMState *s = kvm_state;
|
2010-03-11 14:38:55 +01:00
|
|
|
uint32_t eax = 0, ebx = 0, ecx = 0, edx = 0;
|
|
|
|
|
2012-10-24 23:44:06 +02:00
|
|
|
assert(kvm_enabled());
|
|
|
|
|
2010-03-11 14:38:55 +01:00
|
|
|
x86_cpu_def->name = "host";
|
|
|
|
host_cpuid(0x0, 0, &eax, &ebx, &ecx, &edx);
|
2013-01-21 15:06:36 +01:00
|
|
|
x86_cpu_vendor_words2str(x86_cpu_def->vendor, ebx, edx, ecx);
|
2010-03-11 14:38:55 +01:00
|
|
|
|
|
|
|
host_cpuid(0x1, 0, &eax, &ebx, &ecx, &edx);
|
|
|
|
x86_cpu_def->family = ((eax >> 8) & 0x0F) + ((eax >> 20) & 0xFF);
|
|
|
|
x86_cpu_def->model = ((eax >> 4) & 0x0F) | ((eax & 0xF0000) >> 12);
|
|
|
|
x86_cpu_def->stepping = eax & 0x0F;
|
|
|
|
|
2012-10-24 23:44:07 +02:00
|
|
|
x86_cpu_def->level = kvm_arch_get_supported_cpuid(s, 0x0, 0, R_EAX);
|
|
|
|
x86_cpu_def->features = kvm_arch_get_supported_cpuid(s, 0x1, 0, R_EDX);
|
|
|
|
x86_cpu_def->ext_features = kvm_arch_get_supported_cpuid(s, 0x1, 0, R_ECX);
|
2010-03-11 14:38:55 +01:00
|
|
|
|
2012-10-24 23:44:06 +02:00
|
|
|
if (x86_cpu_def->level >= 7) {
|
2012-10-24 23:44:07 +02:00
|
|
|
x86_cpu_def->cpuid_7_0_ebx_features =
|
|
|
|
kvm_arch_get_supported_cpuid(s, 0x7, 0, R_EBX);
|
Expose CPUID leaf 7 only for -cpu host
Changes v2 -> v3;
- Check for kvm_enabled() before setting cpuid_7_0_ebx_features
Changes v1 -> v2:
- Use kvm_arch_get_supported_cpuid() instead of host_cpuid() on
cpu_x86_fill_host().
We should use GET_SUPPORTED_CPUID for all bits on "-cpu host"
eventually, but I am not changing all the other CPUID leaves because
we may not be able to test such an intrusive change in time for 1.1.
Description of the bug:
Since QEMU 0.15, the CPUID information on CPUID[EAX=7,ECX=0] is being
returned unfiltered to the guest, directly from the GET_SUPPORTED_CPUID
return value.
The problem is that this makes the resulting CPU feature flags
unpredictable and dependent on the host CPU and kernel version. This
breaks live-migration badly if migrating from a host CPU that supports
some features on that CPUID leaf (running a recent kernel) to a kernel
or host CPU that doesn't support it.
Migration also is incorrect (the virtual CPU changes under the guest's
feet) if you migrate in the opposite direction (from an old CPU/kernel
to a new CPU/kernel), but with less serious consequences (guests
normally query CPUID information only once on boot).
Fortunately, the bug affects only users using cpudefs with level >= 7.
The right behavior should be to explicitly enable those features on
[cpudef] config sections or on the "-cpu" command-line arguments. Right
now there is no predefined CPU model on QEMU that has those features:
the latest Intel model we have is Sandy Bridge.
I would like to get this fixed on 1.1, so I am submitting this patch,
that enables those features only if "-cpu host" is being used (as we
don't have any pre-defined CPU model that actually have those features).
After 1.1 is released, we can make those features properly configurable
on [cpudef] and -cpu configuration.
One problem is: with this patch, users with the following setup:
- Running QEMU 1.0;
- Using a cpudef having level >= 7;
- Running a kernel that supports the features on CPUID leaf 7; and
- Running on a CPU that supports some features on CPUID leaf 7
won't be able to live-migrate to QEMU 1.1. But for these users
live-migration is already broken (they can't live-migrate to hosts with
older CPUs or older kernels, already), I don't see how to avoid this
problem.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-05-21 16:27:02 +02:00
|
|
|
} else {
|
|
|
|
x86_cpu_def->cpuid_7_0_ebx_features = 0;
|
|
|
|
}
|
|
|
|
|
2012-10-24 23:44:07 +02:00
|
|
|
x86_cpu_def->xlevel = kvm_arch_get_supported_cpuid(s, 0x80000000, 0, R_EAX);
|
|
|
|
x86_cpu_def->ext2_features =
|
|
|
|
kvm_arch_get_supported_cpuid(s, 0x80000001, 0, R_EDX);
|
|
|
|
x86_cpu_def->ext3_features =
|
|
|
|
kvm_arch_get_supported_cpuid(s, 0x80000001, 0, R_ECX);
|
2010-03-11 14:38:55 +01:00
|
|
|
|
|
|
|
cpu_x86_fill_model_id(x86_cpu_def->model_id);
|
|
|
|
|
2011-06-01 03:59:52 +02:00
|
|
|
/* Call Centaur's CPUID instruction. */
|
2013-01-21 15:06:36 +01:00
|
|
|
if (!strcmp(x86_cpu_def->vendor, CPUID_VENDOR_VIA)) {
|
2011-06-01 03:59:52 +02:00
|
|
|
host_cpuid(0xC0000000, 0, &eax, &ebx, &ecx, &edx);
|
2012-10-24 23:44:07 +02:00
|
|
|
eax = kvm_arch_get_supported_cpuid(s, 0xC0000000, 0, R_EAX);
|
2011-06-01 03:59:52 +02:00
|
|
|
if (eax >= 0xC0000001) {
|
|
|
|
/* Support VIA max extended level */
|
|
|
|
x86_cpu_def->xlevel2 = eax;
|
|
|
|
host_cpuid(0xC0000001, 0, &eax, &ebx, &ecx, &edx);
|
2012-10-24 23:44:07 +02:00
|
|
|
x86_cpu_def->ext4_features =
|
|
|
|
kvm_arch_get_supported_cpuid(s, 0xC0000001, 0, R_EDX);
|
2011-06-01 03:59:52 +02:00
|
|
|
}
|
|
|
|
}
|
2010-09-27 15:16:17 +02:00
|
|
|
|
2013-01-04 23:01:04 +01:00
|
|
|
/* Other KVM-specific feature fields: */
|
|
|
|
x86_cpu_def->svm_features =
|
|
|
|
kvm_arch_get_supported_cpuid(s, 0x8000000A, 0, R_EDX);
|
2013-01-04 23:01:05 +01:00
|
|
|
x86_cpu_def->kvm_features =
|
|
|
|
kvm_arch_get_supported_cpuid(s, KVM_CPUID_FEATURES, 0, R_EAX);
|
2013-01-04 23:01:04 +01:00
|
|
|
|
2012-11-02 17:25:15 +01:00
|
|
|
#endif /* CONFIG_KVM */
|
2010-03-11 14:38:55 +01:00
|
|
|
}
|
|
|
|
|
2013-01-07 19:20:46 +01:00
|
|
|
static int unavailable_host_feature(FeatureWordInfo *f, uint32_t mask)
|
2010-03-11 14:38:55 +01:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 32; ++i)
|
|
|
|
if (1 << i & mask) {
|
2013-01-07 19:20:46 +01:00
|
|
|
const char *reg = get_register_name_32(f->cpuid_reg);
|
2013-01-04 23:01:06 +01:00
|
|
|
assert(reg);
|
|
|
|
fprintf(stderr, "warning: host doesn't support requested feature: "
|
|
|
|
"CPUID.%02XH:%s%s%s [bit %d]\n",
|
2013-01-07 19:20:46 +01:00
|
|
|
f->cpuid_eax, reg,
|
|
|
|
f->feat_names[i] ? "." : "",
|
|
|
|
f->feat_names[i] ? f->feat_names[i] : "", i);
|
2010-03-11 14:38:55 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-01-07 19:20:48 +01:00
|
|
|
/* Check if all requested cpu flags are making their way to the guest
|
|
|
|
*
|
|
|
|
* Returns 0 if all flags are supported by the host, non-zero otherwise.
|
2012-10-24 23:44:06 +02:00
|
|
|
*
|
|
|
|
* This function may be called only if KVM is enabled.
|
2010-03-11 14:38:55 +01:00
|
|
|
*/
|
2013-01-11 03:10:17 +01:00
|
|
|
static int kvm_check_features_against_host(X86CPU *cpu)
|
2010-03-11 14:38:55 +01:00
|
|
|
{
|
2013-01-11 03:10:17 +01:00
|
|
|
CPUX86State *env = &cpu->env;
|
2010-03-11 14:38:55 +01:00
|
|
|
x86_def_t host_def;
|
|
|
|
uint32_t mask;
|
|
|
|
int rv, i;
|
|
|
|
struct model_features_t ft[] = {
|
2013-01-11 03:10:17 +01:00
|
|
|
{&env->cpuid_features, &host_def.features,
|
2013-01-07 19:20:46 +01:00
|
|
|
FEAT_1_EDX },
|
2013-01-11 03:10:17 +01:00
|
|
|
{&env->cpuid_ext_features, &host_def.ext_features,
|
2013-01-07 19:20:46 +01:00
|
|
|
FEAT_1_ECX },
|
2013-01-11 03:10:17 +01:00
|
|
|
{&env->cpuid_ext2_features, &host_def.ext2_features,
|
2013-01-07 19:20:46 +01:00
|
|
|
FEAT_8000_0001_EDX },
|
2013-01-11 03:10:17 +01:00
|
|
|
{&env->cpuid_ext3_features, &host_def.ext3_features,
|
2013-01-07 19:20:46 +01:00
|
|
|
FEAT_8000_0001_ECX },
|
2013-01-11 03:10:17 +01:00
|
|
|
{&env->cpuid_ext4_features, &host_def.ext4_features,
|
2013-01-07 19:20:48 +01:00
|
|
|
FEAT_C000_0001_EDX },
|
2013-01-11 03:10:17 +01:00
|
|
|
{&env->cpuid_7_0_ebx_features, &host_def.cpuid_7_0_ebx_features,
|
2013-01-07 19:20:48 +01:00
|
|
|
FEAT_7_0_EBX },
|
2013-01-11 03:10:17 +01:00
|
|
|
{&env->cpuid_svm_features, &host_def.svm_features,
|
2013-01-07 19:20:48 +01:00
|
|
|
FEAT_SVM },
|
2013-01-11 03:10:17 +01:00
|
|
|
{&env->cpuid_kvm_features, &host_def.kvm_features,
|
2013-01-07 19:20:48 +01:00
|
|
|
FEAT_KVM },
|
2013-01-04 23:01:06 +01:00
|
|
|
};
|
2010-03-11 14:38:55 +01:00
|
|
|
|
2012-10-24 23:44:06 +02:00
|
|
|
assert(kvm_enabled());
|
|
|
|
|
|
|
|
kvm_cpu_fill_host(&host_def);
|
2013-01-07 19:20:46 +01:00
|
|
|
for (rv = 0, i = 0; i < ARRAY_SIZE(ft); ++i) {
|
|
|
|
FeatureWord w = ft[i].feat_word;
|
|
|
|
FeatureWordInfo *wi = &feature_word_info[w];
|
|
|
|
for (mask = 1; mask; mask <<= 1) {
|
2013-01-04 23:01:10 +01:00
|
|
|
if (*ft[i].guest_feat & mask &&
|
2010-03-11 14:38:55 +01:00
|
|
|
!(*ft[i].host_feat & mask)) {
|
2013-01-07 19:20:46 +01:00
|
|
|
unavailable_host_feature(wi, mask);
|
|
|
|
rv = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2010-03-11 14:38:55 +01:00
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
2012-04-17 14:42:22 +02:00
|
|
|
static void x86_cpuid_version_get_family(Object *obj, Visitor *v, void *opaque,
|
|
|
|
const char *name, Error **errp)
|
|
|
|
{
|
|
|
|
X86CPU *cpu = X86_CPU(obj);
|
|
|
|
CPUX86State *env = &cpu->env;
|
|
|
|
int64_t value;
|
|
|
|
|
|
|
|
value = (env->cpuid_version >> 8) & 0xf;
|
|
|
|
if (value == 0xf) {
|
|
|
|
value += (env->cpuid_version >> 20) & 0xff;
|
|
|
|
}
|
|
|
|
visit_type_int(v, &value, name, errp);
|
|
|
|
}
|
|
|
|
|
2012-04-17 12:10:29 +02:00
|
|
|
static void x86_cpuid_version_set_family(Object *obj, Visitor *v, void *opaque,
|
|
|
|
const char *name, Error **errp)
|
2012-02-17 17:46:01 +01:00
|
|
|
{
|
2012-04-17 12:10:29 +02:00
|
|
|
X86CPU *cpu = X86_CPU(obj);
|
|
|
|
CPUX86State *env = &cpu->env;
|
|
|
|
const int64_t min = 0;
|
|
|
|
const int64_t max = 0xff + 0xf;
|
|
|
|
int64_t value;
|
|
|
|
|
|
|
|
visit_type_int(v, &value, name, errp);
|
|
|
|
if (error_is_set(errp)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (value < min || value > max) {
|
|
|
|
error_set(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, "",
|
|
|
|
name ? name : "null", value, min, max);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2012-02-17 17:46:01 +01:00
|
|
|
env->cpuid_version &= ~0xff00f00;
|
2012-04-17 12:10:29 +02:00
|
|
|
if (value > 0x0f) {
|
|
|
|
env->cpuid_version |= 0xf00 | ((value - 0x0f) << 20);
|
2012-02-17 17:46:01 +01:00
|
|
|
} else {
|
2012-04-17 12:10:29 +02:00
|
|
|
env->cpuid_version |= value << 8;
|
2012-02-17 17:46:01 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-04-17 14:48:14 +02:00
|
|
|
static void x86_cpuid_version_get_model(Object *obj, Visitor *v, void *opaque,
|
|
|
|
const char *name, Error **errp)
|
|
|
|
{
|
|
|
|
X86CPU *cpu = X86_CPU(obj);
|
|
|
|
CPUX86State *env = &cpu->env;
|
|
|
|
int64_t value;
|
|
|
|
|
|
|
|
value = (env->cpuid_version >> 4) & 0xf;
|
|
|
|
value |= ((env->cpuid_version >> 16) & 0xf) << 4;
|
|
|
|
visit_type_int(v, &value, name, errp);
|
|
|
|
}
|
|
|
|
|
2012-04-17 12:16:39 +02:00
|
|
|
static void x86_cpuid_version_set_model(Object *obj, Visitor *v, void *opaque,
|
|
|
|
const char *name, Error **errp)
|
2012-02-17 17:46:02 +01:00
|
|
|
{
|
2012-04-17 12:16:39 +02:00
|
|
|
X86CPU *cpu = X86_CPU(obj);
|
|
|
|
CPUX86State *env = &cpu->env;
|
|
|
|
const int64_t min = 0;
|
|
|
|
const int64_t max = 0xff;
|
|
|
|
int64_t value;
|
|
|
|
|
|
|
|
visit_type_int(v, &value, name, errp);
|
|
|
|
if (error_is_set(errp)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (value < min || value > max) {
|
|
|
|
error_set(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, "",
|
|
|
|
name ? name : "null", value, min, max);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2012-02-17 17:46:02 +01:00
|
|
|
env->cpuid_version &= ~0xf00f0;
|
2012-04-17 12:16:39 +02:00
|
|
|
env->cpuid_version |= ((value & 0xf) << 4) | ((value >> 4) << 16);
|
2012-02-17 17:46:02 +01:00
|
|
|
}
|
|
|
|
|
2012-04-17 14:50:53 +02:00
|
|
|
static void x86_cpuid_version_get_stepping(Object *obj, Visitor *v,
|
|
|
|
void *opaque, const char *name,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
X86CPU *cpu = X86_CPU(obj);
|
|
|
|
CPUX86State *env = &cpu->env;
|
|
|
|
int64_t value;
|
|
|
|
|
|
|
|
value = env->cpuid_version & 0xf;
|
|
|
|
visit_type_int(v, &value, name, errp);
|
|
|
|
}
|
|
|
|
|
2012-04-17 14:14:18 +02:00
|
|
|
static void x86_cpuid_version_set_stepping(Object *obj, Visitor *v,
|
|
|
|
void *opaque, const char *name,
|
|
|
|
Error **errp)
|
2012-02-17 17:46:03 +01:00
|
|
|
{
|
2012-04-17 14:14:18 +02:00
|
|
|
X86CPU *cpu = X86_CPU(obj);
|
|
|
|
CPUX86State *env = &cpu->env;
|
|
|
|
const int64_t min = 0;
|
|
|
|
const int64_t max = 0xf;
|
|
|
|
int64_t value;
|
|
|
|
|
|
|
|
visit_type_int(v, &value, name, errp);
|
|
|
|
if (error_is_set(errp)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (value < min || value > max) {
|
|
|
|
error_set(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, "",
|
|
|
|
name ? name : "null", value, min, max);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2012-02-17 17:46:03 +01:00
|
|
|
env->cpuid_version &= ~0xf;
|
2012-04-17 14:14:18 +02:00
|
|
|
env->cpuid_version |= value & 0xf;
|
2012-02-17 17:46:03 +01:00
|
|
|
}
|
|
|
|
|
2012-04-17 18:41:40 +02:00
|
|
|
static void x86_cpuid_get_level(Object *obj, Visitor *v, void *opaque,
|
|
|
|
const char *name, Error **errp)
|
|
|
|
{
|
|
|
|
X86CPU *cpu = X86_CPU(obj);
|
|
|
|
|
2012-05-01 23:33:13 +02:00
|
|
|
visit_type_uint32(v, &cpu->env.cpuid_level, name, errp);
|
2012-04-17 18:41:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void x86_cpuid_set_level(Object *obj, Visitor *v, void *opaque,
|
|
|
|
const char *name, Error **errp)
|
|
|
|
{
|
|
|
|
X86CPU *cpu = X86_CPU(obj);
|
|
|
|
|
2012-05-01 23:33:13 +02:00
|
|
|
visit_type_uint32(v, &cpu->env.cpuid_level, name, errp);
|
2012-04-17 18:41:40 +02:00
|
|
|
}
|
|
|
|
|
2012-04-17 18:44:07 +02:00
|
|
|
static void x86_cpuid_get_xlevel(Object *obj, Visitor *v, void *opaque,
|
|
|
|
const char *name, Error **errp)
|
|
|
|
{
|
|
|
|
X86CPU *cpu = X86_CPU(obj);
|
|
|
|
|
2012-05-01 23:33:13 +02:00
|
|
|
visit_type_uint32(v, &cpu->env.cpuid_xlevel, name, errp);
|
2012-04-17 18:44:07 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void x86_cpuid_set_xlevel(Object *obj, Visitor *v, void *opaque,
|
|
|
|
const char *name, Error **errp)
|
|
|
|
{
|
|
|
|
X86CPU *cpu = X86_CPU(obj);
|
|
|
|
|
2012-05-01 23:33:13 +02:00
|
|
|
visit_type_uint32(v, &cpu->env.cpuid_xlevel, name, errp);
|
2012-04-17 18:44:07 +02:00
|
|
|
}
|
|
|
|
|
2012-04-17 19:22:58 +02:00
|
|
|
static char *x86_cpuid_get_vendor(Object *obj, Error **errp)
|
|
|
|
{
|
|
|
|
X86CPU *cpu = X86_CPU(obj);
|
|
|
|
CPUX86State *env = &cpu->env;
|
|
|
|
char *value;
|
|
|
|
|
2012-10-22 17:03:10 +02:00
|
|
|
value = (char *)g_malloc(CPUID_VENDOR_SZ + 1);
|
2013-01-21 15:06:36 +01:00
|
|
|
x86_cpu_vendor_words2str(value, env->cpuid_vendor1, env->cpuid_vendor2,
|
|
|
|
env->cpuid_vendor3);
|
2012-04-17 19:22:58 +02:00
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void x86_cpuid_set_vendor(Object *obj, const char *value,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
X86CPU *cpu = X86_CPU(obj);
|
|
|
|
CPUX86State *env = &cpu->env;
|
|
|
|
int i;
|
|
|
|
|
2012-10-22 17:03:10 +02:00
|
|
|
if (strlen(value) != CPUID_VENDOR_SZ) {
|
2012-04-17 19:22:58 +02:00
|
|
|
error_set(errp, QERR_PROPERTY_VALUE_BAD, "",
|
|
|
|
"vendor", value);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
env->cpuid_vendor1 = 0;
|
|
|
|
env->cpuid_vendor2 = 0;
|
|
|
|
env->cpuid_vendor3 = 0;
|
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
|
env->cpuid_vendor1 |= ((uint8_t)value[i ]) << (8 * i);
|
|
|
|
env->cpuid_vendor2 |= ((uint8_t)value[i + 4]) << (8 * i);
|
|
|
|
env->cpuid_vendor3 |= ((uint8_t)value[i + 8]) << (8 * i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-04-17 23:02:26 +02:00
|
|
|
static char *x86_cpuid_get_model_id(Object *obj, Error **errp)
|
|
|
|
{
|
|
|
|
X86CPU *cpu = X86_CPU(obj);
|
|
|
|
CPUX86State *env = &cpu->env;
|
|
|
|
char *value;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
value = g_malloc(48 + 1);
|
|
|
|
for (i = 0; i < 48; i++) {
|
|
|
|
value[i] = env->cpuid_model[i >> 2] >> (8 * (i & 3));
|
|
|
|
}
|
|
|
|
value[48] = '\0';
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
2012-04-17 15:17:27 +02:00
|
|
|
static void x86_cpuid_set_model_id(Object *obj, const char *model_id,
|
|
|
|
Error **errp)
|
2012-02-17 17:46:04 +01:00
|
|
|
{
|
2012-04-17 15:17:27 +02:00
|
|
|
X86CPU *cpu = X86_CPU(obj);
|
|
|
|
CPUX86State *env = &cpu->env;
|
2012-02-17 17:46:04 +01:00
|
|
|
int c, len, i;
|
|
|
|
|
|
|
|
if (model_id == NULL) {
|
|
|
|
model_id = "";
|
|
|
|
}
|
|
|
|
len = strlen(model_id);
|
2012-04-17 18:21:52 +02:00
|
|
|
memset(env->cpuid_model, 0, 48);
|
2012-02-17 17:46:04 +01:00
|
|
|
for (i = 0; i < 48; i++) {
|
|
|
|
if (i >= len) {
|
|
|
|
c = '\0';
|
|
|
|
} else {
|
|
|
|
c = (uint8_t)model_id[i];
|
|
|
|
}
|
|
|
|
env->cpuid_model[i >> 2] |= c << (8 * (i & 3));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-04-18 00:12:23 +02:00
|
|
|
static void x86_cpuid_get_tsc_freq(Object *obj, Visitor *v, void *opaque,
|
|
|
|
const char *name, Error **errp)
|
|
|
|
{
|
|
|
|
X86CPU *cpu = X86_CPU(obj);
|
|
|
|
int64_t value;
|
|
|
|
|
|
|
|
value = cpu->env.tsc_khz * 1000;
|
|
|
|
visit_type_int(v, &value, name, errp);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void x86_cpuid_set_tsc_freq(Object *obj, Visitor *v, void *opaque,
|
|
|
|
const char *name, Error **errp)
|
|
|
|
{
|
|
|
|
X86CPU *cpu = X86_CPU(obj);
|
|
|
|
const int64_t min = 0;
|
2012-09-22 02:13:13 +02:00
|
|
|
const int64_t max = INT64_MAX;
|
2012-04-18 00:12:23 +02:00
|
|
|
int64_t value;
|
|
|
|
|
|
|
|
visit_type_int(v, &value, name, errp);
|
|
|
|
if (error_is_set(errp)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (value < min || value > max) {
|
|
|
|
error_set(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, "",
|
|
|
|
name ? name : "null", value, min, max);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
cpu->env.tsc_khz = value / 1000;
|
|
|
|
}
|
|
|
|
|
2012-12-04 20:34:39 +01:00
|
|
|
static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *name)
|
2010-03-11 14:38:55 +01:00
|
|
|
{
|
|
|
|
x86_def_t *def;
|
2013-01-21 01:02:28 +01:00
|
|
|
int i;
|
2010-03-11 14:38:55 +01:00
|
|
|
|
2013-01-21 01:00:24 +01:00
|
|
|
if (name == NULL) {
|
|
|
|
return -1;
|
2012-12-04 20:34:38 +01:00
|
|
|
}
|
2013-01-21 01:00:24 +01:00
|
|
|
if (kvm_enabled() && strcmp(name, "host") == 0) {
|
2012-10-24 23:44:06 +02:00
|
|
|
kvm_cpu_fill_host(x86_cpu_def);
|
2013-01-21 01:00:24 +01:00
|
|
|
return 0;
|
2010-03-11 14:38:55 +01:00
|
|
|
}
|
|
|
|
|
2013-01-21 01:02:28 +01:00
|
|
|
for (i = 0; i < ARRAY_SIZE(builtin_x86_defs); i++) {
|
|
|
|
def = &builtin_x86_defs[i];
|
2013-01-21 01:00:24 +01:00
|
|
|
if (strcmp(name, def->name) == 0) {
|
|
|
|
memcpy(x86_cpu_def, def, sizeof(*def));
|
2013-01-21 15:06:37 +01:00
|
|
|
/* sysenter isn't supported in compatibility mode on AMD,
|
|
|
|
* syscall isn't supported in compatibility mode on Intel.
|
|
|
|
* Normally we advertise the actual CPU vendor, but you can
|
|
|
|
* override this using the 'vendor' property if you want to use
|
|
|
|
* KVM's sysenter/syscall emulation in compatibility mode and
|
|
|
|
* when doing cross vendor migration
|
|
|
|
*/
|
|
|
|
if (kvm_enabled()) {
|
|
|
|
uint32_t ebx = 0, ecx = 0, edx = 0;
|
|
|
|
host_cpuid(0, 0, NULL, &ebx, &ecx, &edx);
|
|
|
|
x86_cpu_vendor_words2str(x86_cpu_def->vendor, ebx, edx, ecx);
|
|
|
|
}
|
2013-01-21 01:00:24 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
2012-12-04 20:34:39 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Parse "+feature,-feature,feature=foo" CPU feature string
|
|
|
|
*/
|
2013-01-21 15:06:38 +01:00
|
|
|
static void cpu_x86_parse_featurestr(X86CPU *cpu, char *features, Error **errp)
|
2012-12-04 20:34:39 +01:00
|
|
|
{
|
|
|
|
char *featurestr; /* Single 'key=value" string being parsed */
|
|
|
|
/* Features to be added */
|
2013-01-11 03:10:15 +01:00
|
|
|
FeatureWordArray plus_features = { 0 };
|
2012-12-04 20:34:39 +01:00
|
|
|
/* Features to be removed */
|
2013-01-07 19:20:45 +01:00
|
|
|
FeatureWordArray minus_features = { 0 };
|
2012-12-04 20:34:39 +01:00
|
|
|
uint32_t numvalue;
|
2013-01-21 15:06:38 +01:00
|
|
|
CPUX86State *env = &cpu->env;
|
2012-12-04 20:34:39 +01:00
|
|
|
|
|
|
|
featurestr = features ? strtok(features, ",") : NULL;
|
2010-03-11 14:38:55 +01:00
|
|
|
|
|
|
|
while (featurestr) {
|
|
|
|
char *val;
|
|
|
|
if (featurestr[0] == '+') {
|
2013-01-07 19:20:45 +01:00
|
|
|
add_flagname_to_bitmaps(featurestr + 1, plus_features);
|
2010-03-11 14:38:55 +01:00
|
|
|
} else if (featurestr[0] == '-') {
|
2013-01-07 19:20:45 +01:00
|
|
|
add_flagname_to_bitmaps(featurestr + 1, minus_features);
|
2010-03-11 14:38:55 +01:00
|
|
|
} else if ((val = strchr(featurestr, '='))) {
|
|
|
|
*val = 0; val++;
|
|
|
|
if (!strcmp(featurestr, "family")) {
|
2013-01-21 15:06:38 +01:00
|
|
|
object_property_parse(OBJECT(cpu), val, featurestr, errp);
|
2010-03-11 14:38:55 +01:00
|
|
|
} else if (!strcmp(featurestr, "model")) {
|
2013-01-21 15:06:38 +01:00
|
|
|
object_property_parse(OBJECT(cpu), val, featurestr, errp);
|
2010-03-11 14:38:55 +01:00
|
|
|
} else if (!strcmp(featurestr, "stepping")) {
|
2013-01-21 15:06:38 +01:00
|
|
|
object_property_parse(OBJECT(cpu), val, featurestr, errp);
|
2010-03-11 14:38:55 +01:00
|
|
|
} else if (!strcmp(featurestr, "level")) {
|
2013-01-21 15:06:38 +01:00
|
|
|
object_property_parse(OBJECT(cpu), val, featurestr, errp);
|
2010-03-11 14:38:55 +01:00
|
|
|
} else if (!strcmp(featurestr, "xlevel")) {
|
|
|
|
char *err;
|
2013-01-21 15:06:38 +01:00
|
|
|
char num[32];
|
|
|
|
|
2010-03-11 14:38:55 +01:00
|
|
|
numvalue = strtoul(val, &err, 0);
|
|
|
|
if (!*val || *err) {
|
error: Strip trailing '\n' from error string arguments (again)
Commit 6daf194d and be62a2eb got rid of a bunch, but they keep coming
back. Tracked down with this Coccinelle semantic patch:
@r@
expression err, eno, cls, fmt;
position p;
@@
(
error_report(fmt, ...)@p
|
error_set(err, cls, fmt, ...)@p
|
error_set_errno(err, eno, cls, fmt, ...)@p
|
error_setg(err, fmt, ...)@p
|
error_setg_errno(err, eno, fmt, ...)@p
)
@script:python@
fmt << r.fmt;
p << r.p;
@@
if "\\n" in str(fmt):
print "%s:%s:%s:%s" % (p[0].file, p[0].line, p[0].column, fmt)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 1360354939-10994-4-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-02-08 21:22:16 +01:00
|
|
|
error_setg(errp, "bad numerical value %s", val);
|
2013-01-21 15:06:38 +01:00
|
|
|
goto out;
|
2010-03-11 14:38:55 +01:00
|
|
|
}
|
|
|
|
if (numvalue < 0x80000000) {
|
2013-01-21 15:06:35 +01:00
|
|
|
fprintf(stderr, "xlevel value shall always be >= 0x80000000"
|
|
|
|
", fixup will be removed in future versions\n");
|
2010-03-13 16:46:33 +01:00
|
|
|
numvalue += 0x80000000;
|
2010-03-11 14:38:55 +01:00
|
|
|
}
|
2013-01-21 15:06:38 +01:00
|
|
|
snprintf(num, sizeof(num), "%" PRIu32, numvalue);
|
|
|
|
object_property_parse(OBJECT(cpu), num, featurestr, errp);
|
2010-03-11 14:38:55 +01:00
|
|
|
} else if (!strcmp(featurestr, "vendor")) {
|
2013-01-21 15:06:38 +01:00
|
|
|
object_property_parse(OBJECT(cpu), val, featurestr, errp);
|
2010-03-11 14:38:55 +01:00
|
|
|
} else if (!strcmp(featurestr, "model_id")) {
|
2013-01-21 15:06:38 +01:00
|
|
|
object_property_parse(OBJECT(cpu), val, "model-id", errp);
|
2011-07-07 16:13:12 +02:00
|
|
|
} else if (!strcmp(featurestr, "tsc_freq")) {
|
|
|
|
int64_t tsc_freq;
|
|
|
|
char *err;
|
2013-01-21 15:06:38 +01:00
|
|
|
char num[32];
|
2011-07-07 16:13:12 +02:00
|
|
|
|
|
|
|
tsc_freq = strtosz_suffix_unit(val, &err,
|
|
|
|
STRTOSZ_DEFSUFFIX_B, 1000);
|
2011-11-22 09:46:04 +01:00
|
|
|
if (tsc_freq < 0 || *err) {
|
error: Strip trailing '\n' from error string arguments (again)
Commit 6daf194d and be62a2eb got rid of a bunch, but they keep coming
back. Tracked down with this Coccinelle semantic patch:
@r@
expression err, eno, cls, fmt;
position p;
@@
(
error_report(fmt, ...)@p
|
error_set(err, cls, fmt, ...)@p
|
error_set_errno(err, eno, cls, fmt, ...)@p
|
error_setg(err, fmt, ...)@p
|
error_setg_errno(err, eno, fmt, ...)@p
)
@script:python@
fmt << r.fmt;
p << r.p;
@@
if "\\n" in str(fmt):
print "%s:%s:%s:%s" % (p[0].file, p[0].line, p[0].column, fmt)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 1360354939-10994-4-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-02-08 21:22:16 +01:00
|
|
|
error_setg(errp, "bad numerical value %s", val);
|
2013-01-21 15:06:38 +01:00
|
|
|
goto out;
|
2011-07-07 16:13:12 +02:00
|
|
|
}
|
2013-01-21 15:06:38 +01:00
|
|
|
snprintf(num, sizeof(num), "%" PRId64, tsc_freq);
|
|
|
|
object_property_parse(OBJECT(cpu), num, "tsc-frequency", errp);
|
2011-12-18 21:48:13 +01:00
|
|
|
} else if (!strcmp(featurestr, "hv_spinlocks")) {
|
|
|
|
char *err;
|
|
|
|
numvalue = strtoul(val, &err, 0);
|
|
|
|
if (!*val || *err) {
|
error: Strip trailing '\n' from error string arguments (again)
Commit 6daf194d and be62a2eb got rid of a bunch, but they keep coming
back. Tracked down with this Coccinelle semantic patch:
@r@
expression err, eno, cls, fmt;
position p;
@@
(
error_report(fmt, ...)@p
|
error_set(err, cls, fmt, ...)@p
|
error_set_errno(err, eno, cls, fmt, ...)@p
|
error_setg(err, fmt, ...)@p
|
error_setg_errno(err, eno, fmt, ...)@p
)
@script:python@
fmt << r.fmt;
p << r.p;
@@
if "\\n" in str(fmt):
print "%s:%s:%s:%s" % (p[0].file, p[0].line, p[0].column, fmt)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 1360354939-10994-4-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-02-08 21:22:16 +01:00
|
|
|
error_setg(errp, "bad numerical value %s", val);
|
2013-01-21 15:06:38 +01:00
|
|
|
goto out;
|
2011-12-18 21:48:13 +01:00
|
|
|
}
|
|
|
|
hyperv_set_spinlock_retries(numvalue);
|
2010-03-11 14:38:55 +01:00
|
|
|
} else {
|
error: Strip trailing '\n' from error string arguments (again)
Commit 6daf194d and be62a2eb got rid of a bunch, but they keep coming
back. Tracked down with this Coccinelle semantic patch:
@r@
expression err, eno, cls, fmt;
position p;
@@
(
error_report(fmt, ...)@p
|
error_set(err, cls, fmt, ...)@p
|
error_set_errno(err, eno, cls, fmt, ...)@p
|
error_setg(err, fmt, ...)@p
|
error_setg_errno(err, eno, fmt, ...)@p
)
@script:python@
fmt << r.fmt;
p << r.p;
@@
if "\\n" in str(fmt):
print "%s:%s:%s:%s" % (p[0].file, p[0].line, p[0].column, fmt)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 1360354939-10994-4-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-02-08 21:22:16 +01:00
|
|
|
error_setg(errp, "unrecognized feature %s", featurestr);
|
2013-01-21 15:06:38 +01:00
|
|
|
goto out;
|
2010-03-11 14:38:55 +01:00
|
|
|
}
|
|
|
|
} else if (!strcmp(featurestr, "check")) {
|
|
|
|
check_cpuid = 1;
|
|
|
|
} else if (!strcmp(featurestr, "enforce")) {
|
|
|
|
check_cpuid = enforce_cpuid = 1;
|
2011-12-18 21:48:13 +01:00
|
|
|
} else if (!strcmp(featurestr, "hv_relaxed")) {
|
|
|
|
hyperv_enable_relaxed_timing(true);
|
|
|
|
} else if (!strcmp(featurestr, "hv_vapic")) {
|
|
|
|
hyperv_enable_vapic_recommended(true);
|
2010-03-11 14:38:55 +01:00
|
|
|
} else {
|
2013-01-21 15:06:38 +01:00
|
|
|
error_setg(errp, "feature string `%s' not in format (+feature|"
|
error: Strip trailing '\n' from error string arguments (again)
Commit 6daf194d and be62a2eb got rid of a bunch, but they keep coming
back. Tracked down with this Coccinelle semantic patch:
@r@
expression err, eno, cls, fmt;
position p;
@@
(
error_report(fmt, ...)@p
|
error_set(err, cls, fmt, ...)@p
|
error_set_errno(err, eno, cls, fmt, ...)@p
|
error_setg(err, fmt, ...)@p
|
error_setg_errno(err, eno, fmt, ...)@p
)
@script:python@
fmt << r.fmt;
p << r.p;
@@
if "\\n" in str(fmt):
print "%s:%s:%s:%s" % (p[0].file, p[0].line, p[0].column, fmt)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 1360354939-10994-4-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-02-08 21:22:16 +01:00
|
|
|
"-feature|feature=xyz)", featurestr);
|
2013-01-21 15:06:38 +01:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (error_is_set(errp)) {
|
|
|
|
goto out;
|
2010-03-11 14:38:55 +01:00
|
|
|
}
|
|
|
|
featurestr = strtok(NULL, ",");
|
|
|
|
}
|
2013-01-21 15:06:38 +01:00
|
|
|
env->cpuid_features |= plus_features[FEAT_1_EDX];
|
|
|
|
env->cpuid_ext_features |= plus_features[FEAT_1_ECX];
|
|
|
|
env->cpuid_ext2_features |= plus_features[FEAT_8000_0001_EDX];
|
|
|
|
env->cpuid_ext3_features |= plus_features[FEAT_8000_0001_ECX];
|
|
|
|
env->cpuid_ext4_features |= plus_features[FEAT_C000_0001_EDX];
|
|
|
|
env->cpuid_kvm_features |= plus_features[FEAT_KVM];
|
|
|
|
env->cpuid_svm_features |= plus_features[FEAT_SVM];
|
|
|
|
env->cpuid_7_0_ebx_features |= plus_features[FEAT_7_0_EBX];
|
|
|
|
env->cpuid_features &= ~minus_features[FEAT_1_EDX];
|
|
|
|
env->cpuid_ext_features &= ~minus_features[FEAT_1_ECX];
|
|
|
|
env->cpuid_ext2_features &= ~minus_features[FEAT_8000_0001_EDX];
|
|
|
|
env->cpuid_ext3_features &= ~minus_features[FEAT_8000_0001_ECX];
|
|
|
|
env->cpuid_ext4_features &= ~minus_features[FEAT_C000_0001_EDX];
|
|
|
|
env->cpuid_kvm_features &= ~minus_features[FEAT_KVM];
|
|
|
|
env->cpuid_svm_features &= ~minus_features[FEAT_SVM];
|
|
|
|
env->cpuid_7_0_ebx_features &= ~minus_features[FEAT_7_0_EBX];
|
2010-03-11 14:38:55 +01:00
|
|
|
|
2013-01-21 15:06:38 +01:00
|
|
|
out:
|
|
|
|
return;
|
2010-03-11 14:38:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* generate a composite string into buf of all cpuid names in featureset
|
|
|
|
* selected by fbits. indicate truncation at bufsize in the event of overflow.
|
|
|
|
* if flags, suppress names undefined in featureset.
|
|
|
|
*/
|
|
|
|
static void listflags(char *buf, int bufsize, uint32_t fbits,
|
|
|
|
const char **featureset, uint32_t flags)
|
|
|
|
{
|
|
|
|
const char **p = &featureset[31];
|
|
|
|
char *q, *b, bit;
|
|
|
|
int nc;
|
|
|
|
|
|
|
|
b = 4 <= bufsize ? buf + (bufsize -= 3) - 1 : NULL;
|
|
|
|
*buf = '\0';
|
|
|
|
for (q = buf, bit = 31; fbits && bufsize; --p, fbits &= ~(1 << bit), --bit)
|
|
|
|
if (fbits & 1 << bit && (*p || !flags)) {
|
|
|
|
if (*p)
|
|
|
|
nc = snprintf(q, bufsize, "%s%s", q == buf ? "" : " ", *p);
|
|
|
|
else
|
|
|
|
nc = snprintf(q, bufsize, "%s[%d]", q == buf ? "" : " ", bit);
|
|
|
|
if (bufsize <= nc) {
|
|
|
|
if (b) {
|
|
|
|
memcpy(b, "...", sizeof("..."));
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
q += nc;
|
|
|
|
bufsize -= nc;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-05 22:41:08 +02:00
|
|
|
/* generate CPU information. */
|
|
|
|
void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf)
|
2010-03-11 14:38:55 +01:00
|
|
|
{
|
|
|
|
x86_def_t *def;
|
|
|
|
char buf[256];
|
2013-01-21 01:02:28 +01:00
|
|
|
int i;
|
2010-03-11 14:38:55 +01:00
|
|
|
|
2013-01-21 01:02:28 +01:00
|
|
|
for (i = 0; i < ARRAY_SIZE(builtin_x86_defs); i++) {
|
|
|
|
def = &builtin_x86_defs[i];
|
2012-09-05 22:41:13 +02:00
|
|
|
snprintf(buf, sizeof(buf), "%s", def->name);
|
2012-09-05 22:41:07 +02:00
|
|
|
(*cpu_fprintf)(f, "x86 %16s %-48s\n", buf, def->model_id);
|
2010-03-11 14:38:55 +01:00
|
|
|
}
|
2010-03-11 14:39:00 +01:00
|
|
|
if (kvm_enabled()) {
|
|
|
|
(*cpu_fprintf)(f, "x86 %16s\n", "[host]");
|
|
|
|
}
|
2012-09-05 22:41:07 +02:00
|
|
|
(*cpu_fprintf)(f, "\nRecognized CPUID flags:\n");
|
|
|
|
listflags(buf, sizeof(buf), (uint32_t)~0, feature_name, 1);
|
2012-09-06 12:05:39 +02:00
|
|
|
(*cpu_fprintf)(f, " %s\n", buf);
|
2012-09-05 22:41:07 +02:00
|
|
|
listflags(buf, sizeof(buf), (uint32_t)~0, ext_feature_name, 1);
|
2012-09-06 12:05:39 +02:00
|
|
|
(*cpu_fprintf)(f, " %s\n", buf);
|
2012-09-05 22:41:07 +02:00
|
|
|
listflags(buf, sizeof(buf), (uint32_t)~0, ext2_feature_name, 1);
|
2012-09-06 12:05:39 +02:00
|
|
|
(*cpu_fprintf)(f, " %s\n", buf);
|
2012-09-05 22:41:07 +02:00
|
|
|
listflags(buf, sizeof(buf), (uint32_t)~0, ext3_feature_name, 1);
|
2012-09-06 12:05:39 +02:00
|
|
|
(*cpu_fprintf)(f, " %s\n", buf);
|
2010-03-11 14:38:55 +01:00
|
|
|
}
|
|
|
|
|
2012-08-15 05:17:36 +02:00
|
|
|
CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp)
|
2012-08-10 18:04:14 +02:00
|
|
|
{
|
|
|
|
CpuDefinitionInfoList *cpu_list = NULL;
|
|
|
|
x86_def_t *def;
|
2013-01-21 01:02:28 +01:00
|
|
|
int i;
|
2012-08-10 18:04:14 +02:00
|
|
|
|
2013-01-21 01:02:28 +01:00
|
|
|
for (i = 0; i < ARRAY_SIZE(builtin_x86_defs); i++) {
|
2012-08-10 18:04:14 +02:00
|
|
|
CpuDefinitionInfoList *entry;
|
|
|
|
CpuDefinitionInfo *info;
|
|
|
|
|
2013-01-21 01:02:28 +01:00
|
|
|
def = &builtin_x86_defs[i];
|
2012-08-10 18:04:14 +02:00
|
|
|
info = g_malloc0(sizeof(*info));
|
|
|
|
info->name = g_strdup(def->name);
|
|
|
|
|
|
|
|
entry = g_malloc0(sizeof(*entry));
|
|
|
|
entry->value = info;
|
|
|
|
entry->next = cpu_list;
|
|
|
|
cpu_list = entry;
|
|
|
|
}
|
|
|
|
|
|
|
|
return cpu_list;
|
|
|
|
}
|
|
|
|
|
i386: kvm: filter CPUID feature words earlier, on cpu.c
cpu.c contains the code that will check if all requested CPU features
are available, so the filtering of KVM features must be there, so we can
implement "check" and "enforce" properly.
The only point where kvm_arch_init_vcpu() is called on i386 is:
- cpu_x86_init()
- x86_cpu_realize() (after cpu_x86_register() is called)
- qemu_init_vcpu()
- qemu_kvm_start_vcpu()
- qemu_kvm_thread_fn() (on a new thread)
- kvm_init_vcpu()
- kvm_arch_init_vcpu()
With this patch, the filtering will be done earlier, at:
- cpu_x86_init()
- cpu_x86_register() (before x86_cpu_realize() is called)
Also, the KVM CPUID filtering will now be done at the same place where
the TCG CPUID feature filtering is done. Later, the code can be changed
to use the same filtering code for the "check" and "enforce" modes, as
now the cpu.c code knows exactly which CPU features are going to be
exposed to the guest (and much earlier).
One thing I was worrying about when doing this is that
kvm_arch_get_supported_cpuid() depends on kvm_irqchip_in_kernel(), and
maybe the 'kvm_kernel_irqchip' global variable wasn't initialized yet at
CPU creation time. But kvm_kernel_irqchip is initialized during
kvm_init(), that is called very early (much earlier than the machine
init function), and kvm_init() is already a requirement to run the
GET_SUPPORTED_CPUID ioctl() (as kvm_init() initializes the kvm_state
global variable).
Side note: it would be nice to keep KVM-specific code inside kvm.c. The
problem is that properly implementing -cpu check/enforce code (that's
inside cpu.c) depends directly on the feature bit filtering done using
kvm_arch_get_supported_cpuid(). Currently -cpu check/enforce is broken
because it simply uses the host CPU feature bits instead of
GET_SUPPORTED_CPUID, and we need to fix that.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2012-10-04 22:49:05 +02:00
|
|
|
#ifdef CONFIG_KVM
|
|
|
|
static void filter_features_for_kvm(X86CPU *cpu)
|
|
|
|
{
|
|
|
|
CPUX86State *env = &cpu->env;
|
|
|
|
KVMState *s = kvm_state;
|
|
|
|
|
2012-10-04 22:49:06 +02:00
|
|
|
env->cpuid_features &=
|
|
|
|
kvm_arch_get_supported_cpuid(s, 1, 0, R_EDX);
|
|
|
|
env->cpuid_ext_features &=
|
|
|
|
kvm_arch_get_supported_cpuid(s, 1, 0, R_ECX);
|
|
|
|
env->cpuid_ext2_features &=
|
|
|
|
kvm_arch_get_supported_cpuid(s, 0x80000001, 0, R_EDX);
|
|
|
|
env->cpuid_ext3_features &=
|
|
|
|
kvm_arch_get_supported_cpuid(s, 0x80000001, 0, R_ECX);
|
|
|
|
env->cpuid_svm_features &=
|
|
|
|
kvm_arch_get_supported_cpuid(s, 0x8000000A, 0, R_EDX);
|
2012-10-04 22:49:07 +02:00
|
|
|
env->cpuid_7_0_ebx_features &=
|
|
|
|
kvm_arch_get_supported_cpuid(s, 7, 0, R_EBX);
|
i386: kvm: filter CPUID feature words earlier, on cpu.c
cpu.c contains the code that will check if all requested CPU features
are available, so the filtering of KVM features must be there, so we can
implement "check" and "enforce" properly.
The only point where kvm_arch_init_vcpu() is called on i386 is:
- cpu_x86_init()
- x86_cpu_realize() (after cpu_x86_register() is called)
- qemu_init_vcpu()
- qemu_kvm_start_vcpu()
- qemu_kvm_thread_fn() (on a new thread)
- kvm_init_vcpu()
- kvm_arch_init_vcpu()
With this patch, the filtering will be done earlier, at:
- cpu_x86_init()
- cpu_x86_register() (before x86_cpu_realize() is called)
Also, the KVM CPUID filtering will now be done at the same place where
the TCG CPUID feature filtering is done. Later, the code can be changed
to use the same filtering code for the "check" and "enforce" modes, as
now the cpu.c code knows exactly which CPU features are going to be
exposed to the guest (and much earlier).
One thing I was worrying about when doing this is that
kvm_arch_get_supported_cpuid() depends on kvm_irqchip_in_kernel(), and
maybe the 'kvm_kernel_irqchip' global variable wasn't initialized yet at
CPU creation time. But kvm_kernel_irqchip is initialized during
kvm_init(), that is called very early (much earlier than the machine
init function), and kvm_init() is already a requirement to run the
GET_SUPPORTED_CPUID ioctl() (as kvm_init() initializes the kvm_state
global variable).
Side note: it would be nice to keep KVM-specific code inside kvm.c. The
problem is that properly implementing -cpu check/enforce code (that's
inside cpu.c) depends directly on the feature bit filtering done using
kvm_arch_get_supported_cpuid(). Currently -cpu check/enforce is broken
because it simply uses the host CPU feature bits instead of
GET_SUPPORTED_CPUID, and we need to fix that.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2012-10-04 22:49:05 +02:00
|
|
|
env->cpuid_kvm_features &=
|
2012-10-04 22:49:06 +02:00
|
|
|
kvm_arch_get_supported_cpuid(s, KVM_CPUID_FEATURES, 0, R_EAX);
|
|
|
|
env->cpuid_ext4_features &=
|
|
|
|
kvm_arch_get_supported_cpuid(s, 0xC0000001, 0, R_EDX);
|
i386: kvm: filter CPUID feature words earlier, on cpu.c
cpu.c contains the code that will check if all requested CPU features
are available, so the filtering of KVM features must be there, so we can
implement "check" and "enforce" properly.
The only point where kvm_arch_init_vcpu() is called on i386 is:
- cpu_x86_init()
- x86_cpu_realize() (after cpu_x86_register() is called)
- qemu_init_vcpu()
- qemu_kvm_start_vcpu()
- qemu_kvm_thread_fn() (on a new thread)
- kvm_init_vcpu()
- kvm_arch_init_vcpu()
With this patch, the filtering will be done earlier, at:
- cpu_x86_init()
- cpu_x86_register() (before x86_cpu_realize() is called)
Also, the KVM CPUID filtering will now be done at the same place where
the TCG CPUID feature filtering is done. Later, the code can be changed
to use the same filtering code for the "check" and "enforce" modes, as
now the cpu.c code knows exactly which CPU features are going to be
exposed to the guest (and much earlier).
One thing I was worrying about when doing this is that
kvm_arch_get_supported_cpuid() depends on kvm_irqchip_in_kernel(), and
maybe the 'kvm_kernel_irqchip' global variable wasn't initialized yet at
CPU creation time. But kvm_kernel_irqchip is initialized during
kvm_init(), that is called very early (much earlier than the machine
init function), and kvm_init() is already a requirement to run the
GET_SUPPORTED_CPUID ioctl() (as kvm_init() initializes the kvm_state
global variable).
Side note: it would be nice to keep KVM-specific code inside kvm.c. The
problem is that properly implementing -cpu check/enforce code (that's
inside cpu.c) depends directly on the feature bit filtering done using
kvm_arch_get_supported_cpuid(). Currently -cpu check/enforce is broken
because it simply uses the host CPU feature bits instead of
GET_SUPPORTED_CPUID, and we need to fix that.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2012-10-04 22:49:05 +02:00
|
|
|
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2012-04-17 12:00:51 +02:00
|
|
|
int cpu_x86_register(X86CPU *cpu, const char *cpu_model)
|
2010-03-11 14:38:55 +01:00
|
|
|
{
|
2012-04-17 12:00:51 +02:00
|
|
|
CPUX86State *env = &cpu->env;
|
2010-03-11 14:38:55 +01:00
|
|
|
x86_def_t def1, *def = &def1;
|
2012-04-17 12:10:29 +02:00
|
|
|
Error *error = NULL;
|
2012-12-04 20:34:39 +01:00
|
|
|
char *name, *features;
|
|
|
|
gchar **model_pieces;
|
2010-03-11 14:38:55 +01:00
|
|
|
|
2010-09-27 15:16:16 +02:00
|
|
|
memset(def, 0, sizeof(*def));
|
|
|
|
|
2012-12-04 20:34:39 +01:00
|
|
|
model_pieces = g_strsplit(cpu_model, ",", 2);
|
|
|
|
if (!model_pieces[0]) {
|
2013-01-11 03:10:16 +01:00
|
|
|
error_setg(&error, "Invalid/empty CPU model name");
|
|
|
|
goto out;
|
2012-12-04 20:34:39 +01:00
|
|
|
}
|
|
|
|
name = model_pieces[0];
|
|
|
|
features = model_pieces[1];
|
|
|
|
|
|
|
|
if (cpu_x86_find_by_name(def, name) < 0) {
|
2013-01-11 03:10:16 +01:00
|
|
|
error_setg(&error, "Unable to find CPU definition: %s", name);
|
|
|
|
goto out;
|
2012-12-04 20:34:39 +01:00
|
|
|
}
|
|
|
|
|
2013-01-17 21:59:28 +01:00
|
|
|
if (kvm_enabled()) {
|
|
|
|
def->kvm_features |= kvm_default_features;
|
|
|
|
}
|
2013-01-11 03:10:15 +01:00
|
|
|
def->ext_features |= CPUID_EXT_HYPERVISOR;
|
|
|
|
|
2013-01-21 15:06:36 +01:00
|
|
|
object_property_set_str(OBJECT(cpu), def->vendor, "vendor", &error);
|
2012-04-17 18:41:40 +02:00
|
|
|
object_property_set_int(OBJECT(cpu), def->level, "level", &error);
|
2012-04-17 12:10:29 +02:00
|
|
|
object_property_set_int(OBJECT(cpu), def->family, "family", &error);
|
2012-04-17 12:16:39 +02:00
|
|
|
object_property_set_int(OBJECT(cpu), def->model, "model", &error);
|
2012-04-17 14:14:18 +02:00
|
|
|
object_property_set_int(OBJECT(cpu), def->stepping, "stepping", &error);
|
2010-03-11 14:38:55 +01:00
|
|
|
env->cpuid_features = def->features;
|
|
|
|
env->cpuid_ext_features = def->ext_features;
|
|
|
|
env->cpuid_ext2_features = def->ext2_features;
|
2010-03-11 14:38:57 +01:00
|
|
|
env->cpuid_ext3_features = def->ext3_features;
|
2012-04-17 18:44:07 +02:00
|
|
|
object_property_set_int(OBJECT(cpu), def->xlevel, "xlevel", &error);
|
2010-03-11 14:38:55 +01:00
|
|
|
env->cpuid_kvm_features = def->kvm_features;
|
2010-09-27 15:16:17 +02:00
|
|
|
env->cpuid_svm_features = def->svm_features;
|
2011-06-01 03:59:52 +02:00
|
|
|
env->cpuid_ext4_features = def->ext4_features;
|
2012-09-26 22:18:43 +02:00
|
|
|
env->cpuid_7_0_ebx_features = def->cpuid_7_0_ebx_features;
|
2011-06-01 03:59:52 +02:00
|
|
|
env->cpuid_xlevel2 = def->xlevel2;
|
2012-09-06 12:05:38 +02:00
|
|
|
|
2012-04-17 15:17:27 +02:00
|
|
|
object_property_set_str(OBJECT(cpu), def->model_id, "model-id", &error);
|
2013-01-21 15:06:38 +01:00
|
|
|
if (error) {
|
|
|
|
goto out;
|
|
|
|
}
|
2013-01-11 03:10:16 +01:00
|
|
|
|
2013-01-21 15:06:38 +01:00
|
|
|
cpu_x86_parse_featurestr(cpu, features, &error);
|
2013-01-11 03:10:16 +01:00
|
|
|
out:
|
|
|
|
g_strfreev(model_pieces);
|
2012-10-02 17:36:54 +02:00
|
|
|
if (error) {
|
|
|
|
fprintf(stderr, "%s\n", error_get_pretty(error));
|
2012-04-17 12:10:29 +02:00
|
|
|
error_free(error);
|
2013-01-11 03:10:16 +01:00
|
|
|
return -1;
|
2012-04-17 12:10:29 +02:00
|
|
|
}
|
2010-03-11 14:38:55 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if !defined(CONFIG_USER_ONLY)
|
|
|
|
|
2010-06-19 09:42:34 +02:00
|
|
|
void cpu_clear_apic_feature(CPUX86State *env)
|
|
|
|
{
|
|
|
|
env->cpuid_features &= ~CPUID_APIC;
|
|
|
|
}
|
|
|
|
|
2010-03-11 14:38:55 +01:00
|
|
|
#endif /* !CONFIG_USER_ONLY */
|
|
|
|
|
2012-09-05 22:41:13 +02:00
|
|
|
/* Initialize list of CPU models, filling some non-static fields if necessary
|
2010-03-11 14:38:55 +01:00
|
|
|
*/
|
|
|
|
void x86_cpudef_setup(void)
|
|
|
|
{
|
2012-05-30 05:35:51 +02:00
|
|
|
int i, j;
|
|
|
|
static const char *model_with_versions[] = { "qemu32", "qemu64", "athlon" };
|
2010-03-11 14:38:55 +01:00
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(builtin_x86_defs); ++i) {
|
2012-09-05 22:41:12 +02:00
|
|
|
x86_def_t *def = &builtin_x86_defs[i];
|
2012-05-30 05:35:51 +02:00
|
|
|
|
|
|
|
/* Look for specific "cpudef" models that */
|
2012-06-20 06:05:51 +02:00
|
|
|
/* have the QEMU version in .model_id */
|
2012-05-30 05:35:51 +02:00
|
|
|
for (j = 0; j < ARRAY_SIZE(model_with_versions); j++) {
|
2012-09-05 22:41:12 +02:00
|
|
|
if (strcmp(model_with_versions[j], def->name) == 0) {
|
|
|
|
pstrcpy(def->model_id, sizeof(def->model_id),
|
|
|
|
"QEMU Virtual CPU version ");
|
|
|
|
pstrcat(def->model_id, sizeof(def->model_id),
|
|
|
|
qemu_get_version());
|
2012-05-30 05:35:51 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2010-03-11 14:38:55 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void get_cpuid_vendor(CPUX86State *env, uint32_t *ebx,
|
|
|
|
uint32_t *ecx, uint32_t *edx)
|
|
|
|
{
|
|
|
|
*ebx = env->cpuid_vendor1;
|
|
|
|
*edx = env->cpuid_vendor2;
|
|
|
|
*ecx = env->cpuid_vendor3;
|
|
|
|
}
|
|
|
|
|
|
|
|
void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
|
|
|
|
uint32_t *eax, uint32_t *ebx,
|
|
|
|
uint32_t *ecx, uint32_t *edx)
|
|
|
|
{
|
2012-12-01 05:35:08 +01:00
|
|
|
X86CPU *cpu = x86_env_get_cpu(env);
|
|
|
|
CPUState *cs = CPU(cpu);
|
|
|
|
|
2010-03-11 14:38:55 +01:00
|
|
|
/* test if maximum index reached */
|
|
|
|
if (index & 0x80000000) {
|
2011-06-01 03:59:52 +02:00
|
|
|
if (index > env->cpuid_xlevel) {
|
|
|
|
if (env->cpuid_xlevel2 > 0) {
|
|
|
|
/* Handle the Centaur's CPUID instruction. */
|
|
|
|
if (index > env->cpuid_xlevel2) {
|
|
|
|
index = env->cpuid_xlevel2;
|
|
|
|
} else if (index < 0xC0000000) {
|
|
|
|
index = env->cpuid_xlevel;
|
|
|
|
}
|
|
|
|
} else {
|
target-i386: CPUID: return highest basic leaf if eax > cpuid_xlevel
This fixes a subtle bug. A bug that probably won't cause trouble for any
existing OS, but a bug anyway:
Intel SDM Volume 2, CPUID Instruction states:
> Two types of information are returned: basic and extended function
> information. If a value entered for CPUID.EAX is higher than the maximum
> input value for basic or extended function for that processor then the
> data for the highest basic information leaf is returned. For example,
> using the Intel Core i7 processor, the following is true:
>
> CPUID.EAX = 05H (* Returns MONITOR/MWAIT leaf. *)
> CPUID.EAX = 0AH (* Returns Architectural Performance Monitoring leaf. *)
> CPUID.EAX = 0BH (* Returns Extended Topology Enumeration leaf. *)
> CPUID.EAX = 0CH (* INVALID: Returns the same information as CPUID.EAX = 0BH. *)
> CPUID.EAX = 80000008H (* Returns linear/physical address size data. *)
> CPUID.EAX = 8000000AH (* INVALID: Returns same information as CPUID.EAX = 0BH. *)
AMD's CPUID Specification, on the other hand, is less specific:
> The CPUID instruction supports two sets or ranges of functions,
> standard and extended.
>
> • The smallest function number of the standard function range is
> Fn0000_0000. The largest function num- ber of the standard function
> range, for a particular implementation, is returned in CPUID
> Fn0000_0000_EAX.
>
> • The smallest function number of the extended function range is
> Fn8000_0000. The largest function num- ber of the extended function
> range, for a particular implementation, is returned in CPUID
> Fn8000_0000_EAX.
>
> Functions that are neither standard nor extended are undefined and
> should not be relied upon.
QEMU's behavior matched Intel's specification before, but this was
changed by commit b3baa152aaef1905876670590275c2dd0bbb088c. This patch
restores the behavior documented by Intel when cpuid_xlevel2 is 0.
The existing behavior when cpuid_xlevel2 is set (falling back to
level=cpuid_xlevel) is being kept, as I couldn't find any public
documentation on the CPUID 0xC0000000 function range on Centaur CPUs.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-12-20 19:43:48 +01:00
|
|
|
/* Intel documentation states that invalid EAX input will
|
|
|
|
* return the same information as EAX=cpuid_level
|
|
|
|
* (Intel SDM Vol. 2A - Instruction Set Reference - CPUID)
|
|
|
|
*/
|
|
|
|
index = env->cpuid_level;
|
2011-06-01 03:59:52 +02:00
|
|
|
}
|
|
|
|
}
|
2010-03-11 14:38:55 +01:00
|
|
|
} else {
|
|
|
|
if (index > env->cpuid_level)
|
|
|
|
index = env->cpuid_level;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch(index) {
|
|
|
|
case 0:
|
|
|
|
*eax = env->cpuid_level;
|
|
|
|
get_cpuid_vendor(env, ebx, ecx, edx);
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
*eax = env->cpuid_version;
|
|
|
|
*ebx = (env->cpuid_apic_id << 24) | 8 << 8; /* CLFLUSH size in quad words, Linux wants it. */
|
|
|
|
*ecx = env->cpuid_ext_features;
|
|
|
|
*edx = env->cpuid_features;
|
2012-12-17 03:27:07 +01:00
|
|
|
if (cs->nr_cores * cs->nr_threads > 1) {
|
|
|
|
*ebx |= (cs->nr_cores * cs->nr_threads) << 16;
|
2010-03-11 14:38:55 +01:00
|
|
|
*edx |= 1 << 28; /* HTT bit */
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
/* cache info: needed for Pentium Pro compatibility */
|
|
|
|
*eax = 1;
|
|
|
|
*ebx = 0;
|
|
|
|
*ecx = 0;
|
|
|
|
*edx = 0x2c307d;
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
/* cache info: needed for Core compatibility */
|
2012-12-17 03:27:07 +01:00
|
|
|
if (cs->nr_cores > 1) {
|
|
|
|
*eax = (cs->nr_cores - 1) << 26;
|
2010-03-11 14:38:55 +01:00
|
|
|
} else {
|
2010-03-13 16:46:33 +01:00
|
|
|
*eax = 0;
|
2010-03-11 14:38:55 +01:00
|
|
|
}
|
|
|
|
switch (count) {
|
|
|
|
case 0: /* L1 dcache info */
|
|
|
|
*eax |= 0x0000121;
|
|
|
|
*ebx = 0x1c0003f;
|
|
|
|
*ecx = 0x000003f;
|
|
|
|
*edx = 0x0000001;
|
|
|
|
break;
|
|
|
|
case 1: /* L1 icache info */
|
|
|
|
*eax |= 0x0000122;
|
|
|
|
*ebx = 0x1c0003f;
|
|
|
|
*ecx = 0x000003f;
|
|
|
|
*edx = 0x0000001;
|
|
|
|
break;
|
|
|
|
case 2: /* L2 cache info */
|
|
|
|
*eax |= 0x0000143;
|
2012-12-17 03:27:07 +01:00
|
|
|
if (cs->nr_threads > 1) {
|
|
|
|
*eax |= (cs->nr_threads - 1) << 14;
|
2010-03-11 14:38:55 +01:00
|
|
|
}
|
|
|
|
*ebx = 0x3c0003f;
|
|
|
|
*ecx = 0x0000fff;
|
|
|
|
*edx = 0x0000001;
|
|
|
|
break;
|
|
|
|
default: /* end of info */
|
|
|
|
*eax = 0;
|
|
|
|
*ebx = 0;
|
|
|
|
*ecx = 0;
|
|
|
|
*edx = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 5:
|
|
|
|
/* mwait info: needed for Core compatibility */
|
|
|
|
*eax = 0; /* Smallest monitor-line size in bytes */
|
|
|
|
*ebx = 0; /* Largest monitor-line size in bytes */
|
|
|
|
*ecx = CPUID_MWAIT_EMX | CPUID_MWAIT_IBE;
|
|
|
|
*edx = 0;
|
|
|
|
break;
|
|
|
|
case 6:
|
|
|
|
/* Thermal and Power Leaf */
|
|
|
|
*eax = 0;
|
|
|
|
*ebx = 0;
|
|
|
|
*ecx = 0;
|
|
|
|
*edx = 0;
|
|
|
|
break;
|
2011-05-30 17:17:42 +02:00
|
|
|
case 7:
|
Expose CPUID leaf 7 only for -cpu host
Changes v2 -> v3;
- Check for kvm_enabled() before setting cpuid_7_0_ebx_features
Changes v1 -> v2:
- Use kvm_arch_get_supported_cpuid() instead of host_cpuid() on
cpu_x86_fill_host().
We should use GET_SUPPORTED_CPUID for all bits on "-cpu host"
eventually, but I am not changing all the other CPUID leaves because
we may not be able to test such an intrusive change in time for 1.1.
Description of the bug:
Since QEMU 0.15, the CPUID information on CPUID[EAX=7,ECX=0] is being
returned unfiltered to the guest, directly from the GET_SUPPORTED_CPUID
return value.
The problem is that this makes the resulting CPU feature flags
unpredictable and dependent on the host CPU and kernel version. This
breaks live-migration badly if migrating from a host CPU that supports
some features on that CPUID leaf (running a recent kernel) to a kernel
or host CPU that doesn't support it.
Migration also is incorrect (the virtual CPU changes under the guest's
feet) if you migrate in the opposite direction (from an old CPU/kernel
to a new CPU/kernel), but with less serious consequences (guests
normally query CPUID information only once on boot).
Fortunately, the bug affects only users using cpudefs with level >= 7.
The right behavior should be to explicitly enable those features on
[cpudef] config sections or on the "-cpu" command-line arguments. Right
now there is no predefined CPU model on QEMU that has those features:
the latest Intel model we have is Sandy Bridge.
I would like to get this fixed on 1.1, so I am submitting this patch,
that enables those features only if "-cpu host" is being used (as we
don't have any pre-defined CPU model that actually have those features).
After 1.1 is released, we can make those features properly configurable
on [cpudef] and -cpu configuration.
One problem is: with this patch, users with the following setup:
- Running QEMU 1.0;
- Using a cpudef having level >= 7;
- Running a kernel that supports the features on CPUID leaf 7; and
- Running on a CPU that supports some features on CPUID leaf 7
won't be able to live-migrate to QEMU 1.1. But for these users
live-migration is already broken (they can't live-migrate to hosts with
older CPUs or older kernels, already), I don't see how to avoid this
problem.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-05-21 16:27:02 +02:00
|
|
|
/* Structured Extended Feature Flags Enumeration Leaf */
|
|
|
|
if (count == 0) {
|
|
|
|
*eax = 0; /* Maximum ECX value for sub-leaves */
|
2012-09-26 22:18:43 +02:00
|
|
|
*ebx = env->cpuid_7_0_ebx_features; /* Feature flags */
|
Expose CPUID leaf 7 only for -cpu host
Changes v2 -> v3;
- Check for kvm_enabled() before setting cpuid_7_0_ebx_features
Changes v1 -> v2:
- Use kvm_arch_get_supported_cpuid() instead of host_cpuid() on
cpu_x86_fill_host().
We should use GET_SUPPORTED_CPUID for all bits on "-cpu host"
eventually, but I am not changing all the other CPUID leaves because
we may not be able to test such an intrusive change in time for 1.1.
Description of the bug:
Since QEMU 0.15, the CPUID information on CPUID[EAX=7,ECX=0] is being
returned unfiltered to the guest, directly from the GET_SUPPORTED_CPUID
return value.
The problem is that this makes the resulting CPU feature flags
unpredictable and dependent on the host CPU and kernel version. This
breaks live-migration badly if migrating from a host CPU that supports
some features on that CPUID leaf (running a recent kernel) to a kernel
or host CPU that doesn't support it.
Migration also is incorrect (the virtual CPU changes under the guest's
feet) if you migrate in the opposite direction (from an old CPU/kernel
to a new CPU/kernel), but with less serious consequences (guests
normally query CPUID information only once on boot).
Fortunately, the bug affects only users using cpudefs with level >= 7.
The right behavior should be to explicitly enable those features on
[cpudef] config sections or on the "-cpu" command-line arguments. Right
now there is no predefined CPU model on QEMU that has those features:
the latest Intel model we have is Sandy Bridge.
I would like to get this fixed on 1.1, so I am submitting this patch,
that enables those features only if "-cpu host" is being used (as we
don't have any pre-defined CPU model that actually have those features).
After 1.1 is released, we can make those features properly configurable
on [cpudef] and -cpu configuration.
One problem is: with this patch, users with the following setup:
- Running QEMU 1.0;
- Using a cpudef having level >= 7;
- Running a kernel that supports the features on CPUID leaf 7; and
- Running on a CPU that supports some features on CPUID leaf 7
won't be able to live-migrate to QEMU 1.1. But for these users
live-migration is already broken (they can't live-migrate to hosts with
older CPUs or older kernels, already), I don't see how to avoid this
problem.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-05-21 16:27:02 +02:00
|
|
|
*ecx = 0; /* Reserved */
|
|
|
|
*edx = 0; /* Reserved */
|
2011-05-30 17:17:42 +02:00
|
|
|
} else {
|
|
|
|
*eax = 0;
|
|
|
|
*ebx = 0;
|
|
|
|
*ecx = 0;
|
|
|
|
*edx = 0;
|
|
|
|
}
|
|
|
|
break;
|
2010-03-11 14:38:55 +01:00
|
|
|
case 9:
|
|
|
|
/* Direct Cache Access Information Leaf */
|
|
|
|
*eax = 0; /* Bits 0-31 in DCA_CAP MSR */
|
|
|
|
*ebx = 0;
|
|
|
|
*ecx = 0;
|
|
|
|
*edx = 0;
|
|
|
|
break;
|
|
|
|
case 0xA:
|
|
|
|
/* Architectural Performance Monitoring Leaf */
|
2011-12-15 11:44:05 +01:00
|
|
|
if (kvm_enabled()) {
|
2012-12-01 05:35:08 +01:00
|
|
|
KVMState *s = cs->kvm_state;
|
2011-12-15 11:44:05 +01:00
|
|
|
|
|
|
|
*eax = kvm_arch_get_supported_cpuid(s, 0xA, count, R_EAX);
|
|
|
|
*ebx = kvm_arch_get_supported_cpuid(s, 0xA, count, R_EBX);
|
|
|
|
*ecx = kvm_arch_get_supported_cpuid(s, 0xA, count, R_ECX);
|
|
|
|
*edx = kvm_arch_get_supported_cpuid(s, 0xA, count, R_EDX);
|
|
|
|
} else {
|
|
|
|
*eax = 0;
|
|
|
|
*ebx = 0;
|
|
|
|
*ecx = 0;
|
|
|
|
*edx = 0;
|
|
|
|
}
|
2010-03-11 14:38:55 +01:00
|
|
|
break;
|
2010-06-17 09:18:14 +02:00
|
|
|
case 0xD:
|
|
|
|
/* Processor Extended State */
|
|
|
|
if (!(env->cpuid_ext_features & CPUID_EXT_XSAVE)) {
|
|
|
|
*eax = 0;
|
|
|
|
*ebx = 0;
|
|
|
|
*ecx = 0;
|
|
|
|
*edx = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (kvm_enabled()) {
|
2012-12-01 05:35:08 +01:00
|
|
|
KVMState *s = cs->kvm_state;
|
2011-06-08 16:11:05 +02:00
|
|
|
|
|
|
|
*eax = kvm_arch_get_supported_cpuid(s, 0xd, count, R_EAX);
|
|
|
|
*ebx = kvm_arch_get_supported_cpuid(s, 0xd, count, R_EBX);
|
|
|
|
*ecx = kvm_arch_get_supported_cpuid(s, 0xd, count, R_ECX);
|
|
|
|
*edx = kvm_arch_get_supported_cpuid(s, 0xd, count, R_EDX);
|
2010-06-17 09:18:14 +02:00
|
|
|
} else {
|
|
|
|
*eax = 0;
|
|
|
|
*ebx = 0;
|
|
|
|
*ecx = 0;
|
|
|
|
*edx = 0;
|
|
|
|
}
|
|
|
|
break;
|
2010-03-11 14:38:55 +01:00
|
|
|
case 0x80000000:
|
|
|
|
*eax = env->cpuid_xlevel;
|
|
|
|
*ebx = env->cpuid_vendor1;
|
|
|
|
*edx = env->cpuid_vendor2;
|
|
|
|
*ecx = env->cpuid_vendor3;
|
|
|
|
break;
|
|
|
|
case 0x80000001:
|
|
|
|
*eax = env->cpuid_version;
|
|
|
|
*ebx = 0;
|
|
|
|
*ecx = env->cpuid_ext3_features;
|
|
|
|
*edx = env->cpuid_ext2_features;
|
|
|
|
|
|
|
|
/* The Linux kernel checks for the CMPLegacy bit and
|
|
|
|
* discards multiple thread information if it is set.
|
|
|
|
* So dont set it here for Intel to make Linux guests happy.
|
|
|
|
*/
|
2012-12-17 03:27:07 +01:00
|
|
|
if (cs->nr_cores * cs->nr_threads > 1) {
|
2010-03-11 14:38:55 +01:00
|
|
|
uint32_t tebx, tecx, tedx;
|
|
|
|
get_cpuid_vendor(env, &tebx, &tecx, &tedx);
|
|
|
|
if (tebx != CPUID_VENDOR_INTEL_1 ||
|
|
|
|
tedx != CPUID_VENDOR_INTEL_2 ||
|
|
|
|
tecx != CPUID_VENDOR_INTEL_3) {
|
|
|
|
*ecx |= 1 << 1; /* CmpLegacy bit */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 0x80000002:
|
|
|
|
case 0x80000003:
|
|
|
|
case 0x80000004:
|
|
|
|
*eax = env->cpuid_model[(index - 0x80000002) * 4 + 0];
|
|
|
|
*ebx = env->cpuid_model[(index - 0x80000002) * 4 + 1];
|
|
|
|
*ecx = env->cpuid_model[(index - 0x80000002) * 4 + 2];
|
|
|
|
*edx = env->cpuid_model[(index - 0x80000002) * 4 + 3];
|
|
|
|
break;
|
|
|
|
case 0x80000005:
|
|
|
|
/* cache info (L1 cache) */
|
|
|
|
*eax = 0x01ff01ff;
|
|
|
|
*ebx = 0x01ff01ff;
|
|
|
|
*ecx = 0x40020140;
|
|
|
|
*edx = 0x40020140;
|
|
|
|
break;
|
|
|
|
case 0x80000006:
|
|
|
|
/* cache info (L2 cache) */
|
|
|
|
*eax = 0;
|
|
|
|
*ebx = 0x42004200;
|
|
|
|
*ecx = 0x02008140;
|
|
|
|
*edx = 0;
|
|
|
|
break;
|
|
|
|
case 0x80000008:
|
|
|
|
/* virtual & phys address size in low 2 bytes. */
|
|
|
|
/* XXX: This value must match the one used in the MMU code. */
|
|
|
|
if (env->cpuid_ext2_features & CPUID_EXT2_LM) {
|
|
|
|
/* 64 bit processor */
|
|
|
|
/* XXX: The physical address space is limited to 42 bits in exec.c. */
|
|
|
|
*eax = 0x00003028; /* 48 bits virtual, 40 bits physical */
|
|
|
|
} else {
|
|
|
|
if (env->cpuid_features & CPUID_PSE36)
|
|
|
|
*eax = 0x00000024; /* 36 bits physical */
|
|
|
|
else
|
|
|
|
*eax = 0x00000020; /* 32 bits physical */
|
|
|
|
}
|
|
|
|
*ebx = 0;
|
|
|
|
*ecx = 0;
|
|
|
|
*edx = 0;
|
2012-12-17 03:27:07 +01:00
|
|
|
if (cs->nr_cores * cs->nr_threads > 1) {
|
|
|
|
*ecx |= (cs->nr_cores * cs->nr_threads) - 1;
|
2010-03-11 14:38:55 +01:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 0x8000000A:
|
2012-12-04 20:34:38 +01:00
|
|
|
if (env->cpuid_ext3_features & CPUID_EXT3_SVM) {
|
|
|
|
*eax = 0x00000001; /* SVM Revision */
|
|
|
|
*ebx = 0x00000010; /* nr of ASIDs */
|
|
|
|
*ecx = 0;
|
|
|
|
*edx = env->cpuid_svm_features; /* optional features */
|
|
|
|
} else {
|
|
|
|
*eax = 0;
|
|
|
|
*ebx = 0;
|
|
|
|
*ecx = 0;
|
|
|
|
*edx = 0;
|
|
|
|
}
|
2010-03-11 14:38:55 +01:00
|
|
|
break;
|
2011-06-01 03:59:52 +02:00
|
|
|
case 0xC0000000:
|
|
|
|
*eax = env->cpuid_xlevel2;
|
|
|
|
*ebx = 0;
|
|
|
|
*ecx = 0;
|
|
|
|
*edx = 0;
|
|
|
|
break;
|
|
|
|
case 0xC0000001:
|
|
|
|
/* Support for VIA CPU's CPUID instruction */
|
|
|
|
*eax = env->cpuid_version;
|
|
|
|
*ebx = 0;
|
|
|
|
*ecx = 0;
|
|
|
|
*edx = env->cpuid_ext4_features;
|
|
|
|
break;
|
|
|
|
case 0xC0000002:
|
|
|
|
case 0xC0000003:
|
|
|
|
case 0xC0000004:
|
|
|
|
/* Reserved for the future, and now filled with zero */
|
|
|
|
*eax = 0;
|
|
|
|
*ebx = 0;
|
|
|
|
*ecx = 0;
|
|
|
|
*edx = 0;
|
|
|
|
break;
|
2010-03-11 14:38:55 +01:00
|
|
|
default:
|
|
|
|
/* reserved values: zero */
|
|
|
|
*eax = 0;
|
|
|
|
*ebx = 0;
|
|
|
|
*ecx = 0;
|
|
|
|
*edx = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2012-04-02 23:20:08 +02:00
|
|
|
|
|
|
|
/* CPUClass::reset() */
|
|
|
|
static void x86_cpu_reset(CPUState *s)
|
|
|
|
{
|
|
|
|
X86CPU *cpu = X86_CPU(s);
|
|
|
|
X86CPUClass *xcc = X86_CPU_GET_CLASS(cpu);
|
|
|
|
CPUX86State *env = &cpu->env;
|
2012-04-03 00:16:24 +02:00
|
|
|
int i;
|
|
|
|
|
|
|
|
if (qemu_loglevel_mask(CPU_LOG_RESET)) {
|
2012-12-17 06:18:02 +01:00
|
|
|
qemu_log("CPU Reset (CPU %d)\n", s->cpu_index);
|
2012-10-05 16:04:43 +02:00
|
|
|
log_cpu_state(env, CPU_DUMP_FPU | CPU_DUMP_CCOP);
|
2012-04-03 00:16:24 +02:00
|
|
|
}
|
2012-04-02 23:20:08 +02:00
|
|
|
|
|
|
|
xcc->parent_reset(s);
|
|
|
|
|
2012-04-03 00:16:24 +02:00
|
|
|
|
|
|
|
memset(env, 0, offsetof(CPUX86State, breakpoints));
|
|
|
|
|
|
|
|
tlb_flush(env, 1);
|
|
|
|
|
|
|
|
env->old_exception = -1;
|
|
|
|
|
|
|
|
/* init to reset state */
|
|
|
|
|
|
|
|
#ifdef CONFIG_SOFTMMU
|
|
|
|
env->hflags |= HF_SOFTMMU_MASK;
|
|
|
|
#endif
|
|
|
|
env->hflags2 |= HF2_GIF_MASK;
|
|
|
|
|
|
|
|
cpu_x86_update_cr0(env, 0x60000010);
|
|
|
|
env->a20_mask = ~0x0;
|
|
|
|
env->smbase = 0x30000;
|
|
|
|
|
|
|
|
env->idt.limit = 0xffff;
|
|
|
|
env->gdt.limit = 0xffff;
|
|
|
|
env->ldt.limit = 0xffff;
|
|
|
|
env->ldt.flags = DESC_P_MASK | (2 << DESC_TYPE_SHIFT);
|
|
|
|
env->tr.limit = 0xffff;
|
|
|
|
env->tr.flags = DESC_P_MASK | (11 << DESC_TYPE_SHIFT);
|
|
|
|
|
|
|
|
cpu_x86_load_seg_cache(env, R_CS, 0xf000, 0xffff0000, 0xffff,
|
|
|
|
DESC_P_MASK | DESC_S_MASK | DESC_CS_MASK |
|
|
|
|
DESC_R_MASK | DESC_A_MASK);
|
|
|
|
cpu_x86_load_seg_cache(env, R_DS, 0, 0, 0xffff,
|
|
|
|
DESC_P_MASK | DESC_S_MASK | DESC_W_MASK |
|
|
|
|
DESC_A_MASK);
|
|
|
|
cpu_x86_load_seg_cache(env, R_ES, 0, 0, 0xffff,
|
|
|
|
DESC_P_MASK | DESC_S_MASK | DESC_W_MASK |
|
|
|
|
DESC_A_MASK);
|
|
|
|
cpu_x86_load_seg_cache(env, R_SS, 0, 0, 0xffff,
|
|
|
|
DESC_P_MASK | DESC_S_MASK | DESC_W_MASK |
|
|
|
|
DESC_A_MASK);
|
|
|
|
cpu_x86_load_seg_cache(env, R_FS, 0, 0, 0xffff,
|
|
|
|
DESC_P_MASK | DESC_S_MASK | DESC_W_MASK |
|
|
|
|
DESC_A_MASK);
|
|
|
|
cpu_x86_load_seg_cache(env, R_GS, 0, 0, 0xffff,
|
|
|
|
DESC_P_MASK | DESC_S_MASK | DESC_W_MASK |
|
|
|
|
DESC_A_MASK);
|
|
|
|
|
|
|
|
env->eip = 0xfff0;
|
|
|
|
env->regs[R_EDX] = env->cpuid_version;
|
|
|
|
|
|
|
|
env->eflags = 0x2;
|
|
|
|
|
|
|
|
/* FPU init */
|
|
|
|
for (i = 0; i < 8; i++) {
|
|
|
|
env->fptags[i] = 1;
|
|
|
|
}
|
|
|
|
env->fpuc = 0x37f;
|
|
|
|
|
|
|
|
env->mxcsr = 0x1f80;
|
|
|
|
|
|
|
|
env->pat = 0x0007040600070406ULL;
|
|
|
|
env->msr_ia32_misc_enable = MSR_IA32_MISC_ENABLE_DEFAULT;
|
|
|
|
|
|
|
|
memset(env->dr, 0, sizeof(env->dr));
|
|
|
|
env->dr[6] = DR6_FIXED_1;
|
|
|
|
env->dr[7] = DR7_FIXED_1;
|
|
|
|
cpu_breakpoint_remove_all(env, BP_CPU);
|
|
|
|
cpu_watchpoint_remove_all(env, BP_CPU);
|
2012-07-23 15:22:27 +02:00
|
|
|
|
|
|
|
#if !defined(CONFIG_USER_ONLY)
|
|
|
|
/* We hard-wire the BSP to the first CPU. */
|
2012-12-17 06:18:02 +01:00
|
|
|
if (s->cpu_index == 0) {
|
2012-07-23 15:22:27 +02:00
|
|
|
apic_designate_bsp(env->apic_state);
|
|
|
|
}
|
|
|
|
|
|
|
|
env->halted = !cpu_is_bsp(cpu);
|
|
|
|
#endif
|
2012-04-02 23:20:08 +02:00
|
|
|
}
|
|
|
|
|
2012-07-23 15:22:27 +02:00
|
|
|
#ifndef CONFIG_USER_ONLY
|
|
|
|
bool cpu_is_bsp(X86CPU *cpu)
|
|
|
|
{
|
|
|
|
return cpu_get_apic_base(cpu->env.apic_state) & MSR_IA32_APICBASE_BSP;
|
|
|
|
}
|
2012-07-23 15:22:28 +02:00
|
|
|
|
|
|
|
/* TODO: remove me, when reset over QOM tree is implemented */
|
|
|
|
static void x86_cpu_machine_reset_cb(void *opaque)
|
|
|
|
{
|
|
|
|
X86CPU *cpu = opaque;
|
|
|
|
cpu_reset(CPU(cpu));
|
|
|
|
}
|
2012-07-23 15:22:27 +02:00
|
|
|
#endif
|
|
|
|
|
2012-04-03 00:00:17 +02:00
|
|
|
static void mce_init(X86CPU *cpu)
|
|
|
|
{
|
|
|
|
CPUX86State *cenv = &cpu->env;
|
|
|
|
unsigned int bank;
|
|
|
|
|
|
|
|
if (((cenv->cpuid_version >> 8) & 0xf) >= 6
|
|
|
|
&& (cenv->cpuid_features & (CPUID_MCE | CPUID_MCA)) ==
|
|
|
|
(CPUID_MCE | CPUID_MCA)) {
|
|
|
|
cenv->mcg_cap = MCE_CAP_DEF | MCE_BANKS_DEF;
|
|
|
|
cenv->mcg_ctl = ~(uint64_t)0;
|
|
|
|
for (bank = 0; bank < MCE_BANKS_DEF; bank++) {
|
|
|
|
cenv->mce_banks[bank * 4] = ~(uint64_t)0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-10-13 22:35:39 +02:00
|
|
|
#define MSI_ADDR_BASE 0xfee00000
|
|
|
|
|
|
|
|
#ifndef CONFIG_USER_ONLY
|
|
|
|
static void x86_cpu_apic_init(X86CPU *cpu, Error **errp)
|
|
|
|
{
|
|
|
|
static int apic_mapped;
|
|
|
|
CPUX86State *env = &cpu->env;
|
2012-10-10 12:18:02 +02:00
|
|
|
APICCommonState *apic;
|
2012-10-13 22:35:39 +02:00
|
|
|
const char *apic_type = "apic";
|
|
|
|
|
|
|
|
if (kvm_irqchip_in_kernel()) {
|
|
|
|
apic_type = "kvm-apic";
|
|
|
|
} else if (xen_enabled()) {
|
|
|
|
apic_type = "xen-apic";
|
|
|
|
}
|
|
|
|
|
|
|
|
env->apic_state = qdev_try_create(NULL, apic_type);
|
|
|
|
if (env->apic_state == NULL) {
|
|
|
|
error_setg(errp, "APIC device '%s' could not be created", apic_type);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
object_property_add_child(OBJECT(cpu), "apic",
|
|
|
|
OBJECT(env->apic_state), NULL);
|
|
|
|
qdev_prop_set_uint8(env->apic_state, "id", env->cpuid_apic_id);
|
|
|
|
/* TODO: convert to link<> */
|
2012-10-10 12:18:02 +02:00
|
|
|
apic = APIC_COMMON(env->apic_state);
|
2012-10-10 14:10:07 +02:00
|
|
|
apic->cpu = cpu;
|
2012-10-13 22:35:39 +02:00
|
|
|
|
|
|
|
if (qdev_init(env->apic_state)) {
|
|
|
|
error_setg(errp, "APIC device '%s' could not be initialized",
|
|
|
|
object_get_typename(OBJECT(env->apic_state)));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* XXX: mapping more APICs at the same memory location */
|
|
|
|
if (apic_mapped == 0) {
|
|
|
|
/* NOTE: the APIC is directly connected to the CPU - it is not
|
|
|
|
on the global memory bus. */
|
|
|
|
/* XXX: what if the base changes? */
|
2013-01-20 02:47:33 +01:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(env->apic_state), 0, MSI_ADDR_BASE);
|
2012-10-13 22:35:39 +02:00
|
|
|
apic_mapped = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2013-01-16 03:41:47 +01:00
|
|
|
static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
|
2012-05-09 23:15:32 +02:00
|
|
|
{
|
2013-01-16 03:41:47 +01:00
|
|
|
X86CPU *cpu = X86_CPU(dev);
|
|
|
|
X86CPUClass *xcc = X86_CPU_GET_CLASS(dev);
|
2012-10-22 17:03:00 +02:00
|
|
|
CPUX86State *env = &cpu->env;
|
2013-01-16 03:41:47 +01:00
|
|
|
#ifndef CONFIG_USER_ONLY
|
|
|
|
Error *local_err = NULL;
|
|
|
|
#endif
|
2012-10-22 17:03:00 +02:00
|
|
|
|
|
|
|
if (env->cpuid_7_0_ebx_features && env->cpuid_level < 7) {
|
|
|
|
env->cpuid_level = 7;
|
|
|
|
}
|
2012-05-09 23:15:32 +02:00
|
|
|
|
2012-12-28 21:01:17 +01:00
|
|
|
/* On AMD CPUs, some CPUID[8000_0001].EDX bits must match the bits on
|
|
|
|
* CPUID[1].EDX.
|
|
|
|
*/
|
|
|
|
if (env->cpuid_vendor1 == CPUID_VENDOR_AMD_1 &&
|
|
|
|
env->cpuid_vendor2 == CPUID_VENDOR_AMD_2 &&
|
|
|
|
env->cpuid_vendor3 == CPUID_VENDOR_AMD_3) {
|
|
|
|
env->cpuid_ext2_features &= ~CPUID_EXT2_AMD_ALIASES;
|
|
|
|
env->cpuid_ext2_features |= (env->cpuid_features
|
|
|
|
& CPUID_EXT2_AMD_ALIASES);
|
|
|
|
}
|
|
|
|
|
2012-12-28 21:01:16 +01:00
|
|
|
if (!kvm_enabled()) {
|
|
|
|
env->cpuid_features &= TCG_FEATURES;
|
|
|
|
env->cpuid_ext_features &= TCG_EXT_FEATURES;
|
|
|
|
env->cpuid_ext2_features &= (TCG_EXT2_FEATURES
|
|
|
|
#ifdef TARGET_X86_64
|
|
|
|
| CPUID_EXT2_SYSCALL | CPUID_EXT2_LM
|
|
|
|
#endif
|
|
|
|
);
|
|
|
|
env->cpuid_ext3_features &= TCG_EXT3_FEATURES;
|
|
|
|
env->cpuid_svm_features &= TCG_SVM_FEATURES;
|
|
|
|
} else {
|
|
|
|
#ifdef CONFIG_KVM
|
|
|
|
filter_features_for_kvm(cpu);
|
|
|
|
#endif
|
2013-01-11 03:10:17 +01:00
|
|
|
if (check_cpuid && kvm_check_features_against_host(cpu)
|
|
|
|
&& enforce_cpuid) {
|
|
|
|
error_setg(errp, "Host's CPU doesn't support requested features");
|
|
|
|
return;
|
|
|
|
}
|
2012-12-28 21:01:16 +01:00
|
|
|
}
|
|
|
|
|
2012-07-23 15:22:28 +02:00
|
|
|
#ifndef CONFIG_USER_ONLY
|
|
|
|
qemu_register_reset(x86_cpu_machine_reset_cb, cpu);
|
2012-10-13 22:35:39 +02:00
|
|
|
|
|
|
|
if (cpu->env.cpuid_features & CPUID_APIC || smp_cpus > 1) {
|
2013-01-16 03:41:47 +01:00
|
|
|
x86_cpu_apic_init(cpu, &local_err);
|
|
|
|
if (local_err != NULL) {
|
|
|
|
error_propagate(errp, local_err);
|
2012-10-13 22:35:39 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2012-07-23 15:22:28 +02:00
|
|
|
#endif
|
|
|
|
|
2012-05-09 23:15:32 +02:00
|
|
|
mce_init(cpu);
|
|
|
|
qemu_init_vcpu(&cpu->env);
|
2012-07-23 15:22:28 +02:00
|
|
|
cpu_reset(CPU(cpu));
|
2013-01-16 03:41:47 +01:00
|
|
|
|
|
|
|
xcc->parent_realize(dev, errp);
|
2012-05-09 23:15:32 +02:00
|
|
|
}
|
|
|
|
|
2013-01-22 21:25:09 +01:00
|
|
|
/* Enables contiguous-apic-ID mode, for compatibility */
|
|
|
|
static bool compat_apic_id_mode;
|
|
|
|
|
|
|
|
void enable_compat_apic_id_mode(void)
|
|
|
|
{
|
|
|
|
compat_apic_id_mode = true;
|
|
|
|
}
|
|
|
|
|
2013-01-22 21:25:04 +01:00
|
|
|
/* Calculates initial APIC ID for a specific CPU index
|
|
|
|
*
|
|
|
|
* Currently we need to be able to calculate the APIC ID from the CPU index
|
|
|
|
* alone (without requiring a CPU object), as the QEMU<->Seabios interfaces have
|
|
|
|
* no concept of "CPU index", and the NUMA tables on fw_cfg need the APIC ID of
|
|
|
|
* all CPUs up to max_cpus.
|
|
|
|
*/
|
|
|
|
uint32_t x86_cpu_apic_id_from_index(unsigned int cpu_index)
|
|
|
|
{
|
2013-01-22 21:25:09 +01:00
|
|
|
uint32_t correct_id;
|
|
|
|
static bool warned;
|
|
|
|
|
|
|
|
correct_id = x86_apicid_from_cpu_idx(smp_cores, smp_threads, cpu_index);
|
|
|
|
if (compat_apic_id_mode) {
|
|
|
|
if (cpu_index != correct_id && !warned) {
|
|
|
|
error_report("APIC IDs set in compatibility mode, "
|
|
|
|
"CPU topology won't match the configuration");
|
|
|
|
warned = true;
|
|
|
|
}
|
|
|
|
return cpu_index;
|
|
|
|
} else {
|
|
|
|
return correct_id;
|
|
|
|
}
|
2013-01-22 21:25:04 +01:00
|
|
|
}
|
|
|
|
|
2012-04-03 00:00:17 +02:00
|
|
|
static void x86_cpu_initfn(Object *obj)
|
|
|
|
{
|
2012-12-17 06:18:02 +01:00
|
|
|
CPUState *cs = CPU(obj);
|
2012-04-03 00:00:17 +02:00
|
|
|
X86CPU *cpu = X86_CPU(obj);
|
|
|
|
CPUX86State *env = &cpu->env;
|
2012-06-19 15:39:46 +02:00
|
|
|
static int inited;
|
2012-04-03 00:00:17 +02:00
|
|
|
|
2013-01-17 12:13:41 +01:00
|
|
|
cs->env_ptr = env;
|
2012-04-03 00:00:17 +02:00
|
|
|
cpu_exec_init(env);
|
2012-04-17 12:10:29 +02:00
|
|
|
|
|
|
|
object_property_add(obj, "family", "int",
|
2012-04-17 14:42:22 +02:00
|
|
|
x86_cpuid_version_get_family,
|
2012-04-17 12:10:29 +02:00
|
|
|
x86_cpuid_version_set_family, NULL, NULL, NULL);
|
2012-04-17 12:16:39 +02:00
|
|
|
object_property_add(obj, "model", "int",
|
2012-04-17 14:48:14 +02:00
|
|
|
x86_cpuid_version_get_model,
|
2012-04-17 12:16:39 +02:00
|
|
|
x86_cpuid_version_set_model, NULL, NULL, NULL);
|
2012-04-17 14:14:18 +02:00
|
|
|
object_property_add(obj, "stepping", "int",
|
2012-04-17 14:50:53 +02:00
|
|
|
x86_cpuid_version_get_stepping,
|
2012-04-17 14:14:18 +02:00
|
|
|
x86_cpuid_version_set_stepping, NULL, NULL, NULL);
|
2012-04-17 18:41:40 +02:00
|
|
|
object_property_add(obj, "level", "int",
|
|
|
|
x86_cpuid_get_level,
|
|
|
|
x86_cpuid_set_level, NULL, NULL, NULL);
|
2012-04-17 18:44:07 +02:00
|
|
|
object_property_add(obj, "xlevel", "int",
|
|
|
|
x86_cpuid_get_xlevel,
|
|
|
|
x86_cpuid_set_xlevel, NULL, NULL, NULL);
|
2012-04-17 19:22:58 +02:00
|
|
|
object_property_add_str(obj, "vendor",
|
|
|
|
x86_cpuid_get_vendor,
|
|
|
|
x86_cpuid_set_vendor, NULL);
|
2012-04-17 15:17:27 +02:00
|
|
|
object_property_add_str(obj, "model-id",
|
2012-04-17 23:02:26 +02:00
|
|
|
x86_cpuid_get_model_id,
|
2012-04-17 15:17:27 +02:00
|
|
|
x86_cpuid_set_model_id, NULL);
|
2012-04-18 00:12:23 +02:00
|
|
|
object_property_add(obj, "tsc-frequency", "int",
|
|
|
|
x86_cpuid_get_tsc_freq,
|
|
|
|
x86_cpuid_set_tsc_freq, NULL, NULL, NULL);
|
2012-04-17 12:10:29 +02:00
|
|
|
|
2013-01-22 21:25:04 +01:00
|
|
|
env->cpuid_apic_id = x86_cpu_apic_id_from_index(cs->cpu_index);
|
2012-06-19 15:39:46 +02:00
|
|
|
|
|
|
|
/* init various static tables used in TCG mode */
|
|
|
|
if (tcg_enabled() && !inited) {
|
|
|
|
inited = 1;
|
|
|
|
optimize_flags_init();
|
|
|
|
#ifndef CONFIG_USER_ONLY
|
|
|
|
cpu_set_debug_excp_handler(breakpoint_handler);
|
|
|
|
#endif
|
|
|
|
}
|
2012-04-03 00:00:17 +02:00
|
|
|
}
|
|
|
|
|
2012-04-02 23:20:08 +02:00
|
|
|
static void x86_cpu_common_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
X86CPUClass *xcc = X86_CPU_CLASS(oc);
|
|
|
|
CPUClass *cc = CPU_CLASS(oc);
|
2013-01-16 03:41:47 +01:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
|
|
|
|
|
|
xcc->parent_realize = dc->realize;
|
|
|
|
dc->realize = x86_cpu_realizefn;
|
2012-04-02 23:20:08 +02:00
|
|
|
|
|
|
|
xcc->parent_reset = cc->reset;
|
|
|
|
cc->reset = x86_cpu_reset;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const TypeInfo x86_cpu_type_info = {
|
|
|
|
.name = TYPE_X86_CPU,
|
|
|
|
.parent = TYPE_CPU,
|
|
|
|
.instance_size = sizeof(X86CPU),
|
2012-04-03 00:00:17 +02:00
|
|
|
.instance_init = x86_cpu_initfn,
|
2012-04-02 23:20:08 +02:00
|
|
|
.abstract = false,
|
|
|
|
.class_size = sizeof(X86CPUClass),
|
|
|
|
.class_init = x86_cpu_common_class_init,
|
|
|
|
};
|
|
|
|
|
|
|
|
static void x86_cpu_register_types(void)
|
|
|
|
{
|
|
|
|
type_register_static(&x86_cpu_type_info);
|
|
|
|
}
|
|
|
|
|
|
|
|
type_init(x86_cpu_register_types)
|