Change ghes to use HEST-based offsets and add support for error inject
Subsystems (2)
PATCH v3 1/14 acpi/ghes: Prepare to support multiple sources on ghes
In reply to Mauro Carvalho ChehabThe current code is actually dependent on having just one error structure with a single source.
As the number of sources should be arch-dependent, as it will depend on what kind of notifications will exist, change the logic to dynamically build the table.
Yet, for a proper support, we need to get the number of sources by reading the number from the HEST table. However, bios currently doesn't store a pointer to it.
For now just change the logic at table build time, while enforcing that it will behave like before with a single source ID.
A future patch will add a HEST table bios pointer and change the logic at acpi_ghes_record_errors() to dynamically use the new size.
--- hw/acpi/ghes.c | 47 +++++++++++++++++++++++++--------------- hw/arm/virt-acpi-build.c | 5 +++++ include/hw/acpi/ghes.h | 21 ++++++++++++------ 3 files changed, 49 insertions(+), 24 deletions(-)
hw/acpi/ghes.c +30 -17
@@ -206,17 +206,26 @@ 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 (GArray *hardware_errors,BIOSLinker *linker, +int num_sources) {int i, error_status_block_offset; +/* +* TODO: Current version supports only one source. +* A further patch will drop this check, after adding a proper migration +* code, as, for the code to work, we need to store a bios pointer to the +* HEST table. +*/ +assert (num_sources ==1 ); +/* 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.
@@ -231,13 +240,13 @@ static void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker)/* 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"
@@ -261,12 +270,14 @@ static void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker) }/* 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:
@@ -297,7 +308,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);
@@ -317,8 +328,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
@@ -333,19 +343,23 @@ static void build_ghes_v2(GArray *table_data,/* Build Hardware Error Source Table */ void acpi_build_hest (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 }; +int i; -build_ghes_error_table (hardware_errors, linker); +build_ghes_error_table (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); }
@@ -410,7 +424,6 @@ void ghes_record_cper_errors(const void *cper, size_t len, } 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);
hw/arm/virt-acpi-build.c +5 -0
@@ -893,6 +893,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) {
@@ -948,6 +952,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)if (vms->ras) {acpi_add_table (table_offsets, tables_blob);acpi_build_hest (tables_blob, tables->hardware_errors, tables->linker, + hest_ghes_notify,ARRAY_SIZE (hest_ghes_notify), vms->oem_id, vms->oem_table_id); }
include/hw/acpi/ghes.h +14 -7
@@ -57,20 +57,27 @@ enum AcpiGhesNotifyType { ACPI_GHES_NOTIFY_RESERVED = 12 }; -enum { -ACPI_HEST_SRC_ID_SEA =0 , -/* future ids go here */ - -ACPI_GHES_ERROR_SOURCE_COUNT -}; -typedef struct AcpiGhesState {uint64_t hw_error_le;bool present;/* True if GHES is present at all on this board */ }AcpiGhesState ; +/* +* 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 ; +void acpi_build_hest (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);
Signature · 1 line
2.48.1
PATCH v3 2/14 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 | 16 ++++++++++++++++ include/hw/acpi/ghes.h | 1 + 2 files changed, 17 insertions(+)
hw/acpi/ghes.c +16 -0
@@ -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)
@@ -349,8 +350,11 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, {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 (hardware_errors, linker, num_sources);acpi_table_begin (&table, table_data);
@@ -362,6 +366,15 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, }acpi_table_end (linker, &table); + +/* +* 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,
@@ -375,6 +388,9 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s,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); +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); + ags->present = true; }
include/hw/acpi/ghes.h +1 -0
@@ -58,6 +58,7 @@ enum AcpiGhesNotifyType { };typedef struct AcpiGhesState { +uint64_t hest_addr_le;uint64_t hw_error_le;bool present;/* True if GHES is present at all on this board */ }AcpiGhesState ;
Signature · 1 line
2.48.1
PATCH v3 6/14 acpi/ghes: only set hw_error_le or hest_addr_le
In reply to Mauro Carvalho ChehabThe hw_error_le pointer is used for legacy support (virt-9.2). Starting from virt-10.0, HEST table is accessed via hest_addr_le.
Remove fw_cfg logic for legacy support if virt is 10.0 or upper.
--- hw/acpi/ghes.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)
hw/acpi/ghes.c +16 -14
@@ -232,8 +232,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, -int num_sources) +static void build_ghes_error_table (AcpiGhesState *ags,GArray *hardware_errors, +BIOSLinker *linker,int num_sources) {int i, error_status_block_offset;
@@ -278,13 +278,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) */
@@ -373,7 +375,7 @@ void acpi_build_hest(AcpiGhesState *ags, GArray *table_data, hest_offset = table_data->len; -build_ghes_error_table (hardware_errors, linker, num_sources); +build_ghes_error_table (ags, hardware_errors, linker, num_sources);acpi_table_begin (&table, table_data);
@@ -404,13 +406,13 @@ 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) {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); } ags->present = true;
Signature · 1 line
2.48.1
PATCH v3 7/14 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
@@ -516,6 +516,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 (error_device_notifiers); +void ghes_record_cper_errors (const void *cper,size_t len,uint16_t source_id,Error **errp) {
@@ -571,7 +574,7 @@ 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 ; +notifier_list_notify (&acpi_generic_error_notifiers,NULL ); }int acpi_ghes_memory_errors (uint16_t source_id,uint64_t physical_address)
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.48.1
PATCH v3 11/14 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]/
---
Changes from v8:
- Added a call to the function that produces GHES generic records, as this is now added earlier in this series.
--- hw/acpi/generic_event_device.c | 2 +- hw/arm/virt-acpi-build.c | 1 + hw/arm/virt.c | 12 +++++++++++- include/hw/arm/virt.h | 1 + 4 files changed, 14 insertions(+), 2 deletions(-)
hw/acpi/generic_event_device.c +1 -1
@@ -331,7 +331,7 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev)static const Property acpi_ged_properties[] = {DEFINE_PROP_UINT32 ("ged-event" , AcpiGedState, ged_event_bitmap,0 ), -DEFINE_PROP_BOOL ("x-has-hest-addr" , AcpiGedState, ghes_state.use_hest_addr, false), +DEFINE_PROP_BOOL ("x-has-hest-addr" , AcpiGedState, ghes_state.use_hest_addr, true), };static const VMStateDescription vmstate_memhp_state = {
hw/arm/virt-acpi-build.c +1 -0
@@ -861,6 +861,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
@@ -678,7 +678,7 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms)DeviceState *dev;MachineState *ms =MACHINE (vms);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 ;if (ms->ram_slots) { event |=ACPI_GED_MEM_HOTPLUG_EVT ;
@@ -1010,6 +1010,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) {
@@ -2404,6 +2411,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
@@ -176,6 +176,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.48.1
v3 cover Change ghes to use HEST-based offsets and add support for error inject
Now that the ghes preparation patches were merged, let's add support for error injection.
On this series, the first 6 patches chang to the math used to calculate offsets at HEST table and hardware_error firmware file, together with its migration code. Migration tested with both latest QEMU released kernel and upstream, on both directions.
The next patches add a new QAPI to allow injecting GHESv2 errors, and a script using such QAPI
to inject ARM Processor Error records.
If I'm counting well, this is the 19th submission of my error inject patches.
---
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)
It follows a diff against v2 to better show the differences.
hw/acpi/generic_event_device.c +6 -7
@@ -29,12 +29,6 @@ static const uint32_t ged_supported_events[] = { ACPI_GED_ERROR_EVT, }; -/* -* ACPI 5.0b: 5.6.6 Device Object Notifications -* Table 5-135 Error Device Notification Values -*/ -#define ERROR_DEVICE_NOTIFICATION 0x80 -/* * The ACPI Generic Event Device (GED) is a hardware-reduced specific * device[ACPI v6.1 Section 5.6.9] that handles all platform events,
@@ -124,9 +118,14 @@ void build_ged_aml(Aml *table, const char *name, HotplugHandler *hotplug_dev, 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 (ERROR_DEVICE_NOTIFICATION ))); +aml_int (0x80 )));break ;case ACPI_GED_NVDIMM_HOTPLUG_EVT : aml_append(if_ctx,
hw/acpi/ghes.c +28 -21
112 lines not on this page · raw message
hw/arm/virt-acpi-build.c +11 -9
@@ -956,8 +956,10 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)build_dbg2 (tables_blob, tables->linker, vms);if (vms->ras) { -AcpiGhesState *ags; +static const AcpiNotificationSourceId *notify;AcpiGedState *acpi_ged_state; +unsigned int notify_sz; +AcpiGhesState *ags; acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED ,NULL ));
@@ -967,16 +969,16 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)acpi_add_table (table_offsets, tables_blob);if (!ags->use_hest_addr) { -acpi_build_hest (ags, tables_blob, tables->hardware_errors, - tables->linker, hest_ghes_notify_9_2, -ARRAY_SIZE (hest_ghes_notify_9_2), - vms->oem_id, vms->oem_table_id); + notify = hest_ghes_notify_9_2; + notify_sz =ARRAY_SIZE (hest_ghes_notify_9_2); }else { -acpi_build_hest (ags, tables_blob, tables->hardware_errors, - tables->linker, hest_ghes_notify, -ARRAY_SIZE (hest_ghes_notify), - vms->oem_id, vms->oem_table_id); + notify = hest_ghes_notify; + notify_sz =ARRAY_SIZE (hest_ghes_notify); } + +acpi_build_hest (ags, tables_blob, tables->hardware_errors, + tables->linker, notify, notify_sz, + vms->oem_id, vms->oem_table_id); } }
scripts/arm_processor_error.py +99 -0
110 lines not on this page · raw message
scripts/qmp_helper.py +1 -1
@@ -541,7 +541,7 @@ def send_cper_raw(self, cper_data): self._connect() - if self.send_cmd("inject-ghes-error", cmd_arg): + if self.send_cmd("inject-ghes-v2-error", cmd_arg): print("Error injected.") def send_cper(self, notif_type, payload):
target/arm/kvm.c +0 -1
@@ -2371,7 +2371,6 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr)assert (code ==BUS_MCEERR_AR || code ==BUS_MCEERR_AO ); ags =acpi_ghes_get_state (); -if (ags && addr) { ram_addr =qemu_ram_addr_from_host (addr); if (ram_addr != RAM_ADDR_INVALID &&
tests/data/acpi/aarch64/virt/HEST deleted binary +0 -0
-
Mauro Carvalho Chehab (14):
acpi/ghes: Prepare to support multiple sources on ghes acpi/ghes: add a firmware file with HEST address acpi/ghes: Use HEST table offsets when preparing GHES records 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/ghes: only set hw_error_le or hest_addr_le acpi/ghes: add a notifier to notify when error data is ready acpi/ghes: Cleanup the code which gets ghes ged state acpi/generic_event_device: add an APEI error device tests/acpi: virt: allow acpi table changes for a new table: HEST arm/virt: Wire up a GED error device for ACPI / GHES tests/acpi: virt: add a HEST table to aarch64 virt and update DSDT qapi/acpi-hest: add an interface to do generic CPER error injection scripts/ghes_inject: add a script to generate GHES error inject
MAINTAINERS | 10 + hw/acpi/Kconfig | 5 + hw/acpi/aml-build.c | 10 + hw/acpi/generic_event_device.c | 43 ++ hw/acpi/ghes-stub.c | 7 +- hw/acpi/ghes.c | 231 ++++-- hw/acpi/ghes_cper.c | 38 + hw/acpi/ghes_cper_stub.c | 19 + hw/acpi/meson.build | 2 + hw/arm/virt-acpi-build.c | 37 +- hw/arm/virt.c | 19 +- hw/core/machine.c | 2 + 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 | 45 +- include/hw/arm/virt.h | 2 + qapi/acpi-hest.json | 35 + qapi/meson.build | 1 + qapi/qapi-schema.json | 1 + scripts/arm_processor_error.py | 476 ++++++++++++ scripts/ghes_inject.py | 51 ++ scripts/qmp_helper.py | 702 ++++++++++++++++++ target/arm/kvm.c | 7 +- tests/data/acpi/aarch64/virt/DSDT | Bin 5196 -> 5240 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5282 -> 5326 bytes tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6557 -> 6601 bytes tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7679 -> 7723 bytes tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5398 -> 5442 bytes 29 files changed, 1666 insertions(+), 81 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.48.1
PATCH v3 3/14 acpi/ghes: Use HEST table offsets when preparing GHES records
There 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 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.
--- hw/acpi/ghes.c | 132 ++++++++++++++++++++++++++++++++++++----- include/hw/acpi/ghes.h | 1 + 2 files changed, 119 insertions(+), 14 deletions(-)
hw/acpi/ghes.c +118 -14
@@ -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,25 @@*/ #define ACPI_GHES_GESB_SIZE 20 +/* +* Offsets with regards to the start of the HEST table stored at +* ags->hest_addr_le, according with the memory layout map at +* docs/specs/acpi_hest_ghes.rst. +*/ + +/* +* ACPI 6.2: 18.3.2.8 Generic Hardware Error Source version 2 +* Table 18-382 Generic Hardware Error Source version 2 (GHESv2) Structure +*/ +#define HEST_GHES_V2_TABLE_SIZE 92 +#define GHES_READ_ACK_ADDR_OFF 64 + +/* +* ACPI 6.2: 18.3.2.7: Generic Hardware Error Source +* Table 18-380: 'Error Status Address' field +*/ +#define GHES_ERR_STATUS_ADDR_OFF 20 +/* * Values for error_severity field */
@@ -212,14 +237,6 @@ static void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker, {int i, error_status_block_offset; -/* -* TODO: Current version supports only one source. -* A further patch will drop this check, after adding a proper migration -* code, as, for the code to work, we need to store a bios pointer to the -* HEST table. -*/ -assert (num_sources ==1 ); -/* Build error_block_address */ for (i =0 ; i < num_sources; i++) {build_append_int_noprefix (hardware_errors,0 ,sizeof (uint64_t ));
@@ -352,6 +369,14 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, .oem_id = oem_id, .oem_table_id = oem_table_id };uint32_t hest_offset;int i; +AcpiGedState *acpi_ged_state; +AcpiGhesState *ags =NULL ; + + acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED , +NULL )); +if (acpi_ged_state) { + ags = &acpi_ged_state->ghes_state; + } hest_offset = table_data->len;
@@ -371,10 +396,12 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors,* 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); +if (ags->use_hest_addr) { +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,
@@ -420,6 +447,78 @@ 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 address 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_TABLE_SIZE ; + } +if (i == num_sources) { +error_setg (errp,"HEST: Source %d not found." , source_id); +return ; + } + +/* Navigate though 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 (const void *cper,size_t len,uint16_t source_id,Error **errp) {
@@ -440,8 +539,13 @@ void ghes_record_cper_errors(const void *cper, size_t len, } ags = &acpi_ged_state->ghes_state; -get_hw_error_offsets (le64_to_cpu (ags->hw_error_le), - &cper_addr, &read_ack_register_addr); +if (!ags->hest_addr_le) { +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); + }if (!cper_addr) {error_setg (errp,"can not find Generic Error Status Block" );
include/hw/acpi/ghes.h +1 -0
@@ -61,6 +61,7 @@ typedef struct AcpiGhesState {uint64_t hest_addr_le;uint64_t hw_error_le;bool present;/* True if GHES is present at all on this board */ +bool use_hest_addr;/* True if HEST address is present */ } AcpiGhesState;/*
Signature · 1 line
2.48.1
PATCH v3 4/14 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
@@ -386,6 +386,34 @@ static const VMStateDescription vmstate_ghes_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 ,
@@ -398,6 +426,7 @@ static const VMStateDescription vmstate_acpi_ged = { &vmstate_memhp_state, &vmstate_cpuhp_state, &vmstate_ghes_state, + &vmstate_hest_state, NULL } };
Signature · 1 line
2.48.1
PATCH v3 5/14 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 | 1 + hw/acpi/ghes.c | 17 ++++++----------- hw/arm/virt-acpi-build.c | 32 ++++++++++++++++++++++++++++---- hw/core/machine.c | 2 ++ include/hw/acpi/ghes.h | 3 ++- 5 files changed, 39 insertions(+), 16 deletions(-)
hw/acpi/generic_event_device.c +1 -0
@@ -318,6 +318,7 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev)static const Property acpi_ged_properties[] = {DEFINE_PROP_UINT32 ("ged-event" , AcpiGedState, ged_event_bitmap,0 ), +DEFINE_PROP_BOOL ("x-has-hest-addr" , AcpiGedState, ghes_state.use_hest_addr, false), };static const VMStateDescription vmstate_memhp_state = {
hw/acpi/ghes.c +6 -11
@@ -359,7 +359,8 @@ static void build_ghes_v2_entry(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 AcpiNotificationSourceId *notif_source, int num_sources,
@@ -369,14 +370,6 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, .oem_id = oem_id, .oem_table_id = oem_table_id };uint32_t hest_offset;int i; -AcpiGedState *acpi_ged_state; -AcpiGhesState *ags =NULL ; - - acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED , -NULL )); -if (acpi_ged_state) { - ags = &acpi_ged_state->ghes_state; - } hest_offset = table_data->len;
@@ -415,8 +408,10 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s,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); -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); +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); + } ags->present = true; }
hw/arm/virt-acpi-build.c +28 -4
@@ -897,6 +897,10 @@ static const AcpiNotificationSourceId hest_ghes_notify[] = { { ACPI_HEST_SRC_ID_SYNC, ACPI_GHES_NOTIFY_SEA }, }; +static const AcpiNotificationSourceId hest_ghes_notify_9_2[] = { + {ACPI_HEST_SRC_ID_SYNC ,ACPI_GHES_NOTIFY_SEA }, +}; +static void virt_acpi_build (VirtMachineState *vms,AcpiBuildTables *tables) {
@@ -950,10 +954,30 @@ 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, - hest_ghes_notify,ARRAY_SIZE (hest_ghes_notify), - vms->oem_id, vms->oem_table_id); +static const AcpiNotificationSourceId *notify; +AcpiGedState *acpi_ged_state; +unsigned int notify_sz; +AcpiGhesState *ags; + + acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED , +NULL )); +if (acpi_ged_state) { + ags = &acpi_ged_state->ghes_state; + +acpi_add_table (table_offsets, tables_blob); + +if (!ags->use_hest_addr) { + notify = hest_ghes_notify_9_2; + notify_sz =ARRAY_SIZE (hest_ghes_notify_9_2); + }else { + notify = hest_ghes_notify; + notify_sz =ARRAY_SIZE (hest_ghes_notify); + } + +acpi_build_hest (ags, tables_blob, tables->hardware_errors, + tables->linker, notify, notify_sz, + vms->oem_id, vms->oem_table_id); + } }if (ms->numa_state->num_nodes >0 ) {
hw/core/machine.c +2 -0
@@ -34,10 +34,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_9_2[] = { {"arm-cpu" ,"backcompat-pauth-default-use-qarma5" ,"true" }, + {TYPE_ACPI_GED ,"x-has-hest-addr" ,"false" }, };const size_t hw_compat_9_2_len =G_N_ELEMENTS (hw_compat_9_2);
include/hw/acpi/ghes.h +2 -1
@@ -76,7 +76,8 @@ typedef struct AcpiNotificationSourceId {enum AcpiGhesNotifyType notify; } AcpiNotificationSourceId; -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 AcpiNotificationSourceId * const notif_source, int num_sources,
Signature · 1 line
2.48.1
PATCH v3 8/14 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 | 40 ++++++++++++---------------------------- include/hw/acpi/ghes.h | 15 ++++++++------- target/arm/kvm.c | 7 +++++-- 4 files changed, 29 insertions(+), 40 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 +12 -28
@@ -414,18 +414,12 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s,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
@@ -519,27 +513,17 @@ static void get_ghes_source_offsets(uint16_t source_id,NotifierList acpi_generic_error_notifiers =NOTIFIER_LIST_INITIALIZER (error_device_notifiers); -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; - -if (!ags->hest_addr_le) { +if (!ags->use_hest_addr) {get_hw_error_offsets (le64_to_cpu (ags->hw_error_le), &cper_addr, &read_ack_register_addr); }else {
@@ -547,11 +531,6 @@ void ghes_record_cper_errors(const void *cper, size_t len, &cper_addr, &read_ack_register_addr, errp); } -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));
@@ -577,7 +556,8 @@ void ghes_record_cper_errors(const void *cper, size_t len,notifier_list_notify (&acpi_generic_error_notifiers,NULL ); } -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[] =
@@ -603,7 +583,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);
@@ -615,7 +595,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;
@@ -624,8 +604,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 && !ags->hest_addr_le) { +return NULL ; + } +return ags; }
include/hw/acpi/ghes.h +8 -7
@@ -63,7 +63,6 @@ enum AcpiGhesNotifyType {typedef struct AcpiGhesState {uint64_t hest_addr_le;uint64_t hw_error_le; -bool present;/* True if GHES is present at all on this board */ bool use_hest_addr;/* True if HEST address is present */ }AcpiGhesState ;
@@ -87,15 +86,17 @@ void acpi_build_hest(AcpiGhesState *ags, GArray *table_data, 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, +* it is enabled and it is safe to call acpi_ghes_memory_errors() to record +* a memory error. Returns false, otherwise. */ -bool acpi_ghes_present (void ); +AcpiGhesState *acpi_ghes_get_state (void );#endif
target/arm/kvm.c +5 -2
@@ -2366,10 +2366,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)) {
@@ -2387,7 +2389,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.48.1
PATCH v3 9/14 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
@@ -2614,3 +2614,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
@@ -26,6 +26,7 @@ static const uint32_t ged_supported_events[] = {ACPI_GED_PWR_DOWN_EVT ,ACPI_GED_NVDIMM_HOTPLUG_EVT ,ACPI_GED_CPU_HOTPLUG_EVT , + ACPI_GED_ERROR_EVT, };/*
@@ -116,6 +117,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"),
@@ -295,6 +306,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
@@ -101,6 +101,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(AcpiGedState, ACPI_GED)#define ACPI_GED_PWR_DOWN_EVT 0x2#define ACPI_GED_NVDIMM_HOTPLUG_EVT 0x4#define ACPI_GED_CPU_HOTPLUG_EVT 0x8 +#define ACPI_GED_ERROR_EVT 0x10 typedef struct GEDState { MemoryRegion evt;
Signature · 1 line
2.48.1
PATCH v3 10/14 tests/acpi: virt: allow acpi table changes for a new table: HEST
In reply to Mauro Carvalho ChehabThe DSDT table will also be affected by such change.
--- tests/data/acpi/aarch64/virt/HEST | 0 tests/qtest/bios-tables-test-allowed-diff.h | 1 + 2 files changed, 1 insertion(+) create mode 100644 tests/data/acpi/aarch64/virt/HEST
tests/data/acpi/aarch64/virt/HEST new file +0 -0
tests/qtest/bios-tables-test-allowed-diff.h +1 -0
@@ -1 +1,2 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/aarch64/virt/DSDT",
Signature · 1 line
2.48.1
PATCH v3 12/14 tests/acpi: virt: add a HEST table to aarch64 virt and update DSDT
In reply to Mauro Carvalho ChehabDSDT.dsl 2025-01-28 09:39:01.684836954 +0100 renamed from DSDT.dsl 2025-01-28 09:38:15.155347858 +0100 +13 -2
@@ -9,9 +9,9 @@ * * Original Table Header: * Signature "DSDT" - * Length 0x00001516 (5398) + * Length 0x00001542 (5442) * Revision 0x02 - * Checksum 0x0F + * Checksum 0xE9 * OEM ID "BOCHS " * OEM Table ID "BXPC " * OEM Revision 0x00000001 (1)
@@ -1931,6 +1931,11 @@ { Notify (PWRB, 0x80) // Status Change } + + If (((Local0 & 0x10) == 0x10)) + { + Notify (GEDD, 0x80) // Status Change + } } }
@@ -1939,6 +1944,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 + } } }
--- tests/data/acpi/aarch64/virt/DSDT | Bin 5196 -> 5240 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5282 -> 5326 bytes tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6557 -> 6601 bytes tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7679 -> 7723 bytes tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5398 -> 5442 bytes tests/data/acpi/aarch64/virt/HEST | 0 tests/qtest/bios-tables-test-allowed-diff.h | 1 - 7 files changed, 1 deletion(-) delete mode 100644 tests/data/acpi/aarch64/virt/HEST
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.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/HEST deleted +0 -0
tests/qtest/bios-tables-test-allowed-diff.h +0 -1
@@ -1,2 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/aarch64/virt/DSDT",
Signature · 1 line
2.48.1
PATCH v3 13/14 qapi/acpi-hest: add an interface to do generic CPER error injection
In reply to Mauro Carvalho ChehabCreates 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 is 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;
---
Changes since v9:
- ARM source IDs renamed to reflect SYNC/ASYNC;
- command name changed to better reflect what it does;
- some improvements at JSON documentation;
- add a check for QMP source at the notification logic.
--- MAINTAINERS | 7 +++++++ hw/acpi/Kconfig | 5 +++++ hw/acpi/ghes.c | 2 +- hw/acpi/ghes_cper.c | 38 ++++++++++++++++++++++++++++++++++++++ hw/acpi/ghes_cper_stub.c | 19 +++++++++++++++++++ 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 | 35 +++++++++++++++++++++++++++++++++++ qapi/meson.build | 1 + qapi/qapi-schema.json | 1 + 13 files changed, 119 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
@@ -2075,6 +2075,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 +38 -0
@@ -0,0 +1,38 @@ +/* +* 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. +* +*/ + +#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; + + ags =acpi_ghes_get_state (); +if (!ags) { +return ; + } + +uint8_t *cper; +size_t len; + + 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); +}
hw/acpi/ghes_cper_stub.c new file +19 -0
@@ -0,0 +1,19 @@ +/* +* 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. +* +*/ + +#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
@@ -896,6 +896,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_9_2[] = {
hw/arm/virt.c +7 -0
@@ -1012,6 +1012,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
@@ -71,6 +71,7 @@ typedef struct AcpiGhesState {*/ 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 +35 -0
@@ -0,0 +1,35 @@ +# -*- Mode: Python -*- +# vim: filetype=python + +## +# == 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.0 +## +{ 'command': 'inject-ghes-v2-error', + 'data': { + 'cper': 'str' + }, + 'features': [ 'unstable' ] +}
qapi/meson.build +1 -0
@@ -59,6 +59,7 @@ qapi_all_modules = [ if have_system qapi_all_modules += [ 'acpi', + 'acpi-hest', 'audio', 'cryptodev', 'qdev',
qapi/qapi-schema.json +1 -0
@@ -75,6 +75,7 @@ { 'include': 'misc-target.json' } { 'include': 'audio.json' } { 'include': 'acpi.json' } +{ 'include': 'acpi-hest.json' } { 'include': 'pci.json' } { 'include': 'stats.json' } { 'include': 'virtio.json' }
Signature · 1 line
2.48.1
PATCH v3 14/14 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 | 702 +++++++++++++++++++++++++++++++++ 4 files changed, 1232 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
@@ -2081,6 +2081,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 +702 -0
702 lines not on this page · raw message
Signature · 1 line
2.48.1
Re: [PATCH v3 03/14] acpi/ghes: Use HEST table offsets when preparing GHES records
In reply to Mauro Carvalho ChehabQuoted 5 lines · On Fri, 31 Jan 2025 18:42:44 +0100 Mauro Carvalho Chehab…
There 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 ack.
Quoted 7 lines
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.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
Tiny niggle on patch split up inline. Either way
Quoted 31 lines
hw/acpi/ghes.c +8
-8@@ -212,14 +237,6 @@ static void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker, {int i, error_status_block_offset; -/* -* TODO: Current version supports only one source. -* A further patch will drop this check, after adding a proper migration -* code, as, for the code to work, we need to store a bios pointer to the -* HEST table. -*/ -assert (num_sources ==1 ); -/* Build error_block_address */ for (i =0 ; i < num_sources; i++) {build_append_int_noprefix (hardware_errors,0 ,sizeof (uint64_t ));@@ -352,6 +369,14 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, .oem_id = oem_id, .oem_table_id = oem_table_id };uint32_t hest_offset;int i; +AcpiGedState *acpi_ged_state; +AcpiGhesState *ags =NULL ; + + acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED , +NULL )); +if (acpi_ged_state) { + ags = &acpi_ged_state->ghes_state; + } hest_offset = table_data->len;
hw/acpi/ghes.c void acpi_build_hest(GArray *table_data, GArray *hardware_errors, · line 399
Quoted 8 lines
hw/acpi/ghes.c +1
-4@@ -371,10 +396,12 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors,* 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); +if (ags->use_hest_addr) {
Maybe move ags->use_hest_addr introduction to previous patch to avoid churn here? It's not set yet anyway.
Quoted 11 lines
hw/acpi/ghes.c +5
-0+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,@@ -420,6 +447,78 @@ static void get_hw_error_offsets(uint64_t ghes_addr, *read_ack_register_addr = ghes_addr +sizeof (uint64_t ); }
Re: [PATCH v3 06/14] acpi/ghes: only set hw_error_le or hest_addr_le
In reply to Mauro Carvalho ChehabQuoted 6 lines · On Fri, 31 Jan 2025 18:42:47 +0100 Mauro Carvalho Chehab…
The
hw_error_lepointer is used for legacy support (virt-9.2). Starting from virt-10.0, HEST table is accessed viahest_addr_le.Remove
fw_cfglogic for legacy support if virt is 10.0 or upper.Signed-off-by Mauro Carvalho Chehab <[email protected]>
Re: [PATCH v3 08/14] acpi/ghes: Cleanup the code which gets ghes ged state
In reply to Mauro Carvalho ChehabQuoted 6 lines · On Fri, 31 Jan 2025 18:42:49 +0100 Mauro Carvalho Chehab…
Move the check logic into a common function and simplify the code which checks if GHES is enabled and was properly setup.
Signed-off-by Mauro Carvalho Chehab <[email protected]>Reviewed-by Jonathan Cameron <[email protected]>Reviewed-by Igor Mammedov <[email protected]>
One minor comment inline on a change I think should be in an earlier patch.
Quoted 13 lines
hw/acpi/ghes.c +1
-3-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 ; }
hw/acpi/ghes.c static void get_ghes_source_offsets(uint16_t source_id, · line 526
Quoted 10 lines
hw/acpi/ghes.c +1
-9- 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; - -if (!ags->hest_addr_le) { +if (!ags->use_hest_addr) {
Should this change be moved back to patch 3? use_hest_addr was available at that point and it would reduce churn a tiny bit.
Quoted 15 lines
get_hw_error_offsets(le64_to_cpu(ags->hw_error_le), &cper_addr, &read_ack_register_addr); } else {hw/acpi/ghes.c +0
-5@@ -547,11 +531,6 @@ void ghes_record_cper_errors(const void *cper, size_t len, &cper_addr, &read_ack_register_addr, errp); } -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));
Re: [PATCH v3 12/14] tests/acpi: virt: add a HEST table to aarch64 virt and update DSDT
In reply to Mauro Carvalho ChehabQuoted 39 lines · On Fri, 31 Jan 2025 18:42:53 +0100 Mauro Carvalho Chehab…
DSDT.dsl 2025-01-28 09:39:01.684836954 +0100 renamed from DSDT.dsl 2025-01-28 09:38:15.155347858 +0100 +13
-2@@ -9,9 +9,9 @@ * * Original Table Header: * Signature "DSDT" - * Length 0x00001516 (5398) + * Length 0x00001542 (5442) * Revision 0x02 - * Checksum 0x0F + * Checksum 0xE9 * OEM ID "BOCHS " * OEM Table ID "BXPC " * OEM Revision 0x00000001 (1)@@ -1931,6 +1931,11 @@ { Notify (PWRB, 0x80) // Status Change } + + If (((Local0 & 0x10) == 0x10)) + { + Notify (GEDD, 0x80) // Status Change + } } }@@ -1939,6 +1944,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 + } } }
Quoted 1 line
Signed-off-by Mauro Carvalho Chehab <[email protected]>
Diff looks good.
Re: [PATCH v3 14/14] scripts/ghes_inject: add a script to generate GHES error inject
In reply to Mauro Carvalho ChehabQuoted 29 lines · On Fri, 31 Jan 2025 18:42:55 +0100 Mauro Carvalho Chehab…
Using 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 armwhich 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 error
Quoted 8 lines
Such script allows customizing the error data, allowing to change all fields at the record. Please use:
$ ghes_inject.py arm -hFor more details about its usage.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
Thanks for examples. Given my poor python skills take this one with a pinch of salt.
Quoted 11 lines · On Fri, 31 Jan 2025 18:42:41 +0100 Mauro Carvalho Chehab…
Now that the ghes preparation patches were merged, let's add support for error injection.
On this series, the first 6 patches chang to the math used to calculate offsets at HEST table and
hardware_errorfirmware file, together with its migration code. Migration tested with both latest QEMU released kernel and upstream, on both directions.The next patches add a new QAPI to allow injecting GHESv2 errors, and a script using such QAPI
to inject ARM Processor Error records.If I'm counting well, this is the 19th submission of my error inject patches.
Looks good to me. All remaining trivial things are in the category of things to consider only if you are doing another spin. The code ends up how I'd like it at the end of the series anyway, just a question of the precise path to that state!
Jonathan
Re: [PATCH v3 02/14] acpi/ghes: add a firmware file with HEST address
In reply to Mauro Carvalho ChehabQuoted 5 lines · On Fri, 31 Jan 2025 18:42:43 +0100 Mauro Carvalho Chehab…
Store HEST table address at GPA, placing its the start of the table at
hest_addr_levariable.Signed-off-by Mauro Carvalho Chehab <[email protected]>Reviewed-by Jonathan Cameron <[email protected]>
Quoted 67 lines
--- hw/acpi/ghes.c | 16 ++++++++++++++++ include/hw/acpi/ghes.h | 1 + 2 files changed, 17 insertions(+)hw/acpi/ghes.c +16
-0@@ -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)@@ -349,8 +350,11 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, {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 (hardware_errors, linker, num_sources);acpi_table_begin (&table, table_data);@@ -362,6 +366,15 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, }acpi_table_end (linker, &table); + +/* +* 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,@@ -375,6 +388,9 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s,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); +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); + ags->present = true; }include/hw/acpi/ghes.h +1
-0@@ -58,6 +58,7 @@ enum AcpiGhesNotifyType { };typedef struct AcpiGhesState { +uint64_t hest_addr_le;uint64_t hw_error_le;bool present;/* True if GHES is present at all on this board */ }AcpiGhesState ;
Re: [PATCH v3 03/14] acpi/ghes: Use HEST table offsets when preparing GHES records
In reply to Mauro Carvalho ChehabQuoted 35 lines · On Fri, 31 Jan 2025 18:42:44 +0100 Mauro Carvalho Chehab…
There 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 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.
Signed-off-by Mauro Carvalho Chehab <[email protected]>--- hw/acpi/ghes.c | 132 ++++++++++++++++++++++++++++++++++++----- include/hw/acpi/ghes.h | 1 + 2 files changed, 119 insertions(+), 14 deletions(-)hw/acpi/ghes.c +6
-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,
hw/acpi/ghes.c line 72
Quoted 6 lines
hw/acpi/ghes.c +3
-0@@ -61,6 +67,25 @@*/ #define ACPI_GHES_GESB_SIZE 20 +/* +* Offsets with regards to the start of the HEST table stored at +* ags->hest_addr_le,
If I read this literary, then offsets above are not what declared later in this patch.
I'd really drop this comment altogether as it's confusing, and rather get variables/macro naming right
Quoted 3 lines
according with the memory layout map at
+ *docs/specs/acpi_hest_ghes.rst.
+ */
what we need is update to above doc, describing new and old ways. a separate patch.
hw/acpi/ghes.c line 77
Quoted 3 lines
hw/acpi/ghes.c +3
-0+ +/* +* ACPI 6.2: 18.3.2.8 Generic Hardware Error Source version 2
^^^^^^^^ - wrt version, I see it in 6.1.
our req is to point to the earliest doc where it has appeared. it it must point to a later version for some justified reason the explanation 'why' should be mentioned in comment message.
please check all versioning/chapters you are touching/adding in this series.
Quoted 3 lines
+ * Table 18-382 Generic Hardware Error Source version 2 (GHESv2) Structure
+ */
+#defineHEST_GHES_V2_TABLE_SIZE92
it's not table but rather an GHES_V2 entry in HEST and should be named as such (emph on _entry_)
Quoted 1 line
+#define
GHES_READ_ACK_ADDR_OFF64
please, add a comment like below but for 'Read Ack Register'
Quoted 43 lines
hw/acpi/ghes.c +14
-8+/* +* ACPI 6.2: 18.3.2.7: Generic Hardware Error Source +* Table 18-380: 'Error Status Address' field +*/ +#define GHES_ERR_STATUS_ADDR_OFF 20 +/* * Values for error_severity field */ @@ -212,14 +237,6 @@ static void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker, {int i, error_status_block_offset; -/* -* TODO: Current version supports only one source. -* A further patch will drop this check, after adding a proper migration -* code, as, for the code to work, we need to store a bios pointer to the -* HEST table. -*/ -assert (num_sources ==1 ); -/* Build error_block_address */ for (i =0 ; i < num_sources; i++) {build_append_int_noprefix (hardware_errors,0 ,sizeof (uint64_t ));@@ -352,6 +369,14 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, .oem_id = oem_id, .oem_table_id = oem_table_id };uint32_t hest_offset;int i; +AcpiGedState *acpi_ged_state; +AcpiGhesState *ags =NULL ; + + acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED , +NULL )); +if (acpi_ged_state) { + ags = &acpi_ged_state->ghes_state; + } hest_offset = table_data->len;@@ -371,10 +396,12 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors,* Tell firmware to write into GPA the address of HEST via fw_cfg, * once initialized. */
hw/acpi/ghes.c void acpi_build_hest(GArray *table_data, GArray *hardware_errors, · line 404
Quoted 10 lines
hw/acpi/ghes.c +6
-4-bios_linker_loader_write_pointer (linker, -ACPI_HEST_ADDR_FW_CFG_FILE ,0 , -sizeof (uint64_t ), -ACPI_BUILD_TABLE_FILE , hest_offset); +if (ags->use_hest_addr) { +bios_linker_loader_write_pointer (linker, +ACPI_HEST_ADDR_FW_CFG_FILE ,0 , +sizeof (uint64_t ), +ACPI_BUILD_TABLE_FILE , hest_offset); + }
I'd move this patch before 2/14, to avoid issues during bisection.
Also legacy variant is hidden in build_ghes_error_table()
/*
* tell firmware to write hardware_errors GPA into
* hardware_errors_addr fw_cfg, once the former has been initialized. */
bios_linker_loader_write_pointer()
and after this patch we end up with scattered code that should pick only one them (but doesn't).
As prereq, I'd move legacy into acpi_build_hest() as separate patch,
then do this patch adds above 'if' gate,
and followup patch [2/14 currently] adds bios_linker_loader_write_pointer(ACPI_HEST_ADDR_FW_CFG_FILE)
hw/acpi/ghes.c void acpi_build_hest(GArray *table_data, GArray *hardware_errors, · line 407
Quoted 3 lines
hw/acpi/ghes.c +0
-0} void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s,
shouldn't we do the same for fw_cfg_add_file_callback() hunk added
in previous patch and related 'fw_cfg_add_file_callback(s, ACPI_HW_ERROR_ADDR_FW_CFG_FILE' we need only one of them.
Quoted 17 lines
hw/acpi/ghes.c +13
-0@@ -420,6 +447,78 @@ 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,
hw/acpi/ghes.c static void get_hw_error_offsets(uint64_t ghes_addr, · line 472
Quoted 10 lines
hw/acpi/ghes.c +9
-0+ 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 +*/ +
not needed newline
Quoted 24 lines
hw/acpi/ghes.c +24
-0+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 address 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_TABLE_SIZE ; + } +if (i == num_sources) { +error_setg (errp,"HEST: Source %d not found." , source_id);
hw/acpi/ghes.c static void get_hw_error_offsets(uint64_t ghes_addr, · line 505
Quoted 10 lines
hw/acpi/ghes.c +10
-0+return ; + } + +/* Navigate though 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)); +
I'd drop newlines for related read/processing
hw/acpi/ghes.c static void get_hw_error_offsets(uint64_t ghes_addr, · line 510
Quoted 6 lines
hw/acpi/ghes.c +5
-0+ error_block_addr =le64_to_cpu (error_block_addr); + +cpu_physical_memory_read (error_block_addr, cper_addr, +sizeof (*cper_addr)); +
ditto
hw/acpi/ghes.c static void get_hw_error_offsets(uint64_t ghes_addr, · line 518
Quoted 8 lines
hw/acpi/ghes.c +8
-0+ *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)); +
ditto
Quoted 27 lines
hw/acpi/ghes.c +3
-0+ *read_ack_start_addr =le64_to_cpu (*read_ack_start_addr); +} + void ghes_record_cper_errors(const void *cper, size_t len,
uint16_tsource_id, Error **errp)
{hw/acpi/ghes.c +7
-2@@ -440,8 +539,13 @@ void ghes_record_cper_errors(const void *cper, size_t len, } ags = &acpi_ged_state->ghes_state; -get_hw_error_offsets (le64_to_cpu (ags->hw_error_le), - &cper_addr, &read_ack_register_addr); +if (!ags->hest_addr_le) { +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); + }if (!cper_addr) {error_setg (errp,"can not find Generic Error Status Block" );include/hw/acpi/ghes.h +0
-0
include/hw/acpi/ghes.h typedef struct AcpiGhesState { · line 67
Quoted 7 lines
include/hw/acpi/ghes.h +1
-0@@ -61,6 +61,7 @@ typedef struct AcpiGhesState {uint64_t hest_addr_le;uint64_t hw_error_le;bool present;/* True if GHES is present at all on this board */ +bool use_hest_addr;/* True if HEST address is present */ } AcpiGhesState;/*
an
Re: [PATCH v3 05/14] acpi/generic_event_device: add logic to detect if HEST addr is available
In reply to Mauro Carvalho ChehabQuoted 43 lines · On Fri, 31 Jan 2025 18:42:46 +0100 Mauro Carvalho Chehab…
Create 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_errorsfirmware file.Signed-off-by Mauro Carvalho Chehab <[email protected]>Reviewed-by Jonathan Cameron <[email protected]>--- hw/acpi/generic_event_device.c | 1 + hw/acpi/ghes.c | 17 ++++++----------- hw/arm/virt-acpi-build.c | 32 ++++++++++++++++++++++++++++---- hw/core/machine.c | 2 ++ include/hw/acpi/ghes.h | 3 ++- 5 files changed, 39 insertions(+), 16 deletions(-)hw/acpi/generic_event_device.c +1
-0@@ -318,6 +318,7 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev)static const Property acpi_ged_properties[] = {DEFINE_PROP_UINT32 ("ged-event" , AcpiGedState, ged_event_bitmap,0 ), +DEFINE_PROP_BOOL ("x-has-hest-addr" , AcpiGedState, ghes_state.use_hest_addr, false), };static const VMStateDescription vmstate_memhp_state = {hw/acpi/ghes.c +2
-1@@ -359,7 +359,8 @@ static void build_ghes_v2_entry(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 AcpiNotificationSourceId *notif_source, int num_sources,@@ -369,14 +370,6 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, .oem_id = oem_id, .oem_table_id = oem_table_id };
hw/acpi/ghes.c void acpi_build_hest(GArray *table_data, GArray *hardware_errors, · line 379
Quoted 10 lines
hw/acpi/ghes.c +0
-8uint32_t hest_offset;int i; -AcpiGedState *acpi_ged_state; -AcpiGhesState *ags =NULL ; - - acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED , -NULL )); -if (acpi_ged_state) { - ags = &acpi_ged_state->ghes_state; - }
hmh, can we move this once within series to the place where it should end up at, instead of rewriting just added code over again,
somewhere at the being of series (maybe as separate patch)?
hw/acpi/ghes.c void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s, · line 414
Quoted 12 lines
hw/acpi/ghes.c +4
-2hest_offset = table_data->len;@@ -415,8 +408,10 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s,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); -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); +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); + }
the same as comment in 3/14, please no flipping back and forth which might break bisection. Also this hunk looks misplaced and should be a part of 3/14
and do not forget about ACPI_HW_ERROR_ADDR_FW_CFG_FILE, that should be excluded when use_hest_addr == TRUE
I see that 6/14 does that, but order makes it
Quoted 31 lines
hw/acpi/ghes.c +0
-0ags->present = true; }hw/arm/virt-acpi-build.c +9
-4@@ -897,6 +897,10 @@ static const AcpiNotificationSourceId hest_ghes_notify[] = { { ACPI_HEST_SRC_ID_SYNC, ACPI_GHES_NOTIFY_SEA }, }; +static const AcpiNotificationSourceId hest_ghes_notify_9_2[] = { + {ACPI_HEST_SRC_ID_SYNC ,ACPI_GHES_NOTIFY_SEA }, +}; +static void virt_acpi_build (VirtMachineState *vms,AcpiBuildTables *tables) {@@ -950,10 +954,30 @@ 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, - hest_ghes_notify,ARRAY_SIZE (hest_ghes_notify), - vms->oem_id, vms->oem_table_id); +static const AcpiNotificationSourceId *notify; +AcpiGedState *acpi_ged_state; +unsigned int notify_sz; +AcpiGhesState *ags; +
hw/arm/virt-acpi-build.c void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) · line 971
Quoted 10 lines
hw/arm/virt-acpi-build.c +10
-0+ acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED , +NULL )); +if (acpi_ged_state) { + ags = &acpi_ged_state->ghes_state; + +acpi_add_table (table_offsets, tables_blob); + +if (!ags->use_hest_addr) { + notify = hest_ghes_notify_9_2; + notify_sz =ARRAY_SIZE (hest_ghes_notify_9_2);
all 9.2 compat hunks look misplaced,
they have no relation to using HEST addr at all, they belong to the patches that introduce new error type i.e. where hest_ghes_notify mutates to 2 entry array.
Quoted 43 lines
hw/arm/virt-acpi-build.c +9
-0+ }else { + notify = hest_ghes_notify; + notify_sz =ARRAY_SIZE (hest_ghes_notify); + } + +acpi_build_hest (ags, tables_blob, tables->hardware_errors, + tables->linker, notify, notify_sz, + vms->oem_id, vms->oem_table_id); + } }if (ms->numa_state->num_nodes >0 ) {hw/core/machine.c +2
-0@@ -34,10 +34,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_9_2[] = { {"arm-cpu" ,"backcompat-pauth-default-use-qarma5" ,"true" }, + {TYPE_ACPI_GED ,"x-has-hest-addr" ,"false" }, };const size_t hw_compat_9_2_len =G_N_ELEMENTS (hw_compat_9_2);include/hw/acpi/ghes.h +2
-1@@ -76,7 +76,8 @@ typedef struct AcpiNotificationSourceId {enum AcpiGhesNotifyType notify; } AcpiNotificationSourceId; -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 AcpiNotificationSourceId * const notif_source, int num_sources,
Quoted 13 lines · On Mon, 3 Feb 2025 11:09:34 +0000 Jonathan Cameron…
Quoted 10 lines · On Fri, 31 Jan 2025 18:42:41 +0100 Mauro Carvalho Chehab…
Now that the ghes preparation patches were merged, let's add support for error injection.
On this series, the first 6 patches chang to the math used to calculate offsets at HEST table and
hardware_errorfirmware file, together with its migration code. Migration tested with both latest QEMU released kernel and upstream, on both directions.The next patches add a new QAPI to allow injecting GHESv2 errors, and a script using such QAPI
to inject ARM Processor Error records.
Quoted 6 lines
Quoted 1 line
If I'm counting well, this is the 19th submission of my error inject patches.
Looks good to me. All remaining trivial things are in the category of things to consider only if you are doing another spin. The code ends up how I'd like it at the end of the series anyway, just a question of the precise path to that state!
if you look at series as a whole it's more or less fine (I guess you and me got used to it)
however if you take it patch by patch (as if you've never seen it) ordering is messed up (the same would apply to everyone after a while when it's forgotten)
So I'd strongly suggest to restructure the series (especially 2-6/14). re sum up my comments wrt ordering:
0 add testcase for HEST table with current HEST as expected blob
(currently missing), so that we can be sure that we haven't messed existing tables during refactoring.
1. Introduce use_hest_addr (disabled) for now so we could place all legacy code to !use_hest_addr branch
2. then patches that do the part of switching to HEST addr lookup,
* ged lookup (preferably at the place it should end up eventually)
* legacy bios_linker/fwcfg fencing patches
* on top of that new hest bios_linker/fwcfg ones
* and then the rest
(everything that belongs to the 2nd error source should _not_ be a part of that)
3. add 2nd error source incl. necessary tests procedures introduce
and update DSDT/HEST
Quoted 3 lines
Jonathan
Re: [PATCH v3 13/14] qapi/acpi-hest: add an interface to do generic CPER error injection
In reply to Mauro Carvalho ChehabQuoted 13 lines · Mauro Carvalho Chehab
Creates 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_QMPsource 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 viaACPI_GHES_NOTIFY_GPIOnotification type.This patch is 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;
Quoted 7 lines
Co-authored-by Jonathan Cameron <[email protected]>Co-authored-by Shiju Jose <[email protected]>Co-authored-by Mauro Carvalho Chehab <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>Signed-off-by Shiju Jose <[email protected]>Signed-off-by Mauro Carvalho Chehab <[email protected]>Acked-by Igor Mammedov <[email protected]>
Re: [PATCH v3 14/14] scripts/ghes_inject: add a script to generate GHES error inject
In reply to Mauro Carvalho ChehabQuoted 37 lines · Mauro Carvalho Chehab
Using 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 armwhich 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 -hFor more details about its usage.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
[...]
scripts/arm_processor_error.py line 4
Quoted 10 lines
scripts/arm_processor_error.py new file +4
-0@@ -0,0 +1,476 @@ +#!/usr/bin/env python3 +# +# pylint: disable=C0301,C0114,R0903,R0912,R0913,R0914,R0915,W0511 +# SPDX-License-Identifier: GPL-2.0
Sorry if this has been answered already... why not GPL-2.0-or-later?
More of the same below.
[...]
Re: [PATCH v3 14/14] scripts/ghes_inject: add a script to generate GHES error inject
Em Wed, 05 Feb 2025 09:16:53 +0100
Markus Armbruster <[email protected]> escreveu:
Quoted 55 lines
Quoted 37 lines · Mauro Carvalho Chehab
Using 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 armwhich 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 -hFor more details about its usage.
Signed-off-by Mauro Carvalho Chehab <[email protected]>[...]
scripts/arm_processor_error.py line 4
Quoted 10 lines
scripts/arm_processor_error.py new file +4
-0@@ -0,0 +1,476 @@ +#!/usr/bin/env python3 +# +# pylint: disable=C0301,C0114,R0903,R0912,R0913,R0914,R0915,W0511 +# SPDX-License-Identifier: GPL-2.0Sorry if this has been answered already... why not GPL-2.0-or-later?
Quoted 1 line
More of the same below.
No particular reason. It is just that GPL-2.0 is my preferred license.
I'll change the license of the three scripts to be GPL-2.0-or-later.
Quoted 3 lines
[...]
Thanks,
Mauro
Re: [PATCH v3 14/14] scripts/ghes_inject: add a script to generate GHES error inject
Quoted 2 lines · Mauro Carvalho Chehab
Em Wed, 05 Feb 2025 09:16:53 +0100
Markus Armbruster <[email protected]> escreveu:
[...]
Quoted 7 lines
Quoted 3 lines
Sorry if this has been answered already... why not GPL-2.0-or-later?
More of the same below.
No particular reason. It is just that GPL-2.0 is my preferred license.
I'll change the license of the three scripts to be GPL-2.0-or-later.
Thank you!
Re: [PATCH v3 03/14] acpi/ghes: Use HEST table offsets when preparing GHES records
In reply to Igor MammedovEm Mon, 3 Feb 2025 15:34:23 +0100
Igor Mammedov <[email protected]> escreveu:
Quoted 50 lines
Quoted 35 lines · On Fri, 31 Jan 2025 18:42:44 +0100 Mauro Carvalho Chehab…
There 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 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.
Signed-off-by Mauro Carvalho Chehab <[email protected]>--- hw/acpi/ghes.c | 132 ++++++++++++++++++++++++++++++++++++----- include/hw/acpi/ghes.h | 1 + 2 files changed, 119 insertions(+), 14 deletions(-)hw/acpi/ghes.c +6
-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, hw/acpi/ghes.c line 72
Quoted 6 lines
hw/acpi/ghes.c +3
-0@@ -61,6 +67,25 @@*/ #define ACPI_GHES_GESB_SIZE 20 +/* +* Offsets with regards to the start of the HEST table stored at +* ags->hest_addr_le, If I read this literary, then offsets above are not what declared later in this patch.
I'd really drop this comment altogether as it's confusing, and rather get variables/macro naming right
Quoted 6 lines
Quoted 3 lines
according with the memory layout map at
+ *docs/specs/acpi_hest_ghes.rst.
+ */what we need is update to above doc, describing new and old ways. a separate patch.
I can't see anything that should be changed at docs/specs/acpi_hest_ghes.rst, as this series doesn't change the firmware layout: we're still using two firmware tables:
- etc/acpi/tables, with HEST on it;
- etc/hardware_errors, with:
- error block addresses;
- read_ack registers;
- CPER records.
The only changes that this series introduce are related to how the error generation logic navigates between HEST and hw_errors firmware. This is not described at acpi_hest_ghes.rst, and both ways follow ACPI specs to the letter.
The only difference is that the code which populates the CPER record and the error/read offsets doesn't require to know how the HEST table generation placed offsets, as it will basically
reproduce what OSPM firmware does when handling HEST events.
Thanks,
Mauro
Em Mon, 3 Feb 2025 16:22:36 +0100
Igor Mammedov <[email protected]> escreveu:
Quoted 30 lines
Quoted 13 lines · On Mon, 3 Feb 2025 11:09:34 +0000 Jonathan Cameron…
Quoted 10 lines · On Fri, 31 Jan 2025 18:42:41 +0100 Mauro Carvalho Chehab…
Now that the ghes preparation patches were merged, let's add support for error injection.
On this series, the first 6 patches chang to the math used to calculate offsets at HEST table and
hardware_errorfirmware file, together with its migration code. Migration tested with both latest QEMU released kernel and upstream, on both directions.The next patches add a new QAPI to allow injecting GHESv2 errors, and a script using such QAPI
to inject ARM Processor Error records.Quoted 6 lines
Quoted 1 line
If I'm counting well, this is the 19th submission of my error inject patches.
Looks good to me. All remaining trivial things are in the category of things to consider only if you are doing another spin. The code ends up how I'd like it at the end of the series anyway, just a question of the precise path to that state!
if you look at series as a whole it's more or less fine (I guess you and me got used to it)
however if you take it patch by patch (as if you've never seen it) ordering is messed up (the same would apply to everyone after a while when it's forgotten)
Quoted 6 lines
So I'd strongly suggest to restructure the series (especially 2-6/14). re sum up my comments wrt ordering:
0 add testcase for HEST table with current HEST as expected blob
(currently missing), so that we can be sure that we haven't messed existing tables during refactoring.
Not sure if I got this one. The HEST table is part of etc/acpi/tables, which is already tested, as you pointed at the previous reviews. Doing changes there is already detected. That's basically why we added patches 10 and 12:
[PATCH v3 10/14] tests/acpi: virt: allow acpi table changes for a new table: HEST [PATCH v3 12/14] tests/acpi: virt: add a HEST table to aarch64 virt and update DSDT
What tests don't have is a check for etc/hardware_errors firmware inside tests/data/acpi/aarch64/virt/, but, IMO, we shouldn't add it there.
See, hardware_errors table contains only some skeleton space to store:
- 1 or more error block address offsets;
- 1 or more read ack register;
- 1 or more HEST source entries containing CPER blocks.
There's nothing there to be actually checked: it is just some empty spaces with a variable number of fields.
With the new code, the actual number of CPER blocks and their corresponding offsets and read ack registers can be different on different architectures. So, for instance, when we add x86 support, we'll likely start with just one error source entry, while arm will have two after this changeset.
Also, one possibility to address the issues reported by Gavin Shan at
https://lore.kernel.org/qemu-devel/[email protected]/
would be to have one entry per each CPU. So, the size of such firmware could be dependent on the number of CPUs.
So, adding any validation to it would just cause pain and probably won't detect any problems.
What could be done instead is to have a different type of tests that would use the error injection script to check if regressions are introduced after QEMU 10.0. Such new kind of test would require this series to be merged first. It would also require the usage of an OSPM image with some testing tools on it. This is easier said than done, as besides the complexity of having an OSPM test image, such kind of tests would require extra logic, specially if it would check regressions for SEA and other notification sources.
Thanks,
Mauro
Quoted 39 lines · On Fri, 21 Feb 2025 07:38:23 +0100 Mauro Carvalho Chehab…
Em Mon, 3 Feb 2025 16:22:36 +0100
Igor Mammedov <[email protected]> escreveu:Quoted 36 lines
Quoted 13 lines · On Mon, 3 Feb 2025 11:09:34 +0000 Jonathan Cameron…
Quoted 10 lines · On Fri, 31 Jan 2025 18:42:41 +0100 Mauro Carvalho Chehab…
Now that the ghes preparation patches were merged, let's add support for error injection.
On this series, the first 6 patches chang to the math used to calculate offsets at HEST table and
hardware_errorfirmware file, together with its migration code. Migration tested with both latest QEMU released kernel and upstream, on both directions.The next patches add a new QAPI to allow injecting GHESv2 errors, and a script using such QAPI
to inject ARM Processor Error records.Quoted 6 lines
Quoted 1 line
If I'm counting well, this is the 19th submission of my error inject patches.
Looks good to me. All remaining trivial things are in the category of things to consider only if you are doing another spin. The code ends up how I'd like it at the end of the series anyway, just a question of the precise path to that state!
if you look at series as a whole it's more or less fine (I guess you and me got used to it)
however if you take it patch by patch (as if you've never seen it) ordering is messed up (the same would apply to everyone after a while when it's forgotten)
So I'd strongly suggest to restructure the series (especially 2-6/14). re sum up my comments wrt ordering:
0 add testcase for HEST table with current HEST as expected blob
(currently missing), so that we can be sure that we haven't messed existing tables during refactoring.
To potentially save time I think Igor is asking that before you do anything at all you plug the existing test hole which is that we don't test HEST
at all. Even after this series I think we don't test HEST. You add
a stub hest and exclusion but then in patch 12 the HEST stub is deleted whereas it should be replaced with the example data for the test.
That indeed doesn't address testing the error data storage which would be a different problem.
Quoted 28 lines
Not sure if I got this one. The HEST table is part of etc/acpi/tables, which is already tested, as you pointed at the previous reviews. Doing changes there is already detected. That's basically why we added patches 10 and 12:
[PATCH v3 10/14] tests/acpi: virt: allow acpi table changes for a new table: HEST [PATCH v3 12/14] tests/acpi: virt: add a HEST table to aarch64 virt and update DSDT
What tests don't have is a check for etc/hardware_errors firmware inside tests/data/acpi/aarch64/virt/, but, IMO, we shouldn't add it there.
See,
hardware_errorstable contains only some skeleton space to store:- 1 or more error block address offsets;
- 1 or more read ack register;
- 1 or more HEST source entries containing CPER blocks.There's nothing there to be actually checked: it is just some empty spaces with a variable number of fields.
With the new code, the actual number of CPER blocks and their corresponding offsets and read ack registers can be different on different architectures. So, for instance, when we add x86 support, we'll likely start with just one error source entry, while arm will have two after this changeset.
Quoted 7 lines
Also, one possibility to address the issues reported by Gavin Shan at
https://lore.kernel.org/qemu-devel/[email protected]/
would be to have one entry per each CPU. So, the size of such firmware could be dependent on the number of CPUs.So, adding any validation to it would just cause pain and probably won't detect any problems.
If we did do this the test would use a fixed number of CPUs so would just verify we didn't break a small number of variants. Useful but to me a follow up to this series not something that needs to be part of it - particularly as Gavin's work may well change that!
Quoted 10 lines
What could be done instead is to have a different type of tests that would use the error injection script to check if regressions are introduced after QEMU 10.0. Such new kind of test would require this series to be merged first. It would also require the usage of an OSPM image with some testing tools on it. This is easier said than done, as besides the complexity of having an OSPM test image, such kind of tests would require extra logic, specially if it would check regressions for SEA and other notification sources.
Agreed that a more end to end test is even better, but those are quite a bit more complex so definitely a follow up.
J
Quoted 3 lines
Thanks,
Mauro
Em Fri, 21 Feb 2025 10:21:27 +0000
Jonathan Cameron <[email protected]> escreveu:
Quoted 39 lines
Quoted 36 lines · On Fri, 21 Feb 2025 07:38:23 +0100 Mauro Carvalho Chehab…
Em Mon, 3 Feb 2025 16:22:36 +0100
Igor Mammedov <[email protected]> escreveu:Quoted 33 lines
Quoted 13 lines · On Mon, 3 Feb 2025 11:09:34 +0000 Jonathan Cameron…
Quoted 10 lines · On Fri, 31 Jan 2025 18:42:41 +0100 Mauro Carvalho Chehab…
Now that the ghes preparation patches were merged, let's add support for error injection.
On this series, the first 6 patches chang to the math used to calculate offsets at HEST table and
hardware_errorfirmware file, together with its migration code. Migration tested with both latest QEMU released kernel and upstream, on both directions.The next patches add a new QAPI to allow injecting GHESv2 errors, and a script using such QAPI
to inject ARM Processor Error records.Quoted 6 lines
Quoted 1 line
If I'm counting well, this is the 19th submission of my error inject patches.
Looks good to me. All remaining trivial things are in the category of things to consider only if you are doing another spin. The code ends up how I'd like it at the end of the series anyway, just a question of the precise path to that state!
if you look at series as a whole it's more or less fine (I guess you and me got used to it)
however if you take it patch by patch (as if you've never seen it) ordering is messed up (the same would apply to everyone after a while when it's forgotten)
So I'd strongly suggest to restructure the series (especially 2-6/14). re sum up my comments wrt ordering:
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
0 add testcase for HEST table with current HEST as expected blob
(currently missing), so that we can be sure that we haven't messed existing tables during refactoring.To potentially save time I think Igor is asking that before you do anything at all you plug the existing test hole which is that we don't test HEST
at all. Even after this series I think we don't test HEST.
On a previous review (v2, I guess), Igor requested me to do the DSDT test just before and after the patch which is actually changing its content (patch 11). The HEST table is inside DSDT firmware, and it is already tested.
Quoted 3 lines
You add
a stub hest and exclusion but then in patch 12 the HEST stub is deleted whereas it should be replaced with the example data for the test.
This was actually a misinterpretation from my side: patch 10 adds the etc/hardware_errors table (mistakenly naming it as HEST), but this was never tested. For the next submission, I'll drop etc/hardware_errors table from patches 10 and 12.
Quoted 35 lines
That indeed doesn't address testing the error data storage which would be a different problem.
Quoted 33 lines
Not sure if I got this one. The HEST table is part of etc/acpi/tables, which is already tested, as you pointed at the previous reviews. Doing changes there is already detected. That's basically why we added patches 10 and 12:
[PATCH v3 10/14] tests/acpi: virt: allow acpi table changes for a new table: HEST [PATCH v3 12/14] tests/acpi: virt: add a HEST table to aarch64 virt and update DSDT
What tests don't have is a check for etc/hardware_errors firmware inside tests/data/acpi/aarch64/virt/, but, IMO, we shouldn't add it there.
See,
hardware_errorstable contains only some skeleton space to store:- 1 or more error block address offsets;
- 1 or more read ack register;
- 1 or more HEST source entries containing CPER blocks.There's nothing there to be actually checked: it is just some empty spaces with a variable number of fields.
With the new code, the actual number of CPER blocks and their corresponding offsets and read ack registers can be different on different architectures. So, for instance, when we add x86 support, we'll likely start with just one error source entry, while arm will have two after this changeset.
Also, one possibility to address the issues reported by Gavin Shan at
https://lore.kernel.org/qemu-devel/[email protected]/
would be to have one entry per each CPU. So, the size of such firmware could be dependent on the number of CPUs.
Quoted 7 lines
Quoted 2 lines
So, adding any validation to it would just cause pain and probably won't detect any problems.
If we did do this the test would use a fixed number of CPUs so would just verify we didn't break a small number of variants. Useful but to me a follow up to this series not something that needs to be part of it - particularly as Gavin's work may well change that!
I don't think that testing etc/hardware_errors would detect any regressions. It will just create a test scenario that will require constant changes, as adding any entry to HEST would hit it.
Besides that, I don't think adding support for it would be a simple matter of adding another table. See, after this series, there are two different scenarios for the /etc/hardware_errors:
- one with a single GHESv2 entry, for virt-9.2;
- another one with two GHESv2 entries for virt-10.0 and above that will dynamically change its size (starting from 2) depending on the features we add, and if we'll have one entry per CPU or not.
Right now, the tests there are only for "virt-latest": there's no test directory for "virt-9.2". Adding support for virt-legacy will very likely require lots of changes there at the test infrastructure, as it will require some virt migration support.
Quoted 11 lines
Quoted 9 lines
What could be done instead is to have a different type of tests that would use the error injection script to check if regressions are introduced after QEMU 10.0. Such new kind of test would require this series to be merged first. It would also require the usage of an OSPM image with some testing tools on it. This is easier said than done, as besides the complexity of having an OSPM test image, such kind of tests would require extra logic, specially if it would check regressions for SEA and other notification sources.
Agreed that a more end to end test is even better, but those are quite a bit more complex so definitely a follow up.
Yes, but it could be simpler than modifying ACPI tests to handle migration.
The way I see is that such kind of integration could be done by some gitlab workflow that would run an error injection script inside a pre-defined image emulating both virt-9.2 and virt-latest and checking if the HEST tables were properly generated for both SEA and GED sources.
This is probably easier for GED, as the QMP interface already detects that the read ack register was changed by the OSPM. For SEA, it may require either some additional instrumentation or to capture OSPM logs.
Anyway, ether way, a change like that is IMO outside the escope of this series, as it will require lots of unrelated changes.
Regards,
Mauro
Em Fri, 21 Feb 2025 13:23:06 +0100
Mauro Carvalho Chehab <[email protected]> escreveu:
Quoted 102 lines
Em Fri, 21 Feb 2025 10:21:27 +0000
Jonathan Cameron <[email protected]> escreveu:Quoted 39 lines
Quoted 36 lines · On Fri, 21 Feb 2025 07:38:23 +0100 Mauro Carvalho Chehab…
Em Mon, 3 Feb 2025 16:22:36 +0100
Igor Mammedov <[email protected]> escreveu:Quoted 33 lines
Quoted 13 lines · On Mon, 3 Feb 2025 11:09:34 +0000 Jonathan Cameron…
Quoted 10 lines · On Fri, 31 Jan 2025 18:42:41 +0100 Mauro Carvalho Chehab…
Now that the ghes preparation patches were merged, let's add support for error injection.
On this series, the first 6 patches chang to the math used to calculate offsets at HEST table and
hardware_errorfirmware file, together with its migration code. Migration tested with both latest QEMU released kernel and upstream, on both directions.The next patches add a new QAPI to allow injecting GHESv2 errors, and a script using such QAPI
to inject ARM Processor Error records.Quoted 6 lines
Quoted 1 line
If I'm counting well, this is the 19th submission of my error inject patches.
Looks good to me. All remaining trivial things are in the category of things to consider only if you are doing another spin. The code ends up how I'd like it at the end of the series anyway, just a question of the precise path to that state!
if you look at series as a whole it's more or less fine (I guess you and me got used to it)
however if you take it patch by patch (as if you've never seen it) ordering is messed up (the same would apply to everyone after a while when it's forgotten)
So I'd strongly suggest to restructure the series (especially 2-6/14). re sum up my comments wrt ordering:
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
0 add testcase for HEST table with current HEST as expected blob
(currently missing), so that we can be sure that we haven't messed existing tables during refactoring.To potentially save time I think Igor is asking that before you do anything at all you plug the existing test hole which is that we don't test HEST
at all. Even after this series I think we don't test HEST.On a previous review (v2, I guess), Igor requested me to do the DSDT test just before and after the patch which is actually changing its content (patch 11). The HEST table is inside DSDT firmware, and it is already tested.
Quoted 3 lines
You add
a stub hest and exclusion but then in patch 12 the HEST stub is deleted whereas it should be replaced with the example data for the test.This was actually a misinterpretation from my side: patch 10 adds the etc/hardware_errors table (mistakenly naming it as HEST), but this was never tested. For the next submission, I'll drop etc/hardware_errors table from patches 10 and 12.
Quoted 38 lines
That indeed doesn't address testing the error data storage which would be a different problem.
Quoted 35 lines
Not sure if I got this one. The HEST table is part of etc/acpi/tables, which is already tested, as you pointed at the previous reviews. Doing changes there is already detected. That's basically why we added patches 10 and 12:
[PATCH v3 10/14] tests/acpi: virt: allow acpi table changes for a new table: HEST [PATCH v3 12/14] tests/acpi: virt: add a HEST table to aarch64 virt and update DSDT
What tests don't have is a check for etc/hardware_errors firmware inside tests/data/acpi/aarch64/virt/, but, IMO, we shouldn't add it there.
See,
hardware_errorstable contains only some skeleton space to store:- 1 or more error block address offsets;
- 1 or more read ack register;
- 1 or more HEST source entries containing CPER blocks.There's nothing there to be actually checked: it is just some empty spaces with a variable number of fields.
With the new code, the actual number of CPER blocks and their corresponding offsets and read ack registers can be different on different architectures. So, for instance, when we add x86 support, we'll likely start with just one error source entry, while arm will have two after this changeset.
Also, one possibility to address the issues reported by Gavin Shan at
https://lore.kernel.org/qemu-devel/[email protected]/
would be to have one entry per each CPU. So, the size of such firmware could be dependent on the number of CPUs.So, adding any validation to it would just cause pain and probably won't detect any problems.
Quoted 8 lines
Quoted 4 lines
If we did do this the test would use a fixed number of CPUs so would just verify we didn't break a small number of variants. Useful but to me a follow up to this series not something that needs to be part of it - particularly as Gavin's work may well change that!
I don't think that testing etc/hardware_errors would detect any regressions. It will just create a test scenario that will require constant changes, as adding any entry to HEST would hit it.
Btw, there is just one patch on this series touching etc/hardware_errors:
https://lore.kernel.org/qemu-devel/647f9c974e606924b6b881a83e047d1d4dff47d5.1740148260.git.mchehab+huawei@kernel.org/T/#u
The table change is due to this simple hunk:
hw/arm/virt-acpi-build.c +1 -0
@@ -896,6 +896,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 }, };
Before such patch, /etc/hardware_errors has:
- 1 error block offset;
- 1 ack register;
- 1 GHESv2 entry for SEA
After the change:
- for virt-9.2: nothing changes, as hw/arm/virt-acpi-build.c will use the backward-compatible table with a single entry to be added to HEST:
static const AcpiNotificationSourceId hest_ghes_notify_9_2[] = {
{ ACPI_HEST_SRC_ID_SYNC, ACPI_GHES_NOTIFY_SEA },
};- for virt-latest/virt-10.0, it will use the new table to create two sources:
static const AcpiNotificationSourceId hest_ghes_notify[] = {
{ ACPI_HEST_SRC_ID_SYNC, ACPI_GHES_NOTIFY_SEA },
{ ACPI_HEST_SRC_ID_QMP, ACPI_GHES_NOTIFY_GPIO },
}; which will actually mean that /etc/hardware_errors will now have:
- 2 error block offsets (one for SEA, one for GED);
- 2 ack registers (one for SEA, one for GED);
- 1 GHESv2 entry for SEA notifier;
- 1 GHESv2 entry for GED GPIO notifier.
With the discussions with Gavin, for virt-10.0 and above, we may end changing the new table (hest_ghes_notify) to have one SEA entry per CPU, plus the GPIO one, and add an extra logic at the error injection logic to select the SEA entry based on the CPU ID and/or based on having an already acked SEA notifier.
Quoted 41 lines
Besides that, I don't think adding support for it would be a simple matter of adding another table. See, after this series, there are two different scenarios for the
/etc/hardware_errors:- one with a single GHESv2 entry, for virt-9.2;
- another one with two GHESv2 entries for virt-10.0 and above that will dynamically change its size (starting from 2) depending on the features we add, and if we'll have one entry per CPU or not.Right now, the tests there are only for "virt-latest": there's no test directory for "virt-9.2". Adding support for virt-legacy will very likely require lots of changes there at the test infrastructure, as it will require some virt migration support.
Quoted 11 lines
Quoted 9 lines
What could be done instead is to have a different type of tests that would use the error injection script to check if regressions are introduced after QEMU 10.0. Such new kind of test would require this series to be merged first. It would also require the usage of an OSPM image with some testing tools on it. This is easier said than done, as besides the complexity of having an OSPM test image, such kind of tests would require extra logic, specially if it would check regressions for SEA and other notification sources.
Agreed that a more end to end test is even better, but those are quite a bit more complex so definitely a follow up.
Yes, but it could be simpler than modifying ACPI tests to handle migration.
The way I see is that such kind of integration could be done by some gitlab workflow that would run an error injection script inside a pre-defined image emulating both virt-9.2 and virt-latest and checking if the HEST tables were properly generated for both SEA and GED sources.
This is probably easier for GED, as the QMP interface already detects that the read ack register was changed by the OSPM. For SEA, it may require either some additional instrumentation or to capture OSPM logs.
Quoted 6 lines
Anyway, ether way, a change like that is IMO outside the escope of this series, as it will require lots of unrelated changes.
Regards,
Mauro
Thanks,
Mauro
Re: [PATCH v3 03/14] acpi/ghes: Use HEST table offsets when preparing GHES records
In reply to Mauro Carvalho ChehabQuoted 75 lines · On Fri, 21 Feb 2025 07:02:21 +0100 Mauro Carvalho Chehab…
Em Mon, 3 Feb 2025 15:34:23 +0100
Igor Mammedov <[email protected]> escreveu:Quoted 50 lines
Quoted 35 lines · On Fri, 31 Jan 2025 18:42:44 +0100 Mauro Carvalho Chehab…
There 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 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.
Signed-off-by Mauro Carvalho Chehab <[email protected]>--- hw/acpi/ghes.c | 132 ++++++++++++++++++++++++++++++++++++----- include/hw/acpi/ghes.h | 1 + 2 files changed, 119 insertions(+), 14 deletions(-)hw/acpi/ghes.c +6
-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, hw/acpi/ghes.c line 72
Quoted 6 lines
hw/acpi/ghes.c +3
-0@@ -61,6 +67,25 @@*/ #define ACPI_GHES_GESB_SIZE 20 +/* +* Offsets with regards to the start of the HEST table stored at +* ags->hest_addr_le, If I read this literary, then offsets above are not what declared later in this patch.
I'd really drop this comment altogether as it's confusing, and rather get variables/macro naming rightQuoted 6 lines
Quoted 3 lines
according with the memory layout map at
+ *docs/specs/acpi_hest_ghes.rst.
+ */what we need is update to above doc, describing new and old ways. a separate patch.
I can't see anything that should be changed at
docs/specs/acpi_hest_ghes.rst, as this series doesn't change the firmware layout: we're still using two firmware tables:- etc/acpi/tables, with HEST on it;
- etc/hardware_errors, with:
- error block addresses;
-read_ackregisters;
- CPER records.The only changes that this series introduce are related to how the error generation logic navigates between HEST and
hw_errorsfirmware. This is not described atacpi_hest_ghes.rst, and both ways follow ACPI specs to the letter.
Quoted 4 lines
The only difference is that the code which populates the CPER record and the error/read offsets doesn't require to know how the HEST table generation placed offsets, as it will basically
reproduce what OSPM firmware does when handling HEST events.
section 8 describes old way to get to address to record old CPER, so it needs to amended to also describe a new approach and say which way is used for which version.
possibly section 11 might need some messaging as well.
Quoted 4 lines
Thanks,
Mauro
Quoted 43 lines · On Fri, 21 Feb 2025 10:21:27 +0000 Jonathan Cameron…
Quoted 39 lines · On Fri, 21 Feb 2025 07:38:23 +0100 Mauro Carvalho Chehab…
Em Mon, 3 Feb 2025 16:22:36 +0100
Igor Mammedov <[email protected]> escreveu:Quoted 36 lines
Quoted 13 lines · On Mon, 3 Feb 2025 11:09:34 +0000 Jonathan Cameron…
Quoted 10 lines · On Fri, 31 Jan 2025 18:42:41 +0100 Mauro Carvalho Chehab…
Now that the ghes preparation patches were merged, let's add support for error injection.
On this series, the first 6 patches chang to the math used to calculate offsets at HEST table and
hardware_errorfirmware file, together with its migration code. Migration tested with both latest QEMU released kernel and upstream, on both directions.The next patches add a new QAPI to allow injecting GHESv2 errors, and a script using such QAPI
to inject ARM Processor Error records.Quoted 6 lines
Quoted 1 line
If I'm counting well, this is the 19th submission of my error inject patches.
Looks good to me. All remaining trivial things are in the category of things to consider only if you are doing another spin. The code ends up how I'd like it at the end of the series anyway, just a question of the precise path to that state!
if you look at series as a whole it's more or less fine (I guess you and me got used to it)
however if you take it patch by patch (as if you've never seen it) ordering is messed up (the same would apply to everyone after a while when it's forgotten)
So I'd strongly suggest to restructure the series (especially 2-6/14). re sum up my comments wrt ordering:
0 add testcase for HEST table with current HEST as expected blob
(currently missing), so that we can be sure that we haven't messed existing tables during refactoring.
Quoted 5 lines
To potentially save time I think Igor is asking that before you do anything at all you plug the existing test hole which is that we don't test HEST
at all. Even after this series I think we don't test HEST. You add
a stub hest and exclusion but then in patch 12 the HEST stub is deleted whereas it should be replaced with the example data for the test.
that's what I was saying.
HEST table should be in DSDT, but it's optional and one has to use 'ras=on' option to enable that, which we aren't doing ATM. So whatever changes are happening we aren't seeing them in tests nor will we see any regression for the same reason.
While white listing tables before change should happen and then updating them is the right thing to do, it's not sufficient since none of tests run with 'ras' enabled, hence code is not actually executed.
Quoted 3 lines
That indeed doesn't address testing the error data storage which would be a different problem.
I'd skip hardware_errors/CPER testing from QEMU unit tests. That's basically requires functioning 'APEI driver' to test that.
Maybe we can use Ani's framework to parse HEST and all the way towards CPER record(s) traversal, but that's certainly out of scope of this series.
It could be done on top, but I won't insist even on that since Mauro's out of tree error injection testing will cover that using actual guest (which I assume he would like to run periodically).
Quoted 59 lines
Quoted 28 lines
Not sure if I got this one. The HEST table is part of etc/acpi/tables, which is already tested, as you pointed at the previous reviews. Doing changes there is already detected. That's basically why we added patches 10 and 12:
[PATCH v3 10/14] tests/acpi: virt: allow acpi table changes for a new table: HEST [PATCH v3 12/14] tests/acpi: virt: add a HEST table to aarch64 virt and update DSDT
What tests don't have is a check for etc/hardware_errors firmware inside tests/data/acpi/aarch64/virt/, but, IMO, we shouldn't add it there.
See,
hardware_errorstable contains only some skeleton space to store:- 1 or more error block address offsets;
- 1 or more read ack register;
- 1 or more HEST source entries containing CPER blocks.There's nothing there to be actually checked: it is just some empty spaces with a variable number of fields.
With the new code, the actual number of CPER blocks and their corresponding offsets and read ack registers can be different on different architectures. So, for instance, when we add x86 support, we'll likely start with just one error source entry, while arm will have two after this changeset.
Quoted 7 lines
Also, one possibility to address the issues reported by Gavin Shan at
https://lore.kernel.org/qemu-devel/[email protected]/
would be to have one entry per each CPU. So, the size of such firmware could be dependent on the number of CPUs.So, adding any validation to it would just cause pain and probably won't detect any problems.
If we did do this the test would use a fixed number of CPUs so would just verify we didn't break a small number of variants. Useful but to me a follow up to this series not something that needs to be part of it - particularly as Gavin's work may well change that!
Quoted 10 lines
What could be done instead is to have a different type of tests that would use the error injection script to check if regressions are introduced after QEMU 10.0. Such new kind of test would require this series to be merged first. It would also require the usage of an OSPM image with some testing tools on it. This is easier said than done, as besides the complexity of having an OSPM test image, such kind of tests would require extra logic, specially if it would check regressions for SEA and other notification sources.
Agreed that a more end to end test is even better, but those are quite a bit more complex so definitely a follow up.
J
Quoted 3 lines
Thanks,
Mauro
Em Tue, 25 Feb 2025 11:01:15 +0100
Igor Mammedov <[email protected]> escreveu:
Quoted 58 lines
Quoted 43 lines · On Fri, 21 Feb 2025 10:21:27 +0000 Jonathan Cameron…
Quoted 39 lines · On Fri, 21 Feb 2025 07:38:23 +0100 Mauro Carvalho Chehab…
Em Mon, 3 Feb 2025 16:22:36 +0100
Igor Mammedov <[email protected]> escreveu:Quoted 36 lines
Quoted 13 lines · On Mon, 3 Feb 2025 11:09:34 +0000 Jonathan Cameron…
Quoted 10 lines · On Fri, 31 Jan 2025 18:42:41 +0100 Mauro Carvalho Chehab…
Now that the ghes preparation patches were merged, let's add support for error injection.
On this series, the first 6 patches chang to the math used to calculate offsets at HEST table and
hardware_errorfirmware file, together with its migration code. Migration tested with both latest QEMU released kernel and upstream, on both directions.The next patches add a new QAPI to allow injecting GHESv2 errors, and a script using such QAPI
to inject ARM Processor Error records.Quoted 6 lines
Quoted 1 line
If I'm counting well, this is the 19th submission of my error inject patches.
Looks good to me. All remaining trivial things are in the category of things to consider only if you are doing another spin. The code ends up how I'd like it at the end of the series anyway, just a question of the precise path to that state!
if you look at series as a whole it's more or less fine (I guess you and me got used to it)
however if you take it patch by patch (as if you've never seen it) ordering is messed up (the same would apply to everyone after a while when it's forgotten)
So I'd strongly suggest to restructure the series (especially 2-6/14). re sum up my comments wrt ordering:
0 add testcase for HEST table with current HEST as expected blob
(currently missing), so that we can be sure that we haven't messed existing tables during refactoring.Quoted 5 lines
To potentially save time I think Igor is asking that before you do anything at all you plug the existing test hole which is that we don't test HEST
at all. Even after this series I think we don't test HEST. You add
a stub hest and exclusion but then in patch 12 the HEST stub is deleted whereas it should be replaced with the example data for the test.that's what I was saying.
HEST table should be in DSDT, but it's optional and one has to use 'ras=on' option to enable that, which we aren't doing ATM. So whatever changes are happening we aren't seeing them in tests nor will we see any regression for the same reason.
Quoted 3 lines
While white listing tables before change should happen and then updating them is the right thing to do, it's not sufficient since none of tests run with 'ras' enabled, hence code is not actually executed.
Ok. Well, again we're not modifying HEST table structure on this changeset. The only change affecting HEST is when the number of entries increased from 1 to 2.
Now, looking at bios-tables-test.c, if I got it right, I should be doing something similar to the enclosed patch, right?
If so, I have a couple of questions:
1. from where should I get the HEST table? dumping the table from the running VM?
2. what values should I use to fill those variables:
int hest_offset = 40 /* HEST */; int hest_entry_size = 4;
Quoted 8 lines
Quoted 4 lines
That indeed doesn't address testing the error data storage which would be a different problem.
I'd skip hardware_errors/CPER testing from QEMU unit tests. That's basically requires functioning 'APEI driver' to test that.
Quoted 7 lines
Maybe we can use Ani's framework to parse HEST and all the way towards CPER record(s) traversal, but that's certainly out of scope of this series.
It could be done on top, but I won't insist even on that since Mauro's out of tree error injection testing will cover that using actual guest (which I assume he would like to run periodically).
Yeah, my plan is to periodically test it. I intend to setup somewhere a CI to test Kernel, QEMU and rasdaemon altogether.
Thanks,
Mauro
---
tests/qtest/bios-tables-test.c +9 -1
@@ -210,6 +210,8 @@ static void test_acpi_fadt_table(test_data *data)uint32_t val;int dsdt_offset =40 /* DSDT */ ;int dsdt_entry_size =4 ; +int hest_offset =40 /* HEST */ ; +int hest_entry_size =4 ;g_assert (compare_signature (&table,"FACP" ));
@@ -242,6 +244,12 @@ static void test_acpi_fadt_table(test_data *data)/* update checksum */ fadt_aml[9 /* Checksum */ ] =0 ; fadt_aml[9 /* Checksum */ ] -=acpi_calc_checksum (fadt_aml, fadt_len); + + + +acpi_fetch_table (data->qts, &table.aml, &table.aml_len, + fadt_aml + hest_offset, hest_entry_size,"HEST" , true); +g_array_append_val (data->tables, table); }static void dump_aml_files (test_data *data,bool rebuild)
@@ -2411,7 +2419,7 @@ static void test_acpi_aarch64_virt_oem_fields(void) };char *args; - args =test_acpi_create_args (&data,"-cpu cortex-a57 " OEM_TEST_ARGS ); + args =test_acpi_create_args (&data,"-ras on -cpu cortex-a57 " OEM_TEST_ARGS ); data.qts =qtest_init (args);test_acpi_load_tables (&data);test_oem_fields (&data);
Em Wed, 26 Feb 2025 10:56:28 +0100
Mauro Carvalho Chehab <[email protected]> escreveu:
Quoted 74 lines
Em Tue, 25 Feb 2025 11:01:15 +0100
Igor Mammedov <[email protected]> escreveu:Quoted 58 lines
Quoted 43 lines · On Fri, 21 Feb 2025 10:21:27 +0000 Jonathan Cameron…
Quoted 39 lines · On Fri, 21 Feb 2025 07:38:23 +0100 Mauro Carvalho Chehab…
Em Mon, 3 Feb 2025 16:22:36 +0100
Igor Mammedov <[email protected]> escreveu:Quoted 36 lines
Quoted 13 lines · On Mon, 3 Feb 2025 11:09:34 +0000 Jonathan Cameron…
Quoted 10 lines · On Fri, 31 Jan 2025 18:42:41 +0100 Mauro Carvalho Chehab…
Now that the ghes preparation patches were merged, let's add support for error injection.
On this series, the first 6 patches chang to the math used to calculate offsets at HEST table and
hardware_errorfirmware file, together with its migration code. Migration tested with both latest QEMU released kernel and upstream, on both directions.The next patches add a new QAPI to allow injecting GHESv2 errors, and a script using such QAPI
to inject ARM Processor Error records.Quoted 6 lines
Quoted 1 line
If I'm counting well, this is the 19th submission of my error inject patches.
Looks good to me. All remaining trivial things are in the category of things to consider only if you are doing another spin. The code ends up how I'd like it at the end of the series anyway, just a question of the precise path to that state!
if you look at series as a whole it's more or less fine (I guess you and me got used to it)
however if you take it patch by patch (as if you've never seen it) ordering is messed up (the same would apply to everyone after a while when it's forgotten)
So I'd strongly suggest to restructure the series (especially 2-6/14). re sum up my comments wrt ordering:
0 add testcase for HEST table with current HEST as expected blob
(currently missing), so that we can be sure that we haven't messed existing tables during refactoring.Quoted 5 lines
To potentially save time I think Igor is asking that before you do anything at all you plug the existing test hole which is that we don't test HEST
at all. Even after this series I think we don't test HEST. You add
a stub hest and exclusion but then in patch 12 the HEST stub is deleted whereas it should be replaced with the example data for the test.that's what I was saying.
HEST table should be in DSDT, but it's optional and one has to use 'ras=on' option to enable that, which we aren't doing ATM. So whatever changes are happening we aren't seeing them in tests nor will we see any regression for the same reason.Quoted 3 lines
While white listing tables before change should happen and then updating them is the right thing to do, it's not sufficient since none of tests run with 'ras' enabled, hence code is not actually executed.
Ok. Well, again we're not modifying HEST table structure on this changeset. The only change affecting HEST is when the number of entries increased from 1 to 2.
Now, looking at
bios-tables-test.c, if I got it right, I should be doing something similar to the enclosed patch, right?If so, I have a couple of questions:
Quoted 7 lines
1. from where should I get the HEST table? dumping the table from the running VM?
2. what values should I use to fill those variables:
int hest_offset = 40 /* HEST */; int hest_entry_size = 4;
Thanks,
Mauro
As a reference, this is the HEST table before the patch series:
/*
* Intel ACPI Component Architecture
* AML/ASL+ Disassembler version 20240927 (64-bit version)
* Copyright (c) 2000 - 2023 Intel Corporation
*
* Disassembly of hest.dat
*
* ACPI Data Table [HEST]
*
* Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue (in hex) */
[000h 0000 004h] Signature : "HEST" [Hardware Error Source Table]
[004h 0004 004h] Table Length : 00000084
[008h 0008 001h] Revision : 01
[009h 0009 001h] Checksum : E0
[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
[028h 0040 002h] Subtable Type : 000A [Generic Hardware Error Source V2]
[02Ah 0042 002h] Source Id : 0000
[02Ch 0044 002h] Related Source Id : FFFF
[02Eh 0046 001h] Reserved : 00
[02Fh 0047 001h] Enabled : 01
[030h 0048 004h] Records To Preallocate : 00000001
[034h 0052 004h] Max Sections Per Record : 00000001
[038h 0056 004h] Max Raw Data Length : 00000400
[03Ch 0060 00Ch] Error Status Address : [Generic Address Structure]
[03Ch 0060 001h] Space ID : 00 [SystemMemory]
[03Dh 0061 001h] Bit Width : 40
[03Eh 0062 001h] Bit Offset : 00
[03Fh 0063 001h] Encoded Access Width : 04 [QWord Access:64]
[040h 0064 008h] Address : 0000000139E40000
[048h 0072 01Ch] Notify : [Hardware Error Notification Structure]
[048h 0072 001h] Notify Type : 08 [SEA]
[049h 0073 001h] Notify Length : 1C
[04Ah 0074 002h] Configuration Write Enable : 0000
[04Ch 0076 004h] PollInterval : 00000000
[050h 0080 004h] Vector : 00000000
[054h 0084 004h] Polling Threshold Value : 00000000
[058h 0088 004h] Polling Threshold Window : 00000000
[05Ch 0092 004h] Error Threshold Value : 00000000
[060h 0096 004h] Error Threshold Window : 00000000
[064h 0100 004h] Error Status Block Length : 00000400
[068h 0104 00Ch] Read Ack Register : [Generic Address Structure]
[068h 0104 001h] Space ID : 00 [SystemMemory]
[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 : 0000000139E40008
[074h 0116 008h] Read Ack Preserve : FFFFFFFFFFFFFFFE
[07Ch 0124 008h] Read Ack Write : 0000000000000001
Raw Table Data: Length 132 (0x84)
0000: 48 45 53 54 84 00 00 00 01 E0 42 4F 43 48 53 20 // HEST......BOCHS
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 // ................
0030: 01 00 00 00 01 00 00 00 00 04 00 00 00 40 00 04 // .............@..
0040: 00 00 E4 39 01 00 00 00 08 1C 00 00 00 00 00 00 // ...9............
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 E4 39 // [email protected]
0070: 01 00 00 00 FE FF FF FF FF FF FF FF 01 00 00 00 // ................
0080: 00 00 00 00 Em Wed, 26 Feb 2025 12:23:03 +0100
Mauro Carvalho Chehab <[email protected]> escreveu:
Quoted 82 lines
Em Wed, 26 Feb 2025 10:56:28 +0100
Mauro Carvalho Chehab <[email protected]> escreveu:Quoted 79 lines
Em Tue, 25 Feb 2025 11:01:15 +0100
Igor Mammedov <[email protected]> escreveu:Quoted 58 lines
Quoted 43 lines · On Fri, 21 Feb 2025 10:21:27 +0000 Jonathan Cameron…
Quoted 39 lines · On Fri, 21 Feb 2025 07:38:23 +0100 Mauro Carvalho Chehab…
Em Mon, 3 Feb 2025 16:22:36 +0100
Igor Mammedov <[email protected]> escreveu:Quoted 36 lines
Quoted 13 lines · On Mon, 3 Feb 2025 11:09:34 +0000 Jonathan Cameron…
Quoted 10 lines · On Fri, 31 Jan 2025 18:42:41 +0100 Mauro Carvalho Chehab…
Now that the ghes preparation patches were merged, let's add support for error injection.
On this series, the first 6 patches chang to the math used to calculate offsets at HEST table and
hardware_errorfirmware file, together with its migration code. Migration tested with both latest QEMU released kernel and upstream, on both directions.The next patches add a new QAPI to allow injecting GHESv2 errors, and a script using such QAPI
to inject ARM Processor Error records.Quoted 6 lines
Quoted 1 line
If I'm counting well, this is the 19th submission of my error inject patches.
Looks good to me. All remaining trivial things are in the category of things to consider only if you are doing another spin. The code ends up how I'd like it at the end of the series anyway, just a question of the precise path to that state!
if you look at series as a whole it's more or less fine (I guess you and me got used to it)
however if you take it patch by patch (as if you've never seen it) ordering is messed up (the same would apply to everyone after a while when it's forgotten)
So I'd strongly suggest to restructure the series (especially 2-6/14). re sum up my comments wrt ordering:
0 add testcase for HEST table with current HEST as expected blob
(currently missing), so that we can be sure that we haven't messed existing tables during refactoring.Quoted 5 lines
To potentially save time I think Igor is asking that before you do anything at all you plug the existing test hole which is that we don't test HEST
at all. Even after this series I think we don't test HEST. You add
a stub hest and exclusion but then in patch 12 the HEST stub is deleted whereas it should be replaced with the example data for the test.that's what I was saying.
HEST table should be in DSDT, but it's optional and one has to use 'ras=on' option to enable that, which we aren't doing ATM. So whatever changes are happening we aren't seeing them in tests nor will we see any regression for the same reason.Quoted 3 lines
While white listing tables before change should happen and then updating them is the right thing to do, it's not sufficient since none of tests run with 'ras' enabled, hence code is not actually executed.
Ok. Well, again we're not modifying HEST table structure on this changeset. The only change affecting HEST is when the number of entries increased from 1 to 2.
Now, looking at
bios-tables-test.c, if I got it right, I should be doing something similar to the enclosed patch, right?If so, I have a couple of questions:
1. from where should I get the HEST table? dumping the table from the running VM?
2. what values should I use to fill those variables:
Quoted 7 lines
Quoted 2 lines
int hest_offset = 40 /* HEST */; int hest_entry_size = 4;Thanks,
MauroAs a reference, this is the HEST table before the patch series:
This is the diff of the HEST table before/after this series.
As already commented, the diff is basically:
-[024h 0036 004h] Error Source Count : 00000001 +[024h 0036 004h] Error Source Count : 00000002
Plus the new entry for source ID 1 using notify type 7 (GPIO):
+[084h 0132 002h] Subtable Type : 000A [Generic Hardware Error Source V2] +[086h 0134 002h] Source Id : 0001 +[088h 0136 002h] Related Source Id : FFFF ... +[0A4h 0164 001h] Notify Type : 07 [GPIO] ... +[0D0h 0208 008h] Read Ack Preserve : FFFFFFFFFFFFFFFE +[0D8h 0216 008h] Read Ack Write : 0000000000000001
Complete diff follows.
Regards,
Mauro
---
hest-after-changes.dsl 2025-02-26 11:25:29.095066026 +0000 renamed from hest-before-changes.dsl 2025-02-26 11:23:30.845089077 +0000 +52 -9
@@ -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 : E0 +[009h 0009 001h] Checksum : 68 [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 : 0000000139E40008 +[06Ch 0108 008h] Address : 0000000139E40010 [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 : 0000000139E40008 + +[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 : 0000000139E40018 - 0000: 48 45 53 54 84 00 00 00 01 E0 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 68 42 4F 43 48 53 20 // HEST.....hBOCHS 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 E4 39 01 00 00 00 08 1C 00 00 00 00 00 00 // ...9............ 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 E4 39 // [email protected] + 0060: 00 00 00 00 00 04 00 00 00 40 00 04 10 00 E4 39 // [email protected] 0070: 01 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 E4 39 // [email protected] + 00A0: 01 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 E4 39 01 00 00 00 // [email protected].... + 00D0: FE FF FF FF FF FF FF FF 01 00 00 00 00 00 00 00 // ................
Thanks,
Mauro
Quoted 79 lines · On Wed, 26 Feb 2025 10:56:28 +0100 Mauro Carvalho Chehab…
Em Tue, 25 Feb 2025 11:01:15 +0100
Igor Mammedov <[email protected]> escreveu:Quoted 58 lines
Quoted 43 lines · On Fri, 21 Feb 2025 10:21:27 +0000 Jonathan Cameron…
Quoted 39 lines · On Fri, 21 Feb 2025 07:38:23 +0100 Mauro Carvalho Chehab…
Em Mon, 3 Feb 2025 16:22:36 +0100
Igor Mammedov <[email protected]> escreveu:Quoted 36 lines
Quoted 13 lines · On Mon, 3 Feb 2025 11:09:34 +0000 Jonathan Cameron…
Quoted 10 lines · On Fri, 31 Jan 2025 18:42:41 +0100 Mauro Carvalho Chehab…
Now that the ghes preparation patches were merged, let's add support for error injection.
On this series, the first 6 patches chang to the math used to calculate offsets at HEST table and
hardware_errorfirmware file, together with its migration code. Migration tested with both latest QEMU released kernel and upstream, on both directions.The next patches add a new QAPI to allow injecting GHESv2 errors, and a script using such QAPI
to inject ARM Processor Error records.Quoted 6 lines
Quoted 1 line
If I'm counting well, this is the 19th submission of my error inject patches.
Looks good to me. All remaining trivial things are in the category of things to consider only if you are doing another spin. The code ends up how I'd like it at the end of the series anyway, just a question of the precise path to that state!
if you look at series as a whole it's more or less fine (I guess you and me got used to it)
however if you take it patch by patch (as if you've never seen it) ordering is messed up (the same would apply to everyone after a while when it's forgotten)
So I'd strongly suggest to restructure the series (especially 2-6/14). re sum up my comments wrt ordering:
0 add testcase for HEST table with current HEST as expected blob
(currently missing), so that we can be sure that we haven't messed existing tables during refactoring.Quoted 5 lines
To potentially save time I think Igor is asking that before you do anything at all you plug the existing test hole which is that we don't test HEST
at all. Even after this series I think we don't test HEST. You add
a stub hest and exclusion but then in patch 12 the HEST stub is deleted whereas it should be replaced with the example data for the test.that's what I was saying.
HEST table should be in DSDT, but it's optional and one has to use 'ras=on' option to enable that, which we aren't doing ATM. So whatever changes are happening we aren't seeing them in tests nor will we see any regression for the same reason.Quoted 3 lines
While white listing tables before change should happen and then updating them is the right thing to do, it's not sufficient since none of tests run with 'ras' enabled, hence code is not actually executed.
Ok. Well, again we're not modifying HEST table structure on this changeset. The only change affecting HEST is when the number of entries increased from 1 to 2.
Now, looking at
bios-tables-test.c, if I got it right, I should be doing something similar to the enclosed patch, right?If so, I have a couple of questions:
1. from where should I get the HEST table? dumping the table from the running VM?
Quoted 4 lines
2. what values should I use to fill those variables:
int hest_offset = 40 /* HEST */; int hest_entry_size = 4;
you don't need to do that,
bios-tables-test will dump all ACPI tables for you automatically, you only need to add or extend a test with ras=on option.
1: 1st add empty table and whitelist it ("tests/data/acpi/aarch64/virt/HEST") 2: enable ras in existing tescase
tests/qtest/bios-tables-test.c +2 -1
@@ -2123,7 +2123,8 @@ static void test_acpi_aarch64_virt_tcg(void) data.smbios_cpu_max_speed =2900 ; data.smbios_cpu_curr_speed =2700 ;test_acpi_one ("-cpu cortex-a57 " -"-smbios type=4,max-speed=2900,current-speed=2700" , &data); +"-smbios type=4,max-speed=2900,current-speed=2700 " +"-machine ras=on" , &data);free_test_data (&data); }
then with installed IASL run
V=1 QTEST_QEMU_BINARY=./qemu-system-aarch64 ./tests/qtest/bios-tables-test
to see diff
3: rebuild tables and follow the rest of procedure to update expected blobs
as described in comment at the top of (tests/qtest/bios-tables-test.c)
I'd recommend to add 3 patches as the beginning of the series, that way we can be sure that if something changes unintentionally it won't go unnoticed.
Quoted 61 lines
Quoted 9 lines
Quoted 5 lines
That indeed doesn't address testing the error data storage which would be a different problem.
I'd skip hardware_errors/CPER testing from QEMU unit tests. That's basically requires functioning 'APEI driver' to test that.
Quoted 7 lines
Maybe we can use Ani's framework to parse HEST and all the way towards CPER record(s) traversal, but that's certainly out of scope of this series.
It could be done on top, but I won't insist even on that since Mauro's out of tree error injection testing will cover that using actual guest (which I assume he would like to run periodically).Yeah, my plan is to periodically test it. I intend to setup somewhere a CI to test Kernel, QEMU and rasdaemon altogether.
Thanks,
Mauro---
tests/qtest/bios-tables-test.c +9
-1@@ -210,6 +210,8 @@ static void test_acpi_fadt_table(test_data *data)uint32_t val;int dsdt_offset =40 /* DSDT */ ;int dsdt_entry_size =4 ; +int hest_offset =40 /* HEST */ ; +int hest_entry_size =4 ;g_assert (compare_signature (&table,"FACP" ));@@ -242,6 +244,12 @@ static void test_acpi_fadt_table(test_data *data)/* update checksum */ fadt_aml[9 /* Checksum */ ] =0 ; fadt_aml[9 /* Checksum */ ] -=acpi_calc_checksum (fadt_aml, fadt_len); + + + +acpi_fetch_table (data->qts, &table.aml, &table.aml_len, + fadt_aml + hest_offset, hest_entry_size,"HEST" , true); +g_array_append_val (data->tables, table); }static void dump_aml_files (test_data *data,bool rebuild)@@ -2411,7 +2419,7 @@ static void test_acpi_aarch64_virt_oem_fields(void) };char *args; - args =test_acpi_create_args (&data,"-cpu cortex-a57 " OEM_TEST_ARGS ); + args =test_acpi_create_args (&data,"-ras on -cpu cortex-a57 " OEM_TEST_ARGS ); data.qts =qtest_init (args);test_acpi_load_tables (&data);test_oem_fields (&data);
Re: [PATCH v3 03/14] acpi/ghes: Use HEST table offsets when preparing GHES records
In reply to Igor MammedovEm Tue, 25 Feb 2025 10:43:27 +0100
Igor Mammedov <[email protected]> escreveu:
Quoted 83 lines
Quoted 75 lines · On Fri, 21 Feb 2025 07:02:21 +0100 Mauro Carvalho Chehab…
Em Mon, 3 Feb 2025 15:34:23 +0100
Igor Mammedov <[email protected]> escreveu:Quoted 50 lines
Quoted 35 lines · On Fri, 31 Jan 2025 18:42:44 +0100 Mauro Carvalho Chehab…
There 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 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.
Signed-off-by Mauro Carvalho Chehab <[email protected]>--- hw/acpi/ghes.c | 132 ++++++++++++++++++++++++++++++++++++----- include/hw/acpi/ghes.h | 1 + 2 files changed, 119 insertions(+), 14 deletions(-)hw/acpi/ghes.c +6
-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, hw/acpi/ghes.c line 72
Quoted 6 lines
hw/acpi/ghes.c +3
-0@@ -61,6 +67,25 @@*/ #define ACPI_GHES_GESB_SIZE 20 +/* +* Offsets with regards to the start of the HEST table stored at +* ags->hest_addr_le, If I read this literary, then offsets above are not what declared later in this patch.
I'd really drop this comment altogether as it's confusing, and rather get variables/macro naming rightQuoted 6 lines
Quoted 3 lines
according with the memory layout map at
+ *docs/specs/acpi_hest_ghes.rst.
+ */what we need is update to above doc, describing new and old ways. a separate patch.
I can't see anything that should be changed at
docs/specs/acpi_hest_ghes.rst, as this series doesn't change the firmware layout: we're still using two firmware tables:- etc/acpi/tables, with HEST on it;
- etc/hardware_errors, with:
- error block addresses;
-read_ackregisters;
- CPER records.The only changes that this series introduce are related to how the error generation logic navigates between HEST and
hw_errorsfirmware. This is not described atacpi_hest_ghes.rst, and both ways follow ACPI specs to the letter.Quoted 4 lines
The only difference is that the code which populates the CPER record and the error/read offsets doesn't require to know how the HEST table generation placed offsets, as it will basically
reproduce what OSPM firmware does when handling HEST events.
Quoted 5 lines
section 8 describes old way to get to address to record old CPER, so it needs to amended to also describe a new approach and say which way is used for which version.
possibly section 11 might need some messaging as well.
Ok, I'll modify it and place at the end of the series. Please see below if the new text is ok for you.
---
[PATCH] docs/specs/acpi_hest_ghes.rst: update it to reflect some changes
While 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 +18 -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 an offset for the beginning of "etc/hardware_errors". + + Newer versions place the location at "etc/acpi_table_hest_addr", + pointing to the beginning of the HEST table. + + Through that such offsets, 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 correspoinding address firmware. (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,6 @@ 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() report RAS errors via a SEA notifications, + when a SIGBUS event is triggered. The logic to convert a SEA notification + into a source ID is defined inside ghes.c source file.
Re: [PATCH v3 03/14] acpi/ghes: Use HEST table offsets when preparing GHES records
Quoted 90 lines · On Wed, 26 Feb 2025 17:14:06 +0100 Mauro Carvalho Chehab…
Em Tue, 25 Feb 2025 10:43:27 +0100
Igor Mammedov <[email protected]> escreveu:Quoted 87 lines
Quoted 75 lines · On Fri, 21 Feb 2025 07:02:21 +0100 Mauro Carvalho Chehab…
Em Mon, 3 Feb 2025 15:34:23 +0100
Igor Mammedov <[email protected]> escreveu:Quoted 50 lines
Quoted 35 lines · On Fri, 31 Jan 2025 18:42:44 +0100 Mauro Carvalho Chehab…
There 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 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.
Signed-off-by Mauro Carvalho Chehab <[email protected]>--- hw/acpi/ghes.c | 132 ++++++++++++++++++++++++++++++++++++----- include/hw/acpi/ghes.h | 1 + 2 files changed, 119 insertions(+), 14 deletions(-)hw/acpi/ghes.c +6
-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, hw/acpi/ghes.c line 72
Quoted 6 lines
hw/acpi/ghes.c +3
-0@@ -61,6 +67,25 @@*/ #define ACPI_GHES_GESB_SIZE 20 +/* +* Offsets with regards to the start of the HEST table stored at +* ags->hest_addr_le, If I read this literary, then offsets above are not what declared later in this patch.
I'd really drop this comment altogether as it's confusing, and rather get variables/macro naming rightQuoted 6 lines
Quoted 3 lines
according with the memory layout map at
+ *docs/specs/acpi_hest_ghes.rst.
+ */what we need is update to above doc, describing new and old ways. a separate patch.
I can't see anything that should be changed at
docs/specs/acpi_hest_ghes.rst, as this series doesn't change the firmware layout: we're still using two firmware tables:- etc/acpi/tables, with HEST on it;
- etc/hardware_errors, with:
- error block addresses;
-read_ackregisters;
- CPER records.The only changes that this series introduce are related to how the error generation logic navigates between HEST and
hw_errorsfirmware. This is not described atacpi_hest_ghes.rst, and both ways follow ACPI specs to the letter.Quoted 4 lines
The only difference is that the code which populates the CPER record and the error/read offsets doesn't require to know how the HEST table generation placed offsets, as it will basically
reproduce what OSPM firmware does when handling HEST events.section 8 describes old way to get to address to record old CPER, so it needs to amended to also describe a new approach and say which way is used for which version.
Quoted 8 lines
Quoted 1 line
possibly section 11 might need some messaging as well.
Ok, I'll modify it and place at the end of the series. Please see below if the new text is ok for you.
---
[PATCH]
docs/specs/acpi_hest_ghes.rst: update it to reflect some changes
s/^^^/docs: hest: add new "etc/acpi_table_hest_addr" and update workflow/
Quoted 24 lines
While 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.
Signed-off-by Mauro Carvalho Chehab <[email protected]>docs/specs/acpi_hest_ghes.rst +1
-6@@ -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
docs/specs/acpi_hest_ghes.rst Design Details · line 102
Quoted 10 lines
docs/specs/acpi_hest_ghes.rst +10
-0+ 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 an offset for the beginning of "etc/hardware_errors". + + Newer versions place the location at "etc/acpi_table_hest_addr", + pointing to the beginning of the HEST table. + + Through that such offsets, the firmware can send back the guest-side
^^^^^^^^^^^^^^^^^^^^^^^^^ can't parse that, suggest to just drop the phrase
docs/specs/acpi_hest_ghes.rst Design Details · line 105
Quoted 3 lines
docs/specs/acpi_hest_ghes.rst +3
-0+ 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
^^^^ drop this?
Quoted 8 lines
docs/specs/acpi_hest_ghes.rst +1
-0+ the correspoinding address firmware. (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,6 @@ Design Details kernel, on receiving notification, guest APEI driver could read the CPER error and take appropriate action.
docs/specs/acpi_hest_ghes.rst Design Details · line 119
Quoted 10 lines
docs/specs/acpi_hest_ghes.rst +3
-5-(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() report RAS errors via a SEA notifications, + when a SIGBUS event is triggered. The logic to convert a SEA notification + into a source ID is defined inside ghes.c source file.
that's cheating and not documentation by any means
Quoted 3 lines
Re: [PATCH v3 03/14] acpi/ghes: Use HEST table offsets when preparing GHES records
Em Thu, 27 Feb 2025 10:22:55 +0100
Igor Mammedov <[email protected]> escreveu:
Quoted 161 lines
Quoted 90 lines · On Wed, 26 Feb 2025 17:14:06 +0100 Mauro Carvalho Chehab…
Em Tue, 25 Feb 2025 10:43:27 +0100
Igor Mammedov <[email protected]> escreveu:Quoted 87 lines
Quoted 75 lines · On Fri, 21 Feb 2025 07:02:21 +0100 Mauro Carvalho Chehab…
Em Mon, 3 Feb 2025 15:34:23 +0100
Igor Mammedov <[email protected]> escreveu:Quoted 50 lines
Quoted 35 lines · On Fri, 31 Jan 2025 18:42:44 +0100 Mauro Carvalho Chehab…
There 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 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.
Signed-off-by Mauro Carvalho Chehab <[email protected]>--- hw/acpi/ghes.c | 132 ++++++++++++++++++++++++++++++++++++----- include/hw/acpi/ghes.h | 1 + 2 files changed, 119 insertions(+), 14 deletions(-)hw/acpi/ghes.c +6
-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, hw/acpi/ghes.c line 72
Quoted 6 lines
hw/acpi/ghes.c +3
-0@@ -61,6 +67,25 @@*/ #define ACPI_GHES_GESB_SIZE 20 +/* +* Offsets with regards to the start of the HEST table stored at +* ags->hest_addr_le, If I read this literary, then offsets above are not what declared later in this patch.
I'd really drop this comment altogether as it's confusing, and rather get variables/macro naming rightQuoted 6 lines
Quoted 3 lines
according with the memory layout map at
+ *docs/specs/acpi_hest_ghes.rst.
+ */what we need is update to above doc, describing new and old ways. a separate patch.
I can't see anything that should be changed at
docs/specs/acpi_hest_ghes.rst, as this series doesn't change the firmware layout: we're still using two firmware tables:- etc/acpi/tables, with HEST on it;
- etc/hardware_errors, with:
- error block addresses;
-read_ackregisters;
- CPER records.The only changes that this series introduce are related to how the error generation logic navigates between HEST and
hw_errorsfirmware. This is not described atacpi_hest_ghes.rst, and both ways follow ACPI specs to the letter.Quoted 4 lines
The only difference is that the code which populates the CPER record and the error/read offsets doesn't require to know how the HEST table generation placed offsets, as it will basically
reproduce what OSPM firmware does when handling HEST events.section 8 describes old way to get to address to record old CPER, so it needs to amended to also describe a new approach and say which way is used for which version.
Quoted 8 lines
Quoted 1 line
possibly section 11 might need some messaging as well.
Ok, I'll modify it and place at the end of the series. Please see below if the new text is ok for you.
---
[PATCH]
docs/specs/acpi_hest_ghes.rst: update it to reflect some changess/^^^/docs: hest: add new "etc/acpi_table_hest_addr" and update workflow/
Quoted 24 lines
While 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.
Signed-off-by Mauro Carvalho Chehab <[email protected]>docs/specs/acpi_hest_ghes.rst +1
-6@@ -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 locationdocs/specs/acpi_hest_ghes.rst Design Details · line 102
Quoted 10 lines
docs/specs/acpi_hest_ghes.rst +10
-0+ 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 an offset for the beginning of "etc/hardware_errors". + + Newer versions place the location at "etc/acpi_table_hest_addr", + pointing to the beginning of the HEST table. + + Through that such offsets, the firmware can send back the guest-side^^^^^^^^^^^^^^^^^^^^^^^^^ can't parse that, suggest to just drop the phrasedocs/specs/acpi_hest_ghes.rst Design Details · line 105
Quoted 3 lines
docs/specs/acpi_hest_ghes.rst +3
-0+ 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^^^^ drop this?Quoted 15 lines
docs/specs/acpi_hest_ghes.rst +3
-5+ the correspoinding address firmware. (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,6 @@ 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() report RAS errors via a SEA notifications, + when a SIGBUS event is triggered.
Quoted 3 lines
Quoted 2 lines
The logic to convert a SEA notification
+ into a source ID is defined insideghes.csource file.that's cheating and not documentation by any means
I'll drop the last paragraph. I guess that (11) were here to document a hack on the original design:
"supported source_id values should be assigned here".
The new code doesn't do any assumptions like that. All it needs is that the caller need to specify the notification type (currently, SEA or GPIO).
So, IMO the only thing eventually useful there is:
(11) kvm_arch_on_sigbus_vcpu() report RAS errors via a SEA notifications, when a SIGBUS event is triggered.
Yet, to be frank, I'm not sure if this should be documented. So perhaps the entire section (11) can be dropped.
Thanks,
Mauro