- kvm-target-i386-Make-invtsc-migratable-when-user-sets-ts.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-target-i386-Enable-fdp-excptn-only-and-zero-fcs-fds.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-kvm-i386-make-kvm_filter_msr-and-related-definitions.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-kvm-remove-unnecessary-ifdef.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-crypto-Define-macros-for-hash-algorithm-digest-lengt.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-cpu-Drop-the-check-of-phys_bits-in-host_cpu_rea.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-cpu-Extract-a-common-fucntion-to-setup-value-of.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-cpu-Drop-the-variable-smp_cores-and-smp_threads.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-cpu-Drop-cores_per_pkg-in-cpu_x86_cpuid.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-topology-Update-the-comment-of-x86_apicid_from_.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-topology-Introduce-helpers-for-various-topology.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-cpu-Track-a-X86CPUTopoInfo-directly-in-CPUX86St.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-cpu-Hoist-check-of-CPUID_EXT3_TOPOEXT-against-t.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-cpu-Remove-nr_cores-from-struct-CPUState.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-cpu-Set-up-CPUID_HT-in-x86_cpu_expand_features-.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-cpu-Set-and-track-CPUID_EXT3_CMP_LEG-in-env-fea.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-Remove-unused-parameter-uint32_t-bit-in-feature.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-target-i386-Print-CPUID-subleaf-info-for-unsupported.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-target-i386-sev-Reduce-system-specific-declarations.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-physmem-replace-assertion-with-error.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-redhat-target-i386-add-CPUID-and-MSR-bits-from-Clear.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-qom-reverse-order-of-instance_post_init-calls.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-target-i386-Remove-AccelCPUClass-cpu_class_init-need.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-cpu-Consolidate-the-helper-to-get-Host-s-vendor.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-rocker-do-not-pollute-the-namespace.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-linux-headers-Update-to-Linux-v6.14-rc3.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-linux-headers-Update-to-Linux-v6.15-rc3.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-linux-headers-update-from-6.15-kvm-next.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-update-Linux-headers-to-v6.16-rc3.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-update-Linux-headers-to-KVM-tree-master.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-Introduce-tdx-guest-object.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Implement-tdx_kvm_type-for-TDX.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Implement-tdx_kvm_init-to-initialize-TDX-VM.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Get-tdx_capabilities-via-KVM_TDX_CAPABILITI.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Introduce-is_tdx_vm-helper-and-cache-tdx_gu.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-kvm-Introduce-kvm_arch_pre_create_vcpu.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Initialize-TDX-before-creating-TD-vcpus.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Add-property-sept-ve-disable-for-tdx-guest-.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Make-sept_ve_disable-set-by-default.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Wire-CPU-features-up-with-attributes-of-TD-.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Validate-TD-attributes.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Support-user-configurable-mrconfigid-mrowne.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Set-APIC-bus-rate-to-match-with-what-TDX-mo.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Implement-user-specified-tsc-frequency.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-load-TDVF-for-TD-guest.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdvf-Introduce-function-to-parse-TDVF-metadata.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Parse-TDVF-metadata-for-TDX-VM.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Don-t-initialize-pc.rom-for-TDX-VMs.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Track-mem_ptr-for-each-firmware-entry-of-TD.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Track-RAM-entries-for-TDX-VM.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-headers-Add-definitions-from-UEFI-spec-for-volumes-r.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Setup-the-TD-HOB-list.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Add-TDVF-memory-via-KVM_TDX_INIT_MEM_REGION.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Call-KVM_TDX_INIT_VCPU-to-initialize-TDX-vc.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Finalize-TDX-VM.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Enable-user-exit-on-KVM_HC_MAP_GPA_RANGE.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Handle-KVM_SYSTEM_EVENT_TDX_FATAL.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Wire-TDX_REPORT_FATAL_ERROR-with-GuestPanic.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-kvm-Check-KVM_CAP_MAX_VCPUS-at-vm-level.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-cpu-introduce-x86_confidential_guest_cpu_instan.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-implement-tdx_cpu_instance_init.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-cpu-Introduce-enable_cpuid_0x1f-to-force-exposi.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Force-exposing-CPUID-0x1f.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Set-kvm_readonly_mem_enabled-to-false-for-T.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Disable-SMM-for-TDX-VMs.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Disable-PIC-for-TDX-VMs.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Set-and-check-kernel_irqchip-mode-for-TDX.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Don-t-synchronize-guest-tsc-for-TDs.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Only-configure-MSR_IA32_UCODE_REV-in-kvm_in.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-apic-Skip-kvm_apic_put-for-TDX.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-cpu-Don-t-set-vcpu_dirty-when-guest_state_protected.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-cgs-Rename-mask_cpuid_features-to-adjust_cpuid_.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Implement-adjust_cpuid_features-for-TDX.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Add-TDX-fixed1-bits-to-supported-CPUIDs.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Add-supported-CPUID-bits-related-to-TD-Attr.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Add-supported-CPUID-bits-relates-to-XFAM.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Add-XFD-to-supported-bit-of-TDX.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Define-supported-KVM-features-for-TDX.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-cgs-Introduce-x86_confidential_guest_check_feat.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Fetch-and-validate-CPUID-of-TD-guest.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Don-t-treat-SYSCALL-as-unavailable.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Make-invtsc-default-on.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Validate-phys_bits-against-host-value.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-docs-Add-TDX-documentation.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Fix-build-on-32-bit-host.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdvf-Fix-build-on-32-bit-host.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-cpu-Move-adjustment-of-CPUID_EXT_PDCM-before-fe.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Error-and-exit-when-named-cpu-model-is-requ.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-cpu-Rename-enable_cpuid_0x1f-to-force_cpuid_0x1.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Fix-the-typo-of-the-comment-of-struct-TdxGu.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Clarify-the-error-message-of-mrconfigid-mro.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-handle-TDG.VP.VMCALL-GetTdVmCallInfo.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-handle-TDG.VP.VMCALL-GetQuote.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-target-i386-move-max_features-to-class.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-target-i386-nvmm-whpx-add-accel-CPU-class-that-sets-.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-target-i386-allow-reordering-max_x86_cpu_initfn-vs-a.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-target-i386-move-accel_cpu_instance_init-to-.instanc.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-target-i386-merge-host_cpu_instance_init-and-host_cp.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Remove-enumeration-of-GetQuote-in-tdx_handl.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Set-value-of-GetTdVmCallInfo-based-on-capab.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-handle-TDVMCALL_SETUP_EVENT_NOTIFY_INTERRUP.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Fix-the-report-of-gpa-in-QAPI.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Remove-task-watch-only-when-it-s-valid.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Don-t-mask-off-CPUID_EXT_PDCM.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-cpu-Move-x86_ext_save_areas-initialization-to-..patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-target-i386-tdx-fix-locking-for-interrupt-injection.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-cpu-Cleanup-host_cpu_max_instance_init.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-i386-tdx-Remove-the-redundant-qemu_mutex_init-tdx-lo.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-redhat-enable-CONFIG_TDX.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-redhat-allow-5-level-paging-for-TDX-VMs.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-memory-Export-a-helper-to-get-intersection-of-a-Memo.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-memory-Change-memory_region_set_ram_discard_manager-.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-memory-Unify-the-definiton-of-ReplayRamPopulate-and-.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-ram-block-attributes-Introduce-RamBlockAttributes-to.patch [RHEL-15710 RHEL-20798 RHEL-49728] - kvm-physmem-Support-coordinated-discarding-of-RAM-with-g.patch [RHEL-15710 RHEL-20798 RHEL-49728] - Resolves: RHEL-15710 ([Intel 9.7 FEAT] TDX: QEMU Support) - Resolves: RHEL-20798 ([Intel 9.6 FEAT] TDX: host: Virt-QEMU: Add safe device pass-through for TD) - Resolves: RHEL-49728 ([Intel 9.7 FEAT] Virt-QEMU: TDX: Allow to configure apic bus clock)
241 lines
7.6 KiB
Diff
241 lines
7.6 KiB
Diff
From 7f2a5ac9ad2e2d54b09e1bcd1a1d59cbde1443eb Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Fri, 18 Jul 2025 18:03:47 +0200
|
|
Subject: [PATCH 058/115] i386/tdx: Wire TDX_REPORT_FATAL_ERROR with GuestPanic
|
|
facility
|
|
|
|
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: [58/115] 4cdc786e5ad029e8ed5713b4a27bb038a4b6f935 (bonzini/rhel-qemu-kvm)
|
|
|
|
Integrate TDX's TDX_REPORT_FATAL_ERROR into QEMU GuestPanic facility
|
|
|
|
Originated-from: Isaku Yamahata <isaku.yamahata@intel.com>
|
|
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
|
Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
|
|
Link: https://lore.kernel.org/r/20250508150002.689633-30-xiaoyao.li@intel.com
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit 6e250463b08b4028123f201343ee72099ef81e68)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
|
Conflicts: system/ -> sysemu/
|
|
---
|
|
qapi/run-state.json | 31 +++++++++++++++++++--
|
|
system/runstate.c | 65 +++++++++++++++++++++++++++++++++++++++++++
|
|
target/i386/kvm/tdx.c | 25 ++++++++++++++++-
|
|
3 files changed, 118 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/qapi/run-state.json b/qapi/run-state.json
|
|
index ce95cfa46b..ee11adc508 100644
|
|
--- a/qapi/run-state.json
|
|
+++ b/qapi/run-state.json
|
|
@@ -501,10 +501,12 @@
|
|
#
|
|
# @s390: s390 guest panic information type (Since: 2.12)
|
|
#
|
|
+# @tdx: tdx guest panic information type (Since: 10.1)
|
|
+#
|
|
# Since: 2.9
|
|
##
|
|
{ 'enum': 'GuestPanicInformationType',
|
|
- 'data': [ 'hyper-v', 's390' ] }
|
|
+ 'data': [ 'hyper-v', 's390', 'tdx' ] }
|
|
|
|
##
|
|
# @GuestPanicInformation:
|
|
@@ -519,7 +521,8 @@
|
|
'base': {'type': 'GuestPanicInformationType'},
|
|
'discriminator': 'type',
|
|
'data': {'hyper-v': 'GuestPanicInformationHyperV',
|
|
- 's390': 'GuestPanicInformationS390'}}
|
|
+ 's390': 'GuestPanicInformationS390',
|
|
+ 'tdx' : 'GuestPanicInformationTdx'}}
|
|
|
|
##
|
|
# @GuestPanicInformationHyperV:
|
|
@@ -598,6 +601,30 @@
|
|
'psw-addr': 'uint64',
|
|
'reason': 'S390CrashReason'}}
|
|
|
|
+##
|
|
+# @GuestPanicInformationTdx:
|
|
+#
|
|
+# TDX Guest panic information specific to TDX, as specified in the
|
|
+# "Guest-Hypervisor Communication Interface (GHCI) Specification",
|
|
+# section TDG.VP.VMCALL<ReportFatalError>.
|
|
+#
|
|
+# @error-code: TD-specific error code
|
|
+#
|
|
+# @message: Human-readable error message provided by the guest. Not
|
|
+# to be trusted.
|
|
+#
|
|
+# @gpa: guest-physical address of a page that contains more verbose
|
|
+# error information, as zero-terminated string. Present when the
|
|
+# "GPA valid" bit (bit 63) is set in @error-code.
|
|
+#
|
|
+#
|
|
+# Since: 10.1
|
|
+##
|
|
+{'struct': 'GuestPanicInformationTdx',
|
|
+ 'data': {'error-code': 'uint32',
|
|
+ 'message': 'str',
|
|
+ '*gpa': 'uint64'}}
|
|
+
|
|
##
|
|
# @MEMORY_FAILURE:
|
|
#
|
|
diff --git a/system/runstate.c b/system/runstate.c
|
|
index c2c9afa905..31970c522e 100644
|
|
--- a/system/runstate.c
|
|
+++ b/system/runstate.c
|
|
@@ -565,6 +565,58 @@ static void qemu_system_wakeup(void)
|
|
}
|
|
}
|
|
|
|
+static char *tdx_parse_panic_message(char *message)
|
|
+{
|
|
+ bool printable = false;
|
|
+ char *buf = NULL;
|
|
+ int len = 0, i;
|
|
+
|
|
+ /*
|
|
+ * Although message is defined as a json string, we shouldn't
|
|
+ * unconditionally treat it as is because the guest generated it and
|
|
+ * it's not necessarily trustable.
|
|
+ */
|
|
+ if (message) {
|
|
+ /* The caller guarantees the NULL-terminated string. */
|
|
+ len = strlen(message);
|
|
+
|
|
+ printable = len > 0;
|
|
+ for (i = 0; i < len; i++) {
|
|
+ if (!(0x20 <= message[i] && message[i] <= 0x7e)) {
|
|
+ printable = false;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (len == 0) {
|
|
+ buf = g_malloc(1);
|
|
+ buf[0] = '\0';
|
|
+ } else {
|
|
+ if (!printable) {
|
|
+ /* 3 = length of "%02x " */
|
|
+ buf = g_malloc(len * 3);
|
|
+ for (i = 0; i < len; i++) {
|
|
+ if (message[i] == '\0') {
|
|
+ break;
|
|
+ } else {
|
|
+ sprintf(buf + 3 * i, "%02x ", message[i]);
|
|
+ }
|
|
+ }
|
|
+ if (i > 0) {
|
|
+ /* replace the last ' '(space) to NULL */
|
|
+ buf[i * 3 - 1] = '\0';
|
|
+ } else {
|
|
+ buf[0] = '\0';
|
|
+ }
|
|
+ } else {
|
|
+ buf = g_strdup(message);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return buf;
|
|
+}
|
|
+
|
|
void qemu_system_guest_panicked(GuestPanicInformation *info)
|
|
{
|
|
qemu_log_mask(LOG_GUEST_ERROR, "Guest crashed");
|
|
@@ -606,7 +658,20 @@ void qemu_system_guest_panicked(GuestPanicInformation *info)
|
|
S390CrashReason_str(info->u.s390.reason),
|
|
info->u.s390.psw_mask,
|
|
info->u.s390.psw_addr);
|
|
+ } else if (info->type == GUEST_PANIC_INFORMATION_TYPE_TDX) {
|
|
+ char *message = tdx_parse_panic_message(info->u.tdx.message);
|
|
+ qemu_log_mask(LOG_GUEST_ERROR,
|
|
+ "\nTDX guest reports fatal error."
|
|
+ " error code: 0x%" PRIx32 " error message:\"%s\"\n",
|
|
+ info->u.tdx.error_code, message);
|
|
+ g_free(message);
|
|
+ if (info->u.tdx.gpa != -1ull) {
|
|
+ qemu_log_mask(LOG_GUEST_ERROR, "Additional error information "
|
|
+ "can be found at gpa page: 0x%" PRIx64 "\n",
|
|
+ info->u.tdx.gpa);
|
|
+ }
|
|
}
|
|
+
|
|
qapi_free_GuestPanicInformation(info);
|
|
}
|
|
}
|
|
diff --git a/target/i386/kvm/tdx.c b/target/i386/kvm/tdx.c
|
|
index 679613ab55..7611f51aae 100644
|
|
--- a/target/i386/kvm/tdx.c
|
|
+++ b/target/i386/kvm/tdx.c
|
|
@@ -16,6 +16,7 @@
|
|
#include "qapi/error.h"
|
|
#include "qom/object_interfaces.h"
|
|
#include "crypto/hash.h"
|
|
+#include "sysemu/runstate.h"
|
|
#include "sysemu/sysemu.h"
|
|
#include "exec/ramblock.h"
|
|
|
|
@@ -615,18 +616,35 @@ int tdx_parse_tdvf(void *flash_ptr, int size)
|
|
return tdvf_parse_metadata(&tdx_guest->tdvf, flash_ptr, size);
|
|
}
|
|
|
|
+static void tdx_panicked_on_fatal_error(X86CPU *cpu, uint64_t error_code,
|
|
+ char *message, uint64_t gpa)
|
|
+{
|
|
+ GuestPanicInformation *panic_info;
|
|
+
|
|
+ panic_info = g_new0(GuestPanicInformation, 1);
|
|
+ panic_info->type = GUEST_PANIC_INFORMATION_TYPE_TDX;
|
|
+ panic_info->u.tdx.error_code = (uint32_t) error_code;
|
|
+ panic_info->u.tdx.message = message;
|
|
+ panic_info->u.tdx.gpa = gpa;
|
|
+
|
|
+ qemu_system_guest_panicked(panic_info);
|
|
+}
|
|
+
|
|
/*
|
|
* 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
|
|
|
|
+#define TDX_REPORT_FATAL_ERROR_GPA_VALID BIT_ULL(63)
|
|
+
|
|
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;
|
|
+ uint64_t gpa = -1ull;
|
|
|
|
if (error_code & 0xffff) {
|
|
error_report("TDX: REPORT_FATAL_ERROR: invalid error code: 0x%lx",
|
|
@@ -657,7 +675,12 @@ int tdx_handle_report_fatal_error(X86CPU *cpu, struct kvm_run *run)
|
|
}
|
|
#undef COPY_REG
|
|
|
|
- error_report("TD guest reports fatal error. %s", message ? : "");
|
|
+ if (error_code & TDX_REPORT_FATAL_ERROR_GPA_VALID) {
|
|
+ gpa = run->system_event.data[R_R13];
|
|
+ }
|
|
+
|
|
+ tdx_panicked_on_fatal_error(cpu, error_code, message, gpa);
|
|
+
|
|
return -1;
|
|
}
|
|
|
|
--
|
|
2.50.1
|
|
|