147 lines
4.8 KiB
Diff
147 lines
4.8 KiB
Diff
From 7c045d8fcd636f8e2e52f303fc668bff20bc6e5d Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Fri, 18 Jul 2025 18:03:47 +0200
|
|
Subject: [PATCH 057/115] i386/tdx: Handle KVM_SYSTEM_EVENT_TDX_FATAL
|
|
|
|
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: [57/115] 2b4612a6e7c55849578ab1dc803849190c80692d (bonzini/rhel-qemu-kvm)
|
|
|
|
TD guest can use TDG.VP.VMCALL<REPORT_FATAL_ERROR> to request
|
|
termination. KVM translates such request into KVM_EXIT_SYSTEM_EVENT with
|
|
type of KVM_SYSTEM_EVENT_TDX_FATAL.
|
|
|
|
Add hanlder for such exit. Parse and print the error message, and
|
|
terminate the TD guest in the handler.
|
|
|
|
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-29-xiaoyao.li@intel.com
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit 98dbfd6849f117de02ac6f513f2a1f95563e60ae)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
---
|
|
target/i386/kvm/kvm.c | 10 +++++++++
|
|
target/i386/kvm/tdx-stub.c | 5 +++++
|
|
target/i386/kvm/tdx.c | 46 ++++++++++++++++++++++++++++++++++++++
|
|
target/i386/kvm/tdx.h | 2 ++
|
|
4 files changed, 63 insertions(+)
|
|
|
|
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
|
|
index fa61221190..4bda4f5525 100644
|
|
--- a/target/i386/kvm/kvm.c
|
|
+++ b/target/i386/kvm/kvm.c
|
|
@@ -6019,6 +6019,16 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)
|
|
case KVM_EXIT_HYPERCALL:
|
|
ret = kvm_handle_hypercall(run);
|
|
break;
|
|
+ case KVM_EXIT_SYSTEM_EVENT:
|
|
+ switch (run->system_event.type) {
|
|
+ case KVM_SYSTEM_EVENT_TDX_FATAL:
|
|
+ ret = tdx_handle_report_fatal_error(cpu, run);
|
|
+ break;
|
|
+ default:
|
|
+ ret = -1;
|
|
+ break;
|
|
+ }
|
|
+ break;
|
|
default:
|
|
fprintf(stderr, "KVM: unknown exit reason %d\n", run->exit_reason);
|
|
ret = -1;
|
|
diff --git a/target/i386/kvm/tdx-stub.c b/target/i386/kvm/tdx-stub.c
|
|
index 7748b6d0a4..720a4ff046 100644
|
|
--- a/target/i386/kvm/tdx-stub.c
|
|
+++ b/target/i386/kvm/tdx-stub.c
|
|
@@ -13,3 +13,8 @@ int tdx_parse_tdvf(void *flash_ptr, int size)
|
|
{
|
|
return -EINVAL;
|
|
}
|
|
+
|
|
+int tdx_handle_report_fatal_error(X86CPU *cpu, struct kvm_run *run)
|
|
+{
|
|
+ return -EINVAL;
|
|
+}
|
|
diff --git a/target/i386/kvm/tdx.c b/target/i386/kvm/tdx.c
|
|
index 62c83394d0..679613ab55 100644
|
|
--- a/target/i386/kvm/tdx.c
|
|
+++ b/target/i386/kvm/tdx.c
|
|
@@ -615,6 +615,52 @@ int tdx_parse_tdvf(void *flash_ptr, int size)
|
|
return tdvf_parse_metadata(&tdx_guest->tdvf, flash_ptr, size);
|
|
}
|
|
|
|
+/*
|
|
+ * Only 8 registers can contain valid ASCII byte stream to form the fatal
|
|
+ * message, and their sequence is: R14, R15, RBX, RDI, RSI, R8, R9, RDX
|
|
+ */
|
|
+#define TDX_FATAL_MESSAGE_MAX 64
|
|
+
|
|
+int tdx_handle_report_fatal_error(X86CPU *cpu, struct kvm_run *run)
|
|
+{
|
|
+ uint64_t error_code = run->system_event.data[R_R12];
|
|
+ uint64_t reg_mask = run->system_event.data[R_ECX];
|
|
+ char *message = NULL;
|
|
+ uint64_t *tmp;
|
|
+
|
|
+ if (error_code & 0xffff) {
|
|
+ error_report("TDX: REPORT_FATAL_ERROR: invalid error code: 0x%lx",
|
|
+ error_code);
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
+ if (reg_mask) {
|
|
+ message = g_malloc0(TDX_FATAL_MESSAGE_MAX + 1);
|
|
+ tmp = (uint64_t *)message;
|
|
+
|
|
+#define COPY_REG(REG) \
|
|
+ do { \
|
|
+ if (reg_mask & BIT_ULL(REG)) { \
|
|
+ *(tmp++) = run->system_event.data[REG]; \
|
|
+ } \
|
|
+ } while (0)
|
|
+
|
|
+ COPY_REG(R_R14);
|
|
+ COPY_REG(R_R15);
|
|
+ COPY_REG(R_EBX);
|
|
+ COPY_REG(R_EDI);
|
|
+ COPY_REG(R_ESI);
|
|
+ COPY_REG(R_R8);
|
|
+ COPY_REG(R_R9);
|
|
+ COPY_REG(R_EDX);
|
|
+ *((char *)tmp) = '\0';
|
|
+ }
|
|
+#undef COPY_REG
|
|
+
|
|
+ error_report("TD guest reports fatal error. %s", message ? : "");
|
|
+ return -1;
|
|
+}
|
|
+
|
|
static bool tdx_guest_get_sept_ve_disable(Object *obj, Error **errp)
|
|
{
|
|
TdxGuest *tdx = TDX_GUEST(obj);
|
|
diff --git a/target/i386/kvm/tdx.h b/target/i386/kvm/tdx.h
|
|
index 36a7400e74..04b5afe199 100644
|
|
--- a/target/i386/kvm/tdx.h
|
|
+++ b/target/i386/kvm/tdx.h
|
|
@@ -8,6 +8,7 @@
|
|
#endif
|
|
|
|
#include "confidential-guest.h"
|
|
+#include "cpu.h"
|
|
#include "hw/i386/tdvf.h"
|
|
|
|
#define TYPE_TDX_GUEST "tdx-guest"
|
|
@@ -59,5 +60,6 @@ bool is_tdx_vm(void);
|
|
int tdx_pre_create_vcpu(CPUState *cpu, Error **errp);
|
|
void tdx_set_tdvf_region(MemoryRegion *tdvf_mr);
|
|
int tdx_parse_tdvf(void *flash_ptr, int size);
|
|
+int tdx_handle_report_fatal_error(X86CPU *cpu, struct kvm_run *run);
|
|
|
|
#endif /* QEMU_I386_TDX_H */
|
|
--
|
|
2.50.1
|
|
|