These ancient RHEL-only CPU models should not really be used by any CPU definition created by libvirt. We keep them just for backwards compatibility with domains which might still be using them. Signed-off-by: Jiri Denemark <jdenemar@redhat.com> --- src/cpu_map/x86_cpu64-rhel5.xml | 2 +- src/cpu_map/x86_cpu64-rhel6.xml | 2 +- tests/cputestdata/x86_64-baseline-no-vendor-result.xml | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/cpu_map/x86_cpu64-rhel5.xml b/src/cpu_map/x86_cpu64-rhel5.xml index be6bcdb7a6..7402b7603c 100644 --- a/src/cpu_map/x86_cpu64-rhel5.xml +++ b/src/cpu_map/x86_cpu64-rhel5.xml @@ -1,6 +1,6 @@ <cpus> <model name='cpu64-rhel5'> - <decode host='on' guest='on'/> + <decode host='off' guest='off'/> <feature name='apic'/> <feature name='clflush'/> <feature name='cmov'/> diff --git a/src/cpu_map/x86_cpu64-rhel6.xml b/src/cpu_map/x86_cpu64-rhel6.xml index c62b1b5575..061939c733 100644 --- a/src/cpu_map/x86_cpu64-rhel6.xml +++ b/src/cpu_map/x86_cpu64-rhel6.xml @@ -1,6 +1,6 @@ <cpus> <model name='cpu64-rhel6'> - <decode host='on' guest='on'/> + <decode host='off' guest='off'/> <feature name='apic'/> <feature name='clflush'/> <feature name='cmov'/> diff --git a/tests/cputestdata/x86_64-baseline-no-vendor-result.xml b/tests/cputestdata/x86_64-baseline-no-vendor-result.xml index 00e03b2152..4b4921cf93 100644 --- a/tests/cputestdata/x86_64-baseline-no-vendor-result.xml +++ b/tests/cputestdata/x86_64-baseline-no-vendor-result.xml @@ -1,3 +1,4 @@ <cpu mode='custom' match='exact'> - <model fallback='allow'>cpu64-rhel6</model> + <model fallback='allow'>kvm64</model> + <feature policy='require' name='lahf_lm'/> </cpu> -- 2.35.1

Signed-off-by: Jiri Denemark <jdenemar@redhat.com> --- tests/cputest.c | 12 ++++++------ ... x86_64-baseline-Westmere+Nehalem-migratable.xml} | 0 ...l => x86_64-baseline-Westmere+Nehalem-result.xml} | 0 ...ne-6.xml => x86_64-baseline-Westmere+Nehalem.xml} | 0 ...ded.xml => x86_64-baseline-features-expanded.xml} | 0 ...esult.xml => x86_64-baseline-features-result.xml} | 0 ...4-baseline-4.xml => x86_64-baseline-features.xml} | 0 ...anded.xml => x86_64-baseline-simple-expanded.xml} | 0 ...-result.xml => x86_64-baseline-simple-result.xml} | 0 ..._64-baseline-3.xml => x86_64-baseline-simple.xml} | 0 10 files changed, 6 insertions(+), 6 deletions(-) rename tests/cputestdata/{x86_64-baseline-6-migratable.xml => x86_64-baseline-Westmere+Nehalem-migratable.xml} (100%) rename tests/cputestdata/{x86_64-baseline-6-result.xml => x86_64-baseline-Westmere+Nehalem-result.xml} (100%) rename tests/cputestdata/{x86_64-baseline-6.xml => x86_64-baseline-Westmere+Nehalem.xml} (100%) rename tests/cputestdata/{x86_64-baseline-4-expanded.xml => x86_64-baseline-features-expanded.xml} (100%) rename tests/cputestdata/{x86_64-baseline-4-result.xml => x86_64-baseline-features-result.xml} (100%) rename tests/cputestdata/{x86_64-baseline-4.xml => x86_64-baseline-features.xml} (100%) rename tests/cputestdata/{x86_64-baseline-3-expanded.xml => x86_64-baseline-simple-expanded.xml} (100%) rename tests/cputestdata/{x86_64-baseline-3-result.xml => x86_64-baseline-simple-result.xml} (100%) rename tests/cputestdata/{x86_64-baseline-3.xml => x86_64-baseline-simple.xml} (100%) diff --git a/tests/cputest.c b/tests/cputest.c index 697b20ada3..305002bdbc 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -1050,12 +1050,12 @@ mymain(void) DO_TEST_BASELINE(VIR_ARCH_X86_64, "incompatible-vendors", 0, -1); DO_TEST_BASELINE(VIR_ARCH_X86_64, "no-vendor", 0, 0); DO_TEST_BASELINE(VIR_ARCH_X86_64, "some-vendors", 0, 0); - DO_TEST_BASELINE(VIR_ARCH_X86_64, "3", 0, 0); - DO_TEST_BASELINE(VIR_ARCH_X86_64, "3", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0); - DO_TEST_BASELINE(VIR_ARCH_X86_64, "4", 0, 0); - DO_TEST_BASELINE(VIR_ARCH_X86_64, "4", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0); - DO_TEST_BASELINE(VIR_ARCH_X86_64, "6", 0, 0); - DO_TEST_BASELINE(VIR_ARCH_X86_64, "6", VIR_CONNECT_BASELINE_CPU_MIGRATABLE, 0); + DO_TEST_BASELINE(VIR_ARCH_X86_64, "simple", 0, 0); + DO_TEST_BASELINE(VIR_ARCH_X86_64, "simple", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0); + DO_TEST_BASELINE(VIR_ARCH_X86_64, "features", 0, 0); + DO_TEST_BASELINE(VIR_ARCH_X86_64, "features", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0); + DO_TEST_BASELINE(VIR_ARCH_X86_64, "Westmere+Nehalem", 0, 0); + DO_TEST_BASELINE(VIR_ARCH_X86_64, "Westmere+Nehalem", VIR_CONNECT_BASELINE_CPU_MIGRATABLE, 0); DO_TEST_BASELINE(VIR_ARCH_PPC64, "incompatible-vendors", 0, -1); DO_TEST_BASELINE(VIR_ARCH_PPC64, "no-vendor", 0, 0); diff --git a/tests/cputestdata/x86_64-baseline-6-migratable.xml b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml similarity index 100% rename from tests/cputestdata/x86_64-baseline-6-migratable.xml rename to tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml diff --git a/tests/cputestdata/x86_64-baseline-6-result.xml b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml similarity index 100% rename from tests/cputestdata/x86_64-baseline-6-result.xml rename to tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml diff --git a/tests/cputestdata/x86_64-baseline-6.xml b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem.xml similarity index 100% rename from tests/cputestdata/x86_64-baseline-6.xml rename to tests/cputestdata/x86_64-baseline-Westmere+Nehalem.xml diff --git a/tests/cputestdata/x86_64-baseline-4-expanded.xml b/tests/cputestdata/x86_64-baseline-features-expanded.xml similarity index 100% rename from tests/cputestdata/x86_64-baseline-4-expanded.xml rename to tests/cputestdata/x86_64-baseline-features-expanded.xml diff --git a/tests/cputestdata/x86_64-baseline-4-result.xml b/tests/cputestdata/x86_64-baseline-features-result.xml similarity index 100% rename from tests/cputestdata/x86_64-baseline-4-result.xml rename to tests/cputestdata/x86_64-baseline-features-result.xml diff --git a/tests/cputestdata/x86_64-baseline-4.xml b/tests/cputestdata/x86_64-baseline-features.xml similarity index 100% rename from tests/cputestdata/x86_64-baseline-4.xml rename to tests/cputestdata/x86_64-baseline-features.xml diff --git a/tests/cputestdata/x86_64-baseline-3-expanded.xml b/tests/cputestdata/x86_64-baseline-simple-expanded.xml similarity index 100% rename from tests/cputestdata/x86_64-baseline-3-expanded.xml rename to tests/cputestdata/x86_64-baseline-simple-expanded.xml diff --git a/tests/cputestdata/x86_64-baseline-3-result.xml b/tests/cputestdata/x86_64-baseline-simple-result.xml similarity index 100% rename from tests/cputestdata/x86_64-baseline-3-result.xml rename to tests/cputestdata/x86_64-baseline-simple-result.xml diff --git a/tests/cputestdata/x86_64-baseline-3.xml b/tests/cputestdata/x86_64-baseline-simple.xml similarity index 100% rename from tests/cputestdata/x86_64-baseline-3.xml rename to tests/cputestdata/x86_64-baseline-simple.xml -- 2.35.1

Checking the signature in two different places makes no sense since the code in between can only mark the candidate as the best option so far, which is what the second signature match does as well. Signed-off-by: Jiri Denemark <jdenemar@redhat.com> --- src/cpu/cpu_x86.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index a5eac7601c..80019ebd70 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2006,15 +2006,22 @@ x86DecodeUseCandidate(virCPUx86Model *current, } /* Ideally we want to select a model with family/model equal to - * family/model of the real CPU. Once we found such model, we only + * family/model of the real CPU and once we found such model, we only * consider candidates with matching family/model. */ - if (signature && - virCPUx86SignaturesMatch(current->signatures, signature) && - !virCPUx86SignaturesMatch(candidate->signatures, signature)) { - VIR_DEBUG("%s differs in signature from matching %s", - cpuCandidate->model, cpuCurrent->model); - return 0; + if (signature) { + if (virCPUx86SignaturesMatch(current->signatures, signature) && + !virCPUx86SignaturesMatch(candidate->signatures, signature)) { + VIR_DEBUG("%s differs in signature from matching %s", + cpuCandidate->model, cpuCurrent->model); + return 0; + } + + if (!virCPUx86SignaturesMatch(current->signatures, signature) && + virCPUx86SignaturesMatch(candidate->signatures, signature)) { + VIR_DEBUG("%s provides matching signature", cpuCandidate->model); + return 1; + } } if (cpuCurrent->nfeatures > cpuCandidate->nfeatures) { @@ -2023,16 +2030,6 @@ x86DecodeUseCandidate(virCPUx86Model *current, return 1; } - /* Prefer a candidate with matching signature even though it would - * result in longer list of features. - */ - if (signature && - virCPUx86SignaturesMatch(candidate->signatures, signature) && - !virCPUx86SignaturesMatch(current->signatures, signature)) { - VIR_DEBUG("%s provides matching signature", cpuCandidate->model); - return 1; - } - VIR_DEBUG("%s does not result in shorter feature list than %s", cpuCandidate->model, cpuCurrent->model); return 0; -- 2.35.1

For finding the best matching CPU model for a given set of features while we don't know the CPU signature (i.e., when computing a baseline CPU model) we've been using a "shortest list of features" heuristics. This works well if new CPU models are supersets of older models, but that's not always the case. As a result it may actually select a new CPU model as a baseline while removing some features from it to make it compatible with older models. This is in general worse than using an old CPU model with a bunch of added features as a guest OS or apps may crash when using features that were disabled. On the other hand we don't want to end up with a very old model which would guarantee no disabled features as it could stop a guest OS or apps from using some features provided by the CPU because they would not expect them on such an old CPU. This patch changes the heuristics to something in between. Enabled and disabled features are counted separately so that a CPU model requiring some features to be disabled looks worse than a model with fewer disabled features even if its complete list of features is longer. The penalty given for each additional disabled feature gets bigger to make longer list of disabled features look even worse. https://bugzilla.redhat.com/show_bug.cgi?id=1851227 Signed-off-by: Jiri Denemark <jdenemar@redhat.com> --- src/cpu/cpu_x86.c | 44 ++++++++++++++++--- .../x86_64-cpuid-Atom-D510-guest.xml | 5 ++- .../x86_64-cpuid-Atom-N450-guest.xml | 5 ++- .../x86_64-cpuid-Phenom-B95-json.xml | 21 +++++---- ...id-baseline-Broadwell-IBRS+Cascadelake.xml | 11 +++-- ..._64-cpuid-baseline-Cascadelake+Icelake.xml | 13 +++--- ...puid-baseline-Cascadelake+Skylake-IBRS.xml | 5 ++- ...6_64-cpuid-baseline-Cooperlake+Icelake.xml | 13 +++--- .../x86_64-host+guest,models-result.xml | 10 +++-- .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 35 +++++++++------ .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 36 ++++++++------- .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 37 +++++++++------- .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 37 +++++++++------- .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 36 +++++++++------ .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 36 +++++++++------ .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 36 +++++++++------ .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 36 +++++++++------ .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 36 +++++++++------ .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 36 +++++++++------ .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 36 +++++++++------ tests/qemuxml2argvdata/cpu-fallback.args | 2 +- .../cpu-host-model-cmt.x86_64-4.0.0.args | 2 +- .../cpu-host-model-fallback.args | 2 +- 23 files changed, 330 insertions(+), 200 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index fdee107ce9..3001fc2b8f 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1956,23 +1956,57 @@ virCPUx86Compare(virCPUDef *host, } +/* Base penalty for disabled features. */ +#define BASE_PENALTY 2 + static int virCPUx86CompareCandidateFeatureList(virCPUDef *cpuCurrent, virCPUDef *cpuCandidate) { size_t current = cpuCurrent->nfeatures; + size_t enabledCurrent = current; + size_t disabledCurrent = 0; size_t candidate = cpuCandidate->nfeatures; + size_t enabled = candidate; + size_t disabled = 0; + + if (cpuCandidate->type != VIR_CPU_TYPE_HOST) { + size_t i; + int penalty = BASE_PENALTY; + + for (i = 0; i < enabledCurrent; i++) { + if (cpuCurrent->features[i].policy == VIR_CPU_FEATURE_DISABLE) { + enabledCurrent--; + disabledCurrent += penalty; + penalty++; + } + } + current = enabledCurrent + disabledCurrent; + + penalty = BASE_PENALTY; + for (i = 0; i < enabled; i++) { + if (cpuCandidate->features[i].policy == VIR_CPU_FEATURE_DISABLE) { + enabled--; + disabled += penalty; + penalty++; + } + } + candidate = enabled + disabled; + } - if (candidate < current) { - VIR_DEBUG("%s is better than %s: %zu < %zu", + if (candidate < current || + (candidate == current && disabled < disabledCurrent)) { + VIR_DEBUG("%s is better than %s: %zu (%zu, %zu) < %zu (%zu, %zu)", cpuCandidate->model, cpuCurrent->model, - candidate, current); + candidate, enabled, disabled, + current, enabledCurrent, disabledCurrent); return 1; } - VIR_DEBUG("%s is not better than %s: %zu >= %zu", + VIR_DEBUG("%s is not better than %s: %zu (%zu, %zu) >= %zu (%zu, %zu)", cpuCandidate->model, cpuCurrent->model, - candidate, current); + candidate, enabled, disabled, + current, enabledCurrent, disabledCurrent); return 0; } diff --git a/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml b/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml index caa0bfd53b..d2f7a79074 100644 --- a/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml @@ -1,6 +1,7 @@ <cpu mode='custom' match='exact'> - <model fallback='forbid'>core2duo</model> + <model fallback='forbid'>n270</model> <vendor>Intel</vendor> + <feature policy='require' name='pse36'/> <feature policy='require' name='ds'/> <feature policy='require' name='acpi'/> <feature policy='require' name='ss'/> @@ -14,6 +15,6 @@ <feature policy='require' name='xtpr'/> <feature policy='require' name='pdcm'/> <feature policy='require' name='movbe'/> + <feature policy='require' name='lm'/> <feature policy='require' name='lahf_lm'/> - <feature policy='disable' name='syscall'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml b/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml index e8f5c93881..779faf6cef 100644 --- a/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml @@ -1,5 +1,5 @@ <cpu mode='custom' match='exact'> - <model fallback='forbid'>core2duo</model> + <model fallback='forbid'>n270</model> <vendor>Intel</vendor> <feature policy='require' name='ds'/> <feature policy='require' name='acpi'/> @@ -15,6 +15,7 @@ <feature policy='require' name='xtpr'/> <feature policy='require' name='pdcm'/> <feature policy='require' name='movbe'/> + <feature policy='require' name='syscall'/> + <feature policy='require' name='lm'/> <feature policy='require' name='lahf_lm'/> - <feature policy='disable' name='pse36'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml index b4198f66a5..7f6289c6d7 100644 --- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml @@ -1,22 +1,25 @@ <cpu mode='custom' match='exact'> - <model fallback='forbid'>Opteron_G3</model> + <model fallback='forbid'>athlon</model> <vendor>AMD</vendor> - <feature policy='require' name='vme'/> + <feature policy='require' name='mca'/> + <feature policy='require' name='clflush'/> + <feature policy='require' name='pni'/> + <feature policy='require' name='cx16'/> <feature policy='require' name='x2apic'/> + <feature policy='require' name='popcnt'/> <feature policy='require' name='hypervisor'/> - <feature policy='require' name='mmxext'/> + <feature policy='require' name='syscall'/> <feature policy='require' name='fxsr_opt'/> <feature policy='require' name='pdpe1gb'/> - <feature policy='require' name='3dnowext'/> - <feature policy='require' name='3dnow'/> + <feature policy='require' name='lm'/> + <feature policy='require' name='lahf_lm'/> <feature policy='require' name='cmp_legacy'/> <feature policy='require' name='cr8legacy'/> + <feature policy='require' name='abm'/> + <feature policy='require' name='sse4a'/> + <feature policy='require' name='misalignsse'/> <feature policy='require' name='3dnowprefetch'/> <feature policy='require' name='osvw'/> <feature policy='require' name='npt'/> <feature policy='require' name='nrip-save'/> - <feature policy='disable' name='nx'/> - <feature policy='disable' name='rdtscp'/> - <feature policy='disable' name='svm'/> - <feature policy='disable' name='monitor'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadelake.xml index 4e3f253e9b..99bce8db87 100644 --- a/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadelake.xml +++ b/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadelake.xml @@ -1,11 +1,14 @@ <cpu mode='custom' match='exact'> - <model fallback='allow'>Skylake-Client-IBRS</model> + <model fallback='allow'>Broadwell-IBRS</model> <vendor>Intel</vendor> + <feature policy='require' name='vme'/> <feature policy='require' name='ss'/> + <feature policy='require' name='f16c'/> + <feature policy='require' name='rdrand'/> <feature policy='require' name='hypervisor'/> + <feature policy='require' name='arat'/> <feature policy='require' name='tsc_adjust'/> + <feature policy='require' name='xsaveopt'/> <feature policy='require' name='pdpe1gb'/> - <feature policy='disable' name='mpx'/> - <feature policy='disable' name='xsavec'/> - <feature policy='disable' name='xgetbv1'/> + <feature policy='require' name='abm'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml index e372a3e446..071c799ba2 100644 --- a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml +++ b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml @@ -1,14 +1,15 @@ <cpu mode='custom' match='exact'> - <model fallback='allow'>Cooperlake</model> + <model fallback='allow'>Cascadelake-Server</model> <vendor>Intel</vendor> <feature policy='require' name='ss'/> <feature policy='require' name='hypervisor'/> <feature policy='require' name='tsc_adjust'/> - <feature policy='require' name='mpx'/> <feature policy='require' name='umip'/> + <feature policy='require' name='pku'/> + <feature policy='require' name='stibp'/> + <feature policy='require' name='arch-capabilities'/> <feature policy='require' name='xsaves'/> - <feature policy='disable' name='avx512-bf16'/> - <feature policy='disable' name='mds-no'/> - <feature policy='disable' name='pschange-mc-no'/> - <feature policy='disable' name='taa-no'/> + <feature policy='require' name='rdctl-no'/> + <feature policy='require' name='ibrs-all'/> + <feature policy='require' name='skip-l1dfl-vmentry'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml index e559e01583..5e42876b39 100644 --- a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml +++ b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml @@ -1,12 +1,13 @@ <cpu mode='custom' match='exact'> - <model fallback='allow'>Cascadelake-Server</model> + <model fallback='allow'>Skylake-Server-IBRS</model> <vendor>Intel</vendor> <feature policy='require' name='ss'/> <feature policy='require' name='hypervisor'/> <feature policy='require' name='tsc_adjust'/> + <feature policy='require' name='clflushopt'/> <feature policy='require' name='umip'/> <feature policy='require' name='pku'/> + <feature policy='require' name='ssbd'/> <feature policy='require' name='xsaves'/> <feature policy='require' name='skip-l1dfl-vmentry'/> - <feature policy='disable' name='avx512vnni'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml index e372a3e446..071c799ba2 100644 --- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml +++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml @@ -1,14 +1,15 @@ <cpu mode='custom' match='exact'> - <model fallback='allow'>Cooperlake</model> + <model fallback='allow'>Cascadelake-Server</model> <vendor>Intel</vendor> <feature policy='require' name='ss'/> <feature policy='require' name='hypervisor'/> <feature policy='require' name='tsc_adjust'/> - <feature policy='require' name='mpx'/> <feature policy='require' name='umip'/> + <feature policy='require' name='pku'/> + <feature policy='require' name='stibp'/> + <feature policy='require' name='arch-capabilities'/> <feature policy='require' name='xsaves'/> - <feature policy='disable' name='avx512-bf16'/> - <feature policy='disable' name='mds-no'/> - <feature policy='disable' name='pschange-mc-no'/> - <feature policy='disable' name='taa-no'/> + <feature policy='require' name='rdctl-no'/> + <feature policy='require' name='ibrs-all'/> + <feature policy='require' name='skip-l1dfl-vmentry'/> </cpu> diff --git a/tests/cputestdata/x86_64-host+guest,models-result.xml b/tests/cputestdata/x86_64-host+guest,models-result.xml index 0dd6955898..42664a48b4 100644 --- a/tests/cputestdata/x86_64-host+guest,models-result.xml +++ b/tests/cputestdata/x86_64-host+guest,models-result.xml @@ -1,17 +1,19 @@ <cpu mode='custom' match='exact'> - <model fallback='allow'>Nehalem</model> + <model fallback='allow'>qemu64</model> <topology sockets='2' dies='1' cores='4' threads='1'/> <feature policy='force' name='pbe'/> <feature policy='force' name='monitor'/> + <feature policy='require' name='ssse3'/> <feature policy='require' name='xtpr'/> <feature policy='require' name='dca'/> + <feature policy='require' name='sse4.1'/> <feature policy='force' name='3dnowext'/> - <feature policy='force' name='svm'/> + <feature policy='require' name='lahf_lm'/> <feature policy='disable' name='sse'/> <feature policy='disable' name='sse4.2'/> - <feature policy='forbid' name='popcnt'/> <feature policy='disable' name='3dnow'/> - <feature policy='require' name='ssse3'/> <feature policy='disable' name='vmx'/> <feature policy='disable' name='ds_cpl'/> + <feature policy='force' name='svm'/> + <feature policy='forbid' name='popcnt'/> </cpu> diff --git a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml index 1a5bc25b99..2a65cb0ad9 100644 --- a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml @@ -36,35 +36,42 @@ </enum> </mode> <mode name='host-model' supported='yes'> - <model fallback='forbid'>EPYC</model> + <model fallback='forbid'>Opteron_G3</model> <vendor>AMD</vendor> <feature policy='require' name='acpi'/> <feature policy='require' name='ss'/> + <feature policy='require' name='pclmuldq'/> <feature policy='require' name='monitor'/> + <feature policy='require' name='ssse3'/> + <feature policy='require' name='sse4.1'/> + <feature policy='require' name='sse4.2'/> + <feature policy='require' name='movbe'/> + <feature policy='require' name='aes'/> + <feature policy='require' name='xsave'/> <feature policy='require' name='hypervisor'/> + <feature policy='require' name='arat'/> + <feature policy='require' name='fsgsbase'/> + <feature policy='require' name='bmi1'/> + <feature policy='require' name='smep'/> + <feature policy='require' name='bmi2'/> <feature policy='require' name='erms'/> <feature policy='require' name='mpx'/> + <feature policy='require' name='adx'/> + <feature policy='require' name='smap'/> <feature policy='require' name='pcommit'/> + <feature policy='require' name='clflushopt'/> <feature policy='require' name='clwb'/> <feature policy='require' name='pku'/> <feature policy='require' name='la57'/> + <feature policy='require' name='xsaveopt'/> + <feature policy='require' name='xgetbv1'/> + <feature policy='require' name='mmxext'/> + <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='3dnowext'/> <feature policy='require' name='3dnow'/> + <feature policy='require' name='cr8legacy'/> <feature policy='require' name='npt'/> - <feature policy='disable' name='vme'/> - <feature policy='disable' name='fma'/> - <feature policy='disable' name='avx'/> - <feature policy='disable' name='f16c'/> - <feature policy='disable' name='rdrand'/> - <feature policy='disable' name='avx2'/> - <feature policy='disable' name='rdseed'/> - <feature policy='disable' name='sha-ni'/> - <feature policy='disable' name='xsavec'/> - <feature policy='disable' name='fxsr_opt'/> <feature policy='disable' name='misalignsse'/> - <feature policy='disable' name='3dnowprefetch'/> - <feature policy='disable' name='osvw'/> - <feature policy='disable' name='topoext'/> </mode> <mode name='custom' supported='yes'> <model usable='yes'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml index e744ac27ac..a4dc7bafc9 100644 --- a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml @@ -36,36 +36,42 @@ </enum> </mode> <mode name='host-model' supported='yes'> - <model fallback='forbid'>EPYC</model> + <model fallback='forbid'>Opteron_G3</model> <vendor>AMD</vendor> <feature policy='require' name='acpi'/> <feature policy='require' name='ss'/> + <feature policy='require' name='pclmuldq'/> <feature policy='require' name='monitor'/> + <feature policy='require' name='ssse3'/> + <feature policy='require' name='sse4.1'/> + <feature policy='require' name='sse4.2'/> + <feature policy='require' name='movbe'/> + <feature policy='require' name='aes'/> + <feature policy='require' name='xsave'/> <feature policy='require' name='hypervisor'/> + <feature policy='require' name='arat'/> + <feature policy='require' name='fsgsbase'/> + <feature policy='require' name='bmi1'/> + <feature policy='require' name='smep'/> + <feature policy='require' name='bmi2'/> <feature policy='require' name='erms'/> <feature policy='require' name='mpx'/> + <feature policy='require' name='adx'/> + <feature policy='require' name='smap'/> <feature policy='require' name='pcommit'/> + <feature policy='require' name='clflushopt'/> <feature policy='require' name='clwb'/> <feature policy='require' name='pku'/> <feature policy='require' name='la57'/> + <feature policy='require' name='xsaveopt'/> + <feature policy='require' name='xgetbv1'/> + <feature policy='require' name='mmxext'/> + <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='3dnowext'/> <feature policy='require' name='3dnow'/> + <feature policy='require' name='cr8legacy'/> <feature policy='require' name='npt'/> - <feature policy='disable' name='vme'/> - <feature policy='disable' name='fma'/> - <feature policy='disable' name='avx'/> - <feature policy='disable' name='f16c'/> - <feature policy='disable' name='rdrand'/> - <feature policy='disable' name='avx2'/> - <feature policy='disable' name='rdseed'/> - <feature policy='disable' name='sha-ni'/> - <feature policy='disable' name='xsavec'/> - <feature policy='disable' name='fxsr_opt'/> <feature policy='disable' name='misalignsse'/> - <feature policy='disable' name='3dnowprefetch'/> - <feature policy='disable' name='osvw'/> - <feature policy='disable' name='topoext'/> - <feature policy='disable' name='nrip-save'/> </mode> <mode name='custom' supported='yes'> <model usable='yes'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml index 80b1ce8ef9..b20c02cb68 100644 --- a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml @@ -36,36 +36,43 @@ </enum> </mode> <mode name='host-model' supported='yes'> - <model fallback='forbid'>EPYC-IBPB</model> + <model fallback='forbid'>Opteron_G3</model> <vendor>AMD</vendor> <feature policy='require' name='acpi'/> <feature policy='require' name='ss'/> + <feature policy='require' name='pclmuldq'/> <feature policy='require' name='monitor'/> + <feature policy='require' name='ssse3'/> + <feature policy='require' name='sse4.1'/> + <feature policy='require' name='sse4.2'/> + <feature policy='require' name='movbe'/> + <feature policy='require' name='aes'/> + <feature policy='require' name='xsave'/> + <feature policy='require' name='rdrand'/> <feature policy='require' name='hypervisor'/> + <feature policy='require' name='arat'/> + <feature policy='require' name='fsgsbase'/> + <feature policy='require' name='bmi1'/> + <feature policy='require' name='smep'/> + <feature policy='require' name='bmi2'/> <feature policy='require' name='erms'/> <feature policy='require' name='mpx'/> + <feature policy='require' name='adx'/> + <feature policy='require' name='smap'/> <feature policy='require' name='pcommit'/> + <feature policy='require' name='clflushopt'/> <feature policy='require' name='clwb'/> <feature policy='require' name='pku'/> <feature policy='require' name='la57'/> + <feature policy='require' name='xsaveopt'/> + <feature policy='require' name='xgetbv1'/> + <feature policy='require' name='mmxext'/> + <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='3dnowext'/> <feature policy='require' name='3dnow'/> + <feature policy='require' name='cr8legacy'/> <feature policy='require' name='npt'/> - <feature policy='disable' name='vme'/> - <feature policy='disable' name='fma'/> - <feature policy='disable' name='avx'/> - <feature policy='disable' name='f16c'/> - <feature policy='disable' name='avx2'/> - <feature policy='disable' name='rdseed'/> - <feature policy='disable' name='sha-ni'/> - <feature policy='disable' name='xsavec'/> - <feature policy='disable' name='fxsr_opt'/> <feature policy='disable' name='misalignsse'/> - <feature policy='disable' name='3dnowprefetch'/> - <feature policy='disable' name='osvw'/> - <feature policy='disable' name='topoext'/> - <feature policy='disable' name='ibpb'/> - <feature policy='disable' name='nrip-save'/> </mode> <mode name='custom' supported='yes'> <model usable='yes'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml index 91b3ed6f80..d0ee3f7b7a 100644 --- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml @@ -36,36 +36,43 @@ </enum> </mode> <mode name='host-model' supported='yes'> - <model fallback='forbid'>EPYC-IBPB</model> + <model fallback='forbid'>Opteron_G3</model> <vendor>AMD</vendor> <feature policy='require' name='acpi'/> <feature policy='require' name='ss'/> + <feature policy='require' name='pclmuldq'/> <feature policy='require' name='monitor'/> + <feature policy='require' name='ssse3'/> + <feature policy='require' name='sse4.1'/> + <feature policy='require' name='sse4.2'/> + <feature policy='require' name='movbe'/> + <feature policy='require' name='aes'/> + <feature policy='require' name='xsave'/> + <feature policy='require' name='rdrand'/> <feature policy='require' name='hypervisor'/> + <feature policy='require' name='arat'/> + <feature policy='require' name='fsgsbase'/> + <feature policy='require' name='bmi1'/> + <feature policy='require' name='smep'/> + <feature policy='require' name='bmi2'/> <feature policy='require' name='erms'/> <feature policy='require' name='mpx'/> + <feature policy='require' name='adx'/> + <feature policy='require' name='smap'/> <feature policy='require' name='pcommit'/> + <feature policy='require' name='clflushopt'/> <feature policy='require' name='clwb'/> <feature policy='require' name='pku'/> <feature policy='require' name='la57'/> + <feature policy='require' name='xsaveopt'/> + <feature policy='require' name='xgetbv1'/> + <feature policy='require' name='mmxext'/> + <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='3dnowext'/> <feature policy='require' name='3dnow'/> + <feature policy='require' name='cr8legacy'/> <feature policy='require' name='npt'/> - <feature policy='disable' name='vme'/> - <feature policy='disable' name='fma'/> - <feature policy='disable' name='avx'/> - <feature policy='disable' name='f16c'/> - <feature policy='disable' name='avx2'/> - <feature policy='disable' name='rdseed'/> - <feature policy='disable' name='sha-ni'/> - <feature policy='disable' name='xsavec'/> - <feature policy='disable' name='fxsr_opt'/> <feature policy='disable' name='misalignsse'/> - <feature policy='disable' name='3dnowprefetch'/> - <feature policy='disable' name='osvw'/> - <feature policy='disable' name='topoext'/> - <feature policy='disable' name='ibpb'/> - <feature policy='disable' name='nrip-save'/> </mode> <mode name='custom' supported='yes'> <model usable='yes'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml index b8737613e9..d277c96426 100644 --- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml @@ -36,35 +36,43 @@ </enum> </mode> <mode name='host-model' supported='yes'> - <model fallback='forbid'>EPYC</model> + <model fallback='forbid'>Opteron_G3</model> <vendor>AMD</vendor> <feature policy='require' name='acpi'/> <feature policy='require' name='ss'/> + <feature policy='require' name='pclmuldq'/> <feature policy='require' name='monitor'/> + <feature policy='require' name='ssse3'/> + <feature policy='require' name='sse4.1'/> + <feature policy='require' name='sse4.2'/> + <feature policy='require' name='movbe'/> + <feature policy='require' name='aes'/> + <feature policy='require' name='xsave'/> + <feature policy='require' name='rdrand'/> <feature policy='require' name='hypervisor'/> + <feature policy='require' name='arat'/> + <feature policy='require' name='fsgsbase'/> + <feature policy='require' name='bmi1'/> + <feature policy='require' name='smep'/> + <feature policy='require' name='bmi2'/> <feature policy='require' name='erms'/> <feature policy='require' name='mpx'/> + <feature policy='require' name='adx'/> + <feature policy='require' name='smap'/> <feature policy='require' name='pcommit'/> + <feature policy='require' name='clflushopt'/> <feature policy='require' name='clwb'/> <feature policy='require' name='pku'/> <feature policy='require' name='la57'/> + <feature policy='require' name='xsaveopt'/> + <feature policy='require' name='xgetbv1'/> + <feature policy='require' name='mmxext'/> + <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='3dnowext'/> <feature policy='require' name='3dnow'/> + <feature policy='require' name='cr8legacy'/> <feature policy='require' name='npt'/> - <feature policy='disable' name='vme'/> - <feature policy='disable' name='fma'/> - <feature policy='disable' name='avx'/> - <feature policy='disable' name='f16c'/> - <feature policy='disable' name='avx2'/> - <feature policy='disable' name='rdseed'/> - <feature policy='disable' name='sha-ni'/> - <feature policy='disable' name='xsavec'/> - <feature policy='disable' name='fxsr_opt'/> <feature policy='disable' name='misalignsse'/> - <feature policy='disable' name='3dnowprefetch'/> - <feature policy='disable' name='osvw'/> - <feature policy='disable' name='topoext'/> - <feature policy='disable' name='nrip-save'/> </mode> <mode name='custom' supported='yes'> <model usable='yes'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml index 034036ca96..4f1ffbb2ba 100644 --- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml @@ -36,35 +36,43 @@ </enum> </mode> <mode name='host-model' supported='yes'> - <model fallback='forbid'>EPYC</model> + <model fallback='forbid'>Opteron_G3</model> <vendor>AMD</vendor> <feature policy='require' name='acpi'/> <feature policy='require' name='ss'/> + <feature policy='require' name='pclmuldq'/> <feature policy='require' name='monitor'/> + <feature policy='require' name='ssse3'/> + <feature policy='require' name='sse4.1'/> + <feature policy='require' name='sse4.2'/> + <feature policy='require' name='movbe'/> + <feature policy='require' name='aes'/> + <feature policy='require' name='xsave'/> + <feature policy='require' name='rdrand'/> <feature policy='require' name='hypervisor'/> + <feature policy='require' name='arat'/> + <feature policy='require' name='fsgsbase'/> + <feature policy='require' name='bmi1'/> + <feature policy='require' name='smep'/> + <feature policy='require' name='bmi2'/> <feature policy='require' name='erms'/> <feature policy='require' name='mpx'/> + <feature policy='require' name='adx'/> + <feature policy='require' name='smap'/> <feature policy='require' name='pcommit'/> + <feature policy='require' name='clflushopt'/> <feature policy='require' name='clwb'/> <feature policy='require' name='pku'/> <feature policy='require' name='la57'/> + <feature policy='require' name='xsaveopt'/> + <feature policy='require' name='xgetbv1'/> + <feature policy='require' name='mmxext'/> + <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='3dnowext'/> <feature policy='require' name='3dnow'/> + <feature policy='require' name='cr8legacy'/> <feature policy='require' name='npt'/> - <feature policy='disable' name='vme'/> - <feature policy='disable' name='fma'/> - <feature policy='disable' name='avx'/> - <feature policy='disable' name='f16c'/> - <feature policy='disable' name='avx2'/> - <feature policy='disable' name='rdseed'/> - <feature policy='disable' name='sha-ni'/> - <feature policy='disable' name='xsavec'/> - <feature policy='disable' name='fxsr_opt'/> <feature policy='disable' name='misalignsse'/> - <feature policy='disable' name='3dnowprefetch'/> - <feature policy='disable' name='osvw'/> - <feature policy='disable' name='topoext'/> - <feature policy='disable' name='nrip-save'/> </mode> <mode name='custom' supported='yes'> <model usable='yes'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml index d3a4b01234..6cff0f815e 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -36,35 +36,43 @@ </enum> </mode> <mode name='host-model' supported='yes'> - <model fallback='forbid'>EPYC</model> + <model fallback='forbid'>Opteron_G3</model> <vendor>AMD</vendor> <feature policy='require' name='acpi'/> <feature policy='require' name='ss'/> + <feature policy='require' name='pclmuldq'/> <feature policy='require' name='monitor'/> + <feature policy='require' name='ssse3'/> + <feature policy='require' name='sse4.1'/> + <feature policy='require' name='sse4.2'/> + <feature policy='require' name='movbe'/> + <feature policy='require' name='aes'/> + <feature policy='require' name='xsave'/> + <feature policy='require' name='rdrand'/> <feature policy='require' name='hypervisor'/> + <feature policy='require' name='arat'/> + <feature policy='require' name='fsgsbase'/> + <feature policy='require' name='bmi1'/> + <feature policy='require' name='smep'/> + <feature policy='require' name='bmi2'/> <feature policy='require' name='erms'/> <feature policy='require' name='mpx'/> + <feature policy='require' name='adx'/> + <feature policy='require' name='smap'/> <feature policy='require' name='pcommit'/> + <feature policy='require' name='clflushopt'/> <feature policy='require' name='clwb'/> <feature policy='require' name='pku'/> <feature policy='require' name='la57'/> + <feature policy='require' name='xsaveopt'/> + <feature policy='require' name='xgetbv1'/> + <feature policy='require' name='mmxext'/> + <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='3dnowext'/> <feature policy='require' name='3dnow'/> + <feature policy='require' name='cr8legacy'/> <feature policy='require' name='npt'/> - <feature policy='disable' name='vme'/> - <feature policy='disable' name='fma'/> - <feature policy='disable' name='avx'/> - <feature policy='disable' name='f16c'/> - <feature policy='disable' name='avx2'/> - <feature policy='disable' name='rdseed'/> - <feature policy='disable' name='sha-ni'/> - <feature policy='disable' name='xsavec'/> - <feature policy='disable' name='fxsr_opt'/> <feature policy='disable' name='misalignsse'/> - <feature policy='disable' name='3dnowprefetch'/> - <feature policy='disable' name='osvw'/> - <feature policy='disable' name='topoext'/> - <feature policy='disable' name='nrip-save'/> </mode> <mode name='custom' supported='yes'> <model usable='yes'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml index 6b85c9c45a..65f4459bcb 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -36,35 +36,43 @@ </enum> </mode> <mode name='host-model' supported='yes'> - <model fallback='forbid'>EPYC</model> + <model fallback='forbid'>Opteron_G3</model> <vendor>AMD</vendor> <feature policy='require' name='acpi'/> <feature policy='require' name='ss'/> + <feature policy='require' name='pclmuldq'/> <feature policy='require' name='monitor'/> + <feature policy='require' name='ssse3'/> + <feature policy='require' name='sse4.1'/> + <feature policy='require' name='sse4.2'/> + <feature policy='require' name='movbe'/> + <feature policy='require' name='aes'/> + <feature policy='require' name='xsave'/> + <feature policy='require' name='rdrand'/> <feature policy='require' name='hypervisor'/> + <feature policy='require' name='arat'/> + <feature policy='require' name='fsgsbase'/> + <feature policy='require' name='bmi1'/> + <feature policy='require' name='smep'/> + <feature policy='require' name='bmi2'/> <feature policy='require' name='erms'/> <feature policy='require' name='mpx'/> + <feature policy='require' name='adx'/> + <feature policy='require' name='smap'/> <feature policy='require' name='pcommit'/> + <feature policy='require' name='clflushopt'/> <feature policy='require' name='clwb'/> <feature policy='require' name='pku'/> <feature policy='require' name='la57'/> + <feature policy='require' name='xsaveopt'/> + <feature policy='require' name='xgetbv1'/> + <feature policy='require' name='mmxext'/> + <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='3dnowext'/> <feature policy='require' name='3dnow'/> + <feature policy='require' name='cr8legacy'/> <feature policy='require' name='npt'/> - <feature policy='disable' name='vme'/> - <feature policy='disable' name='fma'/> - <feature policy='disable' name='avx'/> - <feature policy='disable' name='f16c'/> - <feature policy='disable' name='avx2'/> - <feature policy='disable' name='rdseed'/> - <feature policy='disable' name='sha-ni'/> - <feature policy='disable' name='xsavec'/> - <feature policy='disable' name='fxsr_opt'/> <feature policy='disable' name='misalignsse'/> - <feature policy='disable' name='3dnowprefetch'/> - <feature policy='disable' name='osvw'/> - <feature policy='disable' name='topoext'/> - <feature policy='disable' name='nrip-save'/> </mode> <mode name='custom' supported='yes'> <model usable='yes'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml index 2c761fc1af..40bc875e3c 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -36,35 +36,43 @@ </enum> </mode> <mode name='host-model' supported='yes'> - <model fallback='forbid'>EPYC</model> + <model fallback='forbid'>Opteron_G3</model> <vendor>AMD</vendor> <feature policy='require' name='acpi'/> <feature policy='require' name='ss'/> + <feature policy='require' name='pclmuldq'/> <feature policy='require' name='monitor'/> + <feature policy='require' name='ssse3'/> + <feature policy='require' name='sse4.1'/> + <feature policy='require' name='sse4.2'/> + <feature policy='require' name='movbe'/> + <feature policy='require' name='aes'/> + <feature policy='require' name='xsave'/> + <feature policy='require' name='rdrand'/> <feature policy='require' name='hypervisor'/> + <feature policy='require' name='arat'/> + <feature policy='require' name='fsgsbase'/> + <feature policy='require' name='bmi1'/> + <feature policy='require' name='smep'/> + <feature policy='require' name='bmi2'/> <feature policy='require' name='erms'/> <feature policy='require' name='mpx'/> + <feature policy='require' name='adx'/> + <feature policy='require' name='smap'/> <feature policy='require' name='pcommit'/> + <feature policy='require' name='clflushopt'/> <feature policy='require' name='clwb'/> <feature policy='require' name='pku'/> <feature policy='require' name='la57'/> + <feature policy='require' name='xsaveopt'/> + <feature policy='require' name='xgetbv1'/> + <feature policy='require' name='mmxext'/> + <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='3dnowext'/> <feature policy='require' name='3dnow'/> + <feature policy='require' name='cr8legacy'/> <feature policy='require' name='npt'/> - <feature policy='disable' name='vme'/> - <feature policy='disable' name='fma'/> - <feature policy='disable' name='avx'/> - <feature policy='disable' name='f16c'/> - <feature policy='disable' name='avx2'/> - <feature policy='disable' name='rdseed'/> - <feature policy='disable' name='sha-ni'/> - <feature policy='disable' name='xsavec'/> - <feature policy='disable' name='fxsr_opt'/> <feature policy='disable' name='misalignsse'/> - <feature policy='disable' name='3dnowprefetch'/> - <feature policy='disable' name='osvw'/> - <feature policy='disable' name='topoext'/> - <feature policy='disable' name='nrip-save'/> </mode> <mode name='custom' supported='yes'> <model usable='yes'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml index 8db840faac..a439dda190 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -36,36 +36,44 @@ </enum> </mode> <mode name='host-model' supported='yes'> - <model fallback='forbid'>EPYC</model> + <model fallback='forbid'>Opteron_G3</model> <vendor>AMD</vendor> <feature policy='require' name='acpi'/> <feature policy='require' name='ss'/> + <feature policy='require' name='pclmuldq'/> <feature policy='require' name='monitor'/> + <feature policy='require' name='ssse3'/> + <feature policy='require' name='sse4.1'/> + <feature policy='require' name='sse4.2'/> + <feature policy='require' name='movbe'/> + <feature policy='require' name='aes'/> + <feature policy='require' name='xsave'/> + <feature policy='require' name='rdrand'/> <feature policy='require' name='hypervisor'/> + <feature policy='require' name='arat'/> + <feature policy='require' name='fsgsbase'/> + <feature policy='require' name='bmi1'/> + <feature policy='require' name='smep'/> + <feature policy='require' name='bmi2'/> <feature policy='require' name='erms'/> <feature policy='require' name='mpx'/> + <feature policy='require' name='adx'/> + <feature policy='require' name='smap'/> <feature policy='require' name='pcommit'/> + <feature policy='require' name='clflushopt'/> <feature policy='require' name='clwb'/> <feature policy='require' name='pku'/> <feature policy='require' name='la57'/> + <feature policy='require' name='xsaveopt'/> + <feature policy='require' name='xgetbv1'/> + <feature policy='require' name='mmxext'/> + <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='3dnowext'/> <feature policy='require' name='3dnow'/> + <feature policy='require' name='cr8legacy'/> <feature policy='require' name='npt'/> <feature policy='require' name='svme-addr-chk'/> - <feature policy='disable' name='vme'/> - <feature policy='disable' name='fma'/> - <feature policy='disable' name='avx'/> - <feature policy='disable' name='f16c'/> - <feature policy='disable' name='avx2'/> - <feature policy='disable' name='rdseed'/> - <feature policy='disable' name='sha-ni'/> - <feature policy='disable' name='xsavec'/> - <feature policy='disable' name='fxsr_opt'/> <feature policy='disable' name='misalignsse'/> - <feature policy='disable' name='3dnowprefetch'/> - <feature policy='disable' name='osvw'/> - <feature policy='disable' name='topoext'/> - <feature policy='disable' name='nrip-save'/> </mode> <mode name='custom' supported='yes'> <model usable='yes'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index edd1259c64..9ed9123f7d 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -36,37 +36,45 @@ </enum> </mode> <mode name='host-model' supported='yes'> - <model fallback='forbid'>EPYC</model> + <model fallback='forbid'>Opteron_G3</model> <vendor>AMD</vendor> <feature policy='require' name='acpi'/> <feature policy='require' name='ss'/> + <feature policy='require' name='pclmuldq'/> <feature policy='require' name='monitor'/> + <feature policy='require' name='ssse3'/> + <feature policy='require' name='sse4.1'/> + <feature policy='require' name='sse4.2'/> + <feature policy='require' name='movbe'/> + <feature policy='require' name='aes'/> + <feature policy='require' name='xsave'/> + <feature policy='require' name='rdrand'/> <feature policy='require' name='hypervisor'/> + <feature policy='require' name='arat'/> + <feature policy='require' name='fsgsbase'/> + <feature policy='require' name='bmi1'/> + <feature policy='require' name='smep'/> + <feature policy='require' name='bmi2'/> <feature policy='require' name='erms'/> <feature policy='require' name='mpx'/> + <feature policy='require' name='adx'/> + <feature policy='require' name='smap'/> <feature policy='require' name='pcommit'/> + <feature policy='require' name='clflushopt'/> <feature policy='require' name='clwb'/> <feature policy='require' name='umip'/> <feature policy='require' name='pku'/> <feature policy='require' name='la57'/> + <feature policy='require' name='xsaveopt'/> + <feature policy='require' name='xgetbv1'/> + <feature policy='require' name='mmxext'/> + <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='3dnowext'/> <feature policy='require' name='3dnow'/> + <feature policy='require' name='cr8legacy'/> <feature policy='require' name='npt'/> <feature policy='require' name='svme-addr-chk'/> - <feature policy='disable' name='vme'/> - <feature policy='disable' name='fma'/> - <feature policy='disable' name='avx'/> - <feature policy='disable' name='f16c'/> - <feature policy='disable' name='avx2'/> - <feature policy='disable' name='rdseed'/> - <feature policy='disable' name='sha-ni'/> - <feature policy='disable' name='xsavec'/> - <feature policy='disable' name='fxsr_opt'/> <feature policy='disable' name='misalignsse'/> - <feature policy='disable' name='3dnowprefetch'/> - <feature policy='disable' name='osvw'/> - <feature policy='disable' name='topoext'/> - <feature policy='disable' name='nrip-save'/> </mode> <mode name='custom' supported='yes'> <model usable='yes'>qemu64</model> diff --git a/tests/qemuxml2argvdata/cpu-fallback.args b/tests/qemuxml2argvdata/cpu-fallback.args index a8fad07e5f..fb9a5e0b92 100644 --- a/tests/qemuxml2argvdata/cpu-fallback.args +++ b/tests/qemuxml2argvdata/cpu-fallback.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ --cpu Penryn,sse4.1=off,sse4.2=off,popcnt=off,aes=off \ +-cpu Conroe,cx16=on,sse4.1=off,sse4.2=off,popcnt=off,aes=off \ -m 214 \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args index 3ff226a289..0de09e1d88 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ -accel tcg \ --cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,pku=on,la57=on,3dnowext=on,3dnow=on,npt=on,vme=off,fma=off,avx=off,f16c=off,rdrand=off,avx2=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off \ +-cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \ -m 214 \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.args index 239f18b843..9a6c527b28 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-fallback.args +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ --cpu Penryn,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,monitor=on,ds-cpl=on,vmx=on,est=on,tm2=on,xtpr=on,sse4.1=off,cx16=on,lahf-lm=on \ +-cpu Conroe,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,monitor=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on \ -m 214 \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ -- 2.35.1

While we don't want to aim for the shortest list of disabled features in the baseline result (it would select a very old model), we want to do so while looking at any of the input models for which we're trying to compute a baseline CPU model. Given a set of input models, we always want to take the least capable one of them (i.e., the one with shortest list of disabled features) or a better model which is not one of the input models. So when considering an input model, we just check whether its list of disabled features is shorter than the currently best one. When looking at other models we check both enabled and disabled features while penalizing disabled features as implemented by the previous patch. Signed-off-by: Jiri Denemark <jdenemar@redhat.com> --- src/cpu/cpu_x86.c | 66 ++++++++++++------- ...4-baseline-Westmere+Nehalem-migratable.xml | 8 ++- ...86_64-baseline-Westmere+Nehalem-result.xml | 8 ++- ...-cpuid-baseline-Cooperlake+Cascadelake.xml | 13 ++-- 4 files changed, 64 insertions(+), 31 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 3001fc2b8f..a4aca6055d 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1961,7 +1961,8 @@ virCPUx86Compare(virCPUDef *host, static int virCPUx86CompareCandidateFeatureList(virCPUDef *cpuCurrent, - virCPUDef *cpuCandidate) + virCPUDef *cpuCandidate, + bool isPreferred) { size_t current = cpuCurrent->nfeatures; size_t enabledCurrent = current; @@ -2003,6 +2004,14 @@ virCPUx86CompareCandidateFeatureList(virCPUDef *cpuCurrent, return 1; } + if (isPreferred && disabled < disabledCurrent) { + VIR_DEBUG("%s is in the list of preferred models and provides fewer " + "disabled features than %s: %zu < %zu", + cpuCandidate->model, cpuCurrent->model, + disabled, disabledCurrent); + return 1; + } + VIR_DEBUG("%s is not better than %s: %zu (%zu, %zu) >= %zu (%zu, %zu)", cpuCandidate->model, cpuCurrent->model, candidate, enabled, disabled, @@ -2025,8 +2034,10 @@ x86DecodeUseCandidate(virCPUx86Model *current, virCPUx86Model *candidate, virCPUDef *cpuCandidate, uint32_t signature, - const char *preferred) + const char **preferred) { + bool isPreferred = false; + if (cpuCandidate->type == VIR_CPU_TYPE_HOST && !candidate->decodeHost) { VIR_DEBUG("%s is not supposed to be used for host CPU definition", @@ -2050,9 +2061,13 @@ x86DecodeUseCandidate(virCPUx86Model *current, } } - if (preferred && STREQ(cpuCandidate->model, preferred)) { - VIR_DEBUG("%s is the preferred model", cpuCandidate->model); - return 2; + if (preferred) { + isPreferred = g_strv_contains(preferred, cpuCandidate->model); + + if (isPreferred && !preferred[1]) { + VIR_DEBUG("%s is the preferred model", cpuCandidate->model); + return 2; + } } if (!cpuCurrent) { @@ -2079,7 +2094,8 @@ x86DecodeUseCandidate(virCPUx86Model *current, } } - return virCPUx86CompareCandidateFeatureList(cpuCurrent, cpuCandidate); + return virCPUx86CompareCandidateFeatureList(cpuCurrent, cpuCandidate, + isPreferred); } @@ -2122,7 +2138,7 @@ static int x86Decode(virCPUDef *cpu, const virCPUx86Data *cpuData, virDomainCapsCPUModels *models, - const char *preferred, + const char **preferred, bool migratable) { virCPUx86Map *map; @@ -2155,6 +2171,9 @@ x86Decode(virCPUDef *cpu, x86DataFilterTSX(&data, vendor, map); + if (preferred && !preferred[0]) + preferred = NULL; + /* Walk through the CPU models in reverse order to check newest * models first. */ @@ -2162,16 +2181,18 @@ x86Decode(virCPUDef *cpu, candidate = map->models[i]; if (models && !(hvModel = virDomainCapsCPUModelsGet(models, candidate->name))) { - if (preferred && STREQ(candidate->name, preferred)) { + if (preferred && + !preferred[1] && + STREQ(candidate->name, preferred[0])) { if (cpu->fallback != VIR_CPU_FALLBACK_ALLOW) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("CPU model %s is not supported by hypervisor"), - preferred); + preferred[0]); return -1; } else { VIR_WARN("Preferred CPU model %s not allowed by" " hypervisor; closest supported model will be" - " used", preferred); + " used", preferred[0]); } } else { VIR_DEBUG("CPU model %s not allowed by hypervisor; ignoring", @@ -2779,8 +2800,8 @@ virCPUx86Baseline(virCPUDef **cpus, size_t i; virCPUx86Vendor *vendor = NULL; bool outputVendor = true; - const char *modelName; - bool matchingNames = true; + g_autofree char **modelNames = NULL; + size_t namesLen = 0; g_autoptr(virCPUData) featData = NULL; if (!(map = virCPUx86GetMap())) @@ -2802,19 +2823,17 @@ virCPUx86Baseline(virCPUDef **cpus, return NULL; } - modelName = cpus[0]->model; + modelNames = g_new0(char *, ncpus + 1); + if (cpus[0]->model) + modelNames[namesLen++] = cpus[0]->model; + for (i = 1; i < ncpus; i++) { g_autoptr(virCPUx86Model) model = NULL; const char *vn = NULL; - if (matchingNames && cpus[i]->model) { - if (!modelName) { - modelName = cpus[i]->model; - } else if (STRNEQ(modelName, cpus[i]->model)) { - modelName = NULL; - matchingNames = false; - } - } + if (cpus[i]->model && + !g_strv_contains((const char **) modelNames, cpus[i]->model)) + modelNames[namesLen++] = cpus[i]->model; if (!(model = x86ModelFromCPU(cpus[i], map, -1))) return NULL; @@ -2877,10 +2896,11 @@ virCPUx86Baseline(virCPUDef **cpus, virCPUx86DataAddItem(&base_model->data, &vendor->data) < 0) return NULL; - if (x86Decode(cpu, &base_model->data, models, modelName, migratable) < 0) + if (x86Decode(cpu, &base_model->data, models, + (const char **) modelNames, migratable) < 0) return NULL; - if (STREQ_NULLABLE(cpu->model, modelName)) + if (namesLen == 1 && STREQ(cpu->model, modelNames[0])) cpu->fallback = VIR_CPU_FALLBACK_FORBID; if (!outputVendor) diff --git a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml index 775a27de2e..f5846b1619 100644 --- a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml +++ b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml @@ -1,10 +1,14 @@ <cpu mode='custom' match='exact'> - <model fallback='allow'>SandyBridge</model> + <model fallback='allow'>Westmere</model> <vendor>Intel</vendor> <feature policy='require' name='vme'/> <feature policy='require' name='ss'/> + <feature policy='require' name='pclmuldq'/> <feature policy='require' name='pcid'/> + <feature policy='require' name='x2apic'/> + <feature policy='require' name='tsc-deadline'/> + <feature policy='require' name='xsave'/> <feature policy='require' name='osxsave'/> + <feature policy='require' name='avx'/> <feature policy='require' name='hypervisor'/> - <feature policy='disable' name='rdtscp'/> </cpu> diff --git a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml index cafca97d62..166833276c 100644 --- a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml +++ b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml @@ -1,11 +1,15 @@ <cpu mode='custom' match='exact'> - <model fallback='allow'>SandyBridge</model> + <model fallback='allow'>Westmere</model> <vendor>Intel</vendor> <feature policy='require' name='vme'/> <feature policy='require' name='ss'/> + <feature policy='require' name='pclmuldq'/> <feature policy='require' name='pcid'/> + <feature policy='require' name='x2apic'/> + <feature policy='require' name='tsc-deadline'/> + <feature policy='require' name='xsave'/> <feature policy='require' name='osxsave'/> + <feature policy='require' name='avx'/> <feature policy='require' name='hypervisor'/> <feature policy='require' name='invtsc'/> - <feature policy='disable' name='rdtscp'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml index 46c32c996f..ecac749b97 100644 --- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml +++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml @@ -1,17 +1,22 @@ <cpu mode='custom' match='exact'> - <model fallback='allow'>Cooperlake</model> + <model fallback='allow'>Cascadelake-Server</model> <vendor>Intel</vendor> <feature policy='require' name='ss'/> <feature policy='require' name='vmx'/> <feature policy='require' name='hypervisor'/> <feature policy='require' name='tsc_adjust'/> - <feature policy='require' name='mpx'/> <feature policy='require' name='umip'/> + <feature policy='require' name='pku'/> <feature policy='require' name='md-clear'/> + <feature policy='require' name='stibp'/> + <feature policy='require' name='arch-capabilities'/> <feature policy='require' name='xsaves'/> <feature policy='require' name='ibpb'/> <feature policy='require' name='amd-ssbd'/> + <feature policy='require' name='rdctl-no'/> + <feature policy='require' name='ibrs-all'/> + <feature policy='require' name='skip-l1dfl-vmentry'/> + <feature policy='require' name='mds-no'/> + <feature policy='require' name='pschange-mc-no'/> <feature policy='require' name='tsx-ctrl'/> - <feature policy='disable' name='avx512-bf16'/> - <feature policy='disable' name='taa-no'/> </cpu> -- 2.35.1