For every TDVF sections, QEMU needs to copy its content to guest
private memory via KVM API, to initialize them.
So add a field @mem_ptr to track the pointer of each TDVF sections.
BFV and CFV are firmware and loaded as plfash.
TEMP_MEM and TD_HOB always locate at guest RAM before 4G, specifically
starting from 0x80 0000 (8M)
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
---
include/hw/i386/tdvf.h | 5 +++++
target/i386/kvm/tdx.c | 42 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+)
diff --git a/include/hw/i386/tdvf.h b/include/hw/i386/tdvf.h
index 773bd39a3bff..ce28b7ec4543 100644
--- a/include/hw/i386/tdvf.h
+++ b/include/hw/i386/tdvf.h
@@ -39,6 +39,8 @@ typedef struct TdxFirmwareEntry {
uint64_t size;
uint32_t type;
uint32_t attributes;
+
+ void *mem_ptr;
} TdxFirmwareEntry;
typedef struct TdxFirmware {
@@ -50,6 +52,9 @@ typedef struct TdxFirmware {
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 cd88b6dfc280..fe8554dcebb0 100644
--- a/target/i386/kvm/tdx.c
+++ b/target/i386/kvm/tdx.c
@@ -16,8 +16,10 @@
#include "qom/object_interfaces.h"
#include "standard-headers/asm-x86/kvm_para.h"
#include "sysemu/kvm.h"
+#include "sysemu/sysemu.h"
#include "hw/i386/x86.h"
+#include "hw/i386/tdvf.h"
#include "kvm_i386.h"
#include "tdx.h"
@@ -103,6 +105,44 @@ static void get_tdx_capabilities(void)
tdx_caps = caps;
}
+static void tdx_finalize_vm(Notifier *notifier, void *unused)
+{
+ MachineState *ms = MACHINE(qdev_get_machine());
+ void *base_ram_ptr = memory_region_get_ram_ptr(ms->ram);
+ TdxFirmware *tdvf = &tdx_guest->tdvf;
+ TdxFirmwareEntry *entry;
+
+ for_each_tdx_fw_entry(tdvf, entry) {
+ switch (entry->type) {
+ case TDVF_SECTION_TYPE_BFV:
+ if (tdvf->split_tdvf) {
+ entry->mem_ptr = tdvf->code_ptr;
+ } else {
+ entry->mem_ptr = tdvf->code_ptr + entry->data_offset;
+ }
+ break;
+ case TDVF_SECTION_TYPE_CFV:
+ if (tdvf->split_tdvf) {
+ entry->mem_ptr = tdvf->vars_ptr;
+ } else {
+ entry->mem_ptr = tdvf->code_ptr;
+ }
+ break;
+ case TDVF_SECTION_TYPE_TD_HOB:
+ case TDVF_SECTION_TYPE_TEMP_MEM:
+ entry->mem_ptr = base_ram_ptr + entry->address;
+ break;
+ default:
+ error_report("Unsupported TDVF section %d", entry->type);
+ exit(1);
+ }
+ }
+}
+
+static Notifier tdx_machine_done_notify = {
+ .notify = tdx_finalize_vm,
+};
+
int tdx_kvm_init(MachineState *ms, Error **errp)
{
TdxGuest *tdx = (TdxGuest *)object_dynamic_cast(OBJECT(ms->cgs),
@@ -124,6 +164,8 @@ int tdx_kvm_init(MachineState *ms, Error **errp)
*/
kvm_readonly_mem_allowed = false;
+ qemu_add_machine_init_done_notifier(&tdx_machine_done_notify);
+
tdx_guest = tdx;
return 0;
--
2.27.0