|
 |
ae23c9 |
From c48019a17552791a63cc143321944ed916de0672 Mon Sep 17 00:00:00 2001
|
|
|
ae23c9 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
ae23c9 |
Date: Thu, 9 May 2019 22:43:18 +0100
|
|
|
ae23c9 |
Subject: [PATCH 2/2] i386: kvm: Disable arch_capabilities if MSR can't be set
|
|
|
ae23c9 |
|
|
|
ae23c9 |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
ae23c9 |
Message-id: <20190509224318.23376-3-ehabkost@redhat.com>
|
|
|
ae23c9 |
Patchwork-id: 87252
|
|
|
ae23c9 |
O-Subject: [RHEL-8.1.0 qemu-kvm PATCH 2/2] i386: kvm: Disable arch_capabilities if MSR can't be set
|
|
|
ae23c9 |
Bugzilla: 1707706
|
|
|
ae23c9 |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
ae23c9 |
|
|
|
ae23c9 |
KVM has two bugs in the handling of MSR_IA32_ARCH_CAPABILITIES:
|
|
|
ae23c9 |
|
|
|
ae23c9 |
1) Linux commit commit 1eaafe91a0df ("kvm: x86: IA32_ARCH_CAPABILITIES
|
|
|
ae23c9 |
is always supported") makes GET_SUPPORTED_CPUID return
|
|
|
ae23c9 |
arch_capabilities even if running on SVM. This makes "-cpu
|
|
|
ae23c9 |
host,migratable=off" incorrectly expose arch_capabilities on CPUID on
|
|
|
ae23c9 |
AMD hosts (where the MSR is not emulated by KVM).
|
|
|
ae23c9 |
|
|
|
ae23c9 |
2) KVM_GET_MSR_INDEX_LIST does not return MSR_IA32_ARCH_CAPABILITIES if
|
|
|
ae23c9 |
the MSR is not supported by the host CPU. This makes QEMU not
|
|
|
ae23c9 |
initialize the MSR properly at kvm_put_msrs() on those hosts.
|
|
|
ae23c9 |
|
|
|
ae23c9 |
Work around both bugs on the QEMU side, by checking if the MSR
|
|
|
ae23c9 |
was returned by KVM_GET_MSR_INDEX_LIST before returning the
|
|
|
ae23c9 |
feature flag on kvm_arch_get_supported_cpuid().
|
|
|
ae23c9 |
|
|
|
ae23c9 |
This has the unfortunate side effect of making arch_capabilities
|
|
|
ae23c9 |
unavailable on hosts without hardware support for the MSR until bug #2
|
|
|
ae23c9 |
is fixed on KVM, but I can't see another way to work around bug #1
|
|
|
ae23c9 |
without that side effect.
|
|
|
ae23c9 |
|
|
|
ae23c9 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
ae23c9 |
Message-Id: <20190125220606.4864-2-ehabkost@redhat.com>
|
|
|
ae23c9 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
ae23c9 |
(cherry picked from commit 485b1d256bcb0874bcde0223727c159b6837e6f8)
|
|
|
ae23c9 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
ae23c9 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
ae23c9 |
---
|
|
|
ae23c9 |
target/i386/kvm.c | 9 +++++++++
|
|
|
ae23c9 |
1 file changed, 9 insertions(+)
|
|
|
ae23c9 |
|
|
|
ae23c9 |
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
|
|
|
ae23c9 |
index e3e8c78..8a4d31d 100644
|
|
|
ae23c9 |
--- a/target/i386/kvm.c
|
|
|
ae23c9 |
+++ b/target/i386/kvm.c
|
|
|
ae23c9 |
@@ -374,6 +374,15 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function,
|
|
|
ae23c9 |
if (host_tsx_blacklisted()) {
|
|
|
ae23c9 |
ret &= ~(CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_HLE);
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
+ } else if (function == 7 && index == 0 && reg == R_EDX) {
|
|
|
ae23c9 |
+ /*
|
|
|
ae23c9 |
+ * Linux v4.17-v4.20 incorrectly return ARCH_CAPABILITIES on SVM hosts.
|
|
|
ae23c9 |
+ * We can detect the bug by checking if MSR_IA32_ARCH_CAPABILITIES is
|
|
|
ae23c9 |
+ * returned by KVM_GET_MSR_INDEX_LIST.
|
|
|
ae23c9 |
+ */
|
|
|
ae23c9 |
+ if (!has_msr_arch_capabs) {
|
|
|
ae23c9 |
+ ret &= ~CPUID_7_0_EDX_ARCH_CAPABILITIES;
|
|
|
ae23c9 |
+ }
|
|
|
ae23c9 |
} else if (function == 0x80000001 && reg == R_ECX) {
|
|
|
ae23c9 |
/*
|
|
|
ae23c9 |
* It's safe to enable TOPOEXT even if it's not returned by
|
|
|
ae23c9 |
--
|
|
|
ae23c9 |
1.8.3.1
|
|
|
ae23c9 |
|