Change ghes to use HEST-based offsets and add support for error inject
Subsystems (2)
v12 cover Change ghes to use HEST-based offsets and add support for error inject
Hi Michael,
This is v11 of the patch series, rebased to apply after release 10.1. Just like v1, the difference against v10 is a minor conflict resolution.
Please apply as soon as possible to avoid new conflicts.
Thanks!
-
As ghes_record_cper_errors() was written since the beginning to be public and used by ghes-cper.c. It ended being meged earlier because the error-injection series become too big, so it was decided last year to split in two to make easier for reviewers and maintainers to discuss.
This series change the way HEST table offsets are calculated, making them identical to what an OSPM would do and allowing multiple HEST entries without causing migration issues. It open space to add HEST support for non-arm architectures, as now the number and type of HEST notification entries are not hardcoded at ghes.c. Instead, they're passed as a parameter from the arch-dependent init code.
With such issue addressed, it adds a new notification type and add support to inject errors via a Python script. The script itself is at the final patch.
---
v12:
- some descriptions changed verbal tense to imperative;
- since updated at acpi-hest.json;
- added a g_free at qmp_inject_ghes_v2_error() and fixed coding style;
- fixed NOTIFIER_LIST_INITIALIZER() parameter;
- changed a patch description with a diff on it to avoid issues with git am.
v11:
- rebased on the top of current upstream:
baa79455fa92 ("Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging")
- backward-compatibility logic moved to version 10.1;
- BIOS test tables re-generated, as DSDT tables changed on 10.0;
- added a missing SPDX tag on a new file.
v10:
- rebased on the top of current upstream:
d9ce74873a6a ("Merge tag 'pull-vfio-20250611' of https://github.com/legoater/qemu into staging")
- solved a minor conflict
v9:
- backward compatibility logic moved to version 10.0;
- fixed a compilation issue with target/arm/kvm.c (probably caused by some rebase - funny enough, incremental compilation was fine here);
- added two missing SPDX comments.
v8:
- added a patch to revert recently-added changeset causing a conflict with these. All remaining patches are identical.
v7:
- minor editorial change at the patch updating HEST doc spec with the new workflow
v6:
- some minor nits addressed:
- use GPA instead of offset;
- merged two patches;
- fixed a couple of long line coding style issues;
- the HEST/DSDT diff inside a patch was changed to avoid troubles applying it.
v5:
- make checkpatch happier;
- HEST table is now tested;
- some changes at HEST spec documentation to align with code changes;
- extra care was taken with regards to git bisectability.
v4:
- added an extra comment for AcpiGhesState structure;
- patches reordered;
- no functional changes, just code shift between the patches in this series.
v3:
- addressed more nits;
- hest_add_le now points to the beginning of HEST table;
- removed HEST from tests/data/acpi;
- added an extra patch to not use fw_cfg with virt-10.0 for hw_error_le
v2:
- address some nits;
- improved ags cleanup patch and removed ags.present field;
- added some missing le*_to_cpu() calls;
- update date at copyright for new files to 2024-2025;
- qmp command changed to: inject-ghes-v2-error ans since updated to 10.0;
- added HEST and DSDT tables after the changes to make check target happy. (two patches: first one whitelisting such tables; second one removing from whitelist and updating/adding such tables to tests/data/acpi)
Mauro Carvalho Chehab (17):
Revert "hw/acpi/ghes: Make ghes_record_cper_errors() static" acpi/ghes: Cleanup the code which gets ghes ged state acpi/ghes: prepare to change the way HEST offsets are calculated acpi/ghes: add a firmware file with HEST address acpi/ghes: Use HEST table offsets when preparing GHES records acpi/ghes: don't hard-code the number of sources for HEST table acpi/ghes: add a notifier to notify when error data is ready acpi/generic_event_device: Update GHES migration to cover hest addr acpi/generic_event_device: add logic to detect if HEST addr is
available
acpi/generic_event_device: add an APEI error device tests/acpi: virt: allow acpi table changes at DSDT and HEST tables arm/virt: Wire up a GED error device for ACPI / GHES qapi/acpi-hest: add an interface to do generic CPER error injection acpi/generic_event_device.c: enable use_hest_addr for QEMU 10.x tests/acpi: virt: update HEST and DSDT tables
docs: hest: add new "etc/acpi_table_hest_addr" and update workflow scripts/ghes_inject: add a script to generate GHES error inject
MAINTAINERS | 10 + docs/specs/acpi_hest_ghes.rst | 28 +- hw/acpi/Kconfig | 5 + hw/acpi/aml-build.c | 10 + hw/acpi/generic_event_device.c | 44 ++ hw/acpi/ghes-stub.c | 7 +- hw/acpi/ghes.c | 233 ++++-- hw/acpi/ghes_cper.c | 40 + hw/acpi/ghes_cper_stub.c | 20 + hw/acpi/meson.build | 2 + hw/arm/virt-acpi-build.c | 35 +- hw/arm/virt.c | 19 +- hw/core/machine.c | 5 +- include/hw/acpi/acpi_dev_interface.h | 1 + include/hw/acpi/aml-build.h | 2 + include/hw/acpi/generic_event_device.h | 1 + include/hw/acpi/ghes.h | 51 +- include/hw/arm/virt.h | 2 + qapi/acpi-hest.json | 36 + qapi/meson.build | 1 + qapi/qapi-schema.json | 1 + scripts/arm_processor_error.py | 476 ++++++++++++ scripts/ghes_inject.py | 51 ++ scripts/qmp_helper.py | 703 ++++++++++++++++++ target/arm/kvm.c | 7 +- tests/data/acpi/aarch64/virt/DSDT | Bin 5293 -> 5337 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5379 -> 5423 bytes tests/data/acpi/aarch64/virt/DSDT.acpipcihp | Bin 6202 -> 6246 bytes .../acpi/aarch64/virt/DSDT.hpoffacpiindex | Bin 5347 -> 5391 bytes tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6654 -> 6698 bytes tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7768 -> 7812 bytes tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5495 -> 5539 bytes tests/data/acpi/aarch64/virt/DSDT.viot | Bin 5310 -> 5354 bytes tests/data/acpi/aarch64/virt/HEST | Bin 132 -> 224 bytes 34 files changed, 1700 insertions(+), 90 deletions(-) create mode 100644 hw/acpi/ghes_cper.c create mode 100644 hw/acpi/ghes_cper_stub.c create mode 100644 qapi/acpi-hest.json create mode 100644 scripts/arm_processor_error.py create mode 100755 scripts/ghes_inject.py create mode 100755 scripts/qmp_helper.py
Signature · 1 line
2.51.0
PATCH v12 1/17 Revert "hw/acpi/ghes: Make ghes_record_cper_errors() static"
The ghes_record_cper_errors() function was introduced to be used by other types of errors, as part of the error injection patch series. That's why it is not static.
Make it non-static again to allow its usage outside ghes.c
This reverts commit 611f3bdb20f7828b0813aa90d47d1275ef18329b.
--- hw/acpi/ghes.c | 6 ++++-- include/hw/acpi/ghes.h | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-)
hw/acpi/ghes.c +4 -2
@@ -390,8 +390,8 @@ static void get_hw_error_offsets(uint64_t ghes_addr, *read_ack_register_addr = ghes_addr +sizeof (uint64_t ); } -static void ghes_record_cper_errors (const void *cper,size_t len, -uint16_t source_id,Error **errp) +void ghes_record_cper_errors (const void *cper,size_t len, +uint16_t source_id,Error **errp) {uint64_t cper_addr =0 , read_ack_register_addr =0 , read_ack_register;AcpiGedState *acpi_ged_state;
@@ -440,6 +440,8 @@ static void ghes_record_cper_errors(const void *cper, size_t len,/* Write the generic error data entry into guest memory */ cpu_physical_memory_write (cper_addr, cper, len); + +return ; }int acpi_ghes_memory_errors (uint16_t source_id,uint64_t physical_address)
include/hw/acpi/ghes.h +2 -0
@@ -75,6 +75,8 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors,void acpi_ghes_add_fw_cfg (AcpiGhesState *vms,FWCfgState *s,GArray *hardware_errors);int acpi_ghes_memory_errors (uint16_t source_id,uint64_t error_physical_addr); +void ghes_record_cper_errors (const void *cper,size_t len, +uint16_t source_id,Error **errp);/** * acpi_ghes_present: Report whether ACPI GHES table is present
Signature · 1 line
2.51.0
PATCH v12 2/17 acpi/ghes: Cleanup the code which gets ghes ged state
In reply to Mauro Carvalho ChehabMove the check logic into a common function and simplify the code which checks if GHES is enabled and was properly setup.
--- hw/acpi/ghes-stub.c | 7 ++++--- hw/acpi/ghes.c | 38 +++++++++++--------------------------- include/hw/acpi/ghes.h | 14 +++++++------- target/arm/kvm.c | 7 +++++-- 4 files changed, 27 insertions(+), 39 deletions(-)
hw/acpi/ghes-stub.c +4 -3
@@ -11,12 +11,13 @@#include "qemu/osdep.h" #include "hw/acpi/ghes.h" -int acpi_ghes_memory_errors (uint16_t source_id,uint64_t physical_address) +int acpi_ghes_memory_errors (AcpiGhesState *ags,uint16_t source_id, +uint64_t physical_address) {return -1 ; } -bool acpi_ghes_present (void ) +AcpiGhesState *acpi_ghes_get_state (void ) { -return false; +return NULL ; }
hw/acpi/ghes.c +11 -27
@@ -360,18 +360,12 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s,/* Create a read-write fw_cfg file for Address */ fw_cfg_add_file_callback (s,ACPI_HW_ERROR_ADDR_FW_CFG_FILE ,NULL ,NULL ,NULL , &(ags->hw_error_le),sizeof (ags->hw_error_le), false); - - ags->present = true; }static void get_hw_error_offsets (uint64_t ghes_addr,uint64_t *cper_addr,uint64_t *read_ack_register_addr) { -if (!ghes_addr) { -return ; - } -/* * non-HEST version supports only one source, so no need to change * the start offset based on the source ID. Also, we can't validate
@@ -390,35 +384,20 @@ static void get_hw_error_offsets(uint64_t ghes_addr, *read_ack_register_addr = ghes_addr +sizeof (uint64_t ); } -void ghes_record_cper_errors (const void *cper,size_t len, +void ghes_record_cper_errors (AcpiGhesState *ags,const void *cper,size_t len,uint16_t source_id,Error **errp) {uint64_t cper_addr =0 , read_ack_register_addr =0 , read_ack_register; -AcpiGedState *acpi_ged_state; -AcpiGhesState *ags;if (len >ACPI_GHES_MAX_RAW_DATA_LENGTH ) {error_setg (errp,"GHES CPER record is too big: %zd" , len);return ; } - acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED , -NULL )); -if (!acpi_ged_state) { -error_setg (errp,"Can't find ACPI_GED object" ); -return ; - } - ags = &acpi_ged_state->ghes_state; -assert (ACPI_GHES_ERROR_SOURCE_COUNT ==1 );get_hw_error_offsets (le64_to_cpu (ags->hw_error_le), &cper_addr, &read_ack_register_addr); -if (!cper_addr) { -error_setg (errp,"can not find Generic Error Status Block" ); -return ; - } -cpu_physical_memory_read (read_ack_register_addr, &read_ack_register,sizeof (read_ack_register));
@@ -444,7 +423,8 @@ void ghes_record_cper_errors(const void *cper, size_t len,return ; } -int acpi_ghes_memory_errors (uint16_t source_id,uint64_t physical_address) +int acpi_ghes_memory_errors (AcpiGhesState *ags,uint16_t source_id, +uint64_t physical_address) {/* Memory Error Section Type */ const uint8_t guid[] =
@@ -470,7 +450,7 @@ int acpi_ghes_memory_errors(uint16_t source_id, uint64_t physical_address)acpi_ghes_build_append_mem_cper (block, physical_address);/* Report the error */ -ghes_record_cper_errors (block->data, block->len, source_id, &errp); +ghes_record_cper_errors (ags, block->data, block->len, source_id, &errp);g_array_free (block, true);
@@ -482,7 +462,7 @@ int acpi_ghes_memory_errors(uint16_t source_id, uint64_t physical_address)return 0 ; } -bool acpi_ghes_present (void ) +AcpiGhesState *acpi_ghes_get_state (void ) {AcpiGedState *acpi_ged_state;AcpiGhesState *ags;
@@ -491,8 +471,12 @@ bool acpi_ghes_present(void) NULL));if (!acpi_ged_state) { -return false; +return NULL ; } ags = &acpi_ged_state->ghes_state; -return ags->present; + +if (!ags->hw_error_le) { +return NULL ; + } +return ags; }
include/hw/acpi/ghes.h +7 -7
@@ -66,7 +66,6 @@ enum {typedef struct AcpiGhesState {uint64_t hw_error_le; -bool present;/* True if GHES is present at all on this board */ }AcpiGhesState ; void acpi_build_hest(GArray *table_data, GArray *hardware_errors,
@@ -74,15 +73,16 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, const char *oem_id, const char *oem_table_id);void acpi_ghes_add_fw_cfg (AcpiGhesState *vms,FWCfgState *s,GArray *hardware_errors); -int acpi_ghes_memory_errors (uint16_t source_id,uint64_t error_physical_addr); -void ghes_record_cper_errors (const void *cper,size_t len, +int acpi_ghes_memory_errors (AcpiGhesState *ags,uint16_t source_id, +uint64_t error_physical_addr); +void ghes_record_cper_errors (AcpiGhesState *ags,const void *cper,size_t len,uint16_t source_id,Error **errp);/** -* acpi_ghes_present: Report whether ACPI GHES table is present +* acpi_ghes_get_state: Get a pointer for ACPI ghes state * -* Returns: true if the system has an ACPI GHES table and it is -* safe to call acpi_ghes_memory_errors() to record a memory error. +* Returns: a pointer to ghes state if the system has an ACPI GHES table, +* NULL, otherwise. */ -bool acpi_ghes_present (void ); +AcpiGhesState *acpi_ghes_get_state (void );#endif
target/arm/kvm.c +5 -2
@@ -2443,10 +2443,12 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr) {ram_addr_t ram_addr;hwaddr paddr; +AcpiGhesState *ags;assert (code ==BUS_MCEERR_AR || code ==BUS_MCEERR_AO ); -if (acpi_ghes_present () && addr) { + ags =acpi_ghes_get_state (); +if (ags && addr) { ram_addr =qemu_ram_addr_from_host (addr);if (ram_addr !=RAM_ADDR_INVALID &&kvm_physical_memory_addr_from_host (c->kvm_state, addr, &paddr)) {
@@ -2464,7 +2466,8 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr)*/ if (code ==BUS_MCEERR_AR ) {kvm_cpu_synchronize_state (c); -if (!acpi_ghes_memory_errors (ACPI_HEST_SRC_ID_SEA , paddr)) { +if (!acpi_ghes_memory_errors (ags,ACPI_HEST_SRC_ID_SEA , + paddr)) {kvm_inject_arm_sea (c); }else {error_report ("failed to record the error" );
Signature · 1 line
2.51.0
PATCH v12 3/17 acpi/ghes: prepare to change the way HEST offsets are calculated
In reply to Mauro Carvalho ChehabAdd a new ags flag to change the way HEST offsets are calculated. Currently, offsets needed to store ACPI HEST offsets and read ack are calculated based on a previous knowledge from the logic which creates the HEST table.
Such logic is not generic, not allowing to easily add more HEST entries nor replicates what OSPM does.
As the next patches will be adding a more generic logic, add a new use_hest_addr, set to false, in preparation for such changes.
--- hw/acpi/ghes.c | 39 ++++++++++++++++++++++++--------------- hw/arm/virt-acpi-build.c | 13 ++++++++++--- include/hw/acpi/ghes.h | 12 +++++++++++- 3 files changed, 45 insertions(+), 19 deletions(-)
hw/acpi/ghes.c +24 -15
@@ -206,7 +206,8 @@ ghes_gen_err_data_uncorrectable_recoverable(GArray *block,* Initialize "etc/hardware_errors" and "etc/hardware_errors_addr" fw_cfg blobs. * See docs/specs/acpi_hest_ghes.rst for blobs format. */ -static void build_ghes_error_table (GArray *hardware_errors,BIOSLinker *linker) +static void build_ghes_error_table (AcpiGhesState *ags,GArray *hardware_errors, +BIOSLinker *linker) {int i, error_status_block_offset;
@@ -251,13 +252,15 @@ static void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker) i * ACPI_GHES_MAX_RAW_DATA_LENGTH); } -/* -* tell firmware to write hardware_errors GPA into -* hardware_errors_addr fw_cfg, once the former has been initialized. -*/ -bios_linker_loader_write_pointer (linker,ACPI_HW_ERROR_ADDR_FW_CFG_FILE ,0 , -sizeof (uint64_t ), -ACPI_HW_ERROR_FW_CFG_FILE ,0 ); +if (!ags->use_hest_addr) { +/* +* Tell firmware to write hardware_errors GPA into +* hardware_errors_addr fw_cfg, once the former has been initialized. +*/ +bios_linker_loader_write_pointer (linker,ACPI_HW_ERROR_ADDR_FW_CFG_FILE , +0 ,sizeof (uint64_t ), +ACPI_HW_ERROR_FW_CFG_FILE ,0 ); + } }/* Build Generic Hardware Error Source version 2 (GHESv2) */
@@ -331,14 +334,15 @@ static void build_ghes_v2(GArray *table_data, }/* Build Hardware Error Source Table */ -void acpi_build_hest (GArray *table_data,GArray *hardware_errors, +void acpi_build_hest (AcpiGhesState *ags,GArray *table_data, +GArray *hardware_errors,BIOSLinker *linker,const char *oem_id,const char *oem_table_id) {AcpiTable table = { .sig ="HEST" , .rev =1 , .oem_id = oem_id, .oem_table_id = oem_table_id }; -build_ghes_error_table (hardware_errors, linker); +build_ghes_error_table (ags, hardware_errors, linker);acpi_table_begin (&table, table_data);
@@ -357,9 +361,11 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s,fw_cfg_add_file (s,ACPI_HW_ERROR_FW_CFG_FILE , hardware_error->data, hardware_error->len); -/* Create a read-write fw_cfg file for Address */ -fw_cfg_add_file_callback (s,ACPI_HW_ERROR_ADDR_FW_CFG_FILE ,NULL ,NULL , -NULL , &(ags->hw_error_le),sizeof (ags->hw_error_le), false); +if (!ags->use_hest_addr) { +/* Create a read-write fw_cfg file for Address */ +fw_cfg_add_file_callback (s,ACPI_HW_ERROR_ADDR_FW_CFG_FILE ,NULL ,NULL , +NULL , &(ags->hw_error_le),sizeof (ags->hw_error_le), false); + } } static void get_hw_error_offsets(uint64_t ghes_addr,
@@ -395,8 +401,11 @@ void ghes_record_cper_errors(AcpiGhesState *ags, const void *cper, size_t len, }assert (ACPI_GHES_ERROR_SOURCE_COUNT ==1 ); -get_hw_error_offsets (le64_to_cpu (ags->hw_error_le), - &cper_addr, &read_ack_register_addr); + +if (!ags->use_hest_addr) { +get_hw_error_offsets (le64_to_cpu (ags->hw_error_le), + &cper_addr, &read_ack_register_addr); + }cpu_physical_memory_read (read_ack_register_addr, &read_ack_register,sizeof (read_ack_register));
hw/arm/virt-acpi-build.c +10 -3
@@ -1181,9 +1181,16 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)build_dbg2 (tables_blob, tables->linker, vms);if (vms->ras) { -acpi_add_table (table_offsets, tables_blob); -acpi_build_hest (tables_blob, tables->hardware_errors, tables->linker, - vms->oem_id, vms->oem_table_id); +AcpiGedState *acpi_ged_state; +AcpiGhesState *ags; + + acpi_ged_state =ACPI_GED (vms->acpi_dev); + ags = &acpi_ged_state->ghes_state; +if (ags) { +acpi_add_table (table_offsets, tables_blob); +acpi_build_hest (ags, tables_blob, tables->hardware_errors, + tables->linker, vms->oem_id, vms->oem_table_id); + } }if (ms->numa_state->num_nodes >0 ) {
include/hw/acpi/ghes.h +11 -1
@@ -64,11 +64,21 @@ enum {ACPI_GHES_ERROR_SOURCE_COUNT }; +/* +* AcpiGhesState stores GPA values that will be used to fill HEST entries. +* +* When use_hest_addr is false, the GPA of the etc/hardware_errors firmware +* is stored at hw_error_le. This is the default on QEMU 9.x. +* +* An GPA value equal to zero means that GHES is not present. +*/ typedef struct AcpiGhesState {uint64_t hw_error_le; +bool use_hest_addr;/* Currently, always false */ }AcpiGhesState ; -void acpi_build_hest (GArray *table_data,GArray *hardware_errors, +void acpi_build_hest (AcpiGhesState *ags,GArray *table_data, +GArray *hardware_errors,BIOSLinker *linker,const char *oem_id,const char *oem_table_id); void acpi_ghes_add_fw_cfg(AcpiGhesState *vms, FWCfgState *s,
Signature · 1 line
2.51.0
PATCH v12 4/17 acpi/ghes: add a firmware file with HEST address
In reply to Mauro Carvalho ChehabStore HEST table address at GPA, placing its the start of the table at hest_addr_le variable.
--- hw/acpi/ghes.c | 22 ++++++++++++++++++++-- include/hw/acpi/ghes.h | 6 +++++- 2 files changed, 25 insertions(+), 3 deletions(-)
hw/acpi/ghes.c +20 -2
@@ -30,6 +30,7 @@#define ACPI_HW_ERROR_FW_CFG_FILE "etc/hardware_errors"#define ACPI_HW_ERROR_ADDR_FW_CFG_FILE "etc/hardware_errors_addr" +#define ACPI_HEST_ADDR_FW_CFG_FILE "etc/acpi_table_hest_addr"/* The max size in bytes for one error block */ #define ACPI_GHES_MAX_RAW_DATA_LENGTH (1 * KiB)
@@ -341,6 +342,9 @@ void acpi_build_hest(AcpiGhesState *ags, GArray *table_data, {AcpiTable table = { .sig ="HEST" , .rev =1 , .oem_id = oem_id, .oem_table_id = oem_table_id }; +uint32_t hest_offset; + + hest_offset = table_data->len;build_ghes_error_table (ags, hardware_errors, linker);
@@ -352,6 +356,17 @@ void acpi_build_hest(AcpiGhesState *ags, GArray *table_data, ACPI_GHES_NOTIFY_SEA, ACPI_HEST_SRC_ID_SEA);acpi_table_end (linker, &table); + +if (ags->use_hest_addr) { +/* +* Tell firmware to write into GPA the address of HEST via fw_cfg, +* once initialized. +*/ +bios_linker_loader_write_pointer (linker, +ACPI_HEST_ADDR_FW_CFG_FILE ,0 , +sizeof (uint64_t ), +ACPI_BUILD_TABLE_FILE , hest_offset); + } } void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s,
@@ -361,7 +376,10 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s,fw_cfg_add_file (s,ACPI_HW_ERROR_FW_CFG_FILE , hardware_error->data, hardware_error->len); -if (!ags->use_hest_addr) { +if (ags->use_hest_addr) { +fw_cfg_add_file_callback (s,ACPI_HEST_ADDR_FW_CFG_FILE ,NULL ,NULL , +NULL , &(ags->hest_addr_le),sizeof (ags->hest_addr_le), false); + }else {/* Create a read-write fw_cfg file for Address */ fw_cfg_add_file_callback (s,ACPI_HW_ERROR_ADDR_FW_CFG_FILE ,NULL ,NULL ,NULL , &(ags->hw_error_le),sizeof (ags->hw_error_le), false);
@@ -484,7 +502,7 @@ AcpiGhesState *acpi_ghes_get_state(void) } ags = &acpi_ged_state->ghes_state; -if (!ags->hw_error_le) { +if (!ags->hw_error_le && !ags->hest_addr_le) {return NULL ; }return ags;
include/hw/acpi/ghes.h +5 -1
@@ -70,9 +70,13 @@ enum {* When use_hest_addr is false, the GPA of the etc/hardware_errors firmware * is stored at hw_error_le. This is the default on QEMU 9.x. * -* An GPA value equal to zero means that GHES is not present. +* When use_hest_addr is true, the GPA of the HEST table is stored at +* hest_addr_le. This is the default for QEMU 10.x and above. +* +* Whe both GPA values are equal to zero means that GHES is not present. */ typedef struct AcpiGhesState { +uint64_t hest_addr_le;uint64_t hw_error_le;bool use_hest_addr;/* Currently, always false */ }AcpiGhesState ;
Signature · 1 line
2.51.0
PATCH v12 5/17 acpi/ghes: Use HEST table offsets when preparing GHES records
In reply to Mauro Carvalho ChehabThere are two pointers that are needed during error injection:
1. The start address of the CPER block to be stored;
2. The address of the read ack.
It is preferable to calculate them from the HEST table. This allows checking the source ID, the size of the table and the type of the HEST error block structures.
Yet, keep the old code, as this is needed for migration purposes from older QEMU versions.
--- hw/acpi/ghes.c | 100 +++++++++++++++++++++++++++++++++++++++++ include/hw/acpi/ghes.h | 2 +- 2 files changed, 101 insertions(+), 1 deletion(-)
hw/acpi/ghes.c +100 -0
@@ -41,6 +41,12 @@/* Address offset in Generic Address Structure(GAS) */ #define GAS_ADDR_OFFSET 4 +/* +* ACPI spec 1.0b +* 5.2.3 System Description Table Header +*/ +#define ACPI_DESC_HEADER_OFFSET 36 +/* * The total size of Generic Error Data Entry * ACPI 6.1/6.2: 18.3.2.7.1 Generic Error Data,
@@ -61,6 +67,30 @@*/ #define ACPI_GHES_GESB_SIZE 20 +/* +* See the memory layout map at docs/specs/acpi_hest_ghes.rst. +*/ + +/* +* ACPI 6.1: 18.3.2.8 Generic Hardware Error Source version 2 +* Table 18-344 Generic Hardware Error Source version 2 (GHESv2) Structure +*/ +#define HEST_GHES_V2_ENTRY_SIZE 92 + +/* +* ACPI 6.1: 18.3.2.8 Generic Hardware Error Source version 2 +* Table 18-344 Generic Hardware Error Source version 2 (GHESv2) Structure +* Read Ack Register +*/ +#define GHES_READ_ACK_ADDR_OFF 64 + +/* +* ACPI 6.1: 18.3.2.7: Generic Hardware Error Source +* Table 18-341 Generic Hardware Error Source Structure +* Error Status Address +*/ +#define GHES_ERR_STATUS_ADDR_OFF 20 +/* * Values for error_severity field */
@@ -408,6 +438,73 @@ static void get_hw_error_offsets(uint64_t ghes_addr, *read_ack_register_addr = ghes_addr +sizeof (uint64_t ); } +static void get_ghes_source_offsets (uint16_t source_id, +uint64_t hest_addr, +uint64_t *cper_addr, +uint64_t *read_ack_start_addr, +Error **errp) +{ +uint64_t hest_err_block_addr, hest_read_ack_addr; +uint64_t err_source_entry, error_block_addr; +uint32_t num_sources, i; + + hest_addr +=ACPI_DESC_HEADER_OFFSET ; + +cpu_physical_memory_read (hest_addr, &num_sources, +sizeof (num_sources)); + num_sources =le32_to_cpu (num_sources); + + err_source_entry = hest_addr +sizeof (num_sources); + +/* +* Currently, HEST Error source navigates only for GHESv2 tables +*/ +for (i =0 ; i < num_sources; i++) { +uint64_t addr = err_source_entry; +uint16_t type, src_id; + +cpu_physical_memory_read (addr, &type,sizeof (type)); + type =le16_to_cpu (type); + +/* For now, we only know the size of GHESv2 table */ +if (type !=ACPI_GHES_SOURCE_GENERIC_ERROR_V2 ) { +error_setg (errp,"HEST: type %d not supported." , type); +return ; + } + +/* Compare CPER source ID at the GHESv2 structure */ + addr +=sizeof (type); +cpu_physical_memory_read (addr, &src_id,sizeof (src_id)); +if (le16_to_cpu (src_id) == source_id) { +break ; + } + + err_source_entry +=HEST_GHES_V2_ENTRY_SIZE ; + } +if (i == num_sources) { +error_setg (errp,"HEST: Source %d not found." , source_id); +return ; + } + +/* Navigate through table address pointers */ + hest_err_block_addr = err_source_entry +GHES_ERR_STATUS_ADDR_OFF + +GAS_ADDR_OFFSET ; + +cpu_physical_memory_read (hest_err_block_addr, &error_block_addr, +sizeof (error_block_addr)); + error_block_addr =le64_to_cpu (error_block_addr); + +cpu_physical_memory_read (error_block_addr, cper_addr, +sizeof (*cper_addr)); + *cper_addr =le64_to_cpu (*cper_addr); + + hest_read_ack_addr = err_source_entry +GHES_READ_ACK_ADDR_OFF + +GAS_ADDR_OFFSET ; +cpu_physical_memory_read (hest_read_ack_addr, read_ack_start_addr, +sizeof (*read_ack_start_addr)); + *read_ack_start_addr =le64_to_cpu (*read_ack_start_addr); +} +void ghes_record_cper_errors (AcpiGhesState *ags,const void *cper,size_t len,uint16_t source_id,Error **errp) {
@@ -423,6 +520,9 @@ void ghes_record_cper_errors(AcpiGhesState *ags, const void *cper, size_t len,if (!ags->use_hest_addr) {get_hw_error_offsets (le64_to_cpu (ags->hw_error_le), &cper_addr, &read_ack_register_addr); + }else { +get_ghes_source_offsets (source_id,le64_to_cpu (ags->hest_addr_le), + &cper_addr, &read_ack_register_addr, errp); } cpu_physical_memory_read(read_ack_register_addr,
include/hw/acpi/ghes.h +1 -1
@@ -78,7 +78,7 @@ enum {typedef struct AcpiGhesState {uint64_t hest_addr_le;uint64_t hw_error_le; -bool use_hest_addr;/* Currently, always false */ +bool use_hest_addr;/* True if HEST address is present */ }AcpiGhesState ; void acpi_build_hest(AcpiGhesState *ags, GArray *table_data,
Signature · 1 line
2.51.0
PATCH v12 6/17 acpi/ghes: don't hard-code the number of sources for HEST table
In reply to Mauro Carvalho ChehabThe current code is actually dependent on having just one error structure with a single source, as any change there would cause migration issues.
As the number of sources should be arch-dependent, as it will depend on what kind of notifications will exist, and how many errors can be reported at the same time, change the logic to be more flexible, allowing the number of sources to be defined when building the HEST table by the caller.
--- hw/acpi/ghes.c | 39 +++++++++++++++++++++------------------ hw/arm/virt-acpi-build.c | 8 +++++++- include/hw/acpi/ghes.h | 17 ++++++++++++----- target/arm/kvm.c | 2 +- 4 files changed, 41 insertions(+), 25 deletions(-)
hw/acpi/ghes.c +21 -18
@@ -238,17 +238,17 @@ ghes_gen_err_data_uncorrectable_recoverable(GArray *block,* See docs/specs/acpi_hest_ghes.rst for blobs format. */ static void build_ghes_error_table (AcpiGhesState *ags,GArray *hardware_errors, -BIOSLinker *linker) +BIOSLinker *linker,int num_sources) {int i, error_status_block_offset;/* Build error_block_address */ -for (i =0 ; i <ACPI_GHES_ERROR_SOURCE_COUNT ; i++) { +for (i =0 ; i < num_sources; i++) {build_append_int_noprefix (hardware_errors,0 ,sizeof (uint64_t )); }/* Build read_ack_register */ -for (i =0 ; i <ACPI_GHES_ERROR_SOURCE_COUNT ; i++) { +for (i =0 ; i < num_sources; i++) {/* * Initialize the value of read_ack_register to 1, so GHES can be * writable after (re)boot.
@@ -263,13 +263,13 @@ static void build_ghes_error_table(AcpiGhesState *ags, GArray *hardware_errors,/* Reserve space for Error Status Data Block */ acpi_data_push (hardware_errors, -ACPI_GHES_MAX_RAW_DATA_LENGTH *ACPI_GHES_ERROR_SOURCE_COUNT ); +ACPI_GHES_MAX_RAW_DATA_LENGTH * num_sources);/* Tell guest firmware to place hardware_errors blob into RAM */ bios_linker_loader_alloc (linker,ACPI_HW_ERROR_FW_CFG_FILE , hardware_errors,sizeof (uint64_t ), false); -for (i =0 ; i <ACPI_GHES_ERROR_SOURCE_COUNT ; i++) { +for (i =0 ; i < num_sources; i++) {/* * Tell firmware to patch error_block_address entries to point to * corresponding "Generic Error Status Block"
@@ -295,12 +295,14 @@ static void build_ghes_error_table(AcpiGhesState *ags, GArray *hardware_errors, }/* Build Generic Hardware Error Source version 2 (GHESv2) */ -static void build_ghes_v2 (GArray *table_data, -BIOSLinker *linker, -enum AcpiGhesNotifyType notify, -uint16_t source_id) +static void build_ghes_v2_entry (GArray *table_data, +BIOSLinker *linker, +const AcpiNotificationSourceId *notif_src, +uint16_t index,int num_sources) {uint64_t address_offset; +const uint16_t notify = notif_src->notify; +const uint16_t source_id = notif_src->source_id;/* * Type:
@@ -331,7 +333,7 @@ static void build_ghes_v2(GArray *table_data, address_offset +GAS_ADDR_OFFSET ,sizeof (uint64_t ),ACPI_HW_ERROR_FW_CFG_FILE , - source_id * sizeof(uint64_t)); + index * sizeof(uint64_t));/* Notification Structure */ build_ghes_hw_error_notification (table_data, notify);
@@ -351,8 +353,7 @@ static void build_ghes_v2(GArray *table_data, address_offset +GAS_ADDR_OFFSET ,sizeof (uint64_t ),ACPI_HW_ERROR_FW_CFG_FILE , - (ACPI_GHES_ERROR_SOURCE_COUNT + source_id) - * sizeof(uint64_t)); + (num_sources + index) * sizeof(uint64_t));/* * Read Ack Preserve field
@@ -368,22 +369,26 @@ static void build_ghes_v2(GArray *table_data,void acpi_build_hest (AcpiGhesState *ags,GArray *table_data,GArray *hardware_errors,BIOSLinker *linker, +const AcpiNotificationSourceId *notif_source, +int num_sources,const char *oem_id,const char *oem_table_id) {AcpiTable table = { .sig ="HEST" , .rev =1 , .oem_id = oem_id, .oem_table_id = oem_table_id };uint32_t hest_offset; +int i; hest_offset = table_data->len; -build_ghes_error_table (ags, hardware_errors, linker); +build_ghes_error_table (ags, hardware_errors, linker, num_sources);acpi_table_begin (&table, table_data);/* Error Source Count */ -build_append_int_noprefix (table_data,ACPI_GHES_ERROR_SOURCE_COUNT ,4 ); -build_ghes_v2 (table_data, linker, -ACPI_GHES_NOTIFY_SEA ,ACPI_HEST_SRC_ID_SEA ); +build_append_int_noprefix (table_data, num_sources,4 ); +for (i =0 ; i < num_sources; i++) { +build_ghes_v2_entry (table_data, linker, ¬if_source[i], i, num_sources); + }acpi_table_end (linker, &table);
@@ -515,8 +520,6 @@ void ghes_record_cper_errors(AcpiGhesState *ags, const void *cper, size_t len,return ; } -assert (ACPI_GHES_ERROR_SOURCE_COUNT ==1 ); -if (!ags->use_hest_addr) {get_hw_error_offsets (le64_to_cpu (ags->hw_error_le), &cper_addr, &read_ack_register_addr);
hw/arm/virt-acpi-build.c +7 -1
@@ -1125,6 +1125,10 @@ static void acpi_align_size(GArray *blob, unsigned align)g_array_set_size (blob,ROUND_UP (acpi_data_len (blob), align)); } +static const AcpiNotificationSourceId hest_ghes_notify[] = { + {ACPI_HEST_SRC_ID_SYNC ,ACPI_GHES_NOTIFY_SEA }, +}; +static void virt_acpi_build (VirtMachineState *vms,AcpiBuildTables *tables) {
@@ -1189,7 +1193,9 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)if (ags) {acpi_add_table (table_offsets, tables_blob);acpi_build_hest (ags, tables_blob, tables->hardware_errors, - tables->linker, vms->oem_id, vms->oem_table_id); + tables->linker, hest_ghes_notify, +ARRAY_SIZE (hest_ghes_notify), + vms->oem_id, vms->oem_table_id); } }
include/hw/acpi/ghes.h +12 -5
@@ -57,13 +57,18 @@ enum AcpiGhesNotifyType { ACPI_GHES_NOTIFY_RESERVED = 12 }; -enum { -ACPI_HEST_SRC_ID_SEA =0 , -/* future ids go here */ - -ACPI_GHES_ERROR_SOURCE_COUNT +/* +* ID numbers used to fill HEST source ID field +*/ +enum AcpiGhesSourceID { +ACPI_HEST_SRC_ID_SYNC , }; +typedef struct AcpiNotificationSourceId { +enum AcpiGhesSourceID source_id; +enum AcpiGhesNotifyType notify; +}AcpiNotificationSourceId ; +/* * AcpiGhesState stores GPA values that will be used to fill HEST entries. *
@@ -84,6 +89,8 @@ typedef struct AcpiGhesState {void acpi_build_hest (AcpiGhesState *ags,GArray *table_data,GArray *hardware_errors,BIOSLinker *linker, +const AcpiNotificationSourceId *const notif_source, +int num_sources,const char *oem_id,const char *oem_table_id);void acpi_ghes_add_fw_cfg (AcpiGhesState *vms,FWCfgState *s,GArray *hardware_errors);
target/arm/kvm.c +1 -1
@@ -2466,7 +2466,7 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr)*/ if (code ==BUS_MCEERR_AR ) {kvm_cpu_synchronize_state (c); -if (!acpi_ghes_memory_errors (ags,ACPI_HEST_SRC_ID_SEA , +if (!acpi_ghes_memory_errors (ags,ACPI_HEST_SRC_ID_SYNC , paddr)) {kvm_inject_arm_sea (c); }else {
Signature · 1 line
2.51.0
PATCH v12 7/17 acpi/ghes: add a notifier to notify when error data is ready
In reply to Mauro Carvalho ChehabSome error injection notify methods are async, like GPIO notify. Add a notifier to be used when the error record is ready to be sent to the guest OS.
--- hw/acpi/ghes.c | 5 ++++- include/hw/acpi/ghes.h | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-)
hw/acpi/ghes.c +4 -1
@@ -510,6 +510,9 @@ static void get_ghes_source_offsets(uint16_t source_id, *read_ack_start_addr =le64_to_cpu (*read_ack_start_addr); } +NotifierList acpi_generic_error_notifiers = +NOTIFIER_LIST_INITIALIZER (acpi_generic_error_notifiers); +void ghes_record_cper_errors (AcpiGhesState *ags,const void *cper,size_t len,uint16_t source_id,Error **errp) {
@@ -550,7 +553,7 @@ void ghes_record_cper_errors(AcpiGhesState *ags, const void *cper, size_t len,/* Write the generic error data entry into guest memory */ cpu_physical_memory_write (cper_addr, cper, len); -return ; +notifier_list_notify (&acpi_generic_error_notifiers,NULL ); } int acpi_ghes_memory_errors(AcpiGhesState *ags, uint16_t source_id,
include/hw/acpi/ghes.h +3 -0
@@ -24,6 +24,9 @@#include "hw/acpi/bios-linker-loader.h" #include "qapi/error.h" +#include "qemu/notify.h" + +extern NotifierList acpi_generic_error_notifiers;/* * Values for Hardware Error Notification Type field
Signature · 1 line
2.51.0
PATCH v12 8/17 acpi/generic_event_device: Update GHES migration to cover hest addr
In reply to Mauro Carvalho ChehabThe GHES migration logic should now support HEST table location too.
--- hw/acpi/generic_event_device.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
hw/acpi/generic_event_device.c +29 -0
@@ -436,6 +436,34 @@ static const VMStateDescription vmstate_pcihp_state = { } }; +static const VMStateDescription vmstate_hest = { + .name ="acpi-hest" , + .version_id =1 , + .minimum_version_id =1 , + .fields = (const VMStateField []) { +VMSTATE_UINT64 (hest_addr_le, AcpiGhesState), +VMSTATE_END_OF_LIST () + }, +}; + +static bool hest_needed (void *opaque) +{ +AcpiGedState *s = opaque; +return s->ghes_state.hest_addr_le; +} + +static const VMStateDescription vmstate_hest_state = { + .name ="acpi-ged/hest" , + .version_id =1 , + .minimum_version_id =1 , + .needed = hest_needed, + .fields = (const VMStateField []) { +VMSTATE_STRUCT (ghes_state, AcpiGedState,1 , + vmstate_hest, AcpiGhesState), +VMSTATE_END_OF_LIST () + } +}; +static const VMStateDescription vmstate_acpi_ged = { .name ="acpi-ged" , .version_id =1 ,
@@ -449,6 +477,7 @@ static const VMStateDescription vmstate_acpi_ged = { &vmstate_cpuhp_state, &vmstate_ghes_state, &vmstate_pcihp_state, + &vmstate_hest_state, NULL } };
Signature · 1 line
2.51.0
PATCH v12 9/17 acpi/generic_event_device: add logic to detect if HEST addr is available
In reply to Mauro Carvalho ChehabCreate a new property (x-has-hest-addr) and use it to detect if the GHES table offsets can be calculated from the HEST address (qemu 10.0 and upper) or via the legacy way via an offset obtained from the hardware_errors firmware file.
--- hw/acpi/generic_event_device.c | 2 ++ hw/arm/virt-acpi-build.c | 18 ++++++++++++++++-- hw/core/machine.c | 5 ++++- 3 files changed, 22 insertions(+), 3 deletions(-)
hw/acpi/generic_event_device.c +2 -0
@@ -349,6 +349,8 @@ static const Property acpi_ged_properties[] = { pcihp_state.use_acpi_hotplug_bridge, 0),DEFINE_PROP_LINK ("bus" , AcpiGedState, pcihp_state.root, TYPE_PCI_BUS, PCIBus *), +DEFINE_PROP_BOOL ("x-has-hest-addr" , AcpiGedState, + ghes_state.use_hest_addr, false), }; static const VMStateDescription vmstate_memhp_state = {
hw/arm/virt-acpi-build.c +16 -2
@@ -1129,6 +1129,10 @@ static const AcpiNotificationSourceId hest_ghes_notify[] = { { ACPI_HEST_SRC_ID_SYNC, ACPI_GHES_NOTIFY_SEA }, }; +static const AcpiNotificationSourceId hest_ghes_notify_10_0[] = { + {ACPI_HEST_SRC_ID_SYNC ,ACPI_GHES_NOTIFY_SEA }, +}; +static void virt_acpi_build (VirtMachineState *vms,AcpiBuildTables *tables) {
@@ -1186,15 +1190,25 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)if (vms->ras) {AcpiGedState *acpi_ged_state; +static const AcpiNotificationSourceId *notify; +unsigned int notify_sz;AcpiGhesState *ags; acpi_ged_state =ACPI_GED (vms->acpi_dev); ags = &acpi_ged_state->ghes_state;if (ags) {acpi_add_table (table_offsets, tables_blob); + +if (!ags->use_hest_addr) { + notify = hest_ghes_notify_10_0; + notify_sz =ARRAY_SIZE (hest_ghes_notify_10_0); + }else { + notify = hest_ghes_notify; + notify_sz =ARRAY_SIZE (hest_ghes_notify); + } +acpi_build_hest (ags, tables_blob, tables->hardware_errors, - tables->linker, hest_ghes_notify, -ARRAY_SIZE (hest_ghes_notify), + tables->linker, notify, notify_sz, vms->oem_id, vms->oem_table_id); } }
hw/core/machine.c +4 -1
@@ -35,9 +35,12 @@#include "hw/virtio/virtio-pci.h" #include "hw/virtio/virtio-net.h" #include "hw/virtio/virtio-iommu.h" +#include "hw/acpi/generic_event_device.h" #include "audio/audio.h" -GlobalProperty hw_compat_10_1[] = {}; +GlobalProperty hw_compat_10_1[] = { + {TYPE_ACPI_GED ,"x-has-hest-addr" ,"false" }, +};const size_t hw_compat_10_1_len =G_N_ELEMENTS (hw_compat_10_1);GlobalProperty hw_compat_10_0[] = {
Signature · 1 line
2.51.0
PATCH v12 10/17 acpi/generic_event_device: add an APEI error device
In reply to Mauro Carvalho ChehabAdds a generic error device to handle generic hardware error events as specified at ACPI 6.5 specification at 18.3.2.7.2:
https://uefi.org/specs/ACPI/6.5/18_Platform_Error_Interfaces.html#event-notification-for-generic-error-sources
using HID PNP0C33.
The PNP0C33 device is used to report hardware errors to the guest via ACPI APEI Generic Hardware Error Source (GHES).
--- hw/acpi/aml-build.c | 10 ++++++++++ hw/acpi/generic_event_device.c | 13 +++++++++++++ include/hw/acpi/acpi_dev_interface.h | 1 + include/hw/acpi/aml-build.h | 2 ++ include/hw/acpi/generic_event_device.h | 1 + 5 files changed, 27 insertions(+)
hw/acpi/aml-build.c +10 -0
@@ -2629,3 +2629,13 @@ Aml *aml_i2c_serial_bus_device(uint16_t address, const char *resource_source)return var; } + +/* ACPI 5.0b: 18.3.2.6.2 Event Notification For Generic Error Sources */ +Aml *aml_error_device (void ) +{ +Aml *dev =aml_device (ACPI_APEI_ERROR_DEVICE ); +aml_append (dev,aml_name_decl ("_HID" ,aml_string ("PNP0C33" ))); +aml_append (dev,aml_name_decl ("_UID" ,aml_int (0 ))); + +return dev; +}
hw/acpi/generic_event_device.c +13 -0
@@ -30,6 +30,7 @@ static const uint32_t ged_supported_events[] = {ACPI_GED_NVDIMM_HOTPLUG_EVT ,ACPI_GED_CPU_HOTPLUG_EVT ,ACPI_GED_PCI_HOTPLUG_EVT , + ACPI_GED_ERROR_EVT, };/*
@@ -120,6 +121,16 @@ void build_ged_aml(Aml *table, const char *name, HotplugHandler *hotplug_dev,aml_notify (aml_name (ACPI_POWER_BUTTON_DEVICE ), aml_int(0x80)));break ; +case ACPI_GED_ERROR_EVT : +/* +* ACPI 5.0b: 5.6.6 Device Object Notifications +* Table 5-135 Error Device Notification Values +* Defines 0x80 as the value to be used on notifications +*/ +aml_append (if_ctx, +aml_notify (aml_name (ACPI_APEI_ERROR_DEVICE ), +aml_int (0x80 ))); +break ;case ACPI_GED_NVDIMM_HOTPLUG_EVT : aml_append(if_ctx, aml_notify(aml_name("\\_SB.NVDR"),
@@ -320,6 +331,8 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev) sel =ACPI_GED_MEM_HOTPLUG_EVT ; }else if (ev &ACPI_POWER_DOWN_STATUS ) { sel =ACPI_GED_PWR_DOWN_EVT ; + }else if (ev &ACPI_GENERIC_ERROR ) { + sel =ACPI_GED_ERROR_EVT ; }else if (ev &ACPI_NVDIMM_HOTPLUG_STATUS ) { sel =ACPI_GED_NVDIMM_HOTPLUG_EVT ; }else if (ev &ACPI_CPU_HOTPLUG_STATUS ) {
include/hw/acpi/acpi_dev_interface.h +1 -0
@@ -13,6 +13,7 @@ typedef enum {ACPI_NVDIMM_HOTPLUG_STATUS =16 ,ACPI_VMGENID_CHANGE_STATUS =32 ,ACPI_POWER_DOWN_STATUS =64 , +ACPI_GENERIC_ERROR =128 , } AcpiEventStatusBits;#define TYPE_ACPI_DEVICE_IF "acpi-device-interface"
include/hw/acpi/aml-build.h +2 -0
@@ -252,6 +252,7 @@ struct CrsRangeSet {/* Consumer/Producer */ #define AML_SERIAL_BUS_FLAG_CONSUME_ONLY (1 << 1) +#define ACPI_APEI_ERROR_DEVICE "GEDD"/** * init_aml_allocator: *
@@ -382,6 +383,7 @@ Aml *aml_dma(AmlDmaType typ, AmlDmaBusMaster bm, AmlTransferSize sz, uint8_t channel);Aml *aml_sleep (uint64_t msec);Aml *aml_i2c_serial_bus_device (uint16_t address,const char *resource_source); +Aml *aml_error_device (void );/* Block AML object primitives */ Aml *aml_scope (const char *name_format, ...)G_GNUC_PRINTF (1 ,2 );
include/hw/acpi/generic_event_device.h +1 -0
@@ -103,6 +103,7 @@ OBJECT_DECLARE_TYPE(AcpiGedState, AcpiGedClass, ACPI_GED)#define ACPI_GED_NVDIMM_HOTPLUG_EVT 0x4#define ACPI_GED_CPU_HOTPLUG_EVT 0x8#define ACPI_GED_PCI_HOTPLUG_EVT 0x10 +#define ACPI_GED_ERROR_EVT 0x20 typedef struct GEDState { MemoryRegion evt;
Signature · 1 line
2.51.0
PATCH v12 11/17 tests/acpi: virt: allow acpi table changes at DSDT and HEST tables
In reply to Mauro Carvalho ChehabWe'll be adding a new GED device for HEST GPIO notification and increasing the number of entries at the HEST table.
Blocklist testing HEST and DSDT tables until such changes are completed.
--- tests/qtest/bios-tables-test-allowed-diff.h | 9 +++++++++ 1 file changed, 9 insertions(+)
tests/qtest/bios-tables-test-allowed-diff.h +9 -0
@@ -1 +1,10 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/aarch64/virt/HEST" , +"tests/data/acpi/aarch64/virt/DSDT" , +"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt" , +"tests/data/acpi/aarch64/virt/DSDT.acpipcihp" , +"tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex" , +"tests/data/acpi/aarch64/virt/DSDT.memhp" , +"tests/data/acpi/aarch64/virt/DSDT.pxb" , +"tests/data/acpi/aarch64/virt/DSDT.topology" , +"tests/data/acpi/aarch64/virt/DSDT.viot",
Signature · 1 line
2.51.0
PATCH v12 12/17 arm/virt: Wire up a GED error device for ACPI / GHES
In reply to Mauro Carvalho ChehabAdds support to ARM virtualization to allow handling generic error ACPI Event via GED & error source device.
It is aligned with Linux Kernel patch:
https://lore.kernel.org/lkml/[email protected]/
--- hw/arm/virt-acpi-build.c | 1 + hw/arm/virt.c | 12 +++++++++++- include/hw/arm/virt.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-)
hw/arm/virt-acpi-build.c +1 -0
@@ -1066,6 +1066,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) }acpi_dsdt_add_power_button (scope); +aml_append (scope,aml_error_device ());#ifdef CONFIG_TPM acpi_dsdt_add_tpm (scope, vms);#endif
hw/arm/virt.c +11 -1
@@ -693,7 +693,7 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms)MachineState *ms =MACHINE (vms);SysBusDevice *sbdev;int irq = vms->irqmap[VIRT_ACPI_GED ]; -uint32_t event =ACPI_GED_PWR_DOWN_EVT ; +uint32_t event =ACPI_GED_PWR_DOWN_EVT |ACPI_GED_ERROR_EVT ;bool acpi_pcihp;if (ms->ram_slots) {
@@ -1050,6 +1050,13 @@ static void virt_powerdown_req(Notifier *n, void *opaque) } } +static void virt_generic_error_req (Notifier *n,void *opaque) +{ +VirtMachineState *s =container_of (n, VirtMachineState, generic_error_notifier); + +acpi_send_event (s->acpi_dev,ACPI_GENERIC_ERROR ); +} +static void create_gpio_keys (char *fdt,DeviceState *pl061_dev,uint32_t phandle) {
@@ -2500,6 +2507,9 @@ static void machvirt_init(MachineState *machine)if (has_ged && aarch64 && firmware_loaded &&virt_is_acpi_enabled (vms)) { vms->acpi_dev =create_acpi_ged (vms); + vms->generic_error_notifier.notify = virt_generic_error_req; +notifier_list_add (&acpi_generic_error_notifiers, + &vms->generic_error_notifier); }else {create_gpio_devices (vms,VIRT_GPIO , sysmem); }
include/hw/arm/virt.h +1 -0
@@ -174,6 +174,7 @@ struct VirtMachineState {DeviceState *gic;DeviceState *acpi_dev;Notifier powerdown_notifier; +Notifier generic_error_notifier;PCIBus *bus;char *oem_id;char *oem_table_id;
Signature · 1 line
2.51.0
PATCH v12 13/17 qapi/acpi-hest: add an interface to do generic CPER error injection
In reply to Mauro Carvalho ChehabCreate a QMP command to be used for generic ACPI APEI hardware error injection (HEST) via GHESv2, and add support for it for ARM guests.
Error injection uses ACPI_HEST_SRC_ID_QMP source ID to be platform independent. This is mapped at arch virt bindings, depending on the types supported by QEMU and by the BIOS. So, on ARM, this is supported via ACPI_GHES_NOTIFY_GPIO notification type.
This patch was co-authored:
- original ghes logic to inject a simple ARM record by Shiju Jose;
- generic logic to handle block addresses by Jonathan Cameron;
- generic GHESv2 error inject by Mauro Carvalho Chehab;
--- MAINTAINERS | 7 +++++++ hw/acpi/Kconfig | 5 +++++ hw/acpi/ghes.c | 2 +- hw/acpi/ghes_cper.c | 40 ++++++++++++++++++++++++++++++++++++++++ hw/acpi/ghes_cper_stub.c | 20 ++++++++++++++++++++ hw/acpi/meson.build | 2 ++ hw/arm/virt-acpi-build.c | 1 + hw/arm/virt.c | 7 +++++++ include/hw/acpi/ghes.h | 1 + include/hw/arm/virt.h | 1 + qapi/acpi-hest.json | 36 ++++++++++++++++++++++++++++++++++++ qapi/meson.build | 1 + qapi/qapi-schema.json | 1 + 13 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 hw/acpi/ghes_cper.c create mode 100644 hw/acpi/ghes_cper_stub.c create mode 100644 qapi/acpi-hest.json
MAINTAINERS +7 -0
@@ -2166,6 +2166,13 @@ F: hw/acpi/ghes.c F: include/hw/acpi/ghes.h F: docs/specs/acpi_hest_ghes.rst +ACPI/HEST/GHES/ARM processor CPER +R: Mauro Carvalho Chehab <[email protected]> +S: Maintained +F: hw/arm/ghes_cper.c +F: hw/acpi/ghes_cper_stub.c +F: qapi/acpi-hest.json + ppc4xx L: [email protected] S: Orphan
hw/acpi/Kconfig +5 -0
@@ -51,6 +51,11 @@ config ACPI_APEI bool depends on ACPI +config GHES_CPER + bool + depends on ACPI_APEI + default y + config ACPI_PCI bool depends on ACPI && PCI
hw/acpi/ghes.c +1 -1
@@ -553,7 +553,7 @@ void ghes_record_cper_errors(AcpiGhesState *ags, const void *cper, size_t len,/* Write the generic error data entry into guest memory */ cpu_physical_memory_write (cper_addr, cper, len); -notifier_list_notify (&acpi_generic_error_notifiers,NULL ); +notifier_list_notify (&acpi_generic_error_notifiers, &source_id); } int acpi_ghes_memory_errors(AcpiGhesState *ags, uint16_t source_id,
hw/acpi/ghes_cper.c new file +40 -0
@@ -0,0 +1,40 @@ +/* +* CPER payload parser for error injection +* +* Copyright(C) 2024-2025 Huawei LTD. +* +* This code is licensed under the GPL version 2 or later. See the +* COPYING file in the top-level directory. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#include "qemu/osdep.h" + +#include "qemu/base64.h" +#include "qemu/error-report.h" +#include "qemu/uuid.h" +#include "qapi/qapi-commands-acpi-hest.h" +#include "hw/acpi/ghes.h" + +void qmp_inject_ghes_v2_error (const char *qmp_cper,Error **errp) +{ +AcpiGhesState *ags; +uint8_t *cper; +size_t len; + + ags =acpi_ghes_get_state (); +if (!ags) { +return ; + } + + cper =qbase64_decode (qmp_cper,-1 , &len, errp); +if (!cper) { +error_setg (errp,"missing GHES CPER payload" ); +return ; + } + +ghes_record_cper_errors (ags, cper, len,ACPI_HEST_SRC_ID_QMP , errp); + +g_free (cper); +}
hw/acpi/ghes_cper_stub.c new file +20 -0
@@ -0,0 +1,20 @@ +/* +* Stub interface for CPER payload parser for error injection +* +* Copyright(C) 2024-2025 Huawei LTD. +* +* This code is licensed under the GPL version 2 or later. See the +* COPYING file in the top-level directory. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qapi/qapi-commands-acpi-hest.h" +#include "hw/acpi/ghes.h" + +void qmp_inject_ghes_v2_error (const char *cper,Error **errp) +{ +error_setg (errp,"GHES QMP error inject is not compiled in" ); +}
hw/acpi/meson.build +2 -0
@@ -34,4 +34,6 @@ endif system_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c', 'aml-build-stub.c', 'ghes-stub.c', 'acpi_interface.c')) system_ss.add(when: 'CONFIG_ACPI_PCI_BRIDGE', if_false: files('pci-bridge-stub.c')) system_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss) +system_ss.add(when: 'CONFIG_GHES_CPER', if_true: files('ghes_cper.c')) +system_ss.add(when: 'CONFIG_GHES_CPER', if_false: files('ghes_cper_stub.c')) system_ss.add(files('acpi-qmp-cmds.c'))
hw/arm/virt-acpi-build.c +1 -0
@@ -1128,6 +1128,7 @@ static void acpi_align_size(GArray *blob, unsigned align)static const AcpiNotificationSourceId hest_ghes_notify[] = { {ACPI_HEST_SRC_ID_SYNC ,ACPI_GHES_NOTIFY_SEA }, + {ACPI_HEST_SRC_ID_QMP ,ACPI_GHES_NOTIFY_GPIO }, };static const AcpiNotificationSourceId hest_ghes_notify_10_0[] = {
hw/arm/virt.c +7 -0
@@ -1052,6 +1052,13 @@ static void virt_powerdown_req(Notifier *n, void *opaque)static void virt_generic_error_req (Notifier *n,void *opaque) { +uint16_t *source_id = opaque; + +/* Currently, only QMP source ID is async */ +if (*source_id !=ACPI_HEST_SRC_ID_QMP ) { +return ; + } +VirtMachineState *s =container_of (n, VirtMachineState, generic_error_notifier);acpi_send_event (s->acpi_dev,ACPI_GENERIC_ERROR );
include/hw/acpi/ghes.h +1 -0
@@ -65,6 +65,7 @@ enum AcpiGhesNotifyType {*/ enum AcpiGhesSourceID {ACPI_HEST_SRC_ID_SYNC , +ACPI_HEST_SRC_ID_QMP ,/* Use it only for QMP injected errors */ }; typedef struct AcpiNotificationSourceId {
include/hw/arm/virt.h +1 -0
@@ -33,6 +33,7 @@#include "exec/hwaddr.h" #include "qemu/notify.h" #include "hw/boards.h" +#include "hw/acpi/ghes.h" #include "hw/arm/boot.h" #include "hw/arm/bsa.h" #include "hw/block/flash.h"
qapi/acpi-hest.json new file +36 -0
@@ -0,0 +1,36 @@ +# -*- Mode: Python -*- +# vim: filetype=python +# SPDX-License-Identifier: GPL-2.0-or-later + +## +# == GHESv2 CPER Error Injection +# +# Defined since ACPI Specification 6.1, +# section 18.3.2.8 Generic Hardware Error Source version 2. See: +# +# https://uefi.org/sites/default/files/resources/ACPI_6_1.pdf +## + + +## +# @inject-ghes-v2-error: +# +# Inject an error with additional ACPI 6.1 GHESv2 error information +# +# @cper: contains a base64 encoded string with raw data for a single +# CPER record with Generic Error Status Block, Generic Error Data +# Entry and generic error data payload, as described at +# https://uefi.org/specs/UEFI/2.10/Apx_N_Common_Platform_Error_Record.html#format +# +# Features: +# +# @unstable: This command is experimental. +# +# Since: 10.2 +## +{ 'command': 'inject-ghes-v2-error', + 'data': { + 'cper': 'str' + }, + 'features': [ 'unstable' ] +}
qapi/meson.build +1 -0
@@ -59,6 +59,7 @@ if have_system qapi_all_modules += [ 'accelerator', 'acpi', + 'acpi-hest', 'audio', 'cryptodev', 'qdev',
qapi/qapi-schema.json +1 -0
@@ -68,6 +68,7 @@ { 'include': 'misc-i386.json' } { 'include': 'audio.json' } { 'include': 'acpi.json' } +{ 'include': 'acpi-hest.json' } { 'include': 'pci.json' } { 'include': 'stats.json' } { 'include': 'virtio.json' }
Signature · 1 line
2.51.0
PATCH v12 14/17 acpi/generic_event_device.c: enable use_hest_addr for QEMU 10.x
In reply to Mauro Carvalho ChehabNow that we have everything in place, enable using HEST GPA instead of etc/hardware_errors GPA.
--- hw/acpi/generic_event_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/acpi/generic_event_device.c +1 -1
@@ -363,7 +363,7 @@ static const Property acpi_ged_properties[] = {DEFINE_PROP_LINK ("bus" , AcpiGedState, pcihp_state.root, TYPE_PCI_BUS, PCIBus *),DEFINE_PROP_BOOL ("x-has-hest-addr" , AcpiGedState, - ghes_state.use_hest_addr, false), + ghes_state.use_hest_addr, true), }; static const VMStateDescription vmstate_memhp_state = {
Signature · 1 line
2.51.0
PATCH v12 15/17 tests/acpi: virt: update HEST and DSDT tables
In reply to Mauro Carvalho Chehab --- /tmp/DSDT_old.dsl 2025-09-05 15:03:18.964968499 +0200
+++ /tmp/DSDT.dsl 2025-09-05 15:03:18.966968470 +0200
@@ -5,13 +5,13 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of /tmp/DSDT_old
+ * Disassembly of /tmp/DSDT
*
* Original Table Header:
* Signature "DSDT"
- * Length 0x000014AD (5293)
+ * Length 0x000014D9 (5337)
* Revision 0x02
- * Checksum 0xEA
+ * Checksum 0xA4
* OEM ID "BOCHS "
* OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
@@ -1886,6 +1886,11 @@
{
Notify (PWRB, 0x80) // Status Change
}
+
+ If (((Local0 & 0x20) == 0x20))
+ {
+ Notify (GEDD, 0x80) // Status Change
+ }
}
}
@@ -1894,6 +1899,12 @@
Name (_HID, "PNP0C0C" /* Power Button Device */) // _HID: Hardware ID Name (_UID, Zero) // _UID: Unique ID
}
+
+ Device (GEDD)
+ {
+ Name (_HID, "PNP0C33" /* Error Device */) // _HID: Hardware ID
+ Name (_UID, Zero) // _UID: Unique ID
+ }
}
Scope (\_SB.PCI0)
--- /tmp/DSDT_acpihmatvirt_old.dsl 2025-09-05 15:03:18.979897760 +0200
+++ /tmp/DSDT_acpihmatvirt.dsl 2025-09-05 15:03:18.980968267 +0200 @@ -5,13 +5,13 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of /tmp/DSDT_acpihmatvirt_old
+ * Disassembly of /tmp/DSDT_acpihmatvirt
*
* Original Table Header:
* Signature "DSDT"
- * Length 0x00001503 (5379)
+ * Length 0x0000152F (5423)
* Revision 0x02
- * Checksum 0xA6
+ * Checksum 0x6F
* OEM ID "BOCHS "
* OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
@@ -1904,6 +1904,11 @@
{
Notify (PWRB, 0x80) // Status Change
}
+
+ If (((Local0 & 0x20) == 0x20))
+ {
+ Notify (GEDD, 0x80) // Status Change
+ }
}
}
@@ -1912,6 +1917,12 @@
Name (_HID, "PNP0C0C" /* Power Button Device */) // _HID: Hardware ID Name (_UID, Zero) // _UID: Unique ID
}
+
+ Device (GEDD)
+ {
+ Name (_HID, "PNP0C33" /* Error Device */) // _HID: Hardware ID
+ Name (_UID, Zero) // _UID: Unique ID
+ }
}
Scope (\_SB.PCI0)
--- /tmp/DSDT_acpipcihp_old.dsl 2025-09-05 15:03:18.993968078 +0200
+++ /tmp/DSDT_acpipcihp.dsl 2025-09-05 15:03:18.995968049 +0200
@@ -5,13 +5,13 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of /tmp/DSDT_acpipcihp_old
+ * Disassembly of /tmp/DSDT_acpipcihp
*
* Original Table Header:
* Signature "DSDT"
- * Length 0x0000183A (6202)
+ * Length 0x00001866 (6246)
* Revision 0x02
- * Checksum 0x98
+ * Checksum 0x70
* OEM ID "BOCHS "
* OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
@@ -1893,6 +1893,11 @@
\_SB.PCI0.PCNT ()
Release (\_SB.PCI0.BLCK)
}
+
+ If (((Local0 & 0x20) == 0x20))
+ {
+ Notify (GEDD, 0x80) // Status Change
+ }
}
}
@@ -1901,6 +1906,12 @@
Name (_HID, "PNP0C0C" /* Power Button Device */) // _HID: Hardware ID Name (_UID, Zero) // _UID: Unique ID
}
+
+ Device (GEDD)
+ {
+ Name (_HID, "PNP0C33" /* Error Device */) // _HID: Hardware ID
+ Name (_UID, Zero) // _UID: Unique ID
+ }
}
Scope (_SB.PCI0)
--- /tmp/DSDT_hpoffacpiindex_old.dsl 2025-09-05 15:03:19.007967875 +0200
+++ /tmp/DSDT_hpoffacpiindex.dsl 2025-09-05 15:03:19.009967846 +0200
@@ -5,13 +5,13 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of /tmp/DSDT_hpoffacpiindex_old
+ * Disassembly of /tmp/DSDT_hpoffacpiindex
*
* Original Table Header:
* Signature "DSDT"
- * Length 0x000014E3 (5347)
+ * Length 0x0000150F (5391)
* Revision 0x02
- * Checksum 0x92
+ * Checksum 0x4B
* OEM ID "BOCHS "
* OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
@@ -1886,6 +1886,11 @@
{
Notify (PWRB, 0x80) // Status Change
}
+
+ If (((Local0 & 0x20) == 0x20))
+ {
+ Notify (GEDD, 0x80) // Status Change
+ }
}
}
@@ -1894,6 +1899,12 @@
Name (_HID, "PNP0C0C" /* Power Button Device */) // _HID: Hardware ID Name (_UID, Zero) // _UID: Unique ID
}
+
+ Device (GEDD)
+ {
+ Name (_HID, "PNP0C33" /* Error Device */) // _HID: Hardware ID
+ Name (_UID, Zero) // _UID: Unique ID
+ }
}
Scope (\_SB.PCI0)
--- /tmp/DSDT_memhp_old.dsl 2025-09-05 15:03:19.022215983 +0200
+++ /tmp/DSDT_memhp.dsl 2025-09-05 15:03:19.023967643 +0200 @@ -5,13 +5,13 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of /tmp/DSDT_memhp_old
+ * Disassembly of /tmp/DSDT_memhp
*
* Original Table Header:
* Signature "DSDT"
- * Length 0x000019FE (6654)
+ * Length 0x00001A2A (6698)
* Revision 0x02
- * Checksum 0x0B
+ * Checksum 0xD3
* OEM ID "BOCHS "
* OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
@@ -1898,6 +1898,11 @@
{
Notify (\_SB.NVDR, 0x80) // Status Change
}
+
+ If (((Local0 & 0x20) == 0x20))
+ {
+ Notify (GEDD, 0x80) // Status Change
+ }
}
}
@@ -2203,6 +2208,12 @@
Name (_HID, "PNP0C0C" /* Power Button Device */) // _HID: Hardware ID Name (_UID, Zero) // _UID: Unique ID
}
+
+ Device (GEDD)
+ {
+ Name (_HID, "PNP0C33" /* Error Device */) // _HID: Hardware ID
+ Name (_UID, Zero) // _UID: Unique ID
+ }
}
Scope (\_SB.PCI0)
--- /tmp/DSDT_pxb_old.dsl 2025-09-05 15:03:19.036967455 +0200
+++ /tmp/DSDT_pxb.dsl 2025-09-05 15:03:19.039194754 +0200
@@ -5,13 +5,13 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of /tmp/DSDT_pxb_old
+ * Disassembly of /tmp/DSDT_pxb
*
* Original Table Header:
* Signature "DSDT"
- * Length 0x00001E58 (7768)
+ * Length 0x00001E84 (7812)
* Revision 0x02
- * Checksum 0x4A
+ * Checksum 0x13
* OEM ID "BOCHS "
* OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
@@ -3071,6 +3071,11 @@
{
Notify (PWRB, 0x80) // Status Change
}
+
+ If (((Local0 & 0x20) == 0x20))
+ {
+ Notify (GEDD, 0x80) // Status Change
+ }
}
}
@@ -3079,6 +3084,12 @@
Name (_HID, "PNP0C0C" /* Power Button Device */) // _HID: Hardware ID Name (_UID, Zero) // _UID: Unique ID
}
+
+ Device (GEDD)
+ {
+ Name (_HID, "PNP0C33" /* Error Device */) // _HID: Hardware ID
+ Name (_UID, Zero) // _UID: Unique ID
+ }
}
Scope (\_SB.PCI0)
--- /tmp/DSDT_topology_old.dsl 2025-09-05 15:03:19.050967252 +0200
+++ /tmp/DSDT_topology.dsl 2025-09-05 15:03:19.052967223 +0200
@@ -5,13 +5,13 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of /tmp/DSDT_topology_old
+ * Disassembly of /tmp/DSDT_topology
*
* Original Table Header:
* Signature "DSDT"
- * Length 0x00001577 (5495)
+ * Length 0x000015A3 (5539)
* Revision 0x02
- * Checksum 0xCF
+ * Checksum 0x98
* OEM ID "BOCHS "
* OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
@@ -1928,6 +1928,11 @@
{
Notify (PWRB, 0x80) // Status Change
}
+
+ If (((Local0 & 0x20) == 0x20))
+ {
+ Notify (GEDD, 0x80) // Status Change
+ }
}
}
@@ -1936,6 +1941,12 @@
Name (_HID, "PNP0C0C" /* Power Button Device */) // _HID: Hardware ID Name (_UID, Zero) // _UID: Unique ID
}
+
+ Device (GEDD)
+ {
+ Name (_HID, "PNP0C33" /* Error Device */) // _HID: Hardware ID
+ Name (_UID, Zero) // _UID: Unique ID
+ }
}
Scope (\_SB.PCI0)
--- /tmp/DSDT_viot_old.dsl 2025-09-05 15:03:19.064967049 +0200
+++ /tmp/DSDT_viot.dsl 2025-09-05 15:03:19.067236085 +0200 @@ -5,13 +5,13 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of /tmp/DSDT_viot_old
+ * Disassembly of /tmp/DSDT_viot
*
* Original Table Header:
* Signature "DSDT"
- * Length 0x000014BE (5310)
+ * Length 0x000014EA (5354)
* Revision 0x02
- * Checksum 0x8C
+ * Checksum 0x46
* OEM ID "BOCHS "
* OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
@@ -1886,6 +1886,11 @@
{
Notify (PWRB, 0x80) // Status Change
}
+
+ If (((Local0 & 0x20) == 0x20))
+ {
+ Notify (GEDD, 0x80) // Status Change
+ }
}
}
@@ -1894,6 +1899,12 @@
Name (_HID, "PNP0C0C" /* Power Button Device */) // _HID: Hardware ID Name (_UID, Zero) // _UID: Unique ID
}
+
+ Device (GEDD)
+ {
+ Name (_HID, "PNP0C33" /* Error Device */) // _HID: Hardware ID
+ Name (_UID, Zero) // _UID: Unique ID
+ }
}
Scope (\_SB.PCI0)
--- /tmp/HEST_old.dsl 2025-09-05 15:03:19.078653625 +0200
+++ /tmp/HEST.dsl 2025-09-05 15:03:19.079511472 +0200
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20240322 (64-bit version)
* Copyright (c) 2000 - 2023 Intel Corporation
*
- * Disassembly of /tmp/HEST_old
+ * Disassembly of /tmp/HEST
*
* ACPI Data Table [HEST]
*
@@ -11,16 +11,16 @@
*/
[000h 0000 004h] Signature : "HEST" [Hardware Error Source Table]
-[004h 0004 004h] Table Length : 00000084
+[004h 0004 004h] Table Length : 000000E0
[008h 0008 001h] Revision : 01
-[009h 0009 001h] Checksum : E2
+[009h 0009 001h] Checksum : 6C
[00Ah 0010 006h] Oem ID : "BOCHS "
[010h 0016 008h] Oem Table ID : "BXPC "
[018h 0024 004h] Oem Revision : 00000001
[01Ch 0028 004h] Asl Compiler ID : "BXPC"
[020h 0032 004h] Asl Compiler Revision : 00000001
-[024h 0036 004h] Error Source Count : 00000001
+[024h 0036 004h] Error Source Count : 00000002
[028h 0040 002h] Subtable Type : 000A [Generic Hardware Error Source V2]
[02Ah 0042 002h] Source Id : 0000
@@ -55,19 +55,62 @@
[069h 0105 001h] Bit Width : 40
[06Ah 0106 001h] Bit Offset : 00
[06Bh 0107 001h] Encoded Access Width : 04 [QWord Access:64]
-[06Ch 0108 008h] Address : 0000000043DA0008
+[06Ch 0108 008h] Address : 0000000043DA0010
[074h 0116 008h] Read Ack Preserve : FFFFFFFFFFFFFFFE
[07Ch 0124 008h] Read Ack Write : 0000000000000001
-Raw Table Data: Length 132 (0x84)
+[084h 0132 002h] Subtable Type : 000A [Generic Hardware Error Source V2]
+[086h 0134 002h] Source Id : 0001
+[088h 0136 002h] Related Source Id : FFFF
+[08Ah 0138 001h] Reserved : 00
+[08Bh 0139 001h] Enabled : 01
+[08Ch 0140 004h] Records To Preallocate : 00000001
+[090h 0144 004h] Max Sections Per Record : 00000001
+[094h 0148 004h] Max Raw Data Length : 00000400
+
+[098h 0152 00Ch] Error Status Address : [Generic Address Structure]
+[098h 0152 001h] Space ID : 00 [SystemMemory]
+[099h 0153 001h] Bit Width : 40
+[09Ah 0154 001h] Bit Offset : 00
+[09Bh 0155 001h] Encoded Access Width : 04 [QWord Access:64]
+[09Ch 0156 008h] Address : 0000000043DA0008
+
+[0A4h 0164 01Ch] Notify : [Hardware Error Notification Structure]
+[0A4h 0164 001h] Notify Type : 07 [GPIO]
+[0A5h 0165 001h] Notify Length : 1C
+[0A6h 0166 002h] Configuration Write Enable : 0000
+[0A8h 0168 004h] PollInterval : 00000000
+[0ACh 0172 004h] Vector : 00000000
+[0B0h 0176 004h] Polling Threshold Value : 00000000
+[0B4h 0180 004h] Polling Threshold Window : 00000000
+[0B8h 0184 004h] Error Threshold Value : 00000000
+[0BCh 0188 004h] Error Threshold Window : 00000000
+
+[0C0h 0192 004h] Error Status Block Length : 00000400
+[0C4h 0196 00Ch] Read Ack Register : [Generic Address Structure]
+[0C4h 0196 001h] Space ID : 00 [SystemMemory]
+[0C5h 0197 001h] Bit Width : 40
+[0C6h 0198 001h] Bit Offset : 00
+[0C7h 0199 001h] Encoded Access Width : 04 [QWord Access:64]
+[0C8h 0200 008h] Address : 0000000043DA0018
- 0000: 48 45 53 54 84 00 00 00 01 E2 42 4F 43 48 53 20 // HEST......BOCHS
+[0D0h 0208 008h] Read Ack Preserve : FFFFFFFFFFFFFFFE
+[0D8h 0216 008h] Read Ack Write : 0000000000000001
+
+Raw Table Data: Length 224 (0xE0)
+
+ 0000: 48 45 53 54 E0 00 00 00 01 6C 42 4F 43 48 53 20 // HEST.....lBOCHS
0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....BXPC
- 0020: 01 00 00 00 01 00 00 00 0A 00 00 00 FF FF 00 01 // ................
+ 0020: 01 00 00 00 02 00 00 00 0A 00 00 00 FF FF 00 01 // ................
0030: 01 00 00 00 01 00 00 00 00 04 00 00 00 40 00 04 // .............@.. 0040: 00 00 DA 43 00 00 00 00 08 1C 00 00 00 00 00 00 // ...C............ 0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
- 0060: 00 00 00 00 00 04 00 00 00 40 00 04 08 00 DA 43 // [email protected]
+ 0060: 00 00 00 00 00 04 00 00 00 40 00 04 10 00 DA 43 // [email protected]
0070: 00 00 00 00 FE FF FF FF FF FF FF FF 01 00 00 00 // ................
- 0080: 00 00 00 00 // ....
+ 0080: 00 00 00 00 0A 00 01 00 FF FF 00 01 01 00 00 00 // ................
+ 0090: 01 00 00 00 00 04 00 00 00 40 00 04 08 00 DA 43 // [email protected]
+ 00A0: 00 00 00 00 07 1C 00 00 00 00 00 00 00 00 00 00 // ................
+ 00B0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
+ 00C0: 00 04 00 00 00 40 00 04 18 00 DA 43 00 00 00 00 // [email protected]....
+ 00D0: FE FF FF FF FF FF FF FF 01 00 00 00 00 00 00 00 // ................
--- tests/data/acpi/aarch64/virt/DSDT | Bin 5293 -> 5337 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5379 -> 5423 bytes tests/data/acpi/aarch64/virt/DSDT.acpipcihp | Bin 6202 -> 6246 bytes .../acpi/aarch64/virt/DSDT.hpoffacpiindex | Bin 5347 -> 5391 bytes tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6654 -> 6698 bytes tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7768 -> 7812 bytes tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5495 -> 5539 bytes tests/data/acpi/aarch64/virt/DSDT.viot | Bin 5310 -> 5354 bytes tests/data/acpi/aarch64/virt/HEST | Bin 132 -> 224 bytes tests/qtest/bios-tables-test-allowed-diff.h | 9 --------- 10 files changed, 9 deletions(-)
tests/data/acpi/aarch64/virt/DSDT binary +0 -0
tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt binary +0 -0
tests/data/acpi/aarch64/virt/DSDT.acpipcihp binary +0 -0
tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex binary +0 -0
tests/data/acpi/aarch64/virt/DSDT.memhp binary +0 -0
tests/data/acpi/aarch64/virt/DSDT.pxb binary +0 -0
tests/data/acpi/aarch64/virt/DSDT.topology binary +0 -0
tests/data/acpi/aarch64/virt/DSDT.viot binary +0 -0
tests/data/acpi/aarch64/virt/HEST binary +0 -0
tests/qtest/bios-tables-test-allowed-diff.h +0 -9
@@ -1,10 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/aarch64/virt/HEST" , -"tests/data/acpi/aarch64/virt/DSDT" , -"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt" , -"tests/data/acpi/aarch64/virt/DSDT.acpipcihp" , -"tests/data/acpi/aarch64/virt/DSDT.hpoffacpiindex" , -"tests/data/acpi/aarch64/virt/DSDT.memhp" , -"tests/data/acpi/aarch64/virt/DSDT.pxb" , -"tests/data/acpi/aarch64/virt/DSDT.topology" , -"tests/data/acpi/aarch64/virt/DSDT.viot",
Signature · 1 line
2.51.0
PATCH v12 16/17 docs: hest: add new "etc/acpi_table_hest_addr" and update workflow
In reply to Mauro Carvalho ChehabWhile the HEST layout didn't change, there are some internal changes related to how offsets are calculated and how memory error events are triggered.
Update specs to reflect such changes.
--- docs/specs/acpi_hest_ghes.rst | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)
docs/specs/acpi_hest_ghes.rst +17 -11
@@ -89,12 +89,21 @@ Design Details addresses in the "error_block_address" fields with a pointer to the respective "Error Status Data Block" in the "etc/hardware_errors" blob. -(8) QEMU defines a third and write-only fw_cfg blob which is called - "etc/hardware_errors_addr". Through that blob, the firmware can send back - the guest-side allocation addresses to QEMU. The "etc/hardware_errors_addr" - blob contains a 8-byte entry. QEMU generates a single WRITE_POINTER command - for the firmware. The firmware will write back the start address of - "etc/hardware_errors" blob to the fw_cfg file "etc/hardware_errors_addr". +(8) QEMU defines a third and write-only fw_cfg blob to store the location + where the error block offsets, read ack registers and CPER records are + stored. + + Up to QEMU 9.2, the location was at "etc/hardware_errors_addr", and + contains a GPA for the beginning of "etc/hardware_errors". + + Newer versions place the location at "etc/acpi_table_hest_addr", + pointing to the GPA of the HEST table. + + Using above mentioned 'fw_cfg' files, the firmware can send back the + guest-side allocation addresses to QEMU. They contain a 8-byte entry. + QEMU generates a single WRITE_POINTER command for the firmware. The + firmware will write back the start address of either "etc/hardware_errors" + or HEST table at the corresponding fw_cfg file. (9) When QEMU gets a SIGBUS from the kernel, QEMU writes CPER into corresponding "Error Status Data Block", guest memory, and then injects platform specific
@@ -105,8 +114,5 @@ Design Details kernel, on receiving notification, guest APEI driver could read the CPER error and take appropriate action. -(11) kvm_arch_on_sigbus_vcpu() uses source_id as index in "etc/hardware_errors" to - find out "Error Status Data Block" entry corresponding to error source. So supported - source_id values should be assigned here and not be changed afterwards to make sure - that guest will write error into expected "Error Status Data Block" even if guest was - migrated to a newer QEMU. +(11) kvm_arch_on_sigbus_vcpu() reports RAS errors via a SEA notifications, + when a SIGBUS event is triggered.
Signature · 1 line
2.51.0
PATCH v12 17/17 scripts/ghes_inject: add a script to generate GHES error inject
In reply to Mauro Carvalho ChehabUsing the QMP GHESv2 API requires preparing a raw data array containing a CPER record.
Add a helper script with subcommands to prepare such data.
Currently, only ARM Processor error CPER record is supported, by using:
$ ghes_inject.py arm
which produces those warnings on Linux:
[ 705.032426] [Firmware Warn]: GHES: Unhandled processor error type 0x02: cache error
[ 774.866308] {4}[Hardware Error]: Hardware error from APEI Generic Hardware Error Source: 1
[ 774.866583] {4}[Hardware Error]: event severity: recoverable
[ 774.866738] {4}[Hardware Error]: Error 0, type: recoverable
[ 774.866889] {4}[Hardware Error]: section_type: ARM processor error
[ 774.867048] {4}[Hardware Error]: MIDR: 0x00000000000f0510
[ 774.867189] {4}[Hardware Error]: running state: 0x0
[ 774.867321] {4}[Hardware Error]: Power State Coordination Interface state: 0
[ 774.867511] {4}[Hardware Error]: Error info structure 0:
[ 774.867679] {4}[Hardware Error]: num errors: 2
[ 774.867801] {4}[Hardware Error]: error_type: 0x02: cache error
[ 774.867962] {4}[Hardware Error]: error_info: 0x000000000091000f
[ 774.868124] {4}[Hardware Error]: transaction type: Data Access
[ 774.868280] {4}[Hardware Error]: cache error, operation type: Data write
[ 774.868465] {4}[Hardware Error]: cache level: 2
[ 774.868592] {4}[Hardware Error]: processor context not corrupted
[ 774.868774] [Firmware Warn]: GHES: Unhandled processor error type 0x02: cache errorSuch script allows customizing the error data, allowing to change all fields at the record. Please use:
$ ghes_inject.py arm -h
For more details about its usage.
--- MAINTAINERS | 3 + scripts/arm_processor_error.py | 476 ++++++++++++++++++++++ scripts/ghes_inject.py | 51 +++ scripts/qmp_helper.py | 703 +++++++++++++++++++++++++++++++++ 4 files changed, 1233 insertions(+) create mode 100644 scripts/arm_processor_error.py create mode 100755 scripts/ghes_inject.py create mode 100755 scripts/qmp_helper.py
MAINTAINERS +3 -0
@@ -2172,6 +2172,9 @@ S: Maintained F: hw/arm/ghes_cper.c F: hw/acpi/ghes_cper_stub.c F: qapi/acpi-hest.json +F: scripts/ghes_inject.py +F: scripts/arm_processor_error.py +F: scripts/qmp_helper.py ppc4xx L: [email protected]
scripts/arm_processor_error.py new file +476 -0
476 lines not on this page · raw message
scripts/ghes_inject.py new file +51 -0
51 lines not on this page · raw message
scripts/qmp_helper.py new file +703 -0
703 lines not on this page · raw message
Signature · 1 line
2.51.0
Re: [PATCH v12 17/17] scripts/ghes_inject: add a script to generate GHES error inject
scripts/arm_processor_error.py line 211
Quoted 3 lines · Mauro Carvalho Chehab
scripts/arm_processor_error.py new file +3
-0+ # UEFI N.17 Integer values + g_pei.add_argument("-m", "--multiple-error", nargs="+", + help="Number of errors: 0: Single error, 1: Multiple errors, 2-65535: Error count if known")
While I'm merging this as is, I ask that you please address these unreasonably long lines in this patch by a patch on top please.
Signature · 1 line
MST
Em Tue, 23 Sep 2025 09:03:54 +0200
Mauro Carvalho Chehab <[email protected]> escreveu:
Quoted 7 lines
Hi Michael,
This is v11 of the patch series, rebased to apply after release 10.1. Just like v1, the difference against v10 is a minor conflict resolution.
Please apply as soon as possible to avoid new conflicts.
Dah, I forgot to update this comments... this is v12, addressing your review from v11 - and sent with my venerable mailbomb script that doesn't mangle patches.
I rebased today in the top of current upstream. So far, no conflicts, but as it touches DSDT table and backward-compatible logic, it is still wise to have it applied earlier than later.
Quoted 148 lines
Thanks!
-
As
ghes_record_cper_errors()was written since the beginning to be public and used byghes-cper.c. It ended being meged earlier because the error-injection series become too big, so it was decided last year to split in two to make easier for reviewers and maintainers to discuss.This series change the way HEST table offsets are calculated, making them identical to what an OSPM would do and allowing multiple HEST entries without causing migration issues. It open space to add HEST support for non-arm architectures, as now the number and type of HEST notification entries are not hardcoded at
ghes.c. Instead, they're passed as a parameter from the arch-dependent init code.With such issue addressed, it adds a new notification type and add support to inject errors via a Python script. The script itself is at the final patch.
---
v12:
- some descriptions changed verbal tense to imperative;
- since updated at acpi-hest.json;
- added ag_freeatqmp_inject_ghes_v2_error()and fixed coding style;
- fixedNOTIFIER_LIST_INITIALIZER()parameter;
- changed a patch description with a diff on it to avoid issues with git am.v11:
- rebased on the top of current upstream:
baa79455fa92("Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging")
- backward-compatibility logic moved to version 10.1;
- BIOS test tables re-generated, as DSDT tables changed on 10.0;
- added a missing SPDX tag on a new file.v10:
- rebased on the top of current upstream:
d9ce74873a6a("Merge tag 'pull-vfio-20250611' of https://github.com/legoater/qemu into staging")
- solved a minor conflictv9:
- backward compatibility logic moved to version 10.0;
- fixed a compilation issue withtarget/arm/kvm.c(probably caused by some rebase - funny enough, incremental compilation was fine here);
- added two missing SPDX comments.v8:
- added a patch to revert recently-added changeset causing a conflict with these. All remaining patches are identical.v7:
- minor editorial change at the patch updating HEST doc spec with the new workflowv6:
- some minor nits addressed:
- use GPA instead of offset;
- merged two patches;
- fixed a couple of long line coding style issues;
- the HEST/DSDT diff inside a patch was changed to avoid troubles applying it.v5:
- make checkpatch happier;
- HEST table is now tested;
- some changes at HEST spec documentation to align with code changes;
- extra care was taken with regards to git bisectability.v4:
- added an extra comment for AcpiGhesState structure;
- patches reordered;
- no functional changes, just code shift between the patches in this series.v3:
- addressed more nits;
-hest_add_lenow points to the beginning of HEST table;
- removed HEST from tests/data/acpi;
- added an extra patch to not usefw_cfgwith virt-10.0 forhw_error_lev2:
- address some nits;
- improved ags cleanup patch and removed ags.present field;
- added some missing le*_to_cpu() calls;
- update date at copyright for new files to 2024-2025;
- qmp command changed to: inject-ghes-v2-error ans since updated to 10.0;
- added HEST and DSDT tables after the changes to make check target happy. (two patches: first one whitelisting such tables; second one removing from whitelist and updating/adding such tables to tests/data/acpi)Mauro Carvalho Chehab (17):
Revert "hw/acpi/ghes: Makeghes_record_cper_errors()static" acpi/ghes: Cleanup the code which gets ghes ged state acpi/ghes: prepare to change the way HEST offsets are calculated acpi/ghes: add a firmware file with HEST address acpi/ghes: Use HEST table offsets when preparing GHES records acpi/ghes: don't hard-code the number of sources for HEST table acpi/ghes: add a notifier to notify when error data is ready acpi/generic_event_device: Update GHES migration to cover hest addr acpi/generic_event_device: add logic to detect if HEST addr is
available
acpi/generic_event_device: add an APEI error device tests/acpi: virt: allow acpi table changes at DSDT and HEST tables arm/virt: Wire up a GED error device for ACPI / GHES qapi/acpi-hest: add an interface to do generic CPER error injectionacpi/generic_event_device.c: enableuse_hest_addrfor QEMU 10.x tests/acpi: virt: update HEST and DSDT tables
docs: hest: add new "etc/acpi_table_hest_addr" and update workflowscripts/ghes_inject: add a script to generate GHES error injectMAINTAINERS | 10 + docs/specs/acpi_hest_ghes.rst | 28 +- hw/acpi/Kconfig | 5 + hw/acpi/aml-build.c | 10 + hw/acpi/generic_event_device.c | 44 ++ hw/acpi/ghes-stub.c | 7 +- hw/acpi/ghes.c | 233 ++++-- hw/acpi/ghes_cper.c | 40 + hw/acpi/ghes_cper_stub.c | 20 + hw/acpi/meson.build | 2 + hw/arm/virt-acpi-build.c | 35 +- hw/arm/virt.c | 19 +- hw/core/machine.c | 5 +- include/hw/acpi/acpi_dev_interface.h | 1 + include/hw/acpi/aml-build.h | 2 + include/hw/acpi/generic_event_device.h | 1 + include/hw/acpi/ghes.h | 51 +- include/hw/arm/virt.h | 2 + qapi/acpi-hest.json | 36 + qapi/meson.build | 1 + qapi/qapi-schema.json | 1 + scripts/arm_processor_error.py | 476 ++++++++++++ scripts/ghes_inject.py | 51 ++ scripts/qmp_helper.py | 703 ++++++++++++++++++ target/arm/kvm.c | 7 +- tests/data/acpi/aarch64/virt/DSDT | Bin 5293 -> 5337 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5379 -> 5423 bytes tests/data/acpi/aarch64/virt/DSDT.acpipcihp | Bin 6202 -> 6246 bytes .../acpi/aarch64/virt/DSDT.hpoffacpiindex | Bin 5347 -> 5391 bytes tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6654 -> 6698 bytes tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7768 -> 7812 bytes tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5495 -> 5539 bytes tests/data/acpi/aarch64/virt/DSDT.viot | Bin 5310 -> 5354 bytes
Quoted 9 lines
tests/data/acpi/aarch64/virt/HEST | Bin 132 -> 224 bytes 34 files changed, 1700 insertions(+), 90 deletions(-) create mode 100644 hw/acpi/ghes_cper.c create mode 100644 hw/acpi/ghes_cper_stub.c create mode 100644 qapi/acpi-hest.json create mode 100644 scripts/arm_processor_error.py create mode 100755 scripts/ghes_inject.py create mode 100755 scripts/qmp_helper.py
Thanks,
Mauro