80a22cff37
- hw/virtio/virtio-pmem: Replace impossible check by assertion - tests: Fix printf format string in acpi-utils.c - softmmu/dirtylimit: Add parameter check for hmp "set_vcpu_dirty_limit" - disas/riscv: Fix the typo of inverted order of pmpaddr13 and pmpaddr14 - qga: Fix memory leak when output stream is unused - ui/vnc-clipboard: fix infinite loop in inflate_buffer (CVE-2023-3255) - target/i386: Add few security fix bits in ARCH_CAPABILITIES into SapphireRapids CPU model - target/i386: Add new bit definitions of MSR_IA32_ARCH_CAPABILITIES - target/i386: Allow MCDT_NO if host supports - target/i386: Add support for MCDT_NO in CPUID enumeration - target/i386: Export MSR_ARCH_CAPABILITIES bits to guests - target/i386: add support for FB_CLEAR feature - target/i386: add support for FLUSH_L1D feature - crypto: remove shadowed 'ret' variable - hw/i2c/pmbus_device: Fix modifying QOM class internals from instance - hw/arm/xlnx-zynqmp: fix unsigned error when checking the RPUs number Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From 6beadcde4d28a1e4ad3267b7702162ecf9d4541b Mon Sep 17 00:00:00 2001
|
|
From: Tao Su <tao1.su@linux.intel.com>
|
|
Date: Thu, 6 Jul 2023 13:49:46 +0800
|
|
Subject: [PATCH] target/i386: Allow MCDT_NO if host supports
|
|
|
|
commit ba3709feaab44631315e02cd793cfccae4c6bd2a upstream.
|
|
|
|
MCDT_NO bit indicates HW contains the security fix and doesn't need to
|
|
be mitigated to avoid data-dependent behaviour for certain instructions.
|
|
It needs no hypervisor support. Treat it as supported regardless of what
|
|
KVM reports.
|
|
|
|
Intel-SIG: commit ba3709feaab4 ("target/i386: Allow MCDT_NO if host supports")
|
|
Backport allowing MCDT_NO if host supports
|
|
|
|
Signed-off-by: Tao Su <tao1.su@linux.intel.com>
|
|
Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
|
Message-ID: <20230706054949.66556-4-tao1.su@linux.intel.com>
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
[ jason: amend commit log ]
|
|
Signed-off-by: Jason Zeng <jason.zeng@intel.com>
|
|
---
|
|
target/i386/kvm/kvm.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
|
|
index d323d08dcb..55ee75e844 100644
|
|
--- a/target/i386/kvm/kvm.c
|
|
+++ b/target/i386/kvm/kvm.c
|
|
@@ -424,6 +424,10 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function,
|
|
uint32_t eax;
|
|
host_cpuid(7, 1, &eax, &unused, &unused, &unused);
|
|
ret |= eax & (CPUID_7_1_EAX_FZRM | CPUID_7_1_EAX_FSRS | CPUID_7_1_EAX_FSRC);
|
|
+ } else if (function == 7 && index == 2 && reg == R_EDX) {
|
|
+ uint32_t edx;
|
|
+ host_cpuid(7, 2, &unused, &unused, &unused, &edx);
|
|
+ ret |= edx & CPUID_7_2_EDX_MCDT_NO;
|
|
} else if (function == 0xd && index == 0 &&
|
|
(reg == R_EAX || reg == R_EDX)) {
|
|
/*
|
|
--
|
|
2.41.0.windows.1
|
|
|