93 lines
3.3 KiB
Diff
93 lines
3.3 KiB
Diff
From 44207fd96718352fce68c68515fecf3ea4cee2e9 Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Fri, 18 Jul 2025 18:03:47 +0200
|
|
Subject: [PATCH 069/115] i386/tdx: Only configure MSR_IA32_UCODE_REV in
|
|
kvm_init_msrs() for TDs
|
|
|
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
RH-MergeRequest: 391: TDX support, including attestation and device assignment
|
|
RH-Jira: RHEL-15710 RHEL-20798 RHEL-49728
|
|
RH-Acked-by: Yash Mankad <None>
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
RH-Commit: [69/115] eeff1e580ba5e6da1e2eaddeb51784999b994951 (bonzini/rhel-qemu-kvm)
|
|
|
|
For TDs, only MSR_IA32_UCODE_REV in kvm_init_msrs() can be configured
|
|
by VMM, while the features enumerated/controlled by other MSRs except
|
|
MSR_IA32_UCODE_REV in kvm_init_msrs() are not under control of VMM.
|
|
|
|
Only configure MSR_IA32_UCODE_REV for TDs.
|
|
|
|
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
|
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
|
|
Link: https://lore.kernel.org/r/20250508150002.689633-41-xiaoyao.li@intel.com
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit f9aaad3362a5886d78e7d4d50d563ac16c6acdde)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
---
|
|
target/i386/kvm/kvm.c | 40 +++++++++++++++++++++-------------------
|
|
1 file changed, 21 insertions(+), 19 deletions(-)
|
|
|
|
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
|
|
index 0c47eef03c..f3fe553151 100644
|
|
--- a/target/i386/kvm/kvm.c
|
|
+++ b/target/i386/kvm/kvm.c
|
|
@@ -3761,32 +3761,34 @@ static void kvm_init_msrs(X86CPU *cpu)
|
|
CPUX86State *env = &cpu->env;
|
|
|
|
kvm_msr_buf_reset(cpu);
|
|
- if (has_msr_arch_capabs) {
|
|
- kvm_msr_entry_add(cpu, MSR_IA32_ARCH_CAPABILITIES,
|
|
- env->features[FEAT_ARCH_CAPABILITIES]);
|
|
- }
|
|
|
|
- if (has_msr_core_capabs) {
|
|
- kvm_msr_entry_add(cpu, MSR_IA32_CORE_CAPABILITY,
|
|
- env->features[FEAT_CORE_CAPABILITY]);
|
|
- }
|
|
+ if (!is_tdx_vm()) {
|
|
+ if (has_msr_arch_capabs) {
|
|
+ kvm_msr_entry_add(cpu, MSR_IA32_ARCH_CAPABILITIES,
|
|
+ env->features[FEAT_ARCH_CAPABILITIES]);
|
|
+ }
|
|
+
|
|
+ if (has_msr_core_capabs) {
|
|
+ kvm_msr_entry_add(cpu, MSR_IA32_CORE_CAPABILITY,
|
|
+ env->features[FEAT_CORE_CAPABILITY]);
|
|
+ }
|
|
+
|
|
+ if (has_msr_perf_capabs && cpu->enable_pmu) {
|
|
+ kvm_msr_entry_add_perf(cpu, env->features);
|
|
+ }
|
|
|
|
- if (has_msr_perf_capabs && cpu->enable_pmu) {
|
|
- kvm_msr_entry_add_perf(cpu, env->features);
|
|
+ /*
|
|
+ * Older kernels do not include VMX MSRs in KVM_GET_MSR_INDEX_LIST, but
|
|
+ * all kernels with MSR features should have them.
|
|
+ */
|
|
+ if (kvm_feature_msrs && cpu_has_vmx(env)) {
|
|
+ kvm_msr_entry_add_vmx(cpu, env->features);
|
|
+ }
|
|
}
|
|
|
|
if (has_msr_ucode_rev) {
|
|
kvm_msr_entry_add(cpu, MSR_IA32_UCODE_REV, cpu->ucode_rev);
|
|
}
|
|
-
|
|
- /*
|
|
- * Older kernels do not include VMX MSRs in KVM_GET_MSR_INDEX_LIST, but
|
|
- * all kernels with MSR features should have them.
|
|
- */
|
|
- if (kvm_feature_msrs && cpu_has_vmx(env)) {
|
|
- kvm_msr_entry_add_vmx(cpu, env->features);
|
|
- }
|
|
-
|
|
assert(kvm_buf_set_msrs(cpu) == 0);
|
|
}
|
|
|
|
--
|
|
2.50.1
|
|
|