Re: [PATCH v4 6/6] acpi/ghes: Add a logic to inject ARM processor CPER

Jonathan Cameron
2024-07-29T16:31:13Z

On Mon, 29 Jul 2024 15:21:10 +0200
Mauro Carvalho Chehab <mchehab+huawei@kernel.org> wrote:

> Add an ACPI APEI GHES error injection logic for ARM
> processor CPER, allowing to set fields at from
> UEFI spec 2.10 tables N.16 and N.17 to any valid
> value.
>
> As some GHES functions require handling addresses, add
> a helper function to support it.
>
> Before starting erorr inject, the QAPI requires to negociate
> QMP with:
>
> { "execute": "qmp_capabilities" }
>
> Afterwards, errors can be injected with:
>
> { "execute": "arm-inject-error" }
>
> The error injection events supports several optional arguments,
> having Processor Error Information (PEI) mapped into an array.
>
> So, it is possible to inject multiple errors at the same CPER record,
> as defined at UEFI spec, with:
>
> { "execute": "arm-inject-error", "arguments": {
> "error": [ {"type": [ "cache-error" ]},
> {"type": [ "tlb-error" ]} ] } }
>
> The above generates a single CPER record with two PEI info, one
> reporting a cache error, and the other one a TLB error, using
> default values for other fields.
>
> As all fields from ARM Processor CPER are mapped, so, the error
> could contain physical/virtual addresses, register dumps,
> vendor-specific data, etc.
>
> This patch is co-authored:
> - ghes logic to inject a simple ARM record by Shiju Jose;
> - generic logic to handle block addresses by Jonathan Cameron;
> - logic to allow changing all fields by Mauro Carvalho Chehab;
>
> Co-authored-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> Co-authored-by: Shiju Jose <shiju.jose@huawei.com>
> Co-authored-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> Signed-off-by: Shiju Jose <shiju.jose@huawei.com>
> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

A few minor comments inline.
This crossed (I think) with a reply from Markus though so there are
some other bits to address from that.

Jonathan

