Prepare GHES driver to support error injection
v6 cover Prepare GHES driver to support error injection
Hi Michael,
Please ignore the patch series I sent yesterday:
https://lore.kernel.org/qemu-devel/[email protected]/T/#t
The git range was wrong, and it was supposed to be v6. This is the right one. It is based on the top of v9.2.0-rc3.
Could you please merge this series for ACPI stuff? All patches were already reviewed by Igor. The changes against v4 are just on some patch descriptions, plus the addition of Reviewed-by. No Code changes.
Thanks,
Mauro
-
During the development of a patch series meant to allow GHESv2 error injections, it was requested a change on how CPER offsets are calculated, by adding a new BIOS pointer and reworking the GHES logic. See:
https://lore.kernel.org/qemu-devel/[email protected]/
Such change ended being a big patch, so several intermediate steps are needed, together with several cleanups and renames.
As agreed duing v10 review, I'll be splitting the big patch series into separate pull requests, starting with the cleanup series. This is the first patch set, containing only such preparation patches.
The next series will contain the shift to use offsets from the location of the HEST table, together with a migration logic to make it compatible with 9.1.
---
v5:
- some changes at patches description and added some R-B;
- no changes at the code.
v4:
- merged a patch renaming the function which calculate offsets to:
get_hw_error_offsets(), to avoid the need of such change at the next patch series;
- removed a functional change at the logic which makes
the GHES record generation more generic;
- a couple of trivial changes on patch descriptions and line break cleanups.
v3:
- improved some patch descriptions;
- some patches got reordered to better reflect the changes;
- patch v2 08/15: acpi/ghes: Prepare to support multiple sources on ghes was split on two patches. The first one is in this cleanup series:
acpi/ghes: Change ghes fill logic to work with only one source
contains just the simplification logic. The actual preparation will be moved to this series:
https://lore.kernel.org/qemu-devel/[email protected]/
v2:
- some indentation fixes;
- some description improvements;
- fixed a badly-solved merge conflict that ended renaming a parameter.
Mauro Carvalho Chehab (16):
acpi/ghes: get rid of ACPI_HEST_SRC_ID_RESERVED acpi/ghes: simplify acpi_ghes_record_errors() code acpi/ghes: simplify the per-arch caller to build HEST table acpi/ghes: better handle source_id and notification acpi/ghes: Fix acpi_ghes_record_errors() argument acpi/ghes: Remove a duplicated out of bounds check acpi/ghes: Change the type for source_id
acpi/ghes: don't check if physical_address is not zero acpi/ghes: make the GHES record generation more generic acpi/ghes: better name GHES memory error function acpi/ghes: don't crash QEMU if ghes GED is not found acpi/ghes: rename etc/hardware_error file macros acpi/ghes: better name the offset of the hardware error firmware acpi/ghes: move offset calculus to a separate function acpi/ghes: Change ghes fill logic to work with only one source
docs: acpi_hest_ghes: fix documentation for CPER size
docs/specs/acpi_hest_ghes.rst | 6 +- hw/acpi/generic_event_device.c | 4 +- hw/acpi/ghes-stub.c | 2 +- hw/acpi/ghes.c | 259 +++++++++++++++++++-------------- hw/arm/virt-acpi-build.c | 5 +- include/hw/acpi/ghes.h | 16 +- target/arm/kvm.c | 2 +- 7 files changed, 169 insertions(+), 125 deletions(-)
Signature · 1 line
2.47.1
PATCH v6 1/16 acpi/ghes: get rid of ACPI_HEST_SRC_ID_RESERVED
This is just duplicating ACPI_GHES_ERROR_SOURCE_COUNT, which has a better name. So, drop the duplication.
--- hw/acpi/ghes.c | 7 ++----- include/hw/acpi/ghes.h | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-)
hw/acpi/ghes.c +2 -5
@@ -34,9 +34,6 @@/* The max size in bytes for one error block */ #define ACPI_GHES_MAX_RAW_DATA_LENGTH (1 * KiB) -/* Now only support ARMv8 SEA notification type error source */ -#define ACPI_GHES_ERROR_SOURCE_COUNT 1 -/* Generic Hardware Error Source version 2 */ #define ACPI_GHES_SOURCE_GENERIC_ERROR_V2 10
@@ -396,7 +393,7 @@ int acpi_ghes_record_errors(uint8_t source_id, uint64_t physical_address)AcpiGedState *acpi_ged_state;AcpiGhesState *ags; -assert (source_id <ACPI_HEST_SRC_ID_RESERVED ); +assert (source_id <ACPI_GHES_ERROR_SOURCE_COUNT ); acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED ,NULL ));
@@ -407,7 +404,7 @@ int acpi_ghes_record_errors(uint8_t source_id, uint64_t physical_address)if (physical_address) { -if (source_id <ACPI_HEST_SRC_ID_RESERVED ) { +if (source_id <ACPI_GHES_ERROR_SOURCE_COUNT ) { start_addr += source_id *sizeof (uint64_t ); }
include/hw/acpi/ghes.h +2 -1
@@ -59,7 +59,8 @@ enum AcpiGhesNotifyType {enum {ACPI_HEST_SRC_ID_SEA =0 ,/* future ids go here */ -ACPI_HEST_SRC_ID_RESERVED , + +ACPI_GHES_ERROR_SOURCE_COUNT }; typedef struct AcpiGhesState {
Signature · 1 line
2.47.1
PATCH v6 2/16 acpi/ghes: simplify acpi_ghes_record_errors() code
In reply to Mauro Carvalho ChehabReduce the ident of the function and prepares it for the next changes.
No functional changes.
--- hw/acpi/ghes.c | 56 ++++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 27 deletions(-)
hw/acpi/ghes.c +29 -27
@@ -402,40 +402,42 @@ int acpi_ghes_record_errors(uint8_t source_id, uint64_t physical_address) start_addr =le64_to_cpu (ags->ghes_addr_le); -if (physical_address) { +if (!physical_address) { +return -1 ; + } -if (source_id <ACPI_GHES_ERROR_SOURCE_COUNT ) { - start_addr += source_id *sizeof (uint64_t ); - } +if (source_id <ACPI_GHES_ERROR_SOURCE_COUNT ) { + start_addr += source_id *sizeof (uint64_t ); + } -cpu_physical_memory_read (start_addr, &error_block_addr, -sizeof (error_block_addr)); +cpu_physical_memory_read (start_addr, &error_block_addr, +sizeof (error_block_addr)); - error_block_addr =le64_to_cpu (error_block_addr); + error_block_addr =le64_to_cpu (error_block_addr); - read_ack_register_addr = start_addr + -ACPI_GHES_ERROR_SOURCE_COUNT *sizeof (uint64_t ); + read_ack_register_addr = start_addr + +ACPI_GHES_ERROR_SOURCE_COUNT *sizeof (uint64_t ); -cpu_physical_memory_read (read_ack_register_addr, - &read_ack_register,sizeof (read_ack_register)); +cpu_physical_memory_read (read_ack_register_addr, + &read_ack_register,sizeof (read_ack_register)); -/* zero means OSPM does not acknowledge the error */ -if (!read_ack_register) { -error_report ("OSPM does not acknowledge previous error," -" so can not record CPER for current error anymore" ); - }else if (error_block_addr) { - read_ack_register =cpu_to_le64 (0 ); -/* -* Clear the Read Ack Register, OSPM will write it to 1 when -* it acknowledges this error. -*/ -cpu_physical_memory_write (read_ack_register_addr, - &read_ack_register,sizeof (uint64_t )); +/* zero means OSPM does not acknowledge the error */ +if (!read_ack_register) { +error_report ("OSPM does not acknowledge previous error," +" so can not record CPER for current error anymore" ); + }else if (error_block_addr) { + read_ack_register =cpu_to_le64 (0 ); +/* +* Clear the Read Ack Register, OSPM will write it to 1 when +* it acknowledges this error. +*/ +cpu_physical_memory_write (read_ack_register_addr, + &read_ack_register,sizeof (uint64_t )); - ret =acpi_ghes_record_mem_error (error_block_addr, - physical_address); - }else -error_report ("can not find Generic Error Status Block" ); + ret =acpi_ghes_record_mem_error (error_block_addr, + physical_address); + }else { +error_report ("can not find Generic Error Status Block" ); }return ret;
Signature · 1 line
2.47.1
PATCH v6 3/16 acpi/ghes: simplify the per-arch caller to build HEST table
In reply to Mauro Carvalho ChehabThe GHES driver requires not only a HEST table, but also a separate firmware file to store Error Structure records. It can't do one without the other.
Simplify the caller logic for it to require one function.
No functional changes.
---
Changes from v10:
- Removed the logic which associates notification and source ID. This will be placed on a separate patch.
Changes from v8:
- Non-rename/cleanup changes merged altogether;
- source ID is now more generic, defined per guest target. That should make easier to add support for 86.
--- hw/acpi/ghes.c | 7 +++++-- hw/arm/virt-acpi-build.c | 5 ++--- include/hw/acpi/ghes.h | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-)
hw/acpi/ghes.c +5 -2
@@ -233,7 +233,7 @@ static int acpi_ghes_record_mem_error(uint64_t error_block_address,* Initialize "etc/hardware_errors" and "etc/hardware_errors_addr" fw_cfg blobs. * See docs/specs/acpi_hest_ghes.rst for blobs format. */ -void build_ghes_error_table (GArray *hardware_errors,BIOSLinker *linker) +static void build_ghes_error_table (GArray *hardware_errors,BIOSLinker *linker) {int i, error_status_block_offset;
@@ -356,12 +356,15 @@ static void build_ghes_v2(GArray *table_data, int source_id, BIOSLinker *linker) }/* Build Hardware Error Source Table */ -void acpi_build_hest (GArray *table_data,BIOSLinker *linker, +void acpi_build_hest (GArray *table_data,GArray *hardware_errors, +BIOSLinker *linker,const char *oem_id,const char *oem_table_id) {AcpiTable table = { .sig ="HEST" , .rev =1 , .oem_id = oem_id, .oem_table_id = oem_table_id }; +build_ghes_error_table (hardware_errors, linker); +acpi_table_begin (&table, table_data);/* Error Source Count */
hw/arm/virt-acpi-build.c +2 -3
@@ -942,10 +942,9 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)build_dbg2 (tables_blob, tables->linker, vms);if (vms->ras) { -build_ghes_error_table (tables->hardware_errors, tables->linker);acpi_add_table (table_offsets, tables_blob); -acpi_build_hest (tables_blob, tables->linker, vms->oem_id, - vms->oem_table_id); +acpi_build_hest (tables_blob, tables->hardware_errors, tables->linker, + vms->oem_id, vms->oem_table_id); }if (ms->numa_state->num_nodes >0 ) {
include/hw/acpi/ghes.h +2 -2
@@ -68,8 +68,8 @@ typedef struct AcpiGhesState {bool present;/* True if GHES is present at all on this board */ } AcpiGhesState; -void build_ghes_error_table (GArray *hardware_errors,BIOSLinker *linker); -void acpi_build_hest (GArray *table_data,BIOSLinker *linker, +void acpi_build_hest (GArray *table_data,GArray *hardware_errors, +BIOSLinker *linker,const char *oem_id,const char *oem_table_id);void acpi_ghes_add_fw_cfg (AcpiGhesState *vms,FWCfgState *s,GArray *hardware_errors);
Signature · 1 line
2.47.1
PATCH v6 4/16 acpi/ghes: better handle source_id and notification
In reply to Mauro Carvalho ChehabGHES has two fields that are stored on HEST error source blocks associated with notifications:
- notification type, which is a number defined at the ACPI spec containing several arch-specific synchronous and assynchronous types;
- source id, which is a HW/FW defined number, used to distinguish between different implemented sources.
There could be several sources with the same notification type, which is dependent of the way each architecture maps notifications.
Right now, build_ghes_v2() hardcodes a 1:1 mapping between such fields. Move it to two independent parameters, allowing the caller function to fill both.
---
Chenges from v10:
- Some changes got moved to the previous patch.
Changes from v8:
- Non-rename/cleanup changes merged altogether;
- source ID is now more generic, defined per guest target. That should make easier to add support for 86.
--- hw/acpi/ghes.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)
hw/acpi/ghes.c +9 -14
@@ -284,9 +284,13 @@ 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,int source_id,BIOSLinker *linker) +static void build_ghes_v2 (GArray *table_data, +BIOSLinker *linker, +enum AcpiGhesNotifyType notify, +uint16_t source_id) {uint64_t address_offset; +/* * Type: * Generic Hardware Error Source version 2(GHESv2 - Type 10)
@@ -316,18 +320,8 @@ static void build_ghes_v2(GArray *table_data, int source_id, BIOSLinker *linker) address_offset +GAS_ADDR_OFFSET ,sizeof (uint64_t ), ACPI_GHES_ERRORS_FW_CFG_FILE, source_id * sizeof(uint64_t)); -switch (source_id) { -case ACPI_HEST_SRC_ID_SEA : -/* -* Notification Structure -* Now only enable ARMv8 SEA notification type -*/ -build_ghes_hw_error_notification (table_data,ACPI_GHES_NOTIFY_SEA ); -break ; -default : -error_report ("Not support this error source" ); -abort (); - } +/* Notification Structure */ +build_ghes_hw_error_notification (table_data, notify);/* Error Status Block Length */ build_append_int_noprefix (table_data,ACPI_GHES_MAX_RAW_DATA_LENGTH ,4 );
@@ -369,7 +363,8 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors,/* Error Source Count */ build_append_int_noprefix (table_data,ACPI_GHES_ERROR_SOURCE_COUNT ,4 ); -build_ghes_v2 (table_data,ACPI_HEST_SRC_ID_SEA , linker); +build_ghes_v2 (table_data, linker, +ACPI_GHES_NOTIFY_SEA ,ACPI_HEST_SRC_ID_SEA );acpi_table_end (linker, &table); }
Signature · 1 line
2.47.1
PATCH v6 5/16 acpi/ghes: Fix acpi_ghes_record_errors() argument
In reply to Mauro Carvalho ChehabAlign the header file with the actual implementation of this function, as the first argument is source ID and not notification type.
---
Changes from v8:
- Non-rename/cleanup changes merged altogether;
- source ID is now more generic, defined per guest target. That should make easier to add support for 86.
--- include/hw/acpi/ghes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/hw/acpi/ghes.h +1 -1
@@ -73,7 +73,7 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, const char *oem_id, const char *oem_table_id);void acpi_ghes_add_fw_cfg (AcpiGhesState *vms,FWCfgState *s,GArray *hardware_errors); -int acpi_ghes_record_errors (uint8_t notify,uint64_t error_physical_addr); +int acpi_ghes_record_errors (uint8_t source_id,uint64_t error_physical_addr);/** * acpi_ghes_present: Report whether ACPI GHES table is present
Signature · 1 line
2.47.1
PATCH v6 6/16 acpi/ghes: Remove a duplicated out of bounds check
In reply to Mauro Carvalho Chehabacpi_ghes_record_errors() has an assert() at the beginning to ensure that source_id will be lower than ACPI_GHES_ERROR_SOURCE_COUNT. Remove a duplicated check.
--- hw/acpi/ghes.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
hw/acpi/ghes.c +1 -3
@@ -404,9 +404,7 @@ int acpi_ghes_record_errors(uint8_t source_id, uint64_t physical_address)return -1 ; } -if (source_id <ACPI_GHES_ERROR_SOURCE_COUNT ) { - start_addr += source_id *sizeof (uint64_t ); - } + start_addr += source_id *sizeof (uint64_t );cpu_physical_memory_read (start_addr, &error_block_addr,sizeof (error_block_addr));
Signature · 1 line
2.47.1
PATCH v6 7/16 acpi/ghes: Change the type for source_id
In reply to Mauro Carvalho ChehabAs described at: ACPI 6.5 spec at:
18.3.2. ACPI Error Source
In particular at GHES/GHESv2 table:
Table 18.10 Generic Hardware Error Source Structure
HEST source ID is actually a 16-bit value.
--- hw/acpi/ghes-stub.c | 2 +- hw/acpi/ghes.c | 2 +- include/hw/acpi/ghes.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
hw/acpi/ghes-stub.c +1 -1
@@ -11,7 +11,7 @@#include "qemu/osdep.h" #include "hw/acpi/ghes.h" -int acpi_ghes_record_errors (uint8_t source_id,uint64_t physical_address) +int acpi_ghes_record_errors (uint16_t source_id,uint64_t physical_address) {return -1 ; }
hw/acpi/ghes.c +1 -1
@@ -383,7 +383,7 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s, ags->present = true; } -int acpi_ghes_record_errors (uint8_t source_id,uint64_t physical_address) +int acpi_ghes_record_errors (uint16_t source_id,uint64_t physical_address) {uint64_t error_block_addr, read_ack_register_addr, read_ack_register =0 ;uint64_t start_addr;
include/hw/acpi/ghes.h +1 -1
@@ -73,7 +73,7 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, const char *oem_id, const char *oem_table_id);void acpi_ghes_add_fw_cfg (AcpiGhesState *vms,FWCfgState *s,GArray *hardware_errors); -int acpi_ghes_record_errors (uint8_t source_id,uint64_t error_physical_addr); +int acpi_ghes_record_errors (uint16_t source_id,uint64_t error_physical_addr);/** * acpi_ghes_present: Report whether ACPI GHES table is present
Signature · 1 line
2.47.1
PATCH v6 8/16 acpi/ghes: don't check if physical_address is not zero
In reply to Mauro Carvalho ChehabThe 'physical_address' value is a faulty page. As such, 0 is as valid as any other value.
--- hw/acpi/ghes.c | 4 ---- 1 file changed, 4 deletions(-)
hw/acpi/ghes.c +0 -4
@@ -400,10 +400,6 @@ int acpi_ghes_record_errors(uint16_t source_id, uint64_t physical_address) start_addr =le64_to_cpu (ags->ghes_addr_le); -if (!physical_address) { -return -1 ; - } - start_addr += source_id *sizeof (uint64_t ); cpu_physical_memory_read(start_addr, &error_block_addr,
Signature · 1 line
2.47.1
PATCH v6 9/16 acpi/ghes: make the GHES record generation more generic
In reply to Mauro Carvalho ChehabSplit the code into separate functions to allow using the common CPER filling code by different error sources.
The generic code was moved to ghes_record_cper_errors(), and ghes_gen_err_data_uncorrectable_recoverable() now contains only a logic to fill the Generic Error Data part of the record, as described at:
ACPI 6.2: 18.3.2.7.1 Generic Error Data
The remaining code to generate a memory error now belongs to acpi_ghes_record_errors() function.
A further patch will give it a better name.
# Conflicts:
# roms/edk2
--- hw/acpi/ghes.c | 121 ++++++++++++++++++++++++----------------- include/hw/acpi/ghes.h | 3 + 2 files changed, 73 insertions(+), 51 deletions(-)
hw/acpi/ghes.c +70 -51
@@ -181,51 +181,24 @@ static void acpi_ghes_build_append_mem_cper(GArray *table,build_append_int_noprefix (table,0 ,7 ); } -static int acpi_ghes_record_mem_error (uint64_t error_block_address, -uint64_t error_physical_addr) +static void +ghes_gen_err_data_uncorrectable_recoverable (GArray *block, +const uint8_t *section_type, +int data_length) { -GArray *block; - -/* Memory Error Section Type */ -const uint8_t uefi_cper_mem_sec[] = -UUID_LE (0xA5BC1114 ,0x6F64 ,0x4EDE ,0xB8 ,0x63 ,0x3E ,0x83 , \ -0xED ,0x7C ,0x83 ,0xB1 ); -/* invalid fru id: ACPI 4.0: 17.3.2.6.1 Generic Error Data, * Table 17-13 Generic Error Data Entry */ QemuUUID fru_id = {}; -uint32_t data_length; - - block =g_array_new (false, true/* clear */ ,1 ); - -/* This is the length if adding a new generic error data entry*/ - data_length =ACPI_GHES_DATA_LENGTH +ACPI_GHES_MEM_CPER_LENGTH ; -/* -* It should not run out of the preallocated memory if adding a new generic -* error data entry -*/ -assert ((data_length +ACPI_GHES_GESB_SIZE ) <= -ACPI_GHES_MAX_RAW_DATA_LENGTH );/* Build the new generic error status block header */ acpi_ghes_generic_error_status (block,ACPI_GEBS_UNCORRECTABLE ,0 ,0 , data_length,ACPI_CPER_SEV_RECOVERABLE );/* Build this new generic error data entry header */ -acpi_ghes_generic_error_data (block, uefi_cper_mem_sec, +acpi_ghes_generic_error_data (block, section_type,ACPI_CPER_SEV_RECOVERABLE ,0 ,0 ,ACPI_GHES_MEM_CPER_LENGTH , fru_id,0 ); - -/* Build the memory section CPER for above new generic error data entry */ -acpi_ghes_build_append_mem_cper (block, error_physical_addr); - -/* Write the generic error data entry into guest memory */ -cpu_physical_memory_write (error_block_address, block->data, block->len); - -g_array_free (block, true); - -return 0 ; }/*
@@ -383,15 +356,18 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s, ags->present = true; } -int acpi_ghes_record_errors (uint16_t source_id,uint64_t physical_address) +void ghes_record_cper_errors (const void *cper,size_t len, +uint16_t source_id,Error **errp) {uint64_t error_block_addr, read_ack_register_addr, read_ack_register =0 ;uint64_t start_addr; -bool ret =-1 ;AcpiGedState *acpi_ged_state;AcpiGhesState *ags; -assert (source_id <ACPI_GHES_ERROR_SOURCE_COUNT ); +if (len >ACPI_GHES_MAX_RAW_DATA_LENGTH ) { +error_setg (errp,"GHES CPER record is too big: %ld" , len); +return ; + } acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED ,NULL ));
@@ -406,6 +382,10 @@ int acpi_ghes_record_errors(uint16_t source_id, uint64_t physical_address) sizeof(error_block_addr)); error_block_addr =le64_to_cpu (error_block_addr); +if (!error_block_addr) { +error_setg (errp,"can not find Generic Error Status Block" ); +return ; + } read_ack_register_addr = start_addr +ACPI_GHES_ERROR_SOURCE_COUNT *sizeof (uint64_t );
@@ -415,24 +395,63 @@ int acpi_ghes_record_errors(uint16_t source_id, uint64_t physical_address)/* zero means OSPM does not acknowledge the error */ if (!read_ack_register) { -error_report ("OSPM does not acknowledge previous error," -" so can not record CPER for current error anymore" ); - }else if (error_block_addr) { - read_ack_register =cpu_to_le64 (0 ); -/* -* Clear the Read Ack Register, OSPM will write it to 1 when -* it acknowledges this error. -*/ -cpu_physical_memory_write (read_ack_register_addr, - &read_ack_register,sizeof (uint64_t )); - - ret =acpi_ghes_record_mem_error (error_block_addr, - physical_address); - }else { -error_report ("can not find Generic Error Status Block" ); +error_setg (errp, +"OSPM does not acknowledge previous error," +" so can not record CPER for current error anymore" ); +return ; } -return ret; + read_ack_register =cpu_to_le64 (0 ); +/* +* Clear the Read Ack Register, OSPM will write 1 to this register when +* it acknowledges the error. +*/ +cpu_physical_memory_write (read_ack_register_addr, + &read_ack_register,sizeof (uint64_t )); + +/* Write the generic error data entry into guest memory */ +cpu_physical_memory_write (error_block_addr, cper, len); + +return ; +} + +int acpi_ghes_record_errors (uint16_t source_id,uint64_t physical_address) +{ +/* Memory Error Section Type */ +const uint8_t guid[] = +UUID_LE (0xA5BC1114 ,0x6F64 ,0x4EDE ,0xB8 ,0x63 ,0x3E ,0x83 , \ +0xED ,0x7C ,0x83 ,0xB1 ); +Error *errp =NULL ; +int data_length; +GArray *block; + + block =g_array_new (false, true/* clear */ ,1 ); + + data_length =ACPI_GHES_DATA_LENGTH +ACPI_GHES_MEM_CPER_LENGTH ; +/* +* It should not run out of the preallocated memory if adding a new generic +* error data entry +*/ +assert ((data_length +ACPI_GHES_GESB_SIZE ) <= +ACPI_GHES_MAX_RAW_DATA_LENGTH ); + +ghes_gen_err_data_uncorrectable_recoverable (block, guid, + data_length); + +/* Build the memory section CPER for above new generic error data entry */ +acpi_ghes_build_append_mem_cper (block, physical_address); + +/* Report the error */ +ghes_record_cper_errors (block->data, block->len, source_id, &errp); + +g_array_free (block, true); + +if (errp) { +error_report_err (errp); +return -1 ; + } + +return 0 ; }bool acpi_ghes_present (void )
include/hw/acpi/ghes.h +3 -0
@@ -23,6 +23,7 @@#define ACPI_GHES_H #include "hw/acpi/bios-linker-loader.h" +#include "qapi/error.h" /* * Values for Hardware Error Notification Type field
@@ -73,6 +74,8 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, const char *oem_id, const char *oem_table_id);void acpi_ghes_add_fw_cfg (AcpiGhesState *vms,FWCfgState *s,GArray *hardware_errors); +void ghes_record_cper_errors (const void *cper,size_t len, +uint16_t source_id,Error **errp);int acpi_ghes_record_errors (uint16_t source_id,uint64_t error_physical_addr);/**
Signature · 1 line
2.47.1
PATCH v6 10/16 acpi/ghes: better name GHES memory error function
In reply to Mauro Carvalho ChehabThe current function used to generate GHES data is specific for memory errors. Give a better name for it, as we now have a generic function as well.
--- hw/acpi/ghes-stub.c | 2 +- hw/acpi/ghes.c | 2 +- include/hw/acpi/ghes.h | 4 ++-- target/arm/kvm.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
hw/acpi/ghes-stub.c +1 -1
@@ -11,7 +11,7 @@#include "qemu/osdep.h" #include "hw/acpi/ghes.h" -int acpi_ghes_record_errors (uint16_t source_id,uint64_t physical_address) +int acpi_ghes_memory_errors (uint16_t source_id,uint64_t physical_address) {return -1 ; }
hw/acpi/ghes.c +1 -1
@@ -415,7 +415,7 @@ void ghes_record_cper_errors(const void *cper, size_t len,return ; } -int acpi_ghes_record_errors (uint16_t source_id,uint64_t physical_address) +int acpi_ghes_memory_errors (uint16_t source_id,uint64_t physical_address) {/* Memory Error Section Type */ const uint8_t guid[] =
include/hw/acpi/ghes.h +2 -2
@@ -74,15 +74,15 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, const char *oem_id, const char *oem_table_id);void acpi_ghes_add_fw_cfg (AcpiGhesState *vms,FWCfgState *s,GArray *hardware_errors); +int acpi_ghes_memory_errors (uint16_t source_id,uint64_t error_physical_addr);void ghes_record_cper_errors (const void *cper,size_t len,uint16_t source_id,Error **errp); -int acpi_ghes_record_errors (uint16_t source_id,uint64_t error_physical_addr);/** * acpi_ghes_present: Report whether ACPI GHES table is present * * Returns: true if the system has an ACPI GHES table and it is -* safe to call acpi_ghes_record_errors() to record a memory error. +* safe to call acpi_ghes_memory_errors() to record a memory error. */ bool acpi_ghes_present (void );#endif
target/arm/kvm.c +1 -1
@@ -2387,7 +2387,7 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr)*/ if (code ==BUS_MCEERR_AR ) {kvm_cpu_synchronize_state (c); -if (!acpi_ghes_record_errors (ACPI_HEST_SRC_ID_SEA , paddr)) { +if (!acpi_ghes_memory_errors (ACPI_HEST_SRC_ID_SEA , paddr)) {kvm_inject_arm_sea (c); }else {error_report ("failed to record the error" );
Signature · 1 line
2.47.1
PATCH v6 11/16 acpi/ghes: don't crash QEMU if ghes GED is not found
In reply to Mauro Carvalho ChehabMake error handling within ghes_record_cper_errors() consistent, i.e. instead abort just print a error in case ghes GED is not found.
--- hw/acpi/ghes.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
hw/acpi/ghes.c +4 -1
@@ -371,7 +371,10 @@ void ghes_record_cper_errors(const void *cper, size_t len, acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED ,NULL )); -g_assert (acpi_ged_state); +if (!acpi_ged_state) { +error_setg (errp,"Can't find ACPI_GED object" ); +return ; + } ags = &acpi_ged_state->ghes_state; start_addr =le64_to_cpu (ags->ghes_addr_le);
Signature · 1 line
2.47.1
PATCH v6 12/16 acpi/ghes: rename etc/hardware_error file macros
In reply to Mauro Carvalho ChehabNow that we have also have a file to store HEST data location, which is part of GHES, better name the file where CPER records are stored.
No functional changes.
--- hw/acpi/ghes.c | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-)
hw/acpi/ghes.c +23 -15
@@ -28,8 +28,8 @@#include "hw/nvram/fw_cfg.h" #include "qemu/uuid.h" -#define ACPI_GHES_ERRORS_FW_CFG_FILE "etc/hardware_errors" -#define ACPI_GHES_DATA_ADDR_FW_CFG_FILE "etc/hardware_errors_addr" +#define ACPI_HW_ERROR_FW_CFG_FILE "etc/hardware_errors" +#define ACPI_HW_ERROR_ADDR_FW_CFG_FILE "etc/hardware_errors_addr"/* The max size in bytes for one error block */ #define ACPI_GHES_MAX_RAW_DATA_LENGTH (1 * KiB)
@@ -234,7 +234,7 @@ static void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker) ACPI_GHES_MAX_RAW_DATA_LENGTH * ACPI_GHES_ERROR_SOURCE_COUNT);/* Tell guest firmware to place hardware_errors blob into RAM */ -bios_linker_loader_alloc (linker,ACPI_GHES_ERRORS_FW_CFG_FILE , +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++) {
@@ -243,17 +243,21 @@ static void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker)* corresponding "Generic Error Status Block" */ bios_linker_loader_add_pointer (linker, -ACPI_GHES_ERRORS_FW_CFG_FILE ,sizeof (uint64_t ) * i, -sizeof (uint64_t ),ACPI_GHES_ERRORS_FW_CFG_FILE , - error_status_block_offset + i *ACPI_GHES_MAX_RAW_DATA_LENGTH ); +ACPI_HW_ERROR_FW_CFG_FILE , +sizeof (uint64_t ) * i, +sizeof (uint64_t ), +ACPI_HW_ERROR_FW_CFG_FILE , + error_status_block_offset + + 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_GHES_DATA_ADDR_FW_CFG_FILE , -0 ,sizeof (uint64_t ),ACPI_GHES_ERRORS_FW_CFG_FILE ,0 ); +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) */
@@ -290,8 +294,10 @@ static void build_ghes_v2(GArray *table_data,build_append_gas (table_data,AML_AS_SYSTEM_MEMORY ,0x40 ,0 ,4 /* QWord access */ ,0 );bios_linker_loader_add_pointer (linker,ACPI_BUILD_TABLE_FILE , - address_offset +GAS_ADDR_OFFSET ,sizeof (uint64_t ), -ACPI_GHES_ERRORS_FW_CFG_FILE , source_id *sizeof (uint64_t )); + address_offset +GAS_ADDR_OFFSET , +sizeof (uint64_t ), +ACPI_HW_ERROR_FW_CFG_FILE , + source_id *sizeof (uint64_t ));/* Notification Structure */ build_ghes_hw_error_notification (table_data, notify);
@@ -308,9 +314,11 @@ static void build_ghes_v2(GArray *table_data,build_append_gas (table_data,AML_AS_SYSTEM_MEMORY ,0x40 ,0 ,4 /* QWord access */ ,0 );bios_linker_loader_add_pointer (linker,ACPI_BUILD_TABLE_FILE , - address_offset +GAS_ADDR_OFFSET , -sizeof (uint64_t ),ACPI_GHES_ERRORS_FW_CFG_FILE , - (ACPI_GHES_ERROR_SOURCE_COUNT + source_id) *sizeof (uint64_t )); + address_offset +GAS_ADDR_OFFSET , +sizeof (uint64_t ), +ACPI_HW_ERROR_FW_CFG_FILE , + (ACPI_GHES_ERROR_SOURCE_COUNT + source_id) + *sizeof (uint64_t ));/* * Read Ack Preserve field
@@ -346,11 +354,11 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s, GArray *hardware_error) {/* Create a read-only fw_cfg file for GHES */ -fw_cfg_add_file (s,ACPI_GHES_ERRORS_FW_CFG_FILE , hardware_error->data, +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_GHES_DATA_ADDR_FW_CFG_FILE ,NULL ,NULL , +fw_cfg_add_file_callback (s,ACPI_HW_ERROR_ADDR_FW_CFG_FILE ,NULL ,NULL ,NULL , &(ags->ghes_addr_le),sizeof (ags->ghes_addr_le), false); ags->present = true;
Signature · 1 line
2.47.1
PATCH v6 13/16 acpi/ghes: better name the offset of the hardware error firmware
In reply to Mauro Carvalho ChehabThe hardware error firmware is where HEST error structures are stored. Those can be GHESv2, but they can also be other types.
Better name the location of the hardware error.
No functional changes.
--- hw/acpi/generic_event_device.c | 4 ++-- hw/acpi/ghes.c | 4 ++-- include/hw/acpi/ghes.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
hw/acpi/generic_event_device.c +2 -2
@@ -364,7 +364,7 @@ static const VMStateDescription vmstate_ghes = { .version_id = 1, .minimum_version_id = 1, .fields = (const VMStateField []) { -VMSTATE_UINT64 (ghes_addr_le, AcpiGhesState), +VMSTATE_UINT64 (hw_error_le, AcpiGhesState),VMSTATE_END_OF_LIST () }, };
@@ -372,7 +372,7 @@ static const VMStateDescription vmstate_ghes = {static bool ghes_needed (void *opaque) {AcpiGedState *s = opaque; -return s->ghes_state.ghes_addr_le; +return s->ghes_state.hw_error_le; }static const VMStateDescription vmstate_ghes_state = {
hw/acpi/ghes.c +2 -2
@@ -359,7 +359,7 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s,/* Create a read-write fw_cfg file for Address */ fw_cfg_add_file_callback (s,ACPI_HW_ERROR_ADDR_FW_CFG_FILE ,NULL ,NULL , -NULL , &(ags->ghes_addr_le),sizeof (ags->ghes_addr_le), false); +NULL , &(ags->hw_error_le),sizeof (ags->hw_error_le), false); ags->present = true; }
@@ -385,7 +385,7 @@ void ghes_record_cper_errors(const void *cper, size_t len, } ags = &acpi_ged_state->ghes_state; - start_addr =le64_to_cpu (ags->ghes_addr_le); + start_addr =le64_to_cpu (ags->hw_error_le); start_addr += source_id *sizeof (uint64_t );
include/hw/acpi/ghes.h +1 -1
@@ -65,7 +65,7 @@ enum { };typedef struct AcpiGhesState { -uint64_t ghes_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.1
PATCH v6 14/16 acpi/ghes: move offset calculus to a separate function
In reply to Mauro Carvalho ChehabCurrently, CPER address location is calculated as an offset of the hardware_errors table. It is also badly named, as the offset actually used is the address where the CPER data starts, and not the beginning of the error source.
Move the logic which calculates such offset to a separate function, in preparation for a patch that will be changing the logic to calculate it from the HEST table.
While here, properly name the variable which stores the cper address.
--- hw/acpi/ghes.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-)
hw/acpi/ghes.c +31 -9
@@ -364,10 +364,37 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s, 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 +* the source ID, as it is stored inside the HEST table. +*/ + +cpu_physical_memory_read (ghes_addr, cper_addr, +sizeof (*cper_addr)); + + *cper_addr =le64_to_cpu (*cper_addr); + +/* +* As the current version supports only one source, the ack offset is +* just sizeof(uint64_t). +*/ + *read_ack_register_addr = ghes_addr + +ACPI_GHES_ERROR_SOURCE_COUNT *sizeof (uint64_t ); +} +void ghes_record_cper_errors (const void *cper,size_t len,uint16_t source_id,Error **errp) { -uint64_t error_block_addr, read_ack_register_addr, read_ack_register =0 ; +uint64_t cper_addr =0 , read_ack_register_addr =0 , read_ack_register;uint64_t start_addr;AcpiGedState *acpi_ged_state;AcpiGhesState *ags;
@@ -389,18 +416,13 @@ void ghes_record_cper_errors(const void *cper, size_t len, start_addr += source_id *sizeof (uint64_t ); -cpu_physical_memory_read (start_addr, &error_block_addr, -sizeof (error_block_addr)); +get_hw_error_offsets (start_addr, &cper_addr, &read_ack_register_addr); - error_block_addr =le64_to_cpu (error_block_addr); -if (!error_block_addr) { +if (!cper_addr) {error_setg (errp,"can not find Generic Error Status Block" );return ; } - read_ack_register_addr = start_addr + -ACPI_GHES_ERROR_SOURCE_COUNT *sizeof (uint64_t ); -cpu_physical_memory_read (read_ack_register_addr, &read_ack_register,sizeof (read_ack_register));
@@ -421,7 +443,7 @@ void ghes_record_cper_errors(const void *cper, size_t len, &read_ack_register, sizeof(uint64_t));/* Write the generic error data entry into guest memory */ -cpu_physical_memory_write (error_block_addr, cper, len); +cpu_physical_memory_write (cper_addr, cper, len);return ; }
Signature · 1 line
2.47.1
PATCH v6 15/16 acpi/ghes: Change ghes fill logic to work with only one source
In reply to Mauro Carvalho ChehabExtending to multiple sources require a BIOS pointer to the beginning of the HEST table, which in turn requires a backward-compatible code.
So, the current code supports only one source. Ensure that and simplify the code.
--- hw/acpi/ghes.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
hw/acpi/ghes.c +4 -8
@@ -387,15 +387,13 @@ static void get_hw_error_offsets(uint64_t ghes_addr,* As the current version supports only one source, the ack offset is * just sizeof(uint64_t). */ - *read_ack_register_addr = ghes_addr + -ACPI_GHES_ERROR_SOURCE_COUNT *sizeof (uint64_t ); + *read_ack_register_addr = ghes_addr +sizeof (uint64_t ); }void ghes_record_cper_errors (const void *cper,size_t len,uint16_t source_id,Error **errp) {uint64_t cper_addr =0 , read_ack_register_addr =0 , read_ack_register; -uint64_t start_addr;AcpiGedState *acpi_ged_state;AcpiGhesState *ags;
@@ -412,11 +410,9 @@ void ghes_record_cper_errors(const void *cper, size_t len, } ags = &acpi_ged_state->ghes_state; - start_addr =le64_to_cpu (ags->hw_error_le); - - start_addr += source_id *sizeof (uint64_t ); - -get_hw_error_offsets (start_addr, &cper_addr, &read_ack_register_addr); +assert (ACPI_GHES_ERROR_SOURCE_COUNT ==1 ); +get_hw_error_offsets (le64_to_cpu (ags->hw_error_le), + &cper_addr, &read_ack_register_addr);if (!cper_addr) {error_setg (errp,"can not find Generic Error Status Block" );
Signature · 1 line
2.47.1
PATCH v6 16/16 docs: acpi_hest_ghes: fix documentation for CPER size
In reply to Mauro Carvalho ChehabWhile the spec defines a CPER size of 4KiB for each record, currently it is set to 1KiB. Fix the documentation and add a pointer to the macro name there, as this may help to keep it updated.
--- docs/specs/acpi_hest_ghes.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
docs/specs/acpi_hest_ghes.rst +4 -2
@@ -67,8 +67,10 @@ Design Details (3) The address registers table contains N Error Block Address entries and N Read Ack Register entries. The size for each entry is 8-byte. The Error Status Data Block table contains N Error Status Data Block - entries. The size for each entry is 4096(0x1000) bytes. The total size - for the "etc/hardware_errors" fw_cfg blob is (N * 8 * 2 + N * 4096) bytes. + entries. The size for each entry is defined at the source code as + ACPI_GHES_MAX_RAW_DATA_LENGTH (currently 1024 bytes). The total size + for the "etc/hardware_errors" fw_cfg blob is + (N * 8 * 2 + N * ACPI_GHES_MAX_RAW_DATA_LENGTH) bytes. N is the number of the kinds of hardware error sources. (4) QEMU generates the ACPI linker/loader script for the firmware. The
Signature · 1 line
2.47.1
Re: [PATCH v6 08/16] acpi/ghes: don't check if physical_address is not zero
In reply to Mauro Carvalho ChehabQuoted 2 lines · On Sat, 7 Dec 2024 09:54:14 +0100 Mauro Carvalho Chehab…
The '
physical_address' value is a faulty page. As such, 0 is as valid as any other value.
Still not sure on what faulty pages are :)
Given I tagged previous (after you'd sent this)
Quoted 22 lines
Suggested-by Igor Mammedov <[email protected]>Signed-off-by Mauro Carvalho Chehab <[email protected]>--- hw/acpi/ghes.c | 4 ---- 1 file changed, 4 deletions(-)hw/acpi/ghes.c +0
-4@@ -400,10 +400,6 @@ int acpi_ghes_record_errors(uint16_t source_id, uint64_t physical_address) start_addr =le64_to_cpu (ags->ghes_addr_le); -if (!physical_address) { -return -1 ; - } - start_addr += source_id *sizeof (uint64_t ); cpu_physical_memory_read(start_addr, &error_block_addr,
Mauro Carvalho Chehab
Reviewed-by Igor MammedovRe: [PATCH v6 08/16] acpi/ghes: don't check if physical_address is not zero
Em Mon, 9 Dec 2024 11:36:40 +0000
Jonathan Cameron <[email protected]> escreveu:
Quoted 9 lines
Quoted 2 lines · On Sat, 7 Dec 2024 09:54:14 +0100 Mauro Carvalho Chehab…
The '
physical_address' value is a faulty page. As such, 0 is as valid as any other value.Still not sure on what faulty pages are :)
Given I tagged previous (after you'd sent this)
Reviewed-by Jonathan Cameron <[email protected]>
It seems I forgot adding this tag, from Igor's review, as per:
https://lore.kernel.org/qemu-devel/[email protected]/
This patch was reviwed by Igor already, so:
Quoted 16 lines
Quoted 16 lines
Suggested-by Igor Mammedov <[email protected]>Signed-off-by Mauro Carvalho Chehab <[email protected]>--- hw/acpi/ghes.c | 4 ---- 1 file changed, 4 deletions(-)hw/acpi/ghes.c +0
-0@@ -400,10 +400,6 @@ int acpi_ghes_record_errors(uint16_t source_id, uint64_t physical_address) start_addr =le64_to_cpu (ags->ghes_addr_le);
Quoted 8 lines
hw/acpi/ghes.c int acpi_ghes_record_errors(uint16_t source_id, uint64_t physical_address) · line 405
Quoted 7 lines
hw/acpi/ghes.c +0
-4-if (!physical_address) { -return -1 ; - } - start_addr += source_id *sizeof (uint64_t ); cpu_physical_memory_read(start_addr, &error_block_addr,
Thanks,
Mauro
Re: [PATCH v6 08/16] acpi/ghes: don't check if physical_address is not zero
In reply to Jonathan CameronQuoted 6 lines · On Mon, 9 Dec 2024 11:36:40 +0000 Jonathan Cameron…
Quoted 2 lines · On Sat, 7 Dec 2024 09:54:14 +0100 Mauro Carvalho Chehab…
The '
physical_address' value is a faulty page. As such, 0 is as valid as any other value.Still not sure on what faulty pages are :)
s/page/address/ probably would make it a bit more clear
Quoted 27 lines
Given I tagged previous (after you'd sent this)
Reviewed-by Jonathan Cameron <[email protected]>Quoted 22 lines
Suggested-by Igor Mammedov <[email protected]>Signed-off-by Mauro Carvalho Chehab <[email protected]>--- hw/acpi/ghes.c | 4 ---- 1 file changed, 4 deletions(-)hw/acpi/ghes.c +0
-4@@ -400,10 +400,6 @@ int acpi_ghes_record_errors(uint16_t source_id, uint64_t physical_address) start_addr =le64_to_cpu (ags->ghes_addr_le); -if (!physical_address) { -return -1 ; - } - start_addr += source_id *sizeof (uint64_t ); cpu_physical_memory_read(start_addr, &error_block_addr,
Re: [PATCH v6 09/16] acpi/ghes: make the GHES record generation more generic
In reply to Mauro Carvalho ChehabQuoted 8 lines · On Sat, 7 Dec 2024 09:54:15 +0100 Mauro Carvalho Chehab…
Split the code into separate functions to allow using the common CPER filling code by different error sources.
The generic code was moved to
ghes_record_cper_errors(), andghes_gen_err_data_uncorrectable_recoverable()now contains only a logic to fill the Generic Error Data part of the record, as described at:
Quoted 8 lines
ACPI 6.2: 18.3.2.7.1 Generic Error DataThe remaining code to generate a memory error now belongs to
acpi_ghes_record_errors()function.A further patch will give it a better name.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
Igor tagged this in previous posting. Any reason for dropping?
Quoted 3 lines
# Conflicts:
# roms/edk2
Should clear this out.
A few formatting things inline but beyond that looks good to me.
Quoted 57 lines
/*
hw/acpi/ghes.c +14
-18@@ -383,15 +356,18 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s, ags->present = true; } -int acpi_ghes_record_errors (uint16_t source_id,uint64_t physical_address) +void ghes_record_cper_errors (const void *cper,size_t len, +uint16_t source_id,Error **errp) {uint64_t error_block_addr, read_ack_register_addr, read_ack_register =0 ;uint64_t start_addr; -bool ret =-1 ;AcpiGedState *acpi_ged_state;AcpiGhesState *ags; -assert (source_id <ACPI_GHES_ERROR_SOURCE_COUNT ); +if (len >ACPI_GHES_MAX_RAW_DATA_LENGTH ) { +error_setg (errp,"GHES CPER record is too big: %ld" , len); +return ; + } acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED ,NULL ));@@ -406,6 +382,10 @@ int acpi_ghes_record_errors(uint16_t source_id, uint64_t physical_address) sizeof(error_block_addr)); error_block_addr =le64_to_cpu (error_block_addr); +if (!error_block_addr) { +error_setg (errp,"can not find Generic Error Status Block" ); +return ; + } read_ack_register_addr = start_addr +ACPI_GHES_ERROR_SOURCE_COUNT *sizeof (uint64_t );@@ -415,24 +395,63 @@ int acpi_ghes_record_errors(uint16_t source_id, uint64_t physical_address)/* zero means OSPM does not acknowledge the error */ if (!read_ack_register) { -error_report ("OSPM does not acknowledge previous error," -" so can not record CPER for current error anymore" ); - }else if (error_block_addr) { - read_ack_register =cpu_to_le64 (0 ); -/* -* Clear the Read Ack Register, OSPM will write it to 1 when -* it acknowledges this error. -*/ -cpu_physical_memory_write (read_ack_register_addr, - &read_ack_register,sizeof (uint64_t )); - - ret =acpi_ghes_record_mem_error (error_block_addr, - physical_address); - }else { -error_report ("can not find Generic Error Status Block" ); +error_setg (errp, +"OSPM does not acknowledge previous error," +" so can not record CPER for current error anymore" ); +return ;
hw/acpi/ghes.c int acpi_ghes_record_errors(uint16_t source_id, uint64_t physical_address) · line 410
Quoted 10 lines
hw/acpi/ghes.c +7
-1} -return ret; + read_ack_register =cpu_to_le64 (0 ); +/* +* Clear the Read Ack Register, OSPM will write 1 to this register when +* it acknowledges the error. +*/ +cpu_physical_memory_write (read_ack_register_addr, + &read_ack_register,sizeof (uint64_t ));
Maybe rewrap that line now it's indented less?
Quoted 19 lines
hw/acpi/ghes.c +19
-0+ +/* Write the generic error data entry into guest memory */ +cpu_physical_memory_write (error_block_addr, cper, len); + +return ; +} + +int acpi_ghes_record_errors (uint16_t source_id,uint64_t physical_address) +{ +/* Memory Error Section Type */ +const uint8_t guid[] = +UUID_LE (0xA5BC1114 ,0x6F64 ,0x4EDE ,0xB8 ,0x63 ,0x3E ,0x83 , \ +0xED ,0x7C ,0x83 ,0xB1 ); +Error *errp =NULL ; +int data_length; +GArray *block; + + block =g_array_new (false, true/* clear */ ,1 ); +
hw/acpi/ghes.c int acpi_ghes_record_errors(uint16_t source_id, uint64_t physical_address) · line 439
Quoted 10 lines
hw/acpi/ghes.c +10
-0+ data_length =ACPI_GHES_DATA_LENGTH +ACPI_GHES_MEM_CPER_LENGTH ; +/* +* It should not run out of the preallocated memory if adding a new generic +* error data entry +*/ +assert ((data_length +ACPI_GHES_GESB_SIZE ) <= +ACPI_GHES_MAX_RAW_DATA_LENGTH ); + +ghes_gen_err_data_uncorrectable_recoverable (block, guid, + data_length);
Trivial: That fits on one line under 80 chars.
Quoted 16 lines
hw/acpi/ghes.c +15
-0+ +/* Build the memory section CPER for above new generic error data entry */ +acpi_ghes_build_append_mem_cper (block, physical_address); + +/* Report the error */ +ghes_record_cper_errors (block->data, block->len, source_id, &errp); + +g_array_free (block, true); + +if (errp) { +error_report_err (errp); +return -1 ; + } + +return 0 ; }
Re: [PATCH v6 09/16] acpi/ghes: make the GHES record generation more generic
In reply to Mauro Carvalho ChehabQuoted 92 lines · Mauro Carvalho Chehab
Split the code into separate functions to allow using the common CPER filling code by different error sources.
The generic code was moved to
ghes_record_cper_errors(), andghes_gen_err_data_uncorrectable_recoverable()now contains only a logic to fill the Generic Error Data part of the record, as described at:ACPI 6.2: 18.3.2.7.1 Generic Error DataThe remaining code to generate a memory error now belongs to
acpi_ghes_record_errors()function.A further patch will give it a better name.
Signed-off-by Mauro Carvalho Chehab <[email protected]># Conflicts:
# roms/edk2--- hw/acpi/ghes.c | 121 ++++++++++++++++++++++++----------------- include/hw/acpi/ghes.h | 3 + 2 files changed, 73 insertions(+), 51 deletions(-)hw/acpi/ghes.c +7
-33@@ -181,51 +181,24 @@ static void acpi_ghes_build_append_mem_cper(GArray *table,build_append_int_noprefix (table,0 ,7 ); } -static int acpi_ghes_record_mem_error (uint64_t error_block_address, -uint64_t error_physical_addr) +static void +ghes_gen_err_data_uncorrectable_recoverable (GArray *block, +const uint8_t *section_type, +int data_length) { -GArray *block; - -/* Memory Error Section Type */ -const uint8_t uefi_cper_mem_sec[] = -UUID_LE (0xA5BC1114 ,0x6F64 ,0x4EDE ,0xB8 ,0x63 ,0x3E ,0x83 , \ -0xED ,0x7C ,0x83 ,0xB1 ); -/* invalid fru id: ACPI 4.0: 17.3.2.6.1 Generic Error Data, * Table 17-13 Generic Error Data Entry */ QemuUUID fru_id = {}; -uint32_t data_length; - - block =g_array_new (false, true/* clear */ ,1 ); - -/* This is the length if adding a new generic error data entry*/ - data_length =ACPI_GHES_DATA_LENGTH +ACPI_GHES_MEM_CPER_LENGTH ; -/* -* It should not run out of the preallocated memory if adding a new generic -* error data entry -*/ -assert ((data_length +ACPI_GHES_GESB_SIZE ) <= -ACPI_GHES_MAX_RAW_DATA_LENGTH );/* Build the new generic error status block header */ acpi_ghes_generic_error_status (block,ACPI_GEBS_UNCORRECTABLE ,0 ,0 , data_length,ACPI_CPER_SEV_RECOVERABLE );/* Build this new generic error data entry header */ -acpi_ghes_generic_error_data (block, uefi_cper_mem_sec, +acpi_ghes_generic_error_data (block, section_type,ACPI_CPER_SEV_RECOVERABLE ,0 ,0 ,ACPI_GHES_MEM_CPER_LENGTH , fru_id,0 ); - -/* Build the memory section CPER for above new generic error data entry */ -acpi_ghes_build_append_mem_cper (block, error_physical_addr); - -/* Write the generic error data entry into guest memory */ -cpu_physical_memory_write (error_block_address, block->data, block->len); - -g_array_free (block, true); - -return 0 ; }/* @@ -383,15 +356,18 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s, ags->present = true; } -int acpi_ghes_record_errors (uint16_t source_id,uint64_t physical_address) +void ghes_record_cper_errors (const void *cper,size_t len, +uint16_t source_id,Error **errp)
hw/acpi/ghes.c void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s, · line 368
Quoted 10 lines
hw/acpi/ghes.c +2
-2{uint64_t error_block_addr, read_ack_register_addr, read_ack_register =0 ;uint64_t start_addr; -bool ret =-1 ;AcpiGedState *acpi_ged_state;AcpiGhesState *ags; -assert (source_id <ACPI_GHES_ERROR_SOURCE_COUNT ); +if (len >ACPI_GHES_MAX_RAW_DATA_LENGTH ) { +error_setg (errp,"GHES CPER record is too big: %ld" , len);
size_t should be printed with %zd not %ld.
Quoted 119 lines
hw/acpi/ghes.c +61
-16+return ; + } acpi_ged_state =ACPI_GED (object_resolve_path_type ("" ,TYPE_ACPI_GED ,NULL ));@@ -406,6 +382,10 @@ int acpi_ghes_record_errors(uint16_t source_id, uint64_t physical_address) sizeof(error_block_addr)); error_block_addr =le64_to_cpu (error_block_addr); +if (!error_block_addr) { +error_setg (errp,"can not find Generic Error Status Block" ); +return ; + } read_ack_register_addr = start_addr +ACPI_GHES_ERROR_SOURCE_COUNT *sizeof (uint64_t );@@ -415,24 +395,63 @@ int acpi_ghes_record_errors(uint16_t source_id, uint64_t physical_address)/* zero means OSPM does not acknowledge the error */ if (!read_ack_register) { -error_report ("OSPM does not acknowledge previous error," -" so can not record CPER for current error anymore" ); - }else if (error_block_addr) { - read_ack_register =cpu_to_le64 (0 ); -/* -* Clear the Read Ack Register, OSPM will write it to 1 when -* it acknowledges this error. -*/ -cpu_physical_memory_write (read_ack_register_addr, - &read_ack_register,sizeof (uint64_t )); - - ret =acpi_ghes_record_mem_error (error_block_addr, - physical_address); - }else { -error_report ("can not find Generic Error Status Block" ); +error_setg (errp, +"OSPM does not acknowledge previous error," +" so can not record CPER for current error anymore" ); +return ; } -return ret; + read_ack_register =cpu_to_le64 (0 ); +/* +* Clear the Read Ack Register, OSPM will write 1 to this register when +* it acknowledges the error. +*/ +cpu_physical_memory_write (read_ack_register_addr, + &read_ack_register,sizeof (uint64_t )); + +/* Write the generic error data entry into guest memory */ +cpu_physical_memory_write (error_block_addr, cper, len); + +return ; +} + +int acpi_ghes_record_errors (uint16_t source_id,uint64_t physical_address) +{ +/* Memory Error Section Type */ +const uint8_t guid[] = +UUID_LE (0xA5BC1114 ,0x6F64 ,0x4EDE ,0xB8 ,0x63 ,0x3E ,0x83 , \ +0xED ,0x7C ,0x83 ,0xB1 ); +Error *errp =NULL ; +int data_length; +GArray *block; + + block =g_array_new (false, true/* clear */ ,1 ); + + data_length =ACPI_GHES_DATA_LENGTH +ACPI_GHES_MEM_CPER_LENGTH ; +/* +* It should not run out of the preallocated memory if adding a new generic +* error data entry +*/ +assert ((data_length +ACPI_GHES_GESB_SIZE ) <= +ACPI_GHES_MAX_RAW_DATA_LENGTH ); + +ghes_gen_err_data_uncorrectable_recoverable (block, guid, + data_length); + +/* Build the memory section CPER for above new generic error data entry */ +acpi_ghes_build_append_mem_cper (block, physical_address); + +/* Report the error */ +ghes_record_cper_errors (block->data, block->len, source_id, &errp); + +g_array_free (block, true); + +if (errp) { +error_report_err (errp); +return -1 ; + } + +return 0 ; }bool acpi_ghes_present (void )include/hw/acpi/ghes.h +3
-0@@ -23,6 +23,7 @@#define ACPI_GHES_H #include "hw/acpi/bios-linker-loader.h" +#include "qapi/error.h" /* * Values for Hardware Error Notification Type field @@ -73,6 +74,8 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, const char *oem_id, const char *oem_table_id);void acpi_ghes_add_fw_cfg (AcpiGhesState *vms,FWCfgState *s,GArray *hardware_errors); +void ghes_record_cper_errors (const void *cper,size_t len, +uint16_t source_id,Error **errp);int acpi_ghes_record_errors (uint16_t source_id,uint64_t error_physical_addr);/** Signature · 1 line
2.47.1
Quoted 8 lines · Mauro Carvalho Chehab
Hi Michael,
Please ignore the patch series I sent yesterday:
https://lore.kernel.org/qemu-devel/[email protected]/T/#tThe git range was wrong, and it was supposed to be v6. This is the right one. It is based on the top of v9.2.0-rc3.
Quoted 6 lines
Could you please merge this series for ACPI stuff? All patches were already reviewed by Igor. The changes against v4 are just on some patch descriptions, plus the addition of Reviewed-by. No Code changes.
Thanks,
Mauro
Still waiting for a version with minor nits fixed.
Quoted 77 lines
-
During the development of a patch series meant to allow GHESv2 error injections, it was requested a change on how CPER offsets are calculated, by adding a new BIOS pointer and reworking the GHES logic. See:
https://lore.kernel.org/qemu-devel/[email protected]/
Such change ended being a big patch, so several intermediate steps are needed, together with several cleanups and renames.
As agreed duing v10 review, I'll be splitting the big patch series into separate pull requests, starting with the cleanup series. This is the first patch set, containing only such preparation patches.
The next series will contain the shift to use offsets from the location of the HEST table, together with a migration logic to make it compatible with 9.1.
---
v5:
- some changes at patches description and added some R-B;
- no changes at the code.v4:
- merged a patch renaming the function which calculate offsets to:
get_hw_error_offsets(), to avoid the need of such change at the next patch series;
- removed a functional change at the logic which makes
the GHES record generation more generic;
- a couple of trivial changes on patch descriptions and line break cleanups.v3:
- improved some patch descriptions;
- some patches got reordered to better reflect the changes;
- patch v2 08/15: acpi/ghes: Prepare to support multiple sources on ghes was split on two patches. The first one is in this cleanup series:
acpi/ghes: Change ghes fill logic to work with only one source
contains just the simplification logic. The actual preparation will be moved to this series:https://lore.kernel.org/qemu-devel/[email protected]/v2:
- some indentation fixes;
- some description improvements;
- fixed a badly-solved merge conflict that ended renaming a parameter.Mauro Carvalho Chehab (16):
acpi/ghes: get rid ofACPI_HEST_SRC_ID_RESERVEDacpi/ghes: simplifyacpi_ghes_record_errors()code acpi/ghes: simplify the per-arch caller to build HEST table acpi/ghes: better handlesource_idand notification acpi/ghes: Fixacpi_ghes_record_errors()argument acpi/ghes: Remove a duplicated out of bounds check acpi/ghes: Change the type forsource_id
acpi/ghes: don't check ifphysical_addressis not zero acpi/ghes: make the GHES record generation more generic acpi/ghes: better name GHES memory error function acpi/ghes: don't crash QEMU if ghes GED is not found acpi/ghes: rename etc/hardware_error file macros acpi/ghes: better name the offset of the hardware error firmware acpi/ghes: move offset calculus to a separate function acpi/ghes: Change ghes fill logic to work with only one source
docs:acpi_hest_ghes: fix documentation for CPER sizedocs/specs/acpi_hest_ghes.rst | 6 +- hw/acpi/generic_event_device.c | 4 +- hw/acpi/ghes-stub.c | 2 +- hw/acpi/ghes.c | 259 +++++++++++++++++++-------------- hw/arm/virt-acpi-build.c | 5 +- include/hw/acpi/ghes.h | 16 +- target/arm/kvm.c | 2 +- 7 files changed, 169 insertions(+), 125 deletions(-)Signature · 1 line
2.47.1
Em Wed, 15 Jan 2025 06:09:12 -0500
"Michael S. Tsirkin" <[email protected]> escreveu:
Quoted 13 lines · Mauro Carvalho Chehab
Quoted 12 lines
Hi Michael,
Please ignore the patch series I sent yesterday:
https://lore.kernel.org/qemu-devel/[email protected]/T/#tThe git range was wrong, and it was supposed to be v6. This is the right one. It is based on the top of v9.2.0-rc3.
Could you please merge this series for ACPI stuff? All patches were already reviewed by Igor. The changes against v4 are just on some patch descriptions, plus the addition of Reviewed-by. No Code changes.
Quoted 5 lines
Quoted 2 lines
Thanks,
MauroStill waiting for a version with minor nits fixed.
Just sent v7 addressing the minor nits on patch 9.
Quoted 74 lines
Quoted 74 lines
-
During the development of a patch series meant to allow GHESv2 error injections, it was requested a change on how CPER offsets are calculated, by adding a new BIOS pointer and reworking the GHES logic. See:
https://lore.kernel.org/qemu-devel/[email protected]/
Such change ended being a big patch, so several intermediate steps are needed, together with several cleanups and renames.
As agreed duing v10 review, I'll be splitting the big patch series into separate pull requests, starting with the cleanup series. This is the first patch set, containing only such preparation patches.
The next series will contain the shift to use offsets from the location of the HEST table, together with a migration logic to make it compatible with 9.1.
---
v5:
- some changes at patches description and added some R-B;
- no changes at the code.v4:
- merged a patch renaming the function which calculate offsets to:
get_hw_error_offsets(), to avoid the need of such change at the next patch series;
- removed a functional change at the logic which makes
the GHES record generation more generic;
- a couple of trivial changes on patch descriptions and line break cleanups.v3:
- improved some patch descriptions;
- some patches got reordered to better reflect the changes;
- patch v2 08/15: acpi/ghes: Prepare to support multiple sources on ghes was split on two patches. The first one is in this cleanup series:
acpi/ghes: Change ghes fill logic to work with only one source
contains just the simplification logic. The actual preparation will be moved to this series:https://lore.kernel.org/qemu-devel/[email protected]/v2:
- some indentation fixes;
- some description improvements;
- fixed a badly-solved merge conflict that ended renaming a parameter.Mauro Carvalho Chehab (16):
acpi/ghes: get rid ofACPI_HEST_SRC_ID_RESERVEDacpi/ghes: simplifyacpi_ghes_record_errors()code acpi/ghes: simplify the per-arch caller to build HEST table acpi/ghes: better handlesource_idand notification acpi/ghes: Fixacpi_ghes_record_errors()argument acpi/ghes: Remove a duplicated out of bounds check acpi/ghes: Change the type forsource_id
acpi/ghes: don't check ifphysical_addressis not zero acpi/ghes: make the GHES record generation more generic acpi/ghes: better name GHES memory error function acpi/ghes: don't crash QEMU if ghes GED is not found acpi/ghes: rename etc/hardware_error file macros acpi/ghes: better name the offset of the hardware error firmware acpi/ghes: move offset calculus to a separate function acpi/ghes: Change ghes fill logic to work with only one source
docs:acpi_hest_ghes: fix documentation for CPER sizedocs/specs/acpi_hest_ghes.rst | 6 +- hw/acpi/generic_event_device.c | 4 +- hw/acpi/ghes-stub.c | 2 +- hw/acpi/ghes.c | 259 +++++++++++++++++++-------------- hw/arm/virt-acpi-build.c | 5 +- include/hw/acpi/ghes.h | 16 +- target/arm/kvm.c | 2 +- 7 files changed, 169 insertions(+), 125 deletions(-)
Quoted 4 lines
Quoted 3 lines
Signature · 1 line
2.47.1
Thanks,
Mauro