igvm: Supply MADT via IGVM parameter
v5 cover igvm: Supply MADT via IGVM parameter
When launching using an IGVM file, supply a copy of the MADT (part of the ACPI tables) via an IGVM parameter (IGVM_VHY_MADT) to the guest, in addition to the regular fw_cfg mechanism.
The IGVM parameter can be consumed by Coconut SVSM [1], instead of relying on the fw_cfg interface, which has caused problems before due to unexpected access [2,3]. Using IGVM parameters is the default way for Coconut SVSM; switching over would allow removing specialized code paths for QEMU in Coconut.
Coconut SVSM needs to know the SMP configuration, but does not look at any other ACPI data, nor does it interact with the PCI bus settings. Since the MADT is static and not linked with other ACPI tables, it can be supplied stand-alone like this.
Generating the MADT twice (IGVM processing and ACPI table building) seems acceptable, since there is no infrastructure to obtain the MADT out of the ACPI table memory area during IGVM processing.
In any case OVMF, which runs after SVSM has already been initialized, will continue reading all ACPI tables via fw_cfg and provide fixed up ACPI data to the OS as before.
This series makes ACPI table building more generic by making the BIOS linker optional. This allows the MADT to be generated outside of the ACPI build context. A new function (acpi_build_madt_standalone()) is added for that. With that, the IGVM MADT parameter field can be filled with the MADT data during processing of the IGVM file.
[1] https://github.com/coconut-svsm/svsm/pull/858
[2] https://gitlab.com/qemu-project/qemu/-/issues/2882
[3] https://github.com/coconut-svsm/svsm/issues/646
v5:
- Rebase on latest IGVM rework series from Gerd
- Make qigvm_find_parameter_entry() more generic and use everywhere possible; It now takes the index as input, instead of the full parameter struct
- Consistently use early returns when looking up parameter entries
- Emit a warning message if no parameter area can be found for a given index
v4:
- Add ACPI table checksum calculation without BIOS linker, used for the standalone MADT.
- Don't pass ConfidentialGuestState into the IGVM backend anymore. Not needed, since we already have the full MachineState there now.
- Move the NULL check patch out into a new series (to be posted).
- Address remaining cleanup comments.
v3:
- Pass the machine state into IGVM file processing context instead of MADT data
- Generate MADT from inside the IGVM backend
- Refactor: Extract common code for finding IGVM parameter from IGVM parameter handlers
- Add NULL pointer check for igvm_get_buffer()
v2:
- Provide more context in the message of the main commit
- Document the MADT parameter of IgvmCfgClass::process()
- Document why no MADT data is provided the process call in sev.c
Based-on: <[email protected]>
Oliver Steffen (6):
hw/acpi: Make BIOS linker optional
hw/acpi: Add standalone function to build MADT
igvm: Add common function for finding parameter entries
igvm: Refactor qigvm_parameter_insert
igvm: Pass machine state to IGVM file processing
igvm: Fill MADT IGVM parameter field
backends/igvm-cfg.c | 2 +- backends/igvm.c | 255 +++++++++++++++++++++++--------------- hw/acpi/aml-build.c | 29 ++++- hw/i386/acpi-build.c | 9 ++ hw/i386/acpi-build.h | 2 + include/system/igvm-cfg.h | 3 +- include/system/igvm.h | 5 +- target/i386/sev.c | 3 +- 8 files changed, 197 insertions(+), 111 deletions(-)
Signature · 1 line
2.52.0
PATCH v5 1/6 hw/acpi: Make BIOS linker optional
Make the BIOS linker optional in acpi_table_end() and calculate the ACPI table checksum directly if no linker is provided.
This makes it possible to call for example acpi_build_madt() from outside the ACPI table builder context.
--- hw/acpi/aml-build.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)
hw/acpi/aml-build.c +27 -2
@@ -1730,6 +1730,25 @@ void acpi_table_begin(AcpiTable *desc, GArray *array)build_append_int_noprefix (array,1 ,4 );/* Creator Revision */ } +static uint8_t calculate_acpi_checksum (const gchar *data,size_t len) +{ +size_t i; +uint8_t sum =0 ; + +for (i =0 ; i < len; ++i) { + sum += (uint8_t )data[i]; + } + +return sum; +} + +static void update_acpi_checksum (gchar *data,size_t start_offset, +size_t table_len,size_t checksum_offset) +{ +uint8_t sum =calculate_acpi_checksum (&data[start_offset], table_len); + data[checksum_offset] =0xff - sum +1 ; +} +void acpi_table_end (BIOSLinker *linker,AcpiTable *desc) {/*
@@ -1748,8 +1767,14 @@ void acpi_table_end(BIOSLinker *linker, AcpiTable *desc)*/ memcpy (len_ptr, &table_len_le,sizeof table_len_le); -bios_linker_loader_add_checksum (linker,ACPI_BUILD_TABLE_FILE , - desc->table_offset, table_len, desc->table_offset + checksum_offset); +if (linker !=NULL ) { +bios_linker_loader_add_checksum (linker,ACPI_BUILD_TABLE_FILE , + desc->table_offset, table_len, + desc->table_offset + checksum_offset); + }else { +update_acpi_checksum (desc->array->data, desc->table_offset, + table_len, desc->table_offset + checksum_offset); + } }void *acpi_data_push (GArray *table_data,unsigned size)
Signature · 1 line
2.52.0
PATCH v5 2/6 hw/acpi: Add standalone function to build MADT
In reply to Oliver SteffenAdd a fuction called acpi_build_madt_standalone() that builds a MADT without the rest of the ACPI table structure.
--- hw/i386/acpi-build.c | 9 +++++++++ hw/i386/acpi-build.h | 2 ++ 2 files changed, 11 insertions(+)
hw/i386/acpi-build.c +9 -0
@@ -2249,3 +2249,12 @@ void acpi_setup(void)*/ acpi_build_tables_cleanup (&tables, false); } + +GArray *acpi_build_madt_standalone (MachineState *machine) +{ +X86MachineState *x86ms =X86_MACHINE (machine); +GArray *table =g_array_new (false, true,1 ); +acpi_build_madt (table,NULL , x86ms, x86ms->oem_id, + x86ms->oem_table_id); +return table; +}
hw/i386/acpi-build.h +2 -0
@@ -8,4 +8,6 @@ extern const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio;void acpi_setup (void );Object *acpi_get_i386_pci_host (void ); +GArray *acpi_build_madt_standalone (MachineState *machine); +#endif
Signature · 1 line
2.52.0