> diff --git a/configs/targets/aarch64-softmmu.mak b/configs/targets/aarch64-softmmu.mak
> index 84cb32dc2f4f..b4b3cd97934a 100644
> --- a/configs/targets/aarch64-softmmu.mak
> +++ b/configs/targets/aarch64-softmmu.mak
> @@ -5,3 +5,4 @@ TARGET_KVM_HAVE_GUEST_DEBUG=y
> TARGET_XML_FILES= gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml gdb-xml/arm-m-profile-mve.xml gdb-xml/aarch64-pauth.xml
> # needed by boot.c
> TARGET_NEED_FDT=y
> +CONFIG_ARM_EINJ=y
> diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c
> index 9346f45c59a5..e435c9aa0961 100644
> --- a/hw/acpi/ghes.c
> +++ b/hw/acpi/ghes.c
> @@ -27,6 +27,7 @@
> #include "hw/acpi/generic_event_device.h"
> #include "hw/nvram/fw_cfg.h"
> #include "qemu/uuid.h"
> +#include "qapi/qapi-types-arm-error-inject.h"
>
> #define ACPI_GHES_ERRORS_FW_CFG_FILE "etc/hardware_errors"
> #define ACPI_GHES_DATA_ADDR_FW_CFG_FILE "etc/hardware_errors_addr"
> @@ -53,6 +54,12 @@
> /* The memory section CPER size, UEFI 2.6: N.2.5 Memory Error Section */
> #define ACPI_GHES_MEM_CPER_LENGTH 80
>
> +/*
> + * ARM Processor error section CPER sizes - UEFI 2.10: N.2.4.4
> + */
> +#define ACPI_GHES_ARM_CPER_LENGTH 40
> +#define ACPI_GHES_ARM_CPER_PEI_LENGTH 32
> +
> /* Masks for block_status flags */
> #define ACPI_GEBS_UNCORRECTABLE 1
>
> @@ -234,6 +241,152 @@ static int acpi_ghes_record_mem_error(uint64_t error_block_address,
> return 0;
> }
>
> +/* UEFI 2.9: N.2.4.4 ARM Processor Error Section */
> +static void acpi_ghes_build_append_arm_cper(ArmError err, uint32_t cper_length,
> + GArray *table)
> +{
> + unsigned int i, j;
> +
> + /*
> + * ARM Processor Error Record
> + */
> +
> + /* Validation Bits */

Given nice naming, maybe drop the comments where the field
name makes it obvious?

> + build_append_int_noprefix(table, err.validation, 4);
> +
> + /* Error Info Num */
> + build_append_int_noprefix(table, err.err_info_num, 2);
> +
> + /* Context Info Num */
> + build_append_int_noprefix(table, err.context_info_num, 2);
> +
> + /* Section length */
> + build_append_int_noprefix(table, cper_length, 4);
> +
> + /* Error affinity level */
> + build_append_int_noprefix(table, err.affinity_level, 1);
> +
> + /* Reserved */
> + build_append_int_noprefix(table, 0, 3);
> +
> + /* MPIDR_EL1 */
> + build_append_int_noprefix(table, err.mpidr_el1, 8);
> +
> + /* MIDR_EL1 */
> + build_append_int_noprefix(table, err.midr_el1, 8);
> +
> + /* Running state */
> + build_append_int_noprefix(table, err.running_state, 4);
> +
> + /* PSCI state: only valid when running state is zero */
> + build_append_int_noprefix(table, err.psci_state, 4);
> +
> + for (i = 0; i < err.err_info_num; i++) {
> + /* ARM Propcessor error information */
> + /* Version */
> + build_append_int_noprefix(table, 0, 1);
> +
> + /* Length */
> + build_append_int_noprefix(table, ACPI_GHES_ARM_CPER_PEI_LENGTH, 1);
> +
> + /* Validation Bits */
> + build_append_int_noprefix(table, err.pei[i].validation, 2);
> +
> + /* Type */
> + build_append_int_noprefix(table, err.pei[i].type, 1);
> +
> + /* Multiple error count */
> + build_append_int_noprefix(table, err.pei[i].multiple_error, 2);
> +
> + /* Flags */
> + build_append_int_noprefix(table, err.pei[i].flags, 1);
> +
> + /* Error information */
> + build_append_int_noprefix(table, err.pei[i].error_info, 8);
> +
> + /* Virtual fault address */
> + build_append_int_noprefix(table, err.pei[i].virt_addr, 8);
> +
> + /* Physical fault address */
> + build_append_int_noprefix(table, err.pei[i].phy_addr, 8);
> + }
> +
> + for (i = 0; i < err.context_info_num; i++) {
> + /* ARM Propcessor error context information */
> + /* Version */
> + build_append_int_noprefix(table, 0, 2);
> +
> + /* Validation type */
> + build_append_int_noprefix(table, err.context[i].type, 2);
> +
> + /* Register array size */
> + build_append_int_noprefix(table, err.context[i].size * 8, 4);
> +
> + /* Register array (byte 8 of Context info) */
> + for (j = 0; j < err.context[i].size; j++) {
> + build_append_int_noprefix(table, err.context[i].array[j], 8);
> + }
> + }
> +
> + for (i = 0; i < err.vendor_num; i++) {
> + build_append_int_noprefix(table, err.vendor[i], 1);
> + }
> +}

...

> diff --git a/hw/arm/arm_error_inject.c b/hw/arm/arm_error_inject.c
> new file mode 100644
> index 000000000000..5ebbdf2b2adc
> --- /dev/null
> +++ b/hw/arm/arm_error_inject.c
> @@ -0,0 +1,420 @@
> +/*
> + * ARM Processor error injection
> + *
> + * Copyright(C) 2024 Huawei LTD.
> + *
> + * This code is licensed under the GPL version 2 or later. See the
> + * COPYING file in the top-level directory.
> + *
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qapi/error.h"
> +#include "hw/boards.h"
> +#include "hw/acpi/ghes.h"
> +#include "cpu.h"
> +
> +#define ACPI_GHES_ARM_CPER_CTX_DEFAULT_NREGS 74
> +
> +/* Handle ARM Processor Error Information (PEI) */
> +static const ArmProcessorErrorInformationList *default_pei = { 0 };
> +
> +static ArmPEI *qmp_arm_pei(uint16_t *err_info_num,
> + bool has_error,
> + ArmProcessorErrorInformationList const *error_list)
> +{
> + ArmProcessorErrorInformationList const *next;
> + ArmPeiValidationBitsList const *validation_list;
> + ArmPEI *pei = NULL;
> + uint16_t i;
> +
> + if (!has_error) {
> + error_list = default_pei;
> + }
> +
> + *err_info_num = 0;
> +
> + for (next = error_list; next; next = next->next) {
> + (*err_info_num)++;
> +
> + if (*err_info_num >= 255) {
> + break;
> + }
> + }
> +
> + pei = g_new0(ArmPEI, (*err_info_num));
> +
> + for (next = error_list, i = 0;
> + i < *err_info_num; i++, next = next->next) {
>
Odd alignment.

> +/* For ARM processor errors */
> +void qmp_arm_inject_error(bool has_validation,
> + ArmProcessorValidationBitsList *validation_list,
> + bool has_affinity_level,
> + uint8_t affinity_level,
> + bool has_mpidr_el1,
> + uint64_t mpidr_el1,
> + bool has_midr_el1,
> + uint64_t midr_el1,
> + bool has_running_state,
> + ArmProcessorRunningStateList *running_state_list,
> + bool has_psci_state,
> + uint32_t psci_state,
> + bool has_context,
> + ArmProcessorContextList *context_list,
> + bool has_vendor_specific,
> + uint8List *vendor_specific_list,
> + bool has_error,
> + ArmProcessorErrorInformationList *error_list,
> + Error **errp)
> +{
...

> +
> + if (error.context) {

No need for check. If context_info_num is zero their
won't be a loop iteration.

> + for (i = 0; i < error.context_info_num; i++) {
> + g_free(error.context[i].array);
> + }
> + }
> + g_free(error.context);
> + g_free(error.pei);
> + g_free(error.vendor);
> +
> + return;
> +}
> diff --git a/hw/arm/arm_error_inject_stubs.c b/hw/arm/arm_error_inject_stubs.c
> new file mode 100644
> index 000000000000..be6e8be2d0d9
> --- /dev/null
> +++ b/hw/arm/arm_error_inject_stubs.c
> @@ -0,0 +1,34 @@
> +/*
> + * QMP stub for ARM processor error injection.
> + *
> + * Copyright(C) 2024 Huawei LTD.
> + *
> + * This code is licensed under the GPL version 2 or later. See the
> + * COPYING file in the top-level directory.
> + *
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qapi/error.h"
> +#include "hw/acpi/ghes.h"
> +
> +void qmp_arm_inject_error(bool has_validation,
> + ArmProcessorValidationBitsList *validation,
> + bool has_affinity_level,
> + uint8_t affinity_level,
> + bool has_mpidr_el1,
> + uint64_t mpidr_el1,
> + bool has_midr_el1,
> + uint64_t midr_el1,
> + bool has_running_state,
> + ArmProcessorRunningStateList *running_state,
> + bool has_psci_state,
> + uint32_t psci_state,
> + bool has_context, ArmProcessorContextList *context,
> + bool has_vendor_specific, uint8List *vendor_specific,
> + bool has_error,
> + ArmProcessorErrorInformationList *error,
> + Error **errp)
> +{
> + error_setg(errp, "ARM processor error support is not compiled in");
> +}
Markus suggested:

> A target-specific command like this one should be conditional. Try
> this:
>
> { 'command': 'arm-inject-error',
> 'data': { 'errortypes': ['ArmProcessorErrorType'] },
> 'features': [ 'unstable' ],
> 'if': 'TARGET_ARM' }
>
> No need to provide a qmp_arm_inject_error() stub then.

(I noticed because never knew you could do this.)

Probably crossed with your v4 posting.

> diff --git a/include/hw/acpi/ghes.h b/include/hw/acpi/ghes.h
> index 4f1ab1a73a06..c591a5fb02c4 100644
> --- a/include/hw/acpi/ghes.h
> +++ b/include/hw/acpi/ghes.h

...

> +/* ARM processor - UEFI 2.10 table N.16 */
> +typedef struct ArmError {
> + uint16_t validation;
> +
> + uint8_t affinity_level;
> + uint64_t mpidr_el1;
> + uint64_t midr_el1;
> + uint32_t running_state;
> + uint32_t psci_state;
> +
> + /* Those are calculated based on the input data */
/* Calculated based on the input data */
> + uint16_t err_info_num;
> + uint16_t context_info_num;
> + uint32_t vendor_num;
> + uint32_t context_length;
> +
> + ArmPEI *pei;
> + ArmContext *context;
> + uint8_t *vendor;
> +} ArmError;