61 lines
2.3 KiB
Diff
61 lines
2.3 KiB
Diff
From 53a6bd5c6e3e4f0cf3fcf1b0a326c13e9defdc50 Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Fri, 18 Jul 2025 18:03:50 +0200
|
|
Subject: [PATCH 100/115] i386/tdx: Set value of <GetTdVmCallInfo> based on
|
|
capabilities of both KVM and QEMU
|
|
|
|
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: [100/115] ebdd2061181d3ce95404931904e816171ae4f5ac (bonzini/rhel-qemu-kvm)
|
|
|
|
KVM reports the supported TDVMCALL sub leafs in TDX capabilities.
|
|
|
|
one for kernel-supported
|
|
TDVMCALLs (userspace can set those blindly) and one for user-supported
|
|
TDVMCALLs (userspace can set those if it knows how to handle them)
|
|
|
|
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
|
Link: https://lore.kernel.org/r/20250703024021.3559286-4-xiaoyao.li@intel.com
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit 55be385b10658a2372f944fa41aaba016e1e8433)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
---
|
|
target/i386/kvm/tdx.c | 11 +++++++++--
|
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/target/i386/kvm/tdx.c b/target/i386/kvm/tdx.c
|
|
index 2ca661cbc4..a24e15571a 100644
|
|
--- a/target/i386/kvm/tdx.c
|
|
+++ b/target/i386/kvm/tdx.c
|
|
@@ -1256,14 +1256,21 @@ out_free:
|
|
g_free(task);
|
|
}
|
|
|
|
+#define SUPPORTED_TDVMCALLINFO_1_R11 (0)
|
|
+#define SUPPORTED_TDVMCALLINFO_1_R12 (0)
|
|
+
|
|
void tdx_handle_get_tdvmcall_info(X86CPU *cpu, struct kvm_run *run)
|
|
{
|
|
if (run->tdx.get_tdvmcall_info.leaf != 1) {
|
|
return;
|
|
}
|
|
|
|
- run->tdx.get_tdvmcall_info.r11 = 0;
|
|
- run->tdx.get_tdvmcall_info.r12 = 0;
|
|
+ run->tdx.get_tdvmcall_info.r11 = (tdx_caps->user_tdvmcallinfo_1_r11 &
|
|
+ SUPPORTED_TDVMCALLINFO_1_R11) |
|
|
+ tdx_caps->kernel_tdvmcallinfo_1_r11;
|
|
+ run->tdx.get_tdvmcall_info.r12 = (tdx_caps->user_tdvmcallinfo_1_r12 &
|
|
+ SUPPORTED_TDVMCALLINFO_1_R12) |
|
|
+ tdx_caps->kernel_tdvmcallinfo_1_r12;
|
|
run->tdx.get_tdvmcall_info.r13 = 0;
|
|
run->tdx.get_tdvmcall_info.r14 = 0;
|
|
|
|
--
|
|
2.50.1
|
|
|