From: Denis V. Lunev <[email protected]>
Kernel commit 76ea438b4afc ("KVM: X86: Expose bus lock debug exception
to guest") made KVM offer bus-lock-detect on every host that enumerates
it, AMD Zen 5 included. Kernel commit 54950bfe2b69 ("KVM: SVM: Don't
advertise Bus Lock Detect to guest if SVM support is missing"), marked
for stable, stopped offering it on AMD. A host-model guest started on
Zen 5 under an older kernel has bus-lock-detect in its live definition.
On a destination with the newer kernel QEMU filters the feature out and
the incoming migration fails:
guest CPU doesn't match specification: missing features: bus-lock-detect
Restoring a save image or reverting a snapshot fails the same way, so
the guest cannot be moved to the new kernel without a restart.
Dropping the bit in libvirt costs the guest nothing. Bus lock detection
is enabled through DEBUGCTL, which SVM loads for the guest only with
LBR virtualization active, and 54950bfe2b69 says the guest could not
use the feature despite the CPUID bit. QEMU does not migrate DEBUGCTL,
so the guest resumes with bus lock detection off. A Linux guest since
kernel commit 408eb7417a92 ("x86/bus_lock: Add support for AMD") sets
DEBUGCTL.BLD again only when it brings a CPU online; with LBR
virtualization enabled, the default, kernels since 5ecdb48dd918 ("KVM:
SVM: Treat DEBUGCTL[5:2] as reserved") answer that write with #GP,
which Linux reports as an "unchecked MSR access error" warning and
carries on, and older kernels ignore the bit. QEMU drops the bit either
way; libvirt only decides whether the guest survives.
Kernel commit 62ad461079e7 ("KVM: SVM: Add support for virtualizating
Bus Lock Detect") lets KVM offer the feature on AMD again with LBR
virtualization. A guest started there and moved to a host without it
loses the bus lock #DB, which Linux uses only to warn about or throttle
tasks that cause bus locks.
Add bus-lock-detect next to spec-ctrl in the table of droppable
features, for CPU models whose vendor is AMD: when the hypervisor
dropped it, virCPUUpdateLive() disables it in the live definition and
removes it from the features QEMU reports as filtered. Intel keeps
failing: VMX has virtualized bus lock detection since 76ea438b4afc, so
a missing bit there is a real loss.
Signed-off-by: Denis V. Lunev <[email protected]>
---
src/cpu/cpu_x86.c | 21 +++++++
tests/cputest.c | 2 +
...e-i7-1365U-no-bus-lock-detect-disabled.xml | 4 ++
...re-i7-1365U-no-bus-lock-detect-enabled.xml | 21 +++++++
...Core-i7-1365U-no-bus-lock-detect-guest.xml | 61 +++++++++++++++++++
...0X-16-Core-no-bus-lock-detect-disabled.xml | 4 ++
...50X-16-Core-no-bus-lock-detect-enabled.xml | 14 +++++
...9950X-16-Core-no-bus-lock-detect-guest.xml | 45 ++++++++++++++
...-9950X-16-Core-no-bus-lock-detect-json.xml | 45 ++++++++++++++
9 files changed, 217 insertions(+)
create mode 100644
tests/cputestdata/x86_64-cpuid-Core-i7-1365U-no-bus-lock-detect-disabled.xml
create mode 100644
tests/cputestdata/x86_64-cpuid-Core-i7-1365U-no-bus-lock-detect-enabled.xml
create mode 100644
tests/cputestdata/x86_64-cpuid-Core-i7-1365U-no-bus-lock-detect-guest.xml
create mode 100644
tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-no-bus-lock-detect-disabled.xml
create mode 100644
tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-no-bus-lock-detect-enabled.xml
create mode 100644
tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-no-bus-lock-detect-guest.xml
create mode 100644
tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-no-bus-lock-detect-json.xml
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 3e89d5ef0a..7f6d29b447 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -3170,6 +3170,26 @@ x86SpecCtrlDroppable(const virCPUDef *cpu G_GNUC_UNUSED,
}
+/*
+ * KVM offered bus-lock-detect on AMD hosts until kernel commit
+ * 54950bfe2b69 although SVM never let the guest use it.
+ */
+static int
+x86BusLockDetectDroppable(const virCPUDef *cpu,
+ virCPUx86Map *map,
+ const virCPUx86Data *enabled G_GNUC_UNUSED)
+{
+ virCPUx86Model *model;
+
+ if (!cpu->model ||
+ !(model = x86ModelFind(map, cpu->model)) ||
+ !model->vendor)
+ return 0;
+
+ return STREQ(model->vendor->name, "AMD");
+}
+
+
static const struct {
const char *name;
int (*droppable)(const virCPUDef *cpu,
@@ -3177,6 +3197,7 @@ static const struct {
const virCPUx86Data *enabled);
} x86DroppableFeatures[] = {
{ "spec-ctrl", x86SpecCtrlDroppable },
+ { "bus-lock-detect", x86BusLockDetectDroppable },
};
diff --git a/tests/cputest.c b/tests/cputest.c
index 35b426155e..6c15d71365 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -1262,6 +1262,7 @@ mymain(void)
DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i5-6600", JSON_HOST);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-1270P", JSON_MODELS_REQUIRED);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-1365U", JSON_MODELS_REQUIRED);
+ DO_TEST_UPDATE_LIVE(VIR_ARCH_X86_64, "Core-i7-1365U-no-bus-lock-detect",
-1);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-2600", JSON_HOST);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-2600-xsaveopt",
JSON_MODELS_REQUIRED);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-3520M", JSON_NONE);
@@ -1297,6 +1298,7 @@ mymain(void)
DO_TEST_CPUID(VIR_ARCH_X86_64, "Ryzen-7-1800X-Eight-Core", JSON_HOST);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Ryzen-9-3900X-12-Core", JSON_MODELS);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Ryzen-9-9950X-16-Core", JSON_MODELS);
+ DO_TEST_UPDATE_LIVE(VIR_ARCH_X86_64,
"Ryzen-9-9950X-16-Core-no-bus-lock-detect", 0);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-5110", JSON_NONE);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-6731E", JSON_MODELS);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-6788P", JSON_MODELS_REQUIRED);
diff --git
a/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-no-bus-lock-detect-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-no-bus-lock-detect-disabled.xml
new file mode 100644
index 0000000000..e97a5ab0c5
--- /dev/null
+++
b/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-no-bus-lock-detect-disabled.xml
@@ -0,0 +1,4 @@
+<!-- Features disabled by QEMU -->
+<cpudata arch='x86'>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x01000000' edx='0x00000000'/>
+</cpudata>
diff --git
a/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-no-bus-lock-detect-enabled.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-no-bus-lock-detect-enabled.xml
new file mode 100644
index 0000000000..1f6363183c
--- /dev/null
+++
b/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-no-bus-lock-detect-enabled.xml
@@ -0,0 +1,21 @@
+<!-- Features enabled by QEMU -->
+<cpudata arch='x86'>
+ <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0xf7fa3223' edx='0x0f8bfbff'/>
+ <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x219c27eb'
ecx='0x1840072c' edx='0xbc004410'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x01' eax='0x00000810' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x02' eax='0x00000000' ebx='0x00000000'
ecx='0x00000000' edx='0x0000001f'/>
+ <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x00000121' edx='0x2c100800'/>
+ <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00000000' ebx='0x0100d000'
ecx='0x00000000' edx='0x00000000'/>
+ <msr index='0x10a' edx='0x00000000' eax='0x1400e06b'/>
+ <msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
+ <msr index='0x485' edx='0x00000000' eax='0x20000160'/>
+ <msr index='0x48b' edx='0x06137bff' eax='0x00000000'/>
+ <msr index='0x48c' edx='0x00000d01' eax='0x06330041'/>
+ <msr index='0x48d' edx='0x000000e9' eax='0x00000000'/>
+ <msr index='0x48e' edx='0xfbf99e8c' eax='0x00000000'/>
+ <msr index='0x48f' edx='0x007c9004' eax='0x00000000'/>
+ <msr index='0x490' edx='0x0000e204' eax='0x00000000'/>
+ <msr index='0x491' edx='0x00000000' eax='0x00000001'/>
+</cpudata>
diff --git
a/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-no-bus-lock-detect-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-no-bus-lock-detect-guest.xml
new file mode 100644
index 0000000000..268d5484a4
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-no-bus-lock-detect-guest.xml
@@ -0,0 +1,61 @@
+<cpu mode='custom' match='exact' check='full'>
+ <model fallback='forbid'>SierraForest</model>
+ <vendor>Intel</vendor>
+ <feature policy='require' name='vmx'/>
+ <feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
+ <feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='fdp-excptn-only'/>
+ <feature policy='require' name='zero-fcs-fds'/>
+ <feature policy='require' name='waitpkg'/>
+ <feature policy='require' name='movdiri'/>
+ <feature policy='require' name='movdir64b'/>
+ <feature policy='require' name='md-clear'/>
+ <feature policy='require' name='stibp'/>
+ <feature policy='require' name='flush-l1d'/>
+ <feature policy='require' name='intel-psfd'/>
+ <feature policy='require' name='ipred-ctrl'/>
+ <feature policy='require' name='rrsba-ctrl'/>
+ <feature policy='require' name='ddpd-u'/>
+ <feature policy='require' name='bhi-ctrl'/>
+ <feature policy='require' name='ibpb'/>
+ <feature policy='require' name='ibrs'/>
+ <feature policy='require' name='amd-stibp'/>
+ <feature policy='require' name='amd-ssbd'/>
+ <feature policy='require' name='gds-no'/>
+ <feature policy='require' name='rfds-clear'/>
+ <feature policy='require' name='vmx-activity-wait-sipi'/>
+ <feature policy='require' name='vmx-tsc-scaling'/>
+ <feature policy='require' name='vmx-enable-user-wait-pause'/>
+ <feature policy='require' name='bus-lock-detect'/>
+ <feature policy='disable' name='cmpccxadd'/>
+ <feature policy='disable' name='avx-ifma'/>
+ <feature policy='disable' name='avx-vnni-int8'/>
+ <feature policy='disable' name='avx-ne-convert'/>
+ <feature policy='disable' name='mcdt-no'/>
+ <feature policy='disable' name='wbnoinvd'/>
+ <feature policy='disable' name='pbrsb-no'/>
+ <feature policy='disable' name='dtes64'/>
+ <feature policy='disable' name='monitor'/>
+ <feature policy='disable' name='ds_cpl'/>
+ <feature policy='disable' name='smx'/>
+ <feature policy='disable' name='est'/>
+ <feature policy='disable' name='tm2'/>
+ <feature policy='disable' name='xtpr'/>
+ <feature policy='disable' name='pdcm'/>
+ <feature policy='disable' name='osxsave'/>
+ <feature policy='disable' name='ds'/>
+ <feature policy='disable' name='acpi'/>
+ <feature policy='disable' name='ht'/>
+ <feature policy='disable' name='tm'/>
+ <feature policy='disable' name='pbe'/>
+ <feature policy='disable' name='intel-pt'/>
+ <feature policy='disable' name='ospke'/>
+ <feature policy='disable' name='cet-ss'/>
+ <feature policy='disable' name='pks'/>
+ <feature policy='disable' name='pconfig'/>
+ <feature policy='disable' name='arch-lbr'/>
+ <feature policy='disable' name='cet-ibt'/>
+ <feature policy='disable' name='core-capability'/>
+ <feature policy='disable' name='invtsc'/>
+</cpu>
diff --git
a/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-no-bus-lock-detect-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-no-bus-lock-detect-disabled.xml
new file mode 100644
index 0000000000..e97a5ab0c5
--- /dev/null
+++
b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-no-bus-lock-detect-disabled.xml
@@ -0,0 +1,4 @@
+<!-- Features disabled by QEMU -->
+<cpudata arch='x86'>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x01000000' edx='0x00000000'/>
+</cpudata>
diff --git
a/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-no-bus-lock-detect-enabled.xml
b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-no-bus-lock-detect-enabled.xml
new file mode 100644
index 0000000000..281971e99f
--- /dev/null
+++
b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-no-bus-lock-detect-enabled.xml
@@ -0,0 +1,14 @@
+<!-- Features enabled by QEMU -->
+<cpudata arch='x86'>
+ <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0xf7f83203' edx='0x078bfbff'/>
+ <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0xf1bf07ab'
ecx='0x18405f4e' edx='0x9c000110'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x01' eax='0x00000030' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x008003f7' edx='0x2e500800'/>
+ <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000003'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00000000' ebx='0x1302d205'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x00000000' edx='0x1201947b'/>
+ <cpuid eax_in='0x80000021' ecx_in='0x00' eax='0x58100147' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x80000022' ecx_in='0x00' eax='0x00000001' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+</cpudata>
diff --git
a/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-no-bus-lock-detect-guest.xml
b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-no-bus-lock-detect-guest.xml
new file mode 100644
index 0000000000..174ac2293f
--- /dev/null
+++
b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-no-bus-lock-detect-guest.xml
@@ -0,0 +1,45 @@
+<cpu mode='custom' match='exact' check='full'>
+ <model fallback='forbid'>EPYC-Turin</model>
+ <vendor>AMD</vendor>
+ <feature policy='require' name='x2apic'/>
+ <feature policy='require' name='tsc-deadline'/>
+ <feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='spec-ctrl'/>
+ <feature policy='require' name='stibp'/>
+ <feature policy='require' name='flush-l1d'/>
+ <feature policy='require' name='ssbd'/>
+ <feature policy='require' name='cmp_legacy'/>
+ <feature policy='require' name='virt-ssbd'/>
+ <feature policy='disable' name='pcid'/>
+ <feature policy='disable' name='la57'/>
+ <feature policy='disable' name='monitor'/>
+ <feature policy='disable' name='osxsave'/>
+ <feature policy='disable' name='ht'/>
+ <feature policy='disable' name='cmt'/>
+ <feature policy='disable' name='ospke'/>
+ <feature policy='disable' name='cet-ss'/>
+ <feature policy='require' name='bus-lock-detect'/>
+ <feature policy='disable' name='mbm_total'/>
+ <feature policy='disable' name='mbm_local'/>
+ <feature policy='disable' name='extapic'/>
+ <feature policy='disable' name='ibs'/>
+ <feature policy='disable' name='skinit'/>
+ <feature policy='disable' name='wdt'/>
+ <feature policy='disable' name='tce'/>
+ <feature policy='disable' name='topoext'/>
+ <feature policy='disable' name='perfctr_nb'/>
+ <feature policy='disable' name='invtsc'/>
+ <feature policy='disable' name='svm-lock'/>
+ <feature policy='disable' name='decodeassists'/>
+ <feature policy='disable' name='avic'/>
+ <feature policy='disable' name='gmet'/>
+ <feature policy='disable' name='eraps'/>
+ <feature policy='disable' name='rdctl-no'/>
+ <feature policy='disable' name='skip-l1dfl-vmentry'/>
+ <feature policy='disable' name='mds-no'/>
+ <feature policy='disable' name='pschange-mc-no'/>
+ <feature policy='disable' name='gds-no'/>
+ <feature policy='disable' name='rfds-no'/>
+ <feature policy='disable' name='its-no'/>
+</cpu>
diff --git
a/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-no-bus-lock-detect-json.xml
b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-no-bus-lock-detect-json.xml
new file mode 100644
index 0000000000..533b04903a
--- /dev/null
+++
b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-no-bus-lock-detect-json.xml
@@ -0,0 +1,45 @@
+<cpu mode='custom' match='exact'>
+ <model fallback='forbid'>EPYC-Turin</model>
+ <vendor>AMD</vendor>
+ <feature policy='require' name='x2apic'/>
+ <feature policy='require' name='tsc-deadline'/>
+ <feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='spec-ctrl'/>
+ <feature policy='require' name='stibp'/>
+ <feature policy='require' name='flush-l1d'/>
+ <feature policy='require' name='ssbd'/>
+ <feature policy='require' name='cmp_legacy'/>
+ <feature policy='require' name='virt-ssbd'/>
+ <feature policy='disable' name='pcid'/>
+ <feature policy='disable' name='la57'/>
+ <feature policy='disable' name='monitor'/>
+ <feature policy='disable' name='osxsave'/>
+ <feature policy='disable' name='ht'/>
+ <feature policy='disable' name='cmt'/>
+ <feature policy='disable' name='ospke'/>
+ <feature policy='disable' name='cet-ss'/>
+ <feature policy='disable' name='bus-lock-detect'/>
+ <feature policy='disable' name='mbm_total'/>
+ <feature policy='disable' name='mbm_local'/>
+ <feature policy='disable' name='extapic'/>
+ <feature policy='disable' name='ibs'/>
+ <feature policy='disable' name='skinit'/>
+ <feature policy='disable' name='wdt'/>
+ <feature policy='disable' name='tce'/>
+ <feature policy='disable' name='topoext'/>
+ <feature policy='disable' name='perfctr_nb'/>
+ <feature policy='disable' name='invtsc'/>
+ <feature policy='disable' name='svm-lock'/>
+ <feature policy='disable' name='decodeassists'/>
+ <feature policy='disable' name='avic'/>
+ <feature policy='disable' name='gmet'/>
+ <feature policy='disable' name='eraps'/>
+ <feature policy='disable' name='rdctl-no'/>
+ <feature policy='disable' name='skip-l1dfl-vmentry'/>
+ <feature policy='disable' name='mds-no'/>
+ <feature policy='disable' name='pschange-mc-no'/>
+ <feature policy='disable' name='gds-no'/>
+ <feature policy='disable' name='rfds-no'/>
+ <feature policy='disable' name='its-no'/>
+</cpu>
--
2.53.0