61 lines
2.3 KiB
Diff
61 lines
2.3 KiB
Diff
From 2c833c9f0b720bcf4267f9025344586b4eaa4906 Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Fri, 18 Jul 2025 18:03:48 +0200
|
|
Subject: [PATCH 077/115] i386/tdx: Add XFD to supported bit of TDX
|
|
|
|
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: [77/115] 12485d15d9f665ad75d51f92380997df371180e4 (bonzini/rhel-qemu-kvm)
|
|
|
|
Just mark XFD as always supported for TDX. This simple solution relies
|
|
on the fact KVM will report XFD as 0 when it's not supported by the
|
|
hardware.
|
|
|
|
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
|
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
|
|
Link: https://lore.kernel.org/r/20250508150002.689633-49-xiaoyao.li@intel.com
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit 9f5771c57dbe92d46361afd992a5851c846d0322)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
---
|
|
target/i386/cpu.h | 1 +
|
|
target/i386/kvm/tdx.c | 6 ++++++
|
|
2 files changed, 7 insertions(+)
|
|
|
|
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
|
|
index 3a7a409809..19645eb6f8 100644
|
|
--- a/target/i386/cpu.h
|
|
+++ b/target/i386/cpu.h
|
|
@@ -1100,6 +1100,7 @@ uint64_t x86_cpu_get_supported_feature_word(X86CPU *cpu, FeatureWord w);
|
|
#define CPUID_XSAVE_XSAVEC (1U << 1)
|
|
#define CPUID_XSAVE_XGETBV1 (1U << 2)
|
|
#define CPUID_XSAVE_XSAVES (1U << 3)
|
|
+#define CPUID_XSAVE_XFD (1U << 4)
|
|
|
|
#define CPUID_6_EAX_ARAT (1U << 2)
|
|
|
|
diff --git a/target/i386/kvm/tdx.c b/target/i386/kvm/tdx.c
|
|
index feb9cd7466..f15ed51a32 100644
|
|
--- a/target/i386/kvm/tdx.c
|
|
+++ b/target/i386/kvm/tdx.c
|
|
@@ -621,6 +621,12 @@ static void tdx_add_supported_cpuid_by_xfam(void)
|
|
e->edx |= (tdx_caps->supported_xfam & CPUID_XSTATE_XCR0_MASK) >> 32;
|
|
|
|
e = find_in_supported_entry(0xd, 1);
|
|
+ /*
|
|
+ * Mark XFD always support for TDX, it will be cleared finally in
|
|
+ * tdx_adjust_cpuid_features() if XFD is unavailable on the hardware
|
|
+ * because in this case the original data has it as 0.
|
|
+ */
|
|
+ e->eax |= CPUID_XSAVE_XFD;
|
|
e->ecx |= (tdx_caps->supported_xfam & CPUID_XSTATE_XSS_MASK);
|
|
e->edx |= (tdx_caps->supported_xfam & CPUID_XSTATE_XSS_MASK) >> 32;
|
|
}
|
|
--
|
|
2.50.1
|
|
|