152 lines
4.6 KiB
Diff
152 lines
4.6 KiB
Diff
From 95f727555b05af436c6e23a0dde42155a217a6e8 Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Fri, 18 Jul 2025 18:03:46 +0200
|
|
Subject: [PATCH 049/115] i386/tdx: Track mem_ptr for each firmware entry of
|
|
TDVF
|
|
|
|
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: [49/115] 8cee9537e1387c718ec037bbc1a8d0a6b17bbf49 (bonzini/rhel-qemu-kvm)
|
|
|
|
For each TDVF sections, QEMU needs to copy the content to guest
|
|
private memory via KVM API (KVM_TDX_INIT_MEM_REGION).
|
|
|
|
Introduce a field @mem_ptr for TdxFirmwareEntry to track the memory
|
|
pointer of each TDVF sections. So that QEMU can add/copy them to guest
|
|
private memory later.
|
|
|
|
TDVF sections can be classified into two groups:
|
|
- Firmware itself, e.g., TDVF BFV and CFV, that located separately from
|
|
guest RAM. Its memory pointer is the bios pointer.
|
|
|
|
- Sections located at guest RAM, e.g., TEMP_MEM and TD_HOB.
|
|
mmap a new memory range for them.
|
|
|
|
Register a machine_init_done callback to do the stuff.
|
|
|
|
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-21-xiaoyao.li@intel.com
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit 4420ba0ebbf014acc68f78669e0767e288313ed6)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
|
Conflicts: system/ -> sysemu/
|
|
---
|
|
hw/i386/tdvf.c | 1 +
|
|
include/hw/i386/tdvf.h | 7 +++++++
|
|
target/i386/kvm/tdx.c | 37 +++++++++++++++++++++++++++++++++++++
|
|
3 files changed, 45 insertions(+)
|
|
|
|
diff --git a/hw/i386/tdvf.c b/hw/i386/tdvf.c
|
|
index 824a387d42..88453cf3a5 100644
|
|
--- a/hw/i386/tdvf.c
|
|
+++ b/hw/i386/tdvf.c
|
|
@@ -179,6 +179,7 @@ int tdvf_parse_metadata(TdxFirmware *fw, void *flash_ptr, int size)
|
|
}
|
|
}
|
|
|
|
+ fw->mem_ptr = flash_ptr;
|
|
return 0;
|
|
|
|
err:
|
|
diff --git a/include/hw/i386/tdvf.h b/include/hw/i386/tdvf.h
|
|
index 7ebcac42a3..e75c8d1acc 100644
|
|
--- a/include/hw/i386/tdvf.h
|
|
+++ b/include/hw/i386/tdvf.h
|
|
@@ -26,13 +26,20 @@ typedef struct TdxFirmwareEntry {
|
|
uint64_t size;
|
|
uint32_t type;
|
|
uint32_t attributes;
|
|
+
|
|
+ void *mem_ptr;
|
|
} TdxFirmwareEntry;
|
|
|
|
typedef struct TdxFirmware {
|
|
+ void *mem_ptr;
|
|
+
|
|
uint32_t nr_entries;
|
|
TdxFirmwareEntry *entries;
|
|
} TdxFirmware;
|
|
|
|
+#define for_each_tdx_fw_entry(fw, e) \
|
|
+ for (e = (fw)->entries; e != (fw)->entries + (fw)->nr_entries; e++)
|
|
+
|
|
int tdvf_parse_metadata(TdxFirmware *fw, void *flash_ptr, int size);
|
|
|
|
#endif /* HW_I386_TDVF_H */
|
|
diff --git a/target/i386/kvm/tdx.c b/target/i386/kvm/tdx.c
|
|
index 71be3bd28d..95687e3a91 100644
|
|
--- a/target/i386/kvm/tdx.c
|
|
+++ b/target/i386/kvm/tdx.c
|
|
@@ -12,10 +12,13 @@
|
|
#include "qemu/osdep.h"
|
|
#include "qemu/error-report.h"
|
|
#include "qemu/base64.h"
|
|
+#include "qemu/mmap-alloc.h"
|
|
#include "qapi/error.h"
|
|
#include "qom/object_interfaces.h"
|
|
#include "crypto/hash.h"
|
|
+#include "sysemu/sysemu.h"
|
|
|
|
+#include "hw/i386/tdvf.h"
|
|
#include "hw/i386/x86.h"
|
|
#include "kvm_i386.h"
|
|
#include "tdx.h"
|
|
@@ -143,6 +146,38 @@ void tdx_set_tdvf_region(MemoryRegion *tdvf_mr)
|
|
tdx_guest->tdvf_mr = tdvf_mr;
|
|
}
|
|
|
|
+static void tdx_finalize_vm(Notifier *notifier, void *unused)
|
|
+{
|
|
+ TdxFirmware *tdvf = &tdx_guest->tdvf;
|
|
+ TdxFirmwareEntry *entry;
|
|
+
|
|
+ for_each_tdx_fw_entry(tdvf, entry) {
|
|
+ switch (entry->type) {
|
|
+ case TDVF_SECTION_TYPE_BFV:
|
|
+ case TDVF_SECTION_TYPE_CFV:
|
|
+ entry->mem_ptr = tdvf->mem_ptr + entry->data_offset;
|
|
+ break;
|
|
+ case TDVF_SECTION_TYPE_TD_HOB:
|
|
+ case TDVF_SECTION_TYPE_TEMP_MEM:
|
|
+ entry->mem_ptr = qemu_ram_mmap(-1, entry->size,
|
|
+ qemu_real_host_page_size(), 0, 0);
|
|
+ if (entry->mem_ptr == MAP_FAILED) {
|
|
+ error_report("Failed to mmap memory for TDVF section %d",
|
|
+ entry->type);
|
|
+ exit(1);
|
|
+ }
|
|
+ break;
|
|
+ default:
|
|
+ error_report("Unsupported TDVF section %d", entry->type);
|
|
+ exit(1);
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
+static Notifier tdx_machine_done_notify = {
|
|
+ .notify = tdx_finalize_vm,
|
|
+};
|
|
+
|
|
static int tdx_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
|
|
{
|
|
TdxGuest *tdx = TDX_GUEST(cgs);
|
|
@@ -157,6 +192,8 @@ static int tdx_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
|
|
}
|
|
}
|
|
|
|
+ qemu_add_machine_init_done_notifier(&tdx_machine_done_notify);
|
|
+
|
|
tdx_guest = tdx;
|
|
return 0;
|
|
}
|
|
--
|
|
2.50.1
|
|
|