Change ghes driver to use HEST-based offsets
PATCH v2 1/5 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 synchronous/assynchronous 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 | 43 ++++++++++++++++++++++++++-------------- hw/arm/virt-acpi-build.c | 5 +++++ include/hw/acpi/ghes.h | 21 +++++++++++++------- 3 files changed, 47 insertions(+), 22 deletions(-)
hw/acpi/ghes.c +28 -15
@@ -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"
@@ -263,10 +272,12 @@ 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) +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 *const 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 (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
@@ -889,6 +889,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) {
@@ -944,6 +948,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.47.0
PATCH v2 2/5 acpi/ghes: add a firmware file with HEST address
In reply to Mauro Carvalho ChehabStore HEST table address at GPA, placing its content at hest_addr_le variable.
---
Change from v8:
- hest_addr_lr is now pointing to the error source size and data.
--- hw/acpi/ghes.c | 17 ++++++++++++++++- include/hw/acpi/ghes.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-)
hw/acpi/ghes.c +16 -1
@@ -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)
@@ -261,7 +262,7 @@ static void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker, }/* -* tell firmware to write hardware_errors GPA into +* 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,
@@ -355,6 +356,8 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors,acpi_table_begin (&table, table_data); +int hest_offset = table_data->len; +/* Error Source Count */ build_append_int_noprefix (table_data, num_sources,4 );for (i =0 ; i < num_sources; i++) {
@@ -362,6 +365,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 +387,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.47.0
PATCH v2 3/5 acpi/ghes: Use HEST table offsets when preparing GHES records
In reply to Mauro Carvalho ChehabThere are two pointers that are needed during error injection:
1. The start address of the CPER block to be stored;
2. The address of the ack, which needs a reset before next error.
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 | 98 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 88 insertions(+), 10 deletions(-)
hw/acpi/ghes.c +88 -10
@@ -61,6 +61,23 @@*/ #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_ACK_OFFSET (64 + GAS_ADDR_OFFSET) + +/* ACPI 6.2: 18.3.2.7: Generic Hardware Error Source +* Table 18-380: 'Error Status Address' field +*/ +#define GHES_ERR_ST_ADDR_OFFSET (20 + GAS_ADDR_OFFSET) +/* * Values for error_severity field */
@@ -212,14 +229,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 ));
@@ -419,6 +428,70 @@ 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_struct, error_block_addr; +uint32_t num_sources, i; + +if (!hest_addr) { +return ; + } + +cpu_physical_memory_read (hest_addr, &num_sources,sizeof (num_sources)); + num_sources =le32_to_cpu (num_sources); + + err_source_struct = 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_struct; +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 (src_id == source_id) { +break ; + } + + err_source_struct +=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_struct +GHES_ERR_ST_ADDR_OFFSET ; + hest_read_ack_addr = err_source_struct +GHES_ACK_OFFSET ; + +cpu_physical_memory_read (hest_err_block_addr, &error_block_addr, +sizeof (error_block_addr)); + +cpu_physical_memory_read (error_block_addr, cper_addr, +sizeof (*cper_addr)); + +cpu_physical_memory_read (hest_read_ack_addr, read_ack_start_addr, +sizeof (*read_ack_start_addr)); +} +void ghes_record_cper_errors (const void *cper,size_t len,uint16_t source_id,Error **errp) {
@@ -439,8 +512,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); + } cper_addr =le64_to_cpu (cper_addr);if (!cper_addr) {
Signature · 1 line
2.47.0
PATCH v2 4/5 acpi/generic_event_device: Update GHES migration to cover hest addr
In reply to Mauro Carvalho ChehabThe GHES migration logic at GED 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
@@ -387,6 +387,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 ,
@@ -399,6 +427,7 @@ static const VMStateDescription vmstate_acpi_ged = { &vmstate_memhp_state, &vmstate_cpuhp_state, &vmstate_ghes_state, + &vmstate_hest_state, NULL } };
Signature · 1 line
2.47.0
PATCH v2 5/5 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 9.2 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 | 28 +++++++++++++++++++++------- hw/arm/virt-acpi-build.c | 30 ++++++++++++++++++++++++++---- hw/core/machine.c | 2 ++ include/hw/acpi/ghes.h | 1 + 5 files changed, 51 insertions(+), 11 deletions(-)
hw/acpi/generic_event_device.c +1 -0
@@ -318,6 +318,7 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev)static Property acpi_ged_properties[] = {DEFINE_PROP_UINT32 ("ged-event" , AcpiGedState, ged_event_bitmap,0 ), +DEFINE_PROP_BOOL ("x-has-hest-addr" , AcpiGedState, ghes_state.hest_lookup, true),DEFINE_PROP_END_OF_LIST (), };
hw/acpi/ghes.c +21 -7
@@ -359,6 +359,8 @@ 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 }; +AcpiGedState *acpi_ged_state; +AcpiGhesState *ags =NULL ;int i;build_ghes_error_table (hardware_errors, linker, num_sources);
@@ -379,10 +381,20 @@ 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); + + acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED , +NULL )); +if (!acpi_ged_state) { +return ; + } + + ags = &acpi_ged_state->ghes_state; +if (ags->hest_lookup) { +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,
@@ -396,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 && ags->hest_lookup) { +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; }
@@ -512,7 +526,7 @@ void ghes_record_cper_errors(const void *cper, size_t len, } ags = &acpi_ged_state->ghes_state; -if (!ags->hest_addr_le) { +if (!ags->hest_lookup) {get_hw_error_offsets (le64_to_cpu (ags->hw_error_le), &cper_addr, &read_ack_register_addr); }else {
hw/arm/virt-acpi-build.c +26 -4
@@ -893,6 +893,10 @@ static const AcpiNotificationSourceId hest_ghes_notify[] = { { ACPI_HEST_SRC_ID_SYNC, ACPI_GHES_NOTIFY_SEA }, }; +static const AcpiNotificationSourceId hest_ghes_notify_9_1[] = { + {ACPI_HEST_SRC_ID_SYNC ,ACPI_GHES_NOTIFY_SEA }, +}; +static void virt_acpi_build (VirtMachineState *vms,AcpiBuildTables *tables) {
@@ -946,10 +950,28 @@ 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); +AcpiGhesState *ags; +AcpiGedState *acpi_ged_state; + + 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->hest_lookup) { +acpi_build_hest (tables_blob, tables->hardware_errors, + tables->linker, hest_ghes_notify_9_1, +ARRAY_SIZE (hest_ghes_notify_9_1), + vms->oem_id, vms->oem_table_id); + }else { +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); + } + } }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_1[] = { {TYPE_PCI_DEVICE ,"x-pcie-ext-tag" ,"false" }, + {TYPE_ACPI_GED ,"x-has-hest-addr" ,"false" }, };const size_t hw_compat_9_1_len =G_N_ELEMENTS (hw_compat_9_1);
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 hest_lookup;/* True if HEST address is present */ } AcpiGhesState;/*
Signature · 1 line
2.47.0
v2 cover Change ghes driver to use HEST-based offsets
This series was part of the previous PR to add generic error injection support on GHES. It depends on a cleanup patch series sent earlier today:
https://lore.kernel.org/qemu-devel/[email protected]/T/#t
It contains the changes of the math used to calculate offsets at HEST table and hardware_error firmware file. It prepares for the addition of GHES error injection.
The first patch was previously at the cleanup series. It prepares the logic to support multiple sources.
The second patch adds a new firmware file to store HEST address.
The third patch use the new firmware to calculate offsets using HEST table.
Patches 4 and 5 add migration support. They assume that this series will be merged for qemu 9.2 (maybe it is too late for that, as QEMU is now on soft freeze).
I tested migration using both virt-9.1 and virt-9.2 machines on qemu 9.2.
I also tested migration with:
qemu-9.1 -M virt-9.1 -cpu cortex-a57 => qemu-9.2 -M virt-9.1 -cpu cortex-a57 qemu-9.2 -M virt-9.1 -cpu cortex-a57 => qemu-9.1 -M virt-9.1 -cpu cortex-a57
---
v2:
- some whitespace and comment changes
- patch 3/6 (acpi/ghes: rename the function which gets hw error offsets) was merged on the cleanup series.
Mauro Carvalho Chehab (5):
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
hw/acpi/generic_event_device.c | 30 +++++++ hw/acpi/ghes.c | 156 +++++++++++++++++++++++++++++---- hw/arm/virt-acpi-build.c | 33 ++++++- hw/core/machine.c | 2 + include/hw/acpi/ghes.h | 23 +++-- 5 files changed, 216 insertions(+), 28 deletions(-)
Signature · 1 line
2.47.0
Re: [PATCH v2 3/5] acpi/ghes: Use HEST table offsets when preparing GHES records
In reply to Mauro Carvalho ChehabQuoted 5 lines · On Fri, 22 Nov 2024 14:14:13 +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, which needs a reset before next error.
Quoted 8 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]>---
Just repeat of the comment I failed to explain properly on previous version about comment style.
Quoted 8 lines
hw/acpi/ghes.c | 98 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 88 insertions(+), 10 deletions(-)hw/acpi/ghes.c +0
-0
hw/acpi/ghes.c line 69
Quoted 9 lines
hw/acpi/ghes.c +6
-0@@ -61,6 +61,23 @@*/ #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. +*/ +
This was the bit I failed to explain in previous review. I think for consistency it should be.
/*
* ACPI 6.2: 18.3.2.8 Generic Hardware Error Source version 2
* Table 18-382 Generic Hardware Error Source version 2 (GHESv2) Structure */
hw/acpi/ghes.c line 76
Quoted 7 lines
hw/acpi/ghes.c +7
-0+/* 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_ACK_OFFSET (64 + GAS_ADDR_OFFSET) + +/* ACPI 6.2: 18.3.2.7: Generic Hardware Error Source
Similar here.
Quoted 4 lines
hw/acpi/ghes.c +4
-0+* Table 18-380: 'Error Status Address' field +*/ +#define GHES_ERR_ST_ADDR_OFFSET (20 + GAS_ADDR_OFFSET) +
Re: [PATCH v2 4/5] acpi/generic_event_device: Update GHES migration to cover hest addr
In reply to Mauro Carvalho ChehabQuoted 4 lines · On Fri, 22 Nov 2024 14:14:14 +0100 Mauro Carvalho Chehab…
The GHES migration logic at GED should now support HEST table location too.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
Not my area of expertise but looks sensible to me.
Re: [PATCH v2 5/5] acpi/generic_event_device: add logic to detect if HEST addr is available
In reply to Mauro Carvalho ChehabQuoted 6 lines · On Fri, 22 Nov 2024 14:14:15 +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 9.2 and upper) or via the legacy way via an offset obtained from the
hardware_errorsfirmware file.Signed-off-by Mauro Carvalho Chehab <[email protected]>
Hi Mauro,
I think we still have a few inconsistencies in here on what can be NULL and what can't. See inline.
With those tidied up.
hw/acpi/ghes.c void acpi_build_hest(GArray *table_data, GArray *hardware_errors, · line 363
Quoted 10 lines
hw/acpi/ghes.c +2
-0@@ -359,6 +359,8 @@ 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 }; +AcpiGedState *acpi_ged_state; +AcpiGhesState *ags =NULL ;
I don't think you need to set this any more.
Quoted 30 lines
hw/acpi/ghes.c +14
-4int i;build_ghes_error_table (hardware_errors, linker, num_sources);@@ -379,10 +381,20 @@ 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); + + acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED , +NULL )); +if (!acpi_ged_state) { +return ; + } + + ags = &acpi_ged_state->ghes_state; +if (ags->hest_lookup) { +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,@@ -396,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,
hw/acpi/ghes.c void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s, · line 416
Quoted 10 lines
hw/acpi/ghes.c +4
-2NULL, &(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 && ags->hest_lookup) { +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;
if (!ags) which the above check implies can happen, then boom. So I think you can just drop the check on ags above.
The current caller can never pass that in as NULL anyway and it would make no sense to call this function with it as NULL.
Quoted 26 lines
hw/acpi/ghes.c +1
-1}@@ -512,7 +526,7 @@ void ghes_record_cper_errors(const void *cper, size_t len, } ags = &acpi_ged_state->ghes_state; -if (!ags->hest_addr_le) { +if (!ags->hest_lookup) {get_hw_error_offsets (le64_to_cpu (ags->hw_error_le), &cper_addr, &read_ack_register_addr); }else {hw/arm/virt-acpi-build.c +4
-0@@ -893,6 +893,10 @@ static const AcpiNotificationSourceId hest_ghes_notify[] = { { ACPI_HEST_SRC_ID_SYNC, ACPI_GHES_NOTIFY_SEA }, }; +static const AcpiNotificationSourceId hest_ghes_notify_9_1[] = { + {ACPI_HEST_SRC_ID_SYNC ,ACPI_GHES_NOTIFY_SEA }, +}; +static void virt_acpi_build (VirtMachineState *vms,AcpiBuildTables *tables) {
hw/arm/virt-acpi-build.c void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) · line 953
Quoted 8 lines
hw/arm/virt-acpi-build.c +1
-4@@ -946,10 +950,28 @@ 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); +AcpiGhesState *ags;
Could push down to the scope of if (acpi_ged_state) I don't think it really matters though.
Quoted 53 lines
hw/arm/virt-acpi-build.c +21
-0+AcpiGedState *acpi_ged_state; + + 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->hest_lookup) { +acpi_build_hest (tables_blob, tables->hardware_errors, + tables->linker, hest_ghes_notify_9_1, +ARRAY_SIZE (hest_ghes_notify_9_1), + vms->oem_id, vms->oem_table_id); + }else { +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); + } + } }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_1[] = { {TYPE_PCI_DEVICE ,"x-pcie-ext-tag" ,"false" }, + {TYPE_ACPI_GED ,"x-has-hest-addr" ,"false" }, };const size_t hw_compat_9_1_len =G_N_ELEMENTS (hw_compat_9_1);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 hest_lookup;/* True if HEST address is present */ } AcpiGhesState;/*
Quoted 22 lines · On Fri, 22 Nov 2024 14:14:10 +0100 Mauro Carvalho Chehab…
This series was part of the previous PR to add generic error injection support on GHES. It depends on a cleanup patch series sent earlier today:
https://lore.kernel.org/qemu-devel/[email protected]/T/#tIt contains the changes of the math used to calculate offsets at HEST table and
hardware_errorfirmware file. It prepares for the addition of GHES error injection.The first patch was previously at the cleanup series. It prepares the logic to support multiple sources.
The second patch adds a new firmware file to store HEST address.
The third patch use the new firmware to calculate offsets using HEST table.
Patches 4 and 5 add migration support. They assume that this series will be merged for qemu 9.2 (maybe it is too late for that, as QEMU is now on soft freeze).
Quoted 8 lines
I tested migration using both virt-9.1 and virt-9.2 machines on qemu 9.2.
I also tested migration with:
qemu-9.1 -M virt-9.1 -cpu cortex-a57 => qemu-9.2 -M virt-9.1 -cpu cortex-a57 qemu-9.2 -M virt-9.1 -cpu cortex-a57 => qemu-9.1 -M virt-9.1 -cpu cortex-a57
was that with HEST enabled (it's 'ras' machine option), It would be better to provide full CLI used
Quoted 23 lines
---
v2:
- some whitespace and comment changes
- patch 3/6 (acpi/ghes: rename the function which gets hw error offsets) was merged on the cleanup series.Mauro Carvalho Chehab (5):
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
availablehw/acpi/generic_event_device.c | 30 +++++++ hw/acpi/ghes.c | 156 +++++++++++++++++++++++++++++---- hw/arm/virt-acpi-build.c | 33 ++++++- hw/core/machine.c | 2 + include/hw/acpi/ghes.h | 23 +++-- 5 files changed, 216 insertions(+), 28 deletions(-)
Em Tue, 3 Dec 2024 13:03:10 +0100
Igor Mammedov <[email protected]> escreveu:
Quoted 28 lines
Quoted 25 lines · On Fri, 22 Nov 2024 14:14:10 +0100 Mauro Carvalho Chehab…
This series was part of the previous PR to add generic error injection support on GHES. It depends on a cleanup patch series sent earlier today:
https://lore.kernel.org/qemu-devel/[email protected]/T/#tIt contains the changes of the math used to calculate offsets at HEST table and
hardware_errorfirmware file. It prepares for the addition of GHES error injection.The first patch was previously at the cleanup series. It prepares the logic to support multiple sources.
The second patch adds a new firmware file to store HEST address.
The third patch use the new firmware to calculate offsets using HEST table.
Patches 4 and 5 add migration support. They assume that this series will be merged for qemu 9.2 (maybe it is too late for that, as QEMU is now on soft freeze).
I tested migration using both virt-9.1 and virt-9.2 machines on qemu 9.2.
Quoted 7 lines
Quoted 5 lines
I also tested migration with:
qemu-9.1 -M virt-9.1 -cpu cortex-a57 => qemu-9.2 -M virt-9.1 -cpu cortex-a57 qemu-9.2 -M virt-9.1 -cpu cortex-a57 => qemu-9.1 -M virt-9.1 -cpu cortex-a57was that with HEST enabled (it's 'ras' machine option), It would be better to provide full CLI used
Yes. This is the full command line I'm using for virt-9.2 (urls sanitized):
~/qemu/build/qemu-system-aarch64 -m 4g,maxmem=8G,slots=8 -monitor stdio -no-reboot -bios ~/emulator/QEMU_EFI-silent.fd -kernel ~/kernel/arm64_build/arch/arm64/boot/Image.gz -device pcie-root-port,id=root_port1 -device virtio-blk-pci,drive=hd -device virtio-net-pci,netdev=mynet,id=bob -drive if=none,file=~/emulator/debian.qcow2,format=qcow2,id=hd -object memory-backend-ram,size=4G,id=mem0 -netdev type=user,id=mynet,hostfwd=tcp::5555-:22 -qmp tcp:localhost:4445,server=on,wait=off -M virt-9.2,nvdimm=on,gic-version=3,ras=on -cpu max -smp 4 -numa node,nodeid=0,cpus=0-3,memdev=mem0 -append 'earlycon nomodeset root=/dev/vda1 fsck.mode=skip tp_printk maxcpus=4'
And this is for virt-9.1:
~/qemu/build/qemu-system-aarch64 -m 4g,maxmem=8G,slots=8 -monitor stdio -no-reboot -bios ~/emulator/QEMU_EFI-silent.fd -kernel ~/kernel/arm64_build/arch/arm64/boot/Image.gz -device pcie-root-port,id=root_port1 -device virtio-blk-pci,drive=hd -device virtio-net-pci,netdev=mynet,id=bob -drive if=none,file=~/emulator/debian.qcow2,format=qcow2,id=hd -object memory-backend-ram,size=4G,id=mem0 -netdev type=user,id=mynet,hostfwd=tcp::5555-:22 -qmp tcp:localhost:4445,server=on,wait=off -M virt-9.1,nvdimm=on,gic-version=3,ras=on -cpu max -smp 4 -numa node,nodeid=0,cpus=0-3,memdev=mem0 -append 'earlycon nomodeset root=/dev/vda1 fsck.mode=skip tp_printk maxcpus=4'
I opted to use a shorter version just bolding the difference, as the above are a lot harder to see the differences.
Quoted 17 lines
Quoted 17 lines
---
v2:
- some whitespace and comment changes
- patch 3/6 (acpi/ghes: rename the function which gets hw error offsets) was merged on the cleanup series.Mauro Carvalho Chehab (5):
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
Quoted 8 lines
Quoted 7 lines
hw/acpi/generic_event_device.c | 30 +++++++ hw/acpi/ghes.c | 156 +++++++++++++++++++++++++++++---- hw/arm/virt-acpi-build.c | 33 ++++++- hw/core/machine.c | 2 + include/hw/acpi/ghes.h | 23 +++-- 5 files changed, 216 insertions(+), 28 deletions(-)
Thanks,
Mauro