| Message ID | 20191111014048.21296-4-zhengxiang9@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add ARMv8 RAS virtualization support in QEMU | expand |
On Mon, 11 Nov 2019 09:40:45 +0800 Xiang Zheng <zhengxiang9@huawei.com> wrote: > From: Dongjiu Geng <gengdongjiu@huawei.com> > > This patch implements APEI GHES Table generation via fw_cfg blobs. Now > it only supports ARMv8 SEA, a type of GHESv2 error source. Afterwards, > we can extend the supported types if needed. For the CPER section, > currently it is memory section because kernel mainly wants userspace to > handle the memory errors. > > This patch follows the spec ACPI 6.2 to build the Hardware Error Source > table. For more detailed information, please refer to document: > docs/specs/acpi_hest_ghes.rst > > Suggested-by: Laszlo Ersek <lersek@redhat.com> > Signed-off-by: Dongjiu Geng <gengdongjiu@huawei.com> > Signed-off-by: Xiang Zheng <zhengxiang9@huawei.com> > Reviewed-by: Michael S. Tsirkin <mst@redhat.com> > --- > default-configs/arm-softmmu.mak | 1 + > hw/acpi/Kconfig | 4 + > hw/acpi/Makefile.objs | 1 + > hw/acpi/acpi_ghes.c | 267 ++++++++++++++++++++++++++++++++ > hw/acpi/aml-build.c | 2 + > hw/arm/virt-acpi-build.c | 12 ++ > include/hw/acpi/acpi_ghes.h | 56 +++++++ > include/hw/acpi/aml-build.h | 1 + > 8 files changed, 344 insertions(+) > create mode 100644 hw/acpi/acpi_ghes.c > create mode 100644 include/hw/acpi/acpi_ghes.h > > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak > index 1f2e0e7fde..5722f3130e 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -40,3 +40,4 @@ CONFIG_FSL_IMX25=y > CONFIG_FSL_IMX7=y > CONFIG_FSL_IMX6UL=y > CONFIG_SEMIHOSTING=y > +CONFIG_ACPI_APEI=y > diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig > index 12e3f1e86e..ed8c34d238 100644 > --- a/hw/acpi/Kconfig > +++ b/hw/acpi/Kconfig > @@ -23,6 +23,10 @@ config ACPI_NVDIMM > bool > depends on ACPI > > +config ACPI_APEI > + bool > + depends on ACPI > + > config ACPI_PCI > bool > depends on ACPI && PCI > diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs > index 655a9c1973..84474b0ca8 100644 > --- a/hw/acpi/Makefile.objs > +++ b/hw/acpi/Makefile.objs > @@ -5,6 +5,7 @@ common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o > common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o > common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o > common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o > +common-obj-$(CONFIG_ACPI_APEI) += acpi_ghes.o > common-obj-$(CONFIG_ACPI_VMGENID) += vmgenid.o > common-obj-$(CONFIG_ACPI_HW_REDUCED) += generic_event_device.o > common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o > diff --git a/hw/acpi/acpi_ghes.c b/hw/acpi/acpi_ghes.c > new file mode 100644 > index 0000000000..42c00ff3d3 > --- /dev/null > +++ b/hw/acpi/acpi_ghes.c > @@ -0,0 +1,267 @@ > +/* > + * Support for generating APEI tables and recording CPER for Guests > + * > + * Copyright (c) 2019 HUAWEI TECHNOLOGIES CO., LTD. > + * > + * Author: Dongjiu Geng <gengdongjiu@huawei.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + > + * You should have received a copy of the GNU General Public License along > + * with this program; if not, see <http://www.gnu.org/licenses/>. > + */ > + > +#include "qemu/osdep.h" > +#include "hw/acpi/acpi.h" > +#include "hw/acpi/aml-build.h" > +#include "hw/acpi/acpi_ghes.h" > +#include "hw/nvram/fw_cfg.h" > +#include "sysemu/sysemu.h" > +#include "qemu/error-report.h" > + > +#define ACPI_GHES_ERRORS_FW_CFG_FILE "etc/hardware_errors" > +#define ACPI_GHES_DATA_ADDR_FW_CFG_FILE "etc/hardware_errors_addr" > + > +/* > + * The size of Address field in Generic Address Structure. > + * ACPI 2.0/3.0: 5.2.3.1 Generic Address Structure. > + */ > +#define ACPI_GHES_ADDRESS_SIZE 8 there is not such thing as GHES_ADDRESS_SIZE. I'd just use sizeof(unit64_t), shorter and obvious value when seen at a call site > + > +/* The max size in bytes for one error block */ > +#define ACPI_GHES_MAX_RAW_DATA_LENGTH 0x1000 > + > +/* > + * Now only support ARMv8 SEA notification type error source > + */ maybe one line comment > +#define ACPI_GHES_ERROR_SOURCE_COUNT 1 > + > +/* > + * Generic Hardware Error Source version 2 > + */ ditto > +#define ACPI_GHES_SOURCE_GENERIC_ERROR_V2 10 > + > +/* > + * | +--------------------------+ 0 > + * | | Header | > + * | +--------------------------+ 40---+- > + * | | ................. | | > + * | | error_status_address-----+ 60 | > + * | | ................. | | > + * | | read_ack_register--------+ 104 92 > + * | | read_ack_preserve | | > + * | | read_ack_write | | > + * + +--------------------------+ 132--+- > + * > + * From above GHES definition, the error status address offset is 60; > + * the Read Ack Register offset is 104, the whole size of GHESv2 is 92 > + */ > + > +/* The error status address offset in GHES */ > +#define ACPI_GHES_ERROR_STATUS_ADDRESS_OFFSET(start_addr, n) (start_addr + \ > + 60 + offsetof(struct AcpiGenericAddress, address) + n * 92) > + > +/* The Read Ack Register offset in GHES */ > +#define ACPI_GHES_READ_ACK_REGISTER_ADDRESS_OFFSET(start_addr, n) (start_addr +\ > + 104 + offsetof(struct AcpiGenericAddress, address) + n * 92) drop this hunk, see below why > + > +typedef struct AcpiGhesState { > + uint64_t ghes_addr_le; > +} AcpiGhesState; > + > +/* > + * Hardware Error Notification > + * ACPI 4.0: 17.3.2.7 Hardware Error Notification add/ composes dummy Hardware Error Notification descriptor of specified type > + */ > +static void acpi_ghes_build_notify(GArray *table, const uint8_t type) typically format should be build_WHAT(), so build_ghes_hw_error_notification() And I'd move this out into its own patch. this applies to other trivial in-depended sub-tables, that take all data needed to construct them from supplied arguments. > +{ > + /* Type */ > + build_append_int_noprefix(table, type, 1); > + /* > + * Length: > + * Total length of the structure in bytes > + */ > + build_append_int_noprefix(table, 28, 1); > + /* Configuration Write Enable */ > + build_append_int_noprefix(table, 0, 2); > + /* Poll Interval */ > + build_append_int_noprefix(table, 0, 4); > + /* Vector */ > + build_append_int_noprefix(table, 0, 4); > + /* Switch To Polling Threshold Value */ > + build_append_int_noprefix(table, 0, 4); > + /* Switch To Polling Threshold Window */ > + build_append_int_noprefix(table, 0, 4); > + /* Error Threshold Value */ > + build_append_int_noprefix(table, 0, 4); > + /* Error Threshold Window */ > + build_append_int_noprefix(table, 0, 4); > +} > + /* Initialize "etc/hardware_errors" and "etc/hardware_errors_addr" fwcfg blobs. See docs/specs/acpi_hest_ghes.rst for blobs format */ > +void acpi_ghes_build_error_table(GArray *hardware_errors, BIOSLinker *linker) build_ghes_error_table() also I'd move this function into its own patch along with other related code that initializes and wires it into virt board. > +{ > + int i, error_status_block_offset; > + > + /* > + * | +--------------------------+ > + * | | error_block_address | > + * | | .......... | > + * | +--------------------------+ > + * | | read_ack_register | > + * | | ........... | > + * | +--------------------------+ > + * | | Error Status Data Block | > + * | | ........ | > + * | +--------------------------+ > + */ I'd drop this comment, acpi_hest_ghes.rst should be sufficient, if it's not then fix spec. For example it's not obvious from spec that "Error Status Data Block" immediately follows 'read_ack_register' > + > + /* Build error_block_address */ > + for (i = 0; i < ACPI_GHES_ERROR_SOURCE_COUNT; i++) { > + build_append_int_noprefix(hardware_errors, 0, ACPI_GHES_ADDRESS_SIZE); > + } > + > + /* Build read_ack_register */ > + for (i = 0; i < ACPI_GHES_ERROR_SOURCE_COUNT; i++) { > + /* > + * Initialize the value of read_ack_register to 1, so GHES can be > + * writeable in the first time. s/in the first time/after (re)boot/ > + * ACPI 6.2: 18.3.2.8 Generic Hardware Error Source version 2 > + * (GHESv2 - Type 10) > + */ > + build_append_int_noprefix(hardware_errors, 1, ACPI_GHES_ADDRESS_SIZE); > + } > + > + /* Generic Error Status Block offset in the hardware error fw_cfg blob */ > + error_status_block_offset = hardware_errors->len; > + > + /* Build Error Status Data Block */ /* reserve space for Error Status Data Block */ > + build_append_int_noprefix(hardware_errors, 0, > + ACPI_GHES_MAX_RAW_DATA_LENGTH * ACPI_GHES_ERROR_SOURCE_COUNT); this function is for integers only, if you just need to reserve space you can use acpi_data_push(). > + > + /* Allocate guest memory for the hardware error fw_cfg blob */ /* tell guest firmware to place hardware_errors blob into RAM */ > + bios_linker_loader_alloc(linker, ACPI_GHES_ERRORS_FW_CFG_FILE, > + hardware_errors, 1, false); > + > + for (i = 0; i < ACPI_GHES_ERROR_SOURCE_COUNT; i++) { > + /* > + * Patch the address of Error Status Data Block into > + * the error_block_address of hardware_errors fw_cfg blob Tell firmware to patch error_block_address entries to point to corresponding "Error Status Data Block" > + */ > + bios_linker_loader_add_pointer(linker, > + ACPI_GHES_ERRORS_FW_CFG_FILE, ACPI_GHES_ADDRESS_SIZE * i, > + ACPI_GHES_ADDRESS_SIZE, ACPI_GHES_ERRORS_FW_CFG_FILE, > + error_status_block_offset + i * ACPI_GHES_MAX_RAW_DATA_LENGTH); > + } > + > + /* > + * Write the address of hardware_errors blob into the > + * hardware_errors_addr fw_cfg blob. /* 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, ACPI_GHES_ADDRESS_SIZE, ACPI_GHES_ERRORS_FW_CFG_FILE, 0); > +} > + > +/* Build Hardware Error Source Table */ > +void acpi_ghes_build_hest(GArray *table_data, GArray *hardware_errors, > + BIOSLinker *linker) it's not GEST specific table, so build_hest() > +{ > + uint32_t hest_start = table_data->len; > + uint32_t source_id = 0; > + > + /* Hardware Error Source Table header*/ > + acpi_data_push(table_data, sizeof(AcpiTableHeader)); > + > + /* Error Source Count */ > + build_append_int_noprefix(table_data, ACPI_GHES_ERROR_SOURCE_COUNT, 4); > + this is the place where all error source structures will be enumerated. I'd move out GHESv2 specific coed into a separate function so that code here would look like this build_ghes_v2(...); > + /* > + * Type: > + * Generic Hardware Error Source version 2(GHESv2 - Type 10) > + */ > + build_append_int_noprefix(table_data, ACPI_GHES_SOURCE_GENERIC_ERROR_V2, 2); > + /* > + * Source Id > + * Once we support more than one hardware error sources, we need to > + * increase the value of this field. I'm not sure ^^^ is correct, according to spec it's just unique id per distinct error structure, so we just assign arbitrary values to each declared source and that never changes once assigned. For now I'd make source_id an enum with one member enum { ACPI_HEST_SRC_ID_SEA = 0, /* future ids go here */ ACPI_HEST_SRC_ID_RESERVED, } and use that instead of allocating magic 0 at the beginning of the function. build_ghes_v2(ACPI_HEST_GHES_SEA); Also add a comment to declaration that already assigned values are not to be changed > + */ > + build_append_int_noprefix(table_data, source_id, 2); > + /* Related Source Id */ > + build_append_int_noprefix(table_data, 0xffff, 2); > + /* Flags */ > + build_append_int_noprefix(table_data, 0, 1); > + /* Enabled */ > + build_append_int_noprefix(table_data, 1, 1); > + > + /* Number of Records To Pre-allocate */ > + build_append_int_noprefix(table_data, 1, 4); > + /* Max Sections Per Record */ > + build_append_int_noprefix(table_data, 1, 4); > + /* Max Raw Data Length */ > + build_append_int_noprefix(table_data, ACPI_GHES_MAX_RAW_DATA_LENGTH, 4); > + > + /* Error Status Address */ > + 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, > + ACPI_GHES_ERROR_STATUS_ADDRESS_OFFSET(hest_start, source_id), it's fine only if GHESv2 is the only entries in HEST, but once other types are added this macro will silently fall apart and cause table corruption. Instead of offset from hest_start, I suggest to use offset relative to GAS structure, here is an idea #define GAS_ADDR_OFFSET 4 off = table->len build_append_gas() bios_linker_loader_add_pointer(..., off + GAS_ADDR_OFFSET, ... > + ACPI_GHES_ADDRESS_SIZE, ACPI_GHES_ERRORS_FW_CFG_FILE, > + source_id * ACPI_GHES_ADDRESS_SIZE); > + > + /* > + * Notification Structure > + * Now only enable ARMv8 SEA notification type > + */ > + acpi_ghes_build_notify(table_data, ACPI_GHES_NOTIFY_SEA); > + > + /* Error Status Block Length */ > + build_append_int_noprefix(table_data, ACPI_GHES_MAX_RAW_DATA_LENGTH, 4); > + > + /* > + * Read Ack Register > + * ACPI 6.1: 18.3.2.8 Generic Hardware Error Source > + * version 2 (GHESv2 - Type 10) > + */ > + 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, > + ACPI_GHES_READ_ACK_REGISTER_ADDRESS_OFFSET(hest_start, 0), ditto > + ACPI_GHES_ADDRESS_SIZE, ACPI_GHES_ERRORS_FW_CFG_FILE, > + (ACPI_GHES_ERROR_SOURCE_COUNT + source_id) * ACPI_GHES_ADDRESS_SIZE); > + > + /* > + * Read Ack Preserve > + * We only provide the first bit in Read Ack Register to OSPM to write > + * while the other bits are preserved. > + */ > + build_append_int_noprefix(table_data, ~0x1ULL, 8); > + /* Read Ack Write */ > + build_append_int_noprefix(table_data, 0x1, 8); > + > + build_header(linker, table_data, (void *)(table_data->data + hest_start), > + "HEST", table_data->len - hest_start, 1, NULL, "GHES"); hest is not GHEST specific so s/GHES/NULL/ > +} > + > +static AcpiGhesState ges; > +void acpi_ghes_add_fw_cfg(FWCfgState *s, GArray *hardware_error) > +{ > + > + size_t size = 2 * ACPI_GHES_ADDRESS_SIZE + ACPI_GHES_MAX_RAW_DATA_LENGTH; > + size_t request_block_size = ACPI_GHES_ERROR_SOURCE_COUNT * size; > + > + /* Create a read-only fw_cfg file for GHES */ > + fw_cfg_add_file(s, ACPI_GHES_ERRORS_FW_CFG_FILE, hardware_error->data, > + request_block_size); > + > + /* Create a read-write fw_cfg file for Address */ > + fw_cfg_add_file_callback(s, ACPI_GHES_DATA_ADDR_FW_CFG_FILE, NULL, NULL, > + NULL, &ges.ghes_addr_le, sizeof(ges.ghes_addr_le), false); > +} > diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c > index 2c3702b882..3681ec6e3d 100644 > --- a/hw/acpi/aml-build.c > +++ b/hw/acpi/aml-build.c > @@ -1578,6 +1578,7 @@ void acpi_build_tables_init(AcpiBuildTables *tables) > tables->table_data = g_array_new(false, true /* clear */, 1); > tables->tcpalog = g_array_new(false, true /* clear */, 1); > tables->vmgenid = g_array_new(false, true /* clear */, 1); > + tables->hardware_errors = g_array_new(false, true /* clear */, 1); > tables->linker = bios_linker_loader_init(); > } > > @@ -1588,6 +1589,7 @@ void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre) > g_array_free(tables->table_data, true); > g_array_free(tables->tcpalog, mfre); > g_array_free(tables->vmgenid, mfre); > + g_array_free(tables->hardware_errors, mfre); > } > > /* > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index 4cd50175e0..1b1fd273e4 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -48,6 +48,7 @@ > #include "sysemu/reset.h" > #include "kvm_arm.h" > #include "migration/vmstate.h" > +#include "hw/acpi/acpi_ghes.h" > > #define ARM_SPI_BASE 32 > > @@ -825,6 +826,13 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) > acpi_add_table(table_offsets, tables_blob); > build_spcr(tables_blob, tables->linker, vms); > > + if (vms->ras) { > + acpi_add_table(table_offsets, tables_blob); > + acpi_ghes_build_error_table(tables->hardware_errors, tables->linker); > + acpi_ghes_build_hest(tables_blob, tables->hardware_errors, > + tables->linker); > + } > + > if (ms->numa_state->num_nodes > 0) { > acpi_add_table(table_offsets, tables_blob); > build_srat(tables_blob, tables->linker, vms); > @@ -942,6 +950,10 @@ void virt_acpi_setup(VirtMachineState *vms) > fw_cfg_add_file(vms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, tables.tcpalog->data, > acpi_data_len(tables.tcpalog)); > > + if (vms->ras) { > + acpi_ghes_add_fw_cfg(vms->fw_cfg, tables.hardware_errors); > + } > + > build_state->rsdp_mr = acpi_add_rom_blob(virt_acpi_build_update, > build_state, tables.rsdp, > ACPI_BUILD_RSDP_FILE, 0); > diff --git a/include/hw/acpi/acpi_ghes.h b/include/hw/acpi/acpi_ghes.h > new file mode 100644 > index 0000000000..cb62ec9c7b > --- /dev/null > +++ b/include/hw/acpi/acpi_ghes.h > @@ -0,0 +1,56 @@ > +/* > + * Support for generating APEI tables and recording CPER for Guests > + * > + * Copyright (c) 2019 HUAWEI TECHNOLOGIES CO., LTD. > + * > + * Author: Dongjiu Geng <gengdongjiu@huawei.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + > + * You should have received a copy of the GNU General Public License along > + * with this program; if not, see <http://www.gnu.org/licenses/>. > + */ > + > +#ifndef ACPI_GHES_H > +#define ACPI_GHES_H > + > +#include "hw/acpi/bios-linker-loader.h" > + > +/* > + * Values for Hardware Error Notification Type field > + */ > +enum AcpiGhesNotifyType { > + ACPI_GHES_NOTIFY_POLLED = 0, /* Polled */ > + ACPI_GHES_NOTIFY_EXTERNAL = 1, /* External Interrupt */ > + ACPI_GHES_NOTIFY_LOCAL = 2, /* Local Interrupt */ > + ACPI_GHES_NOTIFY_SCI = 3, /* SCI */ > + ACPI_GHES_NOTIFY_NMI = 4, /* NMI */ > + ACPI_GHES_NOTIFY_CMCI = 5, /* CMCI, ACPI 5.0: 18.3.2.7, Table 18-290 */ > + ACPI_GHES_NOTIFY_MCE = 6, /* MCE, ACPI 5.0: 18.3.2.7, Table 18-290 */ > + /* GPIO-Signal, ACPI 6.0: 18.3.2.7, Table 18-332 */ > + ACPI_GHES_NOTIFY_GPIO = 7, > + /* ARMv8 SEA, ACPI 6.1: 18.3.2.9, Table 18-345 */ > + ACPI_GHES_NOTIFY_SEA = 8, > + /* ARMv8 SEI, ACPI 6.1: 18.3.2.9, Table 18-345 */ > + ACPI_GHES_NOTIFY_SEI = 9, > + /* External Interrupt - GSIV, ACPI 6.1: 18.3.2.9, Table 18-345 */ > + ACPI_GHES_NOTIFY_GSIV = 10, > + /* Software Delegated Exception, ACPI 6.2: 18.3.2.9, Table 18-383 */ > + ACPI_GHES_NOTIFY_SDEI = 11, > + ACPI_GHES_NOTIFY_RESERVED = 12 /* 12 and greater are reserved */ > +}; maybe make all comment go on newline, otherwise zoo above look ugly > + > +void acpi_ghes_build_hest(GArray *table_data, GArray *hardware_error, > + BIOSLinker *linker); > + > +void acpi_ghes_build_error_table(GArray *hardware_errors, BIOSLinker *linker); > +void acpi_ghes_add_fw_cfg(FWCfgState *s, GArray *hardware_errors); > +#endif > diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h > index de4a406568..8f13620701 100644 > --- a/include/hw/acpi/aml-build.h > +++ b/include/hw/acpi/aml-build.h > @@ -220,6 +220,7 @@ struct AcpiBuildTables { > GArray *rsdp; > GArray *tcpalog; > GArray *vmgenid; > + GArray *hardware_errors; > BIOSLinker *linker; > } AcpiBuildTables; >
Hi,Igor, Thanks for you review and time. > >> + /* >> + * Type: >> + * Generic Hardware Error Source version 2(GHESv2 - Type 10) >> + */ >> + build_append_int_noprefix(table_data, ACPI_GHES_SOURCE_GENERIC_ERROR_V2, 2); >> + /* >> + * Source Id > >> + * Once we support more than one hardware error sources, we need to >> + * increase the value of this field. > I'm not sure ^^^ is correct, according to spec it's just unique id per > distinct error structure, so we just assign arbitrary values to each > declared source and that never changes once assigned. The source id is used to distinct the error source, for each source， the ‘source id’ is unique， but different source has different source id. for example, the 'source id' of the error source 0 is 0, the 'source id' of the error source 1 is 1. > > For now I'd make source_id an enum with one member > enum { > ACPI_HEST_SRC_ID_SEA = 0, > /* future ids go here */ > ACPI_HEST_SRC_ID_RESERVED, > } If we only have one error source, we can use enum instead of allocating magic 0. But if we have more error source , such as 10 error source. using enum maybe not a good idea. for example, if there are 10 error sources, I can just using below loop for(i=0; i< 10; i++) build_ghes_v2（source_id++）; > > and use that instead of allocating magic 0 at the beginning of the function. > build_ghes_v2(ACPI_HEST_GHES_SEA); > Also add a comment to declaration that already assigned values are not to be changed > >> + */ >> + build_append_int_noprefix(table_data, source_id, 2); >> + /* Related Source Id */ >> + build_append_int_noprefix(table_data, 0xffff, 2); >> + /* Flags */ >> + build_append_int_noprefix(table_data, 0, 1); >> + /* Enabled */ >> + build_append_int_noprefix(table_data, 1, 1); >> + >> + /* Number of Records To Pre-allocate */ >> + build_append_int_noprefix(table_data, 1, 4); >> + /* Max Sections Per Record */ >> + build_append_int_noprefix(table_data, 1, 4); >> + /* Max Raw Data Length */ >> + build_append_int_noprefix(table_data, ACPI_GHES_MAX_RAW_DATA_LENGTH, 4); >> + >> + /* Error Status Address */ >> + 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, >> + ACPI_GHES_ERROR_STATUS_ADDRESS_OFFSET(hest_start, source_id), > it's fine only if GHESv2 is the only entries in HEST, but once > other types are added this macro will silently fall apart and > cause table corruption. > > Instead of offset from hest_start, I suggest to use offset relative > to GAS structure, here is an idea > > #define GAS_ADDR_OFFSET 4 > > off = table->len > build_append_gas() > bios_linker_loader_add_pointer(..., > off + GAS_ADDR_OFFSET, ... I think your suggestion is good. > >> + ACPI_GHES_ADDRESS_SIZE, ACPI_GHES_ERRORS_FW_CFG_FILE, >> + source_id * ACPI_GHES_ADDRESS_SIZE); >> + >> + /* >> + * Notification Structure >> + * Now only enable ARMv8 SEA notification type >> + */ >> + acpi_ghes_build_notify(table_data, ACPI_GHES_NOTIFY_SEA); >> + >> + /* Error Status Block Length */ >> + build_append_int_noprefix(table_data, ACPI_GHES_MAX_RAW_DATA_LENGTH, 4); >> + >> + /* >> + * Read Ack Register >> + * ACPI 6.1: 18.3.2.8 Generic Hardware Error Source >> + * version 2 (GHESv2 - Type 10) >> + */ >> + 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, >> + ACPI_GHES_READ_ACK_REGISTER_ADDRESS_OFFSET(hest_start, 0), > ditto > >> + ACPI_GHES_ADDRESS_SIZE, ACPI_GHES_ERRORS_FW_CFG_FILE, >> + (ACPI_GHES_ERROR_SOURCE_COUNT + source_id) * ACPI_GHES_ADDRESS_SIZE); >> + >> + /* >> + * Read Ack Preserve >> + * We only provide the first bit in Read Ack Register to OSPM to write >> + * while the other bits are preserved. >> + */ >> + build_append_int_noprefix(table_data, ~0x1ULL, 8); >> + /* Read Ack Write */ >> + build_append_int_noprefix(table_data, 0x1, 8); >> + >> + build_header(linker, table_data, (void *)(table_data->data + hest_start), >> + "HEST", table_data->len - hest_start, 1, NULL, "GHES"); > hest is not GHEST specific so s/GHES/NULL/ > >> +} >> + >> +static AcpiGhesState ges; >> +void acpi_ghes_add_fw_cfg(FWCfgState *s, GArray *hardware_error) >> +{ >> + >> + size_t size = 2 * ACPI_GHES_ADDRESS_SIZE + ACPI_GHES_MAX_RAW_DATA_LENGTH; >> + size_t request_block_size = ACPI_GHES_ERROR_SOURCE_COUNT * size; >> + > >> + /* Create a read-only fw_cfg file for GHES */ >> + fw_cfg_add_file(s, ACPI_GHES_ERRORS_FW_CFG_FILE, hardware_error->data, >> + request_block_size); >> + >> + /* Create a read-write fw_cfg file for Address */ >> + fw_cfg_add_file_callback(s, ACPI_GHES_DATA_ADDR_FW_CFG_FILE, NULL, NULL, >> + NULL, &ges.ghes_addr_le, sizeof(ges.ghes_addr_le), false); >> +} >> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c >> index 2c3702b882..3681ec6e3d 100644 >> --- a/hw/acpi/aml-build.c >> +++ b/hw/acpi/aml-build.c >> @@ -1578,6 +1578,7 @@ void acpi_build_tables_init(AcpiBuildTables *tables) >> tables->table_data = g_array_new(false, true /* clear */, 1); >> tables->tcpalog = g_array_new(false, true /* clear */, 1); >> tables->vmgenid = g_array_new(false, true /* clear */, 1); >> + tables->hardware_errors = g_array_new(false, true /* clear */, 1); >> tables->linker = bios_linker_loader_init(); >> } >> >> @@ -1588,6 +1589,7 @@ void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre) >> g_array_free(tables->table_data, true); >> g_array_free(tables->tcpalog, mfre); >> g_array_free(tables->vmgenid, mfre); >> + g_array_free(tables->hardware_errors, mfre); >> } >> >> /* >> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c >> index 4cd50175e0..1b1fd273e4 100644 >> --- a/hw/arm/virt-acpi-build.c >> +++ b/hw/arm/virt-acpi-build.c >> @@ -48,6 +48,7 @@ >> #include "sysemu/reset.h" >> #include "kvm_arm.h" >> #include "migration/vmstate.h" >> +#include "hw/acpi/acpi_ghes.h" >> >> #define ARM_SPI_BASE 32 >> >> @@ -825,6 +826,13 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) >> acpi_add_table(table_offsets, tables_blob); >> build_spcr(tables_blob, tables->linker, vms); >> >> + if (vms->ras) { >> + acpi_add_table(table_offsets, tables_blob); >> + acpi_ghes_build_error_table(tables->hardware_errors, tables->linker); >> + acpi_ghes_build_hest(tables_blob, tables->hardware_errors, >> + tables->linker); >> + } >> + >> if (ms->numa_state->num_nodes > 0) { >> acpi_add_table(table_offsets, tables_blob); >> build_srat(tables_blob, tables->linker, vms); >> @@ -942,6 +950,10 @@ void virt_acpi_setup(VirtMachineState *vms) >> fw_cfg_add_file(vms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, tables.tcpalog->data, >> acpi_data_len(tables.tcpalog)); >> >> + if (vms->ras) { >> + acpi_ghes_add_fw_cfg(vms->fw_cfg, tables.hardware_errors); >> + } >> + >> build_state->rsdp_mr = acpi_add_rom_blob(virt_acpi_build_update, >> build_state, tables.rsdp, >> ACPI_BUILD_RSDP_FILE, 0); >> diff --git a/include/hw/acpi/acpi_ghes.h b/include/hw/acpi/acpi_ghes.h >> new file mode 100644 >> index 0000000000..cb62ec9c7b >> --- /dev/null >> +++ b/include/hw/acpi/acpi_ghes.h >> @@ -0,0 +1,56 @@ >> +/* >> + * Support for generating APEI tables and recording CPER for Guests >> + * >> + * Copyright (c) 2019 HUAWEI TECHNOLOGIES CO., LTD. >> + * >> + * Author: Dongjiu Geng <gengdongjiu@huawei.com> >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License as published by >> + * the Free Software Foundation; either version 2 of the License, or >> + * (at your option) any later version. >> + >> + * This program is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + >> + * You should have received a copy of the GNU General Public License along >> + * with this program; if not, see <http://www.gnu.org/licenses/>. >> + */ >> + >> +#ifndef ACPI_GHES_H >> +#define ACPI_GHES_H >> + >> +#include "hw/acpi/bios-linker-loader.h" >> + >> +/* >> + * Values for Hardware Error Notification Type field >> + */ >> +enum AcpiGhesNotifyType { >> + ACPI_GHES_NOTIFY_POLLED = 0, /* Polled */ >> + ACPI_GHES_NOTIFY_EXTERNAL = 1, /* External Interrupt */ >> + ACPI_GHES_NOTIFY_LOCAL = 2, /* Local Interrupt */ >> + ACPI_GHES_NOTIFY_SCI = 3, /* SCI */ >> + ACPI_GHES_NOTIFY_NMI = 4, /* NMI */ >> + ACPI_GHES_NOTIFY_CMCI = 5, /* CMCI, ACPI 5.0: 18.3.2.7, Table 18-290 */ >> + ACPI_GHES_NOTIFY_MCE = 6, /* MCE, ACPI 5.0: 18.3.2.7, Table 18-290 */ >> + /* GPIO-Signal, ACPI 6.0: 18.3.2.7, Table 18-332 */ >> + ACPI_GHES_NOTIFY_GPIO = 7, >> + /* ARMv8 SEA, ACPI 6.1: 18.3.2.9, Table 18-345 */ >> + ACPI_GHES_NOTIFY_SEA = 8, >> + /* ARMv8 SEI, ACPI 6.1: 18.3.2.9, Table 18-345 */ >> + ACPI_GHES_NOTIFY_SEI = 9, >> + /* External Interrupt - GSIV, ACPI 6.1: 18.3.2.9, Table 18-345 */ >> + ACPI_GHES_NOTIFY_GSIV = 10, >> + /* Software Delegated Exception, ACPI 6.2: 18.3.2.9, Table 18-383 */ >> + ACPI_GHES_NOTIFY_SDEI = 11, >> + ACPI_GHES_NOTIFY_RESERVED = 12 /* 12 and greater are reserved */ >> +}; > maybe make all comment go on newline, otherwise zoo above look ugly sure. > >> + >> +void acpi_ghes_build_hest(GArray *table_data, GArray *hardware_error, >> + BIOSLinker *linker); >> + >> +void acpi_ghes_build_error_table(GArray *hardware_errors, BIOSLinker *linker); >> +void acpi_ghes_add_fw_cfg(FWCfgState *s, GArray *hardware_errors); >> +#endif >> diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h >> index de4a406568..8f13620701 100644 >> --- a/include/hw/acpi/aml-build.h >> +++ b/include/hw/acpi/aml-build.h >> @@ -220,6 +220,7 @@ struct AcpiBuildTables { >> GArray *rsdp; >> GArray *tcpalog; >> GArray *vmgenid; >> + GArray *hardware_errors; >> BIOSLinker *linker; >> } AcpiBuildTables; >> > > . >
On 2019/11/18 20:49, gengdongjiu wrote: >>> + */ >>> + build_append_int_noprefix(table_data, source_id, 2); >>> + /* Related Source Id */ >>> + build_append_int_noprefix(table_data, 0xffff, 2); >>> + /* Flags */ >>> + build_append_int_noprefix(table_data, 0, 1); >>> + /* Enabled */ >>> + build_append_int_noprefix(table_data, 1, 1); >>> + >>> + /* Number of Records To Pre-allocate */ >>> + build_append_int_noprefix(table_data, 1, 4); >>> + /* Max Sections Per Record */ >>> + build_append_int_noprefix(table_data, 1, 4); >>> + /* Max Raw Data Length */ >>> + build_append_int_noprefix(table_data, ACPI_GHES_MAX_RAW_DATA_LENGTH, 4); >>> + >>> + /* Error Status Address */ >>> + 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, >>> + ACPI_GHES_ERROR_STATUS_ADDRESS_OFFSET(hest_start, source_id), >> it's fine only if GHESv2 is the only entries in HEST, but once >> other types are added this macro will silently fall apart and >> cause table corruption. why silently fall? I think the acpi_ghes.c only support GHESv2 type, not support other type. >> >> Instead of offset from hest_start, I suggest to use offset relative >> to GAS structure, here is an idea>> >> #define GAS_ADDR_OFFSET 4 >> >> off = table->len >> build_append_gas() >> bios_linker_loader_add_pointer(..., >> off + GAS_ADDR_OFFSET, ... If use offset relative to GAS structure, the code does not easily extend to support more Generic Hardware Error Source. if use offset relative to hest_start, just use a loop, the code can support more error source, for example: for (source_id = 0; i<n; source_id++) { ...... bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE, ACPI_GHES_ERROR_STATUS_ADDRESS_OFFSET(hest_start, source_id), sizeof(uint64_t), ACPI_GHES_ERRORS_FW_CFG_FILE, source_id * sizeof(uint64_t)); ....... } My previous series patch support 2 error sources, but now only enable 'SEA' type Error Source
On Mon, Nov 18, 2019 at 09:18:01PM +0800, gengdongjiu wrote: > On 2019/11/18 20:49, gengdongjiu wrote: > >>> + */ > >>> + build_append_int_noprefix(table_data, source_id, 2); > >>> + /* Related Source Id */ > >>> + build_append_int_noprefix(table_data, 0xffff, 2); > >>> + /* Flags */ > >>> + build_append_int_noprefix(table_data, 0, 1); > >>> + /* Enabled */ > >>> + build_append_int_noprefix(table_data, 1, 1); > >>> + > >>> + /* Number of Records To Pre-allocate */ > >>> + build_append_int_noprefix(table_data, 1, 4); > >>> + /* Max Sections Per Record */ > >>> + build_append_int_noprefix(table_data, 1, 4); > >>> + /* Max Raw Data Length */ > >>> + build_append_int_noprefix(table_data, ACPI_GHES_MAX_RAW_DATA_LENGTH, 4); > >>> + > >>> + /* Error Status Address */ > >>> + 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, > >>> + ACPI_GHES_ERROR_STATUS_ADDRESS_OFFSET(hest_start, source_id), > >> it's fine only if GHESv2 is the only entries in HEST, but once > >> other types are added this macro will silently fall apart and > >> cause table corruption. > why silently fall? > I think the acpi_ghes.c only support GHESv2 type, not support other type. > > >> > >> Instead of offset from hest_start, I suggest to use offset relative > >> to GAS structure, here is an idea>> > >> #define GAS_ADDR_OFFSET 4 > >> > >> off = table->len > >> build_append_gas() > >> bios_linker_loader_add_pointer(..., > >> off + GAS_ADDR_OFFSET, ... > > If use offset relative to GAS structure, the code does not easily extend to support more Generic Hardware Error Source. > if use offset relative to hest_start, just use a loop, the code can support more error source, for example: > for (source_id = 0; i<n; source_id++) > { > ...... > bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE, > ACPI_GHES_ERROR_STATUS_ADDRESS_OFFSET(hest_start, source_id), > sizeof(uint64_t), ACPI_GHES_ERRORS_FW_CFG_FILE, > source_id * sizeof(uint64_t)); > ....... > } > > My previous series patch support 2 error sources, but now only enable 'SEA' type Error Source I'd try to merge this, worry about extending things later. This is at v21 and the simpler you can keep things, the faster it'll go in.
On 2019/11/18 21:21, Michael S. Tsirkin wrote: >> If use offset relative to GAS structure, the code does not easily extend to support more Generic Hardware Error Source. >> if use offset relative to hest_start, just use a loop, the code can support more error source, for example: >> for (source_id = 0; i<n; source_id++) >> { >> ...... >> bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE, >> ACPI_GHES_ERROR_STATUS_ADDRESS_OFFSET(hest_start, source_id), >> sizeof(uint64_t), ACPI_GHES_ERRORS_FW_CFG_FILE, >> source_id * sizeof(uint64_t)); >> ....... >> } >> >> My previous series patch support 2 error sources, but now only enable 'SEA' type Error Source > I'd try to merge this, worry about extending things later. > This is at v21 and the simpler you can keep things, > the faster it'll go in. Thanks a lot for the comments. Yes, I think we can merge the v21 series.
Hi Xiang, On Mon, 11 Nov 2019 at 01:48, Xiang Zheng <zhengxiang9@huawei.com> wrote: > > From: Dongjiu Geng <gengdongjiu@huawei.com> > > This patch implements APEI GHES Table generation via fw_cfg blobs. Now > it only supports ARMv8 SEA, a type of GHESv2 error source. Afterwards, > we can extend the supported types if needed. For the CPER section, > currently it is memory section because kernel mainly wants userspace to > handle the memory errors. > > This patch follows the spec ACPI 6.2 to build the Hardware Error Source > table. For more detailed information, please refer to document: > docs/specs/acpi_hest_ghes.rst > > Suggested-by: Laszlo Ersek <lersek@redhat.com> > Signed-off-by: Dongjiu Geng <gengdongjiu@huawei.com> > Signed-off-by: Xiang Zheng <zhengxiang9@huawei.com> > Reviewed-by: Michael S. Tsirkin <mst@redhat.com> > --- > default-configs/arm-softmmu.mak | 1 + > hw/acpi/Kconfig | 4 + > hw/acpi/Makefile.objs | 1 + > hw/acpi/acpi_ghes.c | 267 ++++++++++++++++++++++++++++++++ > hw/acpi/aml-build.c | 2 + > hw/arm/virt-acpi-build.c | 12 ++ > include/hw/acpi/acpi_ghes.h | 56 +++++++ > include/hw/acpi/aml-build.h | 1 + > 8 files changed, 344 insertions(+) > create mode 100644 hw/acpi/acpi_ghes.c > create mode 100644 include/hw/acpi/acpi_ghes.h > > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak > index 1f2e0e7fde..5722f3130e 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -40,3 +40,4 @@ CONFIG_FSL_IMX25=y > CONFIG_FSL_IMX7=y > CONFIG_FSL_IMX6UL=y > CONFIG_SEMIHOSTING=y > +CONFIG_ACPI_APEI=y > diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig > index 12e3f1e86e..ed8c34d238 100644 > --- a/hw/acpi/Kconfig > +++ b/hw/acpi/Kconfig > @@ -23,6 +23,10 @@ config ACPI_NVDIMM > bool > depends on ACPI > > +config ACPI_APEI > + bool > + depends on ACPI > + > config ACPI_PCI > bool > depends on ACPI && PCI > diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs > index 655a9c1973..84474b0ca8 100644 > --- a/hw/acpi/Makefile.objs > +++ b/hw/acpi/Makefile.objs > @@ -5,6 +5,7 @@ common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o > common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o > common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o > common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o > +common-obj-$(CONFIG_ACPI_APEI) += acpi_ghes.o Minor: The 'acpi' prefix could be dropped - it does not seem to be used for other files (self impliend by the dir name). This also applies to most of the naming within this patch > common-obj-$(CONFIG_ACPI_VMGENID) += vmgenid.o > common-obj-$(CONFIG_ACPI_HW_REDUCED) += generic_event_device.o > common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o > diff --git a/hw/acpi/acpi_ghes.c b/hw/acpi/acpi_ghes.c > new file mode 100644 > index 0000000000..42c00ff3d3 > --- /dev/null > +++ b/hw/acpi/acpi_ghes.c > @@ -0,0 +1,267 @@ > +/* > + * Support for generating APEI tables and recording CPER for Guests > + * > + * Copyright (c) 2019 HUAWEI TECHNOLOGIES CO., LTD. > + * > + * Author: Dongjiu Geng <gengdongjiu@huawei.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + > + * You should have received a copy of the GNU General Public License along > + * with this program; if not, see <http://www.gnu.org/licenses/>. > + */ > + > +#include "qemu/osdep.h" > +#include "hw/acpi/acpi.h" > +#include "hw/acpi/aml-build.h" > +#include "hw/acpi/acpi_ghes.h" > +#include "hw/nvram/fw_cfg.h" > +#include "sysemu/sysemu.h" > +#include "qemu/error-report.h" > + > +#define ACPI_GHES_ERRORS_FW_CFG_FILE "etc/hardware_errors" > +#define ACPI_GHES_DATA_ADDR_FW_CFG_FILE "etc/hardware_errors_addr" > + > +/* > + * The size of Address field in Generic Address Structure. > + * ACPI 2.0/3.0: 5.2.3.1 Generic Address Structure. > + */ > +#define ACPI_GHES_ADDRESS_SIZE 8 > + As already mentioned, you can safely drop this and use sizeof(unit64_t). > +/* The max size in bytes for one error block */ > +#define ACPI_GHES_MAX_RAW_DATA_LENGTH 0x1000 > + > +/* > + * 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 Minor: this is actually a type so would be good if the name would reflect that somehow...... > + > +/* > + * | +--------------------------+ 0 > + * | | Header | > + * | +--------------------------+ 40---+- > + * | | ................. | | > + * | | error_status_address-----+ 60 | > + * | | ................. | | > + * | | read_ack_register--------+ 104 92 > + * | | read_ack_preserve | | > + * | | read_ack_write | | > + * + +--------------------------+ 132--+- > + * > + * From above GHES definition, the error status address offset is 60; > + * the Read Ack Register offset is 104, the whole size of GHESv2 is 92 > + */ > + This could potentially land into the doc instead. Also the GHEST is actually part of HEST so your offsets are for HEST not GHEST itself so the comment might be slightly misleading > +/* The error status address offset in GHES */ > +#define ACPI_GHES_ERROR_STATUS_ADDRESS_OFFSET(start_addr, n) (start_addr + \ > + 60 + offsetof(struct AcpiGenericAddress, address) + n * 92) > + > +/* The Read Ack Register offset in GHES */ > +#define ACPI_GHES_READ_ACK_REGISTER_ADDRESS_OFFSET(start_addr, n) (start_addr +\ > + 104 + offsetof(struct AcpiGenericAddress, address) + n * 92) > + > +typedef struct AcpiGhesState { > + uint64_t ghes_addr_le; > +} AcpiGhesState; > + Minor: Why AcpiGhes*State* ? And do we need the struct to track single address? > +/* > + * Hardware Error Notification > + * ACPI 4.0: 17.3.2.7 Hardware Error Notification > + */ You are referencing older spec here. The commit message states 6.2 version. Not to mention that 4.0 did not support ARMv8 SEA source. You should not mention sections that do not correspond to the spec the patch is based on. > +static void acpi_ghes_build_notify(GArray *table, const uint8_t type) As it has already been mentioned - the naming here could follow the existing convention. Also this function is creating Hardware Error Notification table which is not necessarily tightly connected to GHES Similarly this applies to the overall naming used within this patch. > +{ > + /* Type */ > + build_append_int_noprefix(table, type, 1); > + /* > + * Length: > + * Total length of the structure in bytes > + */ > + build_append_int_noprefix(table, 28, 1); > + /* Configuration Write Enable */ > + build_append_int_noprefix(table, 0, 2); > + /* Poll Interval */ > + build_append_int_noprefix(table, 0, 4); > + /* Vector */ > + build_append_int_noprefix(table, 0, 4); > + /* Switch To Polling Threshold Value */ > + build_append_int_noprefix(table, 0, 4); > + /* Switch To Polling Threshold Window */ > + build_append_int_noprefix(table, 0, 4); > + /* Error Threshold Value */ > + build_append_int_noprefix(table, 0, 4); > + /* Error Threshold Window */ > + build_append_int_noprefix(table, 0, 4); Most of those fields are being set to the same single value. Why not covering it all in one go ? > +} > + > +/* Build table for the hardware error fw_cfg blob */ > +void acpi_ghes_build_error_table(GArray *hardware_errors, BIOSLinker *linker) > +{ > + int i, error_status_block_offset; > + > + /* > + * | +--------------------------+ > + * | | error_block_address | > + * | | .......... | > + * | +--------------------------+ > + * | | read_ack_register | > + * | | ........... | > + * | +--------------------------+ > + * | | Error Status Data Block | > + * | | ........ | > + * | +--------------------------+ > + */ > + > + /* Build error_block_address */ > + for (i = 0; i < ACPI_GHES_ERROR_SOURCE_COUNT; i++) { > + build_append_int_noprefix(hardware_errors, 0, ACPI_GHES_ADDRESS_SIZE); > + } > + > + /* Build read_ack_register */ > + for (i = 0; i < ACPI_GHES_ERROR_SOURCE_COUNT; i++) { > + /* > + * Initialize the value of read_ack_register to 1, so GHES can be > + * writeable in the first time. > + * ACPI 6.2: 18.3.2.8 Generic Hardware Error Source version 2 > + * (GHESv2 - Type 10) > + */ > + build_append_int_noprefix(hardware_errors, 1, ACPI_GHES_ADDRESS_SIZE); This is a bit of a simplification (justified to some extent) but this should take into account both Read Ack Preserve and Read Ack Write masks..... or having at least a comment would be good Also the above implies support only for GHESTv2 (the 'Ack' regs are GHESv2 specific) still this is iterating over potentially available/supported hw error sources At this point it is ok but if the support gets extended this will not be valid - managing 'Ack' regs should be properly guarded for GHESv2 .. > + } > + > + /* Generic Error Status Block offset in the hardware error fw_cfg blob */ > + error_status_block_offset = hardware_errors->len; > + > + /* Build Error Status Data Block */ > + build_append_int_noprefix(hardware_errors, 0, > + ACPI_GHES_MAX_RAW_DATA_LENGTH * ACPI_GHES_ERROR_SOURCE_COUNT); > + > + /* Allocate guest memory for the hardware error fw_cfg blob */ > + bios_linker_loader_alloc(linker, ACPI_GHES_ERRORS_FW_CFG_FILE, > + hardware_errors, 1, false); > + > + for (i = 0; i < ACPI_GHES_ERROR_SOURCE_COUNT; i++) { > + /* > + * Patch the address of Error Status Data Block into > + * the error_block_address of hardware_errors fw_cfg blob > + */ > + bios_linker_loader_add_pointer(linker, > + ACPI_GHES_ERRORS_FW_CFG_FILE, ACPI_GHES_ADDRESS_SIZE * i, > + ACPI_GHES_ADDRESS_SIZE, ACPI_GHES_ERRORS_FW_CFG_FILE, > + error_status_block_offset + i * ACPI_GHES_MAX_RAW_DATA_LENGTH); > + } > + > + /* > + * Write the address of hardware_errors fw_cfg blob into the > + * hardware_errors_addr fw_cfg blob. > + */ > + bios_linker_loader_write_pointer(linker, ACPI_GHES_DATA_ADDR_FW_CFG_FILE, > + 0, ACPI_GHES_ADDRESS_SIZE, ACPI_GHES_ERRORS_FW_CFG_FILE, 0); > +} > + > +/* Build Hardware Error Source Table */ > +void acpi_ghes_build_hest(GArray *table_data, GArray *hardware_errors, > + BIOSLinker *linker) > +{ > + uint32_t hest_start = table_data->len; > + uint32_t source_id = 0; > + > + /* Hardware Error Source Table header*/ > + acpi_data_push(table_data, sizeof(AcpiTableHeader)); > + > + /* Error Source Count */ > + build_append_int_noprefix(table_data, ACPI_GHES_ERROR_SOURCE_COUNT, 4); > + > + /* > + * Type: > + * Generic Hardware Error Source version 2(GHESv2 - Type 10) > + */ > + build_append_int_noprefix(table_data, ACPI_GHES_SOURCE_GENERIC_ERROR_V2, 2); > + /* > + * Source Id > + * Once we support more than one hardware error sources, we need to > + * increase the value of this field. > + */ > + build_append_int_noprefix(table_data, source_id, 2); > + /* Related Source Id */ > + build_append_int_noprefix(table_data, 0xffff, 2); Would be nice to have a comment on the value used -> 'no alternate sources' > + /* Flags */ > + build_append_int_noprefix(table_data, 0, 1); > + /* Enabled */ > + build_append_int_noprefix(table_data, 1, 1); > + > + /* Number of Records To Pre-allocate */ > + build_append_int_noprefix(table_data, 1, 4); > + /* Max Sections Per Record */ > + build_append_int_noprefix(table_data, 1, 4); > + /* Max Raw Data Length */ > + build_append_int_noprefix(table_data, ACPI_GHES_MAX_RAW_DATA_LENGTH, 4); > + > + /* Error Status Address */ > + 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, > + ACPI_GHES_ERROR_STATUS_ADDRESS_OFFSET(hest_start, source_id), > + ACPI_GHES_ADDRESS_SIZE, ACPI_GHES_ERRORS_FW_CFG_FILE, > + source_id * ACPI_GHES_ADDRESS_SIZE); > + > + /* > + * Notification Structure > + * Now only enable ARMv8 SEA notification type > + */ > + acpi_ghes_build_notify(table_data, ACPI_GHES_NOTIFY_SEA); > + > + /* Error Status Block Length */ > + build_append_int_noprefix(table_data, ACPI_GHES_MAX_RAW_DATA_LENGTH, 4); > + > + /* > + * Read Ack Register > + * ACPI 6.1: 18.3.2.8 Generic Hardware Error Source > + * version 2 (GHESv2 - Type 10) > + */ > + 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, > + ACPI_GHES_READ_ACK_REGISTER_ADDRESS_OFFSET(hest_start, 0), > + ACPI_GHES_ADDRESS_SIZE, ACPI_GHES_ERRORS_FW_CFG_FILE, > + (ACPI_GHES_ERROR_SOURCE_COUNT + source_id) * ACPI_GHES_ADDRESS_SIZE); > + > + /* > + * Read Ack Preserve > + * We only provide the first bit in Read Ack Register to OSPM to write > + * while the other bits are preserved. > + */ > + build_append_int_noprefix(table_data, ~0x1ULL, 8); > + /* Read Ack Write */ > + build_append_int_noprefix(table_data, 0x1, 8); > + > + build_header(linker, table_data, (void *)(table_data->data + hest_start), > + "HEST", table_data->len - hest_start, 1, NULL, "GHES"); > +} > + Already mentioned .... but ... the last few lines are GHESv2 specific but it seems that HES/GHES/GHESv2 are being mixed within this patch. Would be nice if those could be separated to easy future extensions BR Beata > +static AcpiGhesState ges; > +void acpi_ghes_add_fw_cfg(FWCfgState *s, GArray *hardware_error) > +{ > + > + size_t size = 2 * ACPI_GHES_ADDRESS_SIZE + ACPI_GHES_MAX_RAW_DATA_LENGTH; > + size_t request_block_size = ACPI_GHES_ERROR_SOURCE_COUNT * size; > + > + /* Create a read-only fw_cfg file for GHES */ > + fw_cfg_add_file(s, ACPI_GHES_ERRORS_FW_CFG_FILE, hardware_error->data, > + request_block_size); > + > + /* Create a read-write fw_cfg file for Address */ > + fw_cfg_add_file_callback(s, ACPI_GHES_DATA_ADDR_FW_CFG_FILE, NULL, NULL, > + NULL, &ges.ghes_addr_le, sizeof(ges.ghes_addr_le), false); > +} > diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c > index 2c3702b882..3681ec6e3d 100644 > --- a/hw/acpi/aml-build.c > +++ b/hw/acpi/aml-build.c > @@ -1578,6 +1578,7 @@ void acpi_build_tables_init(AcpiBuildTables *tables) > tables->table_data = g_array_new(false, true /* clear */, 1); > tables->tcpalog = g_array_new(false, true /* clear */, 1); > tables->vmgenid = g_array_new(false, true /* clear */, 1); > + tables->hardware_errors = g_array_new(false, true /* clear */, 1); > tables->linker = bios_linker_loader_init(); > } > > @@ -1588,6 +1589,7 @@ void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre) > g_array_free(tables->table_data, true); > g_array_free(tables->tcpalog, mfre); > g_array_free(tables->vmgenid, mfre); > + g_array_free(tables->hardware_errors, mfre); > } > > /* > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index 4cd50175e0..1b1fd273e4 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -48,6 +48,7 @@ > #include "sysemu/reset.h" > #include "kvm_arm.h" > #include "migration/vmstate.h" > +#include "hw/acpi/acpi_ghes.h" > > #define ARM_SPI_BASE 32 > > @@ -825,6 +826,13 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) > acpi_add_table(table_offsets, tables_blob); > build_spcr(tables_blob, tables->linker, vms); > > + if (vms->ras) { > + acpi_add_table(table_offsets, tables_blob); > + acpi_ghes_build_error_table(tables->hardware_errors, tables->linker); > + acpi_ghes_build_hest(tables_blob, tables->hardware_errors, > + tables->linker); > + } > + > if (ms->numa_state->num_nodes > 0) { > acpi_add_table(table_offsets, tables_blob); > build_srat(tables_blob, tables->linker, vms); > @@ -942,6 +950,10 @@ void virt_acpi_setup(VirtMachineState *vms) > fw_cfg_add_file(vms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, tables.tcpalog->data, > acpi_data_len(tables.tcpalog)); > > + if (vms->ras) { > + acpi_ghes_add_fw_cfg(vms->fw_cfg, tables.hardware_errors); > + } > + > build_state->rsdp_mr = acpi_add_rom_blob(virt_acpi_build_update, > build_state, tables.rsdp, > ACPI_BUILD_RSDP_FILE, 0); > diff --git a/include/hw/acpi/acpi_ghes.h b/include/hw/acpi/acpi_ghes.h > new file mode 100644 > index 0000000000..cb62ec9c7b > --- /dev/null > +++ b/include/hw/acpi/acpi_ghes.h > @@ -0,0 +1,56 @@ > +/* > + * Support for generating APEI tables and recording CPER for Guests > + * > + * Copyright (c) 2019 HUAWEI TECHNOLOGIES CO., LTD. > + * > + * Author: Dongjiu Geng <gengdongjiu@huawei.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + > + * You should have received a copy of the GNU General Public License along > + * with this program; if not, see <http://www.gnu.org/licenses/>. > + */ > + > +#ifndef ACPI_GHES_H > +#define ACPI_GHES_H > + > +#include "hw/acpi/bios-linker-loader.h" > + > +/* > + * Values for Hardware Error Notification Type field > + */ > +enum AcpiGhesNotifyType { > + ACPI_GHES_NOTIFY_POLLED = 0, /* Polled */ > + ACPI_GHES_NOTIFY_EXTERNAL = 1, /* External Interrupt */ > + ACPI_GHES_NOTIFY_LOCAL = 2, /* Local Interrupt */ > + ACPI_GHES_NOTIFY_SCI = 3, /* SCI */ > + ACPI_GHES_NOTIFY_NMI = 4, /* NMI */ > + ACPI_GHES_NOTIFY_CMCI = 5, /* CMCI, ACPI 5.0: 18.3.2.7, Table 18-290 */ > + ACPI_GHES_NOTIFY_MCE = 6, /* MCE, ACPI 5.0: 18.3.2.7, Table 18-290 */ > + /* GPIO-Signal, ACPI 6.0: 18.3.2.7, Table 18-332 */ > + ACPI_GHES_NOTIFY_GPIO = 7, > + /* ARMv8 SEA, ACPI 6.1: 18.3.2.9, Table 18-345 */ > + ACPI_GHES_NOTIFY_SEA = 8, > + /* ARMv8 SEI, ACPI 6.1: 18.3.2.9, Table 18-345 */ > + ACPI_GHES_NOTIFY_SEI = 9, > + /* External Interrupt - GSIV, ACPI 6.1: 18.3.2.9, Table 18-345 */ > + ACPI_GHES_NOTIFY_GSIV = 10, > + /* Software Delegated Exception, ACPI 6.2: 18.3.2.9, Table 18-383 */ > + ACPI_GHES_NOTIFY_SDEI = 11, > + ACPI_GHES_NOTIFY_RESERVED = 12 /* 12 and greater are reserved */ > +}; > + > +void acpi_ghes_build_hest(GArray *table_data, GArray *hardware_error, > + BIOSLinker *linker); > + > +void acpi_ghes_build_error_table(GArray *hardware_errors, BIOSLinker *linker); > +void acpi_ghes_add_fw_cfg(FWCfgState *s, GArray *hardware_errors); > +#endif > diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h > index de4a406568..8f13620701 100644 > --- a/include/hw/acpi/aml-build.h > +++ b/include/hw/acpi/aml-build.h > @@ -220,6 +220,7 @@ struct AcpiBuildTables { > GArray *rsdp; > GArray *tcpalog; > GArray *vmgenid; > + GArray *hardware_errors; > BIOSLinker *linker; > } AcpiBuildTables; > > -- > 2.19.1 > > >
Hi, On Mon, 18 Nov 2019 at 12:50, gengdongjiu <gengdongjiu@huawei.com> wrote: > > Hi,Igor, > Thanks for you review and time. > > > > >> + /* > >> + * Type: > >> + * Generic Hardware Error Source version 2(GHESv2 - Type 10) > >> + */ > >> + build_append_int_noprefix(table_data, ACPI_GHES_SOURCE_GENERIC_ERROR_V2, 2); > >> + /* > >> + * Source Id > > > >> + * Once we support more than one hardware error sources, we need to > >> + * increase the value of this field. > > I'm not sure ^^^ is correct, according to spec it's just unique id per > > distinct error structure, so we just assign arbitrary values to each > > declared source and that never changes once assigned. > The source id is used to distinct the error source, for each source， the ‘source id’ is unique， > but different source has different source id. for example, the 'source id' of the error source 0 is 0, > the 'source id' of the error source 1 is 1. > I might be wrong but the source id is not a sequence number and it can have any value as long as it is unique and the comment 're 'increasing the number' reads bit wrong. > > > > > For now I'd make source_id an enum with one member > > enum { > > ACPI_HEST_SRC_ID_SEA = 0, > > /* future ids go here */ > > ACPI_HEST_SRC_ID_RESERVED, > > } > If we only have one error source, we can use enum instead of allocating magic 0. > But if we have more error source , such as 10 error source. using enum maybe not a good idea. > > for example, if there are 10 error sources, I can just using below loop > > for(i=0; i< 10; i++) > build_ghes_v2（source_id++）; > You can do that but using enum makes it more readable and maintainable. Also you can keep the source id as a sequence number but still represent that with enum, as it has been suggested, and use the 'RESERVED' field for loop control. I think it might be also worth to represent the HES type as enum as well : enum{ ACPI_HES_TYPE_GHESv2 = 10, }; > > > > and use that instead of allocating magic 0 at the beginning of the function. > > build_ghes_v2(ACPI_HEST_GHES_SEA); > > Also add a comment to declaration that already assigned values are not to be changed > > > >> + */ > >> + build_append_int_noprefix(table_data, source_id, 2); > >> + /* Related Source Id */ > >> + build_append_int_noprefix(table_data, 0xffff, 2); > >> + /* Flags */ > >> + build_append_int_noprefix(table_data, 0, 1); > >> + /* Enabled */ > >> + build_append_int_noprefix(table_data, 1, 1); > >> + > >> + /* Number of Records To Pre-allocate */ > >> + build_append_int_noprefix(table_data, 1, 4); > >> + /* Max Sections Per Record */ > >> + build_append_int_noprefix(table_data, 1, 4); > >> + /* Max Raw Data Length */ > >> + build_append_int_noprefix(table_data, ACPI_GHES_MAX_RAW_DATA_LENGTH, 4); > >> + > >> + /* Error Status Address */ > >> + 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, > >> + ACPI_GHES_ERROR_STATUS_ADDRESS_OFFSET(hest_start, source_id), > > it's fine only if GHESv2 is the only entries in HEST, but once > > other types are added this macro will silently fall apart and > > cause table corruption. > > > > Instead of offset from hest_start, I suggest to use offset relative > > to GAS structure, here is an idea > > > > #define GAS_ADDR_OFFSET 4 > > > > off = table->len > > build_append_gas() > > bios_linker_loader_add_pointer(..., > > off + GAS_ADDR_OFFSET, ... > I think your suggestion is good. > > > > >> + ACPI_GHES_ADDRESS_SIZE, ACPI_GHES_ERRORS_FW_CFG_FILE, > >> + source_id * ACPI_GHES_ADDRESS_SIZE); > >> + > >> + /* > >> + * Notification Structure > >> + * Now only enable ARMv8 SEA notification type > >> + */ > >> + acpi_ghes_build_notify(table_data, ACPI_GHES_NOTIFY_SEA); > >> + > >> + /* Error Status Block Length */ > >> + build_append_int_noprefix(table_data, ACPI_GHES_MAX_RAW_DATA_LENGTH, 4); > >> + > >> + /* > >> + * Read Ack Register > >> + * ACPI 6.1: 18.3.2.8 Generic Hardware Error Source > >> + * version 2 (GHESv2 - Type 10) > >> + */ > >> + 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, > >> + ACPI_GHES_READ_ACK_REGISTER_ADDRESS_OFFSET(hest_start, 0), > > ditto > > > >> + ACPI_GHES_ADDRESS_SIZE, ACPI_GHES_ERRORS_FW_CFG_FILE, > >> + (ACPI_GHES_ERROR_SOURCE_COUNT + source_id) * ACPI_GHES_ADDRESS_SIZE); > >> + > >> + /* > >> + * Read Ack Preserve > >> + * We only provide the first bit in Read Ack Register to OSPM to write > >> + * while the other bits are preserved. > >> + */ > >> + build_append_int_noprefix(table_data, ~0x1ULL, 8); > >> + /* Read Ack Write */ > >> + build_append_int_noprefix(table_data, 0x1, 8); > >> + > >> + build_header(linker, table_data, (void *)(table_data->data + hest_start), > >> + "HEST", table_data->len - hest_start, 1, NULL, "GHES"); > > hest is not GHEST specific so s/GHES/NULL/ > > > >> +} > >> + > >> +static AcpiGhesState ges; > >> +void acpi_ghes_add_fw_cfg(FWCfgState *s, GArray *hardware_error) > >> +{ > >> + > >> + size_t size = 2 * ACPI_GHES_ADDRESS_SIZE + ACPI_GHES_MAX_RAW_DATA_LENGTH; > >> + size_t request_block_size = ACPI_GHES_ERROR_SOURCE_COUNT * size; > >> + > > > >> + /* Create a read-only fw_cfg file for GHES */ > >> + fw_cfg_add_file(s, ACPI_GHES_ERRORS_FW_CFG_FILE, hardware_error->data, > >> + request_block_size); > >> + > >> + /* Create a read-write fw_cfg file for Address */ > >> + fw_cfg_add_file_callback(s, ACPI_GHES_DATA_ADDR_FW_CFG_FILE, NULL, NULL, > >> + NULL, &ges.ghes_addr_le, sizeof(ges.ghes_addr_le), false); > >> +} > >> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c > >> index 2c3702b882..3681ec6e3d 100644 > >> --- a/hw/acpi/aml-build.c > >> +++ b/hw/acpi/aml-build.c > >> @@ -1578,6 +1578,7 @@ void acpi_build_tables_init(AcpiBuildTables *tables) > >> tables->table_data = g_array_new(false, true /* clear */, 1); > >> tables->tcpalog = g_array_new(false, true /* clear */, 1); > >> tables->vmgenid = g_array_new(false, true /* clear */, 1); > >> + tables->hardware_errors = g_array_new(false, true /* clear */, 1); > >> tables->linker = bios_linker_loader_init(); > >> } > >> > >> @@ -1588,6 +1589,7 @@ void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre) > >> g_array_free(tables->table_data, true); > >> g_array_free(tables->tcpalog, mfre); > >> g_array_free(tables->vmgenid, mfre); > >> + g_array_free(tables->hardware_errors, mfre); > >> } > >> > >> /* > >> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > >> index 4cd50175e0..1b1fd273e4 100644 > >> --- a/hw/arm/virt-acpi-build.c > >> +++ b/hw/arm/virt-acpi-build.c > >> @@ -48,6 +48,7 @@ > >> #include "sysemu/reset.h" > >> #include "kvm_arm.h" > >> #include "migration/vmstate.h" > >> +#include "hw/acpi/acpi_ghes.h" > >> > >> #define ARM_SPI_BASE 32 > >> > >> @@ -825,6 +826,13 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) > >> acpi_add_table(table_offsets, tables_blob); > >> build_spcr(tables_blob, tables->linker, vms); > >> > >> + if (vms->ras) { > >> + acpi_add_table(table_offsets, tables_blob); > >> + acpi_ghes_build_error_table(tables->hardware_errors, tables->linker); > >> + acpi_ghes_build_hest(tables_blob, tables->hardware_errors, > >> + tables->linker); > >> + } > >> + > >> if (ms->numa_state->num_nodes > 0) { > >> acpi_add_table(table_offsets, tables_blob); > >> build_srat(tables_blob, tables->linker, vms); > >> @@ -942,6 +950,10 @@ void virt_acpi_setup(VirtMachineState *vms) > >> fw_cfg_add_file(vms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, tables.tcpalog->data, > >> acpi_data_len(tables.tcpalog)); > >> > >> + if (vms->ras) { > >> + acpi_ghes_add_fw_cfg(vms->fw_cfg, tables.hardware_errors); > >> + } > >> + > >> build_state->rsdp_mr = acpi_add_rom_blob(virt_acpi_build_update, > >> build_state, tables.rsdp, > >> ACPI_BUILD_RSDP_FILE, 0); > >> diff --git a/include/hw/acpi/acpi_ghes.h b/include/hw/acpi/acpi_ghes.h > >> new file mode 100644 > >> index 0000000000..cb62ec9c7b > >> --- /dev/null > >> +++ b/include/hw/acpi/acpi_ghes.h > >> @@ -0,0 +1,56 @@ > >> +/* > >> + * Support for generating APEI tables and recording CPER for Guests > >> + * > >> + * Copyright (c) 2019 HUAWEI TECHNOLOGIES CO., LTD. > >> + * > >> + * Author: Dongjiu Geng <gengdongjiu@huawei.com> > >> + * > >> + * This program is free software; you can redistribute it and/or modify > >> + * it under the terms of the GNU General Public License as published by > >> + * the Free Software Foundation; either version 2 of the License, or > >> + * (at your option) any later version. > >> + > >> + * This program is distributed in the hope that it will be useful, > >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of > >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > >> + * GNU General Public License for more details. > >> + > >> + * You should have received a copy of the GNU General Public License along > >> + * with this program; if not, see <http://www.gnu.org/licenses/>. > >> + */ > >> + > >> +#ifndef ACPI_GHES_H > >> +#define ACPI_GHES_H > >> + > >> +#include "hw/acpi/bios-linker-loader.h" > >> + > >> +/* > >> + * Values for Hardware Error Notification Type field > >> + */ > >> +enum AcpiGhesNotifyType { > >> + ACPI_GHES_NOTIFY_POLLED = 0, /* Polled */ > >> + ACPI_GHES_NOTIFY_EXTERNAL = 1, /* External Interrupt */ > >> + ACPI_GHES_NOTIFY_LOCAL = 2, /* Local Interrupt */ > >> + ACPI_GHES_NOTIFY_SCI = 3, /* SCI */ > >> + ACPI_GHES_NOTIFY_NMI = 4, /* NMI */ > >> + ACPI_GHES_NOTIFY_CMCI = 5, /* CMCI, ACPI 5.0: 18.3.2.7, Table 18-290 */ > >> + ACPI_GHES_NOTIFY_MCE = 6, /* MCE, ACPI 5.0: 18.3.2.7, Table 18-290 */ > >> + /* GPIO-Signal, ACPI 6.0: 18.3.2.7, Table 18-332 */ > >> + ACPI_GHES_NOTIFY_GPIO = 7, > >> + /* ARMv8 SEA, ACPI 6.1: 18.3.2.9, Table 18-345 */ > >> + ACPI_GHES_NOTIFY_SEA = 8, > >> + /* ARMv8 SEI, ACPI 6.1: 18.3.2.9, Table 18-345 */ > >> + ACPI_GHES_NOTIFY_SEI = 9, > >> + /* External Interrupt - GSIV, ACPI 6.1: 18.3.2.9, Table 18-345 */ > >> + ACPI_GHES_NOTIFY_GSIV = 10, > >> + /* Software Delegated Exception, ACPI 6.2: 18.3.2.9, Table 18-383 */ > >> + ACPI_GHES_NOTIFY_SDEI = 11, > >> + ACPI_GHES_NOTIFY_RESERVED = 12 /* 12 and greater are reserved */ > >> +}; > > maybe make all comment go on newline, otherwise zoo above look ugly > sure. > > > > >> + > >> +void acpi_ghes_build_hest(GArray *table_data, GArray *hardware_error, > >> + BIOSLinker *linker); > >> + > >> +void acpi_ghes_build_error_table(GArray *hardware_errors, BIOSLinker *linker); > >> +void acpi_ghes_add_fw_cfg(FWCfgState *s, GArray *hardware_errors); > >> +#endif > >> diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h > >> index de4a406568..8f13620701 100644 > >> --- a/include/hw/acpi/aml-build.h > >> +++ b/include/hw/acpi/aml-build.h > >> @@ -220,6 +220,7 @@ struct AcpiBuildTables { > >> GArray *rsdp; > >> GArray *tcpalog; > >> GArray *vmgenid; > >> + GArray *hardware_errors; > >> BIOSLinker *linker; > >> } AcpiBuildTables; > >> > > > > . > > > >
On Fri, 22 Nov 2019 15:42:52 +0000 Beata Michalska <beata.michalska@linaro.org> wrote: > Hi Xiang, > > On Mon, 11 Nov 2019 at 01:48, Xiang Zheng <zhengxiang9@huawei.com> wrote: > > > > From: Dongjiu Geng <gengdongjiu@huawei.com> > > > > This patch implements APEI GHES Table generation via fw_cfg blobs. Now > > it only supports ARMv8 SEA, a type of GHESv2 error source. Afterwards, > > we can extend the supported types if needed. For the CPER section, > > currently it is memory section because kernel mainly wants userspace to > > handle the memory errors. > > > > This patch follows the spec ACPI 6.2 to build the Hardware Error Source > > table. For more detailed information, please refer to document: > > docs/specs/acpi_hest_ghes.rst > > > > Suggested-by: Laszlo Ersek <lersek@redhat.com> > > Signed-off-by: Dongjiu Geng <gengdongjiu@huawei.com> > > Signed-off-by: Xiang Zheng <zhengxiang9@huawei.com> > > Reviewed-by: Michael S. Tsirkin <mst@redhat.com> > > --- > > default-configs/arm-softmmu.mak | 1 + > > hw/acpi/Kconfig | 4 + > > hw/acpi/Makefile.objs | 1 + > > hw/acpi/acpi_ghes.c | 267 ++++++++++++++++++++++++++++++++ > > hw/acpi/aml-build.c | 2 + > > hw/arm/virt-acpi-build.c | 12 ++ > > include/hw/acpi/acpi_ghes.h | 56 +++++++ > > include/hw/acpi/aml-build.h | 1 + > > 8 files changed, 344 insertions(+) > > create mode 100644 hw/acpi/acpi_ghes.c > > create mode 100644 include/hw/acpi/acpi_ghes.h > > > > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak > > index 1f2e0e7fde..5722f3130e 100644 > > --- a/default-configs/arm-softmmu.mak > > +++ b/default-configs/arm-softmmu.mak > > @@ -40,3 +40,4 @@ CONFIG_FSL_IMX25=y > > CONFIG_FSL_IMX7=y > > CONFIG_FSL_IMX6UL=y > > CONFIG_SEMIHOSTING=y > > +CONFIG_ACPI_APEI=y > > diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig > > index 12e3f1e86e..ed8c34d238 100644 > > --- a/hw/acpi/Kconfig > > +++ b/hw/acpi/Kconfig > > @@ -23,6 +23,10 @@ config ACPI_NVDIMM > > bool > > depends on ACPI > > > > +config ACPI_APEI > > + bool > > + depends on ACPI > > + > > config ACPI_PCI > > bool > > depends on ACPI && PCI > > diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs > > index 655a9c1973..84474b0ca8 100644 > > --- a/hw/acpi/Makefile.objs > > +++ b/hw/acpi/Makefile.objs > > @@ -5,6 +5,7 @@ common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o > > common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o > > common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o > > common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o > > +common-obj-$(CONFIG_ACPI_APEI) += acpi_ghes.o > > Minor: The 'acpi' prefix could be dropped - it does not seem to be used > for other files (self impliend by the dir name). > This also applies to most of the naming within this patch > > > common-obj-$(CONFIG_ACPI_VMGENID) += vmgenid.o > > common-obj-$(CONFIG_ACPI_HW_REDUCED) += generic_event_device.o > > common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o > > diff --git a/hw/acpi/acpi_ghes.c b/hw/acpi/acpi_ghes.c > > new file mode 100644 > > index 0000000000..42c00ff3d3 > > --- /dev/null > > +++ b/hw/acpi/acpi_ghes.c > > @@ -0,0 +1,267 @@ > > +/* > > + * Support for generating APEI tables and recording CPER for Guests > > + * > > + * Copyright (c) 2019 HUAWEI TECHNOLOGIES CO., LTD. > > + * > > + * Author: Dongjiu Geng <gengdongjiu@huawei.com> > > + * > > + * This program is free software; you can redistribute it and/or modify > > + * it under the terms of the GNU General Public License as published by > > + * the Free Software Foundation; either version 2 of the License, or > > + * (at your option) any later version. > > + > > + * This program is distributed in the hope that it will be useful, > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > + * GNU General Public License for more details. > > + > > + * You should have received a copy of the GNU General Public License along > > + * with this program; if not, see <http://www.gnu.org/licenses/>. > > + */ > > + > > +#include "qemu/osdep.h" > > +#include "hw/acpi/acpi.h" > > +#include "hw/acpi/aml-build.h" > > +#include "hw/acpi/acpi_ghes.h" > > +#include "hw/nvram/fw_cfg.h" > > +#include "sysemu/sysemu.h" > > +#include "qemu/error-report.h" > > + > > +#define ACPI_GHES_ERRORS_FW_CFG_FILE "etc/hardware_errors" > > +#define ACPI_GHES_DATA_ADDR_FW_CFG_FILE "etc/hardware_errors_addr" > > + > > +/* > > + * The size of Address field in Generic Address Structure. > > + * ACPI 2.0/3.0: 5.2.3.1 Generic Address Structure. > > + */ > > +#define ACPI_GHES_ADDRESS_SIZE 8 > > + > As already mentioned, you can safely drop this and use sizeof(unit64_t). > > > +/* The max size in bytes for one error block */ > > +#define ACPI_GHES_MAX_RAW_DATA_LENGTH 0x1000 > > + > > +/* > > + * 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 > > Minor: this is actually a type so would be good if the name would > reflect that somehow...... > > > + > > +/* > > + * | +--------------------------+ 0 > > + * | | Header | > > + * | +--------------------------+ 40---+- > > + * | | ................. | | > > + * | | error_status_address-----+ 60 | > > + * | | ................. | | > > + * | | read_ack_register--------+ 104 92 > > + * | | read_ack_preserve | | > > + * | | read_ack_write | | > > + * + +--------------------------+ 132--+- > > + * > > + * From above GHES definition, the error status address offset is 60; > > + * the Read Ack Register offset is 104, the whole size of GHESv2 is 92 > > + */ > > + > This could potentially land into the doc instead. > Also the GHEST is actually part of HEST so your offsets are for > HEST not GHEST itself so the comment might be slightly misleading > > > +/* The error status address offset in GHES */ > > +#define ACPI_GHES_ERROR_STATUS_ADDRESS_OFFSET(start_addr, n) (start_addr + \ > > + 60 + offsetof(struct AcpiGenericAddress, address) + n * 92) > > + > > +/* The Read Ack Register offset in GHES */ > > +#define ACPI_GHES_READ_ACK_REGISTER_ADDRESS_OFFSET(start_addr, n) (start_addr +\ > > + 104 + offsetof(struct AcpiGenericAddress, address) + n * 92) > > + > > +typedef struct AcpiGhesState { > > + uint64_t ghes_addr_le; > > +} AcpiGhesState; > > + > Minor: Why AcpiGhes*State* ? And do we need the struct to track single address? > > > +/* > > + * Hardware Error Notification > > + * ACPI 4.0: 17.3.2.7 Hardware Error Notification > > + */ > You are referencing older spec here. The commit message states > 6.2 version. Not to mention that 4.0 did not support ARMv8 SEA source. > You should not mention sections that do not correspond to the spec > the patch is based on. normally we use the spec where structure appeared first, and use later one only when there is no other choice (i.e. work uses/implement fields that weren't in the original structure revision) > > > +static void acpi_ghes_build_notify(GArray *table, const uint8_t type) > > As it has already been mentioned - the naming here could follow the existing > convention. Also this function is creating Hardware Error Notification table > which is not necessarily tightly connected to GHES > Similarly this applies to the overall naming used within this patch. > > +{ > > + /* Type */ > > + build_append_int_noprefix(table, type, 1); > > + /* > > + * Length: > > + * Total length of the structure in bytes > > + */ > > + build_append_int_noprefix(table, 28, 1); > > + /* Configuration Write Enable */ > > + build_append_int_noprefix(table, 0, 2); > > + /* Poll Interval */ > > + build_append_int_noprefix(table, 0, 4); > > + /* Vector */ > > + build_append_int_noprefix(table, 0, 4); > > + /* Switch To Polling Threshold Value */ > > + build_append_int_noprefix(table, 0, 4); > > + /* Switch To Polling Threshold Window */ > > + build_append_int_noprefix(table, 0, 4); > > + /* Error Threshold Value */ > > + build_append_int_noprefix(table, 0, 4); > > + /* Error Threshold Window */ > > + build_append_int_noprefix(table, 0, 4); > > Most of those fields are being set to the same single value. > Why not covering it all in one go ? that's intentional. yep it takes more lines to code but it also makes comparing code against spec much easier as it practically matches table in the spec line by line. > > +} > > + > > +/* Build table for the hardware error fw_cfg blob */ > > +void acpi_ghes_build_error_table(GArray *hardware_errors, BIOSLinker *linker) > > +{ > > + int i, error_status_block_offset; > > + > > + /* > > + * | +--------------------------+ > > + * | | error_block_address | > > + * | | .......... | > > + * | +--------------------------+ > > + * | | read_ack_register | > > + * | | ........... | > > + * | +--------------------------+ > > + * | | Error Status Data Block | > > + * | | ........ | > > + * | +--------------------------+ > > + */ > > + > > + /* Build error_block_address */ > > + for (i = 0; i < ACPI_GHES_ERROR_SOURCE_COUNT; i++) { > > + build_append_int_noprefix(hardware_errors, 0, ACPI_GHES_ADDRESS_SIZE); > > + } > > + > > + /* Build read_ack_register */ > > + for (i = 0; i < ACPI_GHES_ERROR_SOURCE_COUNT; i++) { > > + /* > > + * Initialize the value of read_ack_register to 1, so GHES can be > > + * writeable in the first time. > > + * ACPI 6.2: 18.3.2.8 Generic Hardware Error Source version 2 > > + * (GHESv2 - Type 10) > > + */ > > + build_append_int_noprefix(hardware_errors, 1, ACPI_GHES_ADDRESS_SIZE); > This is a bit of a simplification (justified to some extent) but this > should take into > account both Read Ack Preserve and Read Ack Write masks..... > or having at least a comment would be good > > Also the above implies support only for GHESTv2 (the 'Ack' regs are GHESv2 > specific) still this is iterating over potentially available/supported > hw error sources > At this point it is ok but if the support gets extended this will not > be valid - managing > 'Ack' regs should be properly guarded for GHESv2 .. It ok for code to be more complicated so it would be able to handle other usecases in the future. But if there aren't actual plans to add other usecases, then it's just over-engineering which might mislead reader later on to trying figure out what's going on here. (modulo the case where we are defining ABI between guest and QEMU) So I'd rather simplify code if there aren't plans to extend it, and let someone else to generalize it when there is an actual need for it. > > > + } > > + > > + /* Generic Error Status Block offset in the hardware error fw_cfg blob */ > > + error_status_block_offset = hardware_errors->len; > > + > > + /* Build Error Status Data Block */ > > + build_append_int_noprefix(hardware_errors, 0, > > + ACPI_GHES_MAX_RAW_DATA_LENGTH * ACPI_GHES_ERROR_SOURCE_COUNT); > > + > > + /* Allocate guest memory for the hardware error fw_cfg blob */ > > + bios_linker_loader_alloc(linker, ACPI_GHES_ERRORS_FW_CFG_FILE, > > + hardware_errors, 1, false); > > + > > + for (i = 0; i < ACPI_GHES_ERROR_SOURCE_COUNT; i++) { > > + /* > > + * Patch the address of Error Status Data Block into > > + * the error_block_address of hardware_errors fw_cfg blob > > + */ > > + bios_linker_loader_add_pointer(linker, > > + ACPI_GHES_ERRORS_FW_CFG_FILE, ACPI_GHES_ADDRESS_SIZE * i, > > + ACPI_GHES_ADDRESS_SIZE, ACPI_GHES_ERRORS_FW_CFG_FILE, > > + error_status_block_offset + i * ACPI_GHES_MAX_RAW_DATA_LENGTH); > > + } > > + > > + /* > > + * Write the address of hardware_errors fw_cfg blob into the > > + * hardware_errors_addr fw_cfg blob. > > + */ > > + bios_linker_loader_write_pointer(linker, ACPI_GHES_DATA_ADDR_FW_CFG_FILE, > > + 0, ACPI_GHES_ADDRESS_SIZE, ACPI_GHES_ERRORS_FW_CFG_FILE, 0); > > +} > > + > > +/* Build Hardware Error Source Table */ > > +void acpi_ghes_build_hest(GArray *table_data, GArray *hardware_errors, > > + BIOSLinker *linker) > > +{ > > + uint32_t hest_start = table_data->len; > > + uint32_t source_id = 0; > > + > > + /* Hardware Error Source Table header*/ > > + acpi_data_push(table_data, sizeof(AcpiTableHeader)); > > + > > + /* Error Source Count */ > > + build_append_int_noprefix(table_data, ACPI_GHES_ERROR_SOURCE_COUNT, 4); > > + > > + /* > > + * Type: > > + * Generic Hardware Error Source version 2(GHESv2 - Type 10) > > + */ > > + build_append_int_noprefix(table_data, ACPI_GHES_SOURCE_GENERIC_ERROR_V2, 2); > > + /* > > + * Source Id > > + * Once we support more than one hardware error sources, we need to > > + * increase the value of this field. > > + */ > > + build_append_int_noprefix(table_data, source_id, 2); > > + /* Related Source Id */ > > + build_append_int_noprefix(table_data, 0xffff, 2); > > Would be nice to have a comment on the value used -> > 'no alternate sources' usually we use verbaltim field name as in the spec table definition. This way reader could easily find it in the spec and read on the meaning of values. This is done to avoid copying needlessly spec text into QEMU. So if 0xffff is described in the table definition, then typically just field name comment is sufficient. > > + /* Flags */ > > + build_append_int_noprefix(table_data, 0, 1); > > + /* Enabled */ > > + build_append_int_noprefix(table_data, 1, 1); > > + > > + /* Number of Records To Pre-allocate */ > > + build_append_int_noprefix(table_data, 1, 4); > > + /* Max Sections Per Record */ > > + build_append_int_noprefix(table_data, 1, 4); > > + /* Max Raw Data Length */ > > + build_append_int_noprefix(table_data, ACPI_GHES_MAX_RAW_DATA_LENGTH, 4); > > + > > + /* Error Status Address */ > > + 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, > > + ACPI_GHES_ERROR_STATUS_ADDRESS_OFFSET(hest_start, source_id), > > + ACPI_GHES_ADDRESS_SIZE, ACPI_GHES_ERRORS_FW_CFG_FILE, > > + source_id * ACPI_GHES_ADDRESS_SIZE); > > + > > + /* > > + * Notification Structure > > + * Now only enable ARMv8 SEA notification type > > + */ > > + acpi_ghes_build_notify(table_data, ACPI_GHES_NOTIFY_SEA); > > + > > + /* Error Status Block Length */ > > + build_append_int_noprefix(table_data, ACPI_GHES_MAX_RAW_DATA_LENGTH, 4); > > + > > + /* > > + * Read Ack Register > > + * ACPI 6.1: 18.3.2.8 Generic Hardware Error Source > > + * version 2 (GHESv2 - Type 10) > > + */ > > + 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, > > + ACPI_GHES_READ_ACK_REGISTER_ADDRESS_OFFSET(hest_start, 0), > > + ACPI_GHES_ADDRESS_SIZE, ACPI_GHES_ERRORS_FW_CFG_FILE, > > + (ACPI_GHES_ERROR_SOURCE_COUNT + source_id) * ACPI_GHES_ADDRESS_SIZE); > > + > > + /* > > + * Read Ack Preserve > > + * We only provide the first bit in Read Ack Register to OSPM to write > > + * while the other bits are preserved. > > + */ > > + build_append_int_noprefix(table_data, ~0x1ULL, 8); > > + /* Read Ack Write */ > > + build_append_int_noprefix(table_data, 0x1, 8); > > + > > + build_header(linker, table_data, (void *)(table_data->data + hest_start), > > + "HEST", table_data->len - hest_start, 1, NULL, "GHES"); > > +} > > + > Already mentioned .... but ... > the last few lines are GHESv2 specific but it seems that HES/GHES/GHESv2 > are being mixed within this patch. Would be nice if those could be separated > to easy future extensions > > BR > > Beata > > > +static AcpiGhesState ges; > > +void acpi_ghes_add_fw_cfg(FWCfgState *s, GArray *hardware_error) > > +{ > > + > > + size_t size = 2 * ACPI_GHES_ADDRESS_SIZE + ACPI_GHES_MAX_RAW_DATA_LENGTH; > > + size_t request_block_size = ACPI_GHES_ERROR_SOURCE_COUNT * size; > > + > > + /* Create a read-only fw_cfg file for GHES */ > > + fw_cfg_add_file(s, ACPI_GHES_ERRORS_FW_CFG_FILE, hardware_error->data, > > + request_block_size); > > + > > + /* Create a read-write fw_cfg file for Address */ > > + fw_cfg_add_file_callback(s, ACPI_GHES_DATA_ADDR_FW_CFG_FILE, NULL, NULL, > > + NULL, &ges.ghes_addr_le, sizeof(ges.ghes_addr_le), false); > > +} > > diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c > > index 2c3702b882..3681ec6e3d 100644 > > --- a/hw/acpi/aml-build.c > > +++ b/hw/acpi/aml-build.c > > @@ -1578,6 +1578,7 @@ void acpi_build_tables_init(AcpiBuildTables *tables) > > tables->table_data = g_array_new(false, true /* clear */, 1); > > tables->tcpalog = g_array_new(false, true /* clear */, 1); > > tables->vmgenid = g_array_new(false, true /* clear */, 1); > > + tables->hardware_errors = g_array_new(false, true /* clear */, 1); > > tables->linker = bios_linker_loader_init(); > > } > > > > @@ -1588,6 +1589,7 @@ void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre) > > g_array_free(tables->table_data, true); > > g_array_free(tables->tcpalog, mfre); > > g_array_free(tables->vmgenid, mfre); > > + g_array_free(tables->hardware_errors, mfre); > > } > > > > /* > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > > index 4cd50175e0..1b1fd273e4 100644 > > --- a/hw/arm/virt-acpi-build.c > > +++ b/hw/arm/virt-acpi-build.c > > @@ -48,6 +48,7 @@ > > #include "sysemu/reset.h" > > #include "kvm_arm.h" > > #include "migration/vmstate.h" > > +#include "hw/acpi/acpi_ghes.h" > > > > #define ARM_SPI_BASE 32 > > > > @@ -825,6 +826,13 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) > > acpi_add_table(table_offsets, tables_blob); > > build_spcr(tables_blob, tables->linker, vms); > > > > + if (vms->ras) { > > + acpi_add_table(table_offsets, tables_blob); > > + acpi_ghes_build_error_table(tables->hardware_errors, tables->linker); > > + acpi_ghes_build_hest(tables_blob, tables->hardware_errors, > > + tables->linker); > > + } > > + > > if (ms->numa_state->num_nodes > 0) { > > acpi_add_table(table_offsets, tables_blob); > > build_srat(tables_blob, tables->linker, vms); > > @@ -942,6 +950,10 @@ void virt_acpi_setup(VirtMachineState *vms) > > fw_cfg_add_file(vms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, tables.tcpalog->data, > > acpi_data_len(tables.tcpalog)); > > > > + if (vms->ras) { > > + acpi_ghes_add_fw_cfg(vms->fw_cfg, tables.hardware_errors); > > + } > > + > > build_state->rsdp_mr = acpi_add_rom_blob(virt_acpi_build_update, > > build_state, tables.rsdp, > > ACPI_BUILD_RSDP_FILE, 0); > > diff --git a/include/hw/acpi/acpi_ghes.h b/include/hw/acpi/acpi_ghes.h > > new file mode 100644 > > index 0000000000..cb62ec9c7b > > --- /dev/null > > +++ b/include/hw/acpi/acpi_ghes.h > > @@ -0,0 +1,56 @@ > > +/* > > + * Support for generating APEI tables and recording CPER for Guests > > + * > > + * Copyright (c) 2019 HUAWEI TECHNOLOGIES CO., LTD. > > + * > > + * Author: Dongjiu Geng <gengdongjiu@huawei.com> > > + * > > + * This program is free software; you can redistribute it and/or modify > > + * it under the terms of the GNU General Public License as published by > > + * the Free Software Foundation; either version 2 of the License, or > > + * (at your option) any later version. > > + > > + * This program is distributed in the hope that it will be useful, > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > + * GNU General Public License for more details. > > + > > + * You should have received a copy of the GNU General Public License along > > + * with this program; if not, see <http://www.gnu.org/licenses/>. > > + */ > > + > > +#ifndef ACPI_GHES_H > > +#define ACPI_GHES_H > > + > > +#include "hw/acpi/bios-linker-loader.h" > > + > > +/* > > + * Values for Hardware Error Notification Type field > > + */ > > +enum AcpiGhesNotifyType { > > + ACPI_GHES_NOTIFY_POLLED = 0, /* Polled */ > > + ACPI_GHES_NOTIFY_EXTERNAL = 1, /* External Interrupt */ > > + ACPI_GHES_NOTIFY_LOCAL = 2, /* Local Interrupt */ > > + ACPI_GHES_NOTIFY_SCI = 3, /* SCI */ > > + ACPI_GHES_NOTIFY_NMI = 4, /* NMI */ > > + ACPI_GHES_NOTIFY_CMCI = 5, /* CMCI, ACPI 5.0: 18.3.2.7, Table 18-290 */ > > + ACPI_GHES_NOTIFY_MCE = 6, /* MCE, ACPI 5.0: 18.3.2.7, Table 18-290 */ > > + /* GPIO-Signal, ACPI 6.0: 18.3.2.7, Table 18-332 */ > > + ACPI_GHES_NOTIFY_GPIO = 7, > > + /* ARMv8 SEA, ACPI 6.1: 18.3.2.9, Table 18-345 */ > > + ACPI_GHES_NOTIFY_SEA = 8, > > + /* ARMv8 SEI, ACPI 6.1: 18.3.2.9, Table 18-345 */ > > + ACPI_GHES_NOTIFY_SEI = 9, > > + /* External Interrupt - GSIV, ACPI 6.1: 18.3.2.9, Table 18-345 */ > > + ACPI_GHES_NOTIFY_GSIV = 10, > > + /* Software Delegated Exception, ACPI 6.2: 18.3.2.9, Table 18-383 */ > > + ACPI_GHES_NOTIFY_SDEI = 11, > > + ACPI_GHES_NOTIFY_RESERVED = 12 /* 12 and greater are reserved */ > > +}; > > + > > +void acpi_ghes_build_hest(GArray *table_data, GArray *hardware_error, > > + BIOSLinker *linker); > > + > > +void acpi_ghes_build_error_table(GArray *hardware_errors, BIOSLinker *linker); > > +void acpi_ghes_add_fw_cfg(FWCfgState *s, GArray *hardware_errors); > > +#endif > > diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h > > index de4a406568..8f13620701 100644 > > --- a/include/hw/acpi/aml-build.h > > +++ b/include/hw/acpi/aml-build.h > > @@ -220,6 +220,7 @@ struct AcpiBuildTables { > > GArray *rsdp; > > GArray *tcpalog; > > GArray *vmgenid; > > + GArray *hardware_errors; > > BIOSLinker *linker; > > } AcpiBuildTables; > > > > -- > > 2.19.1 > > > > > > >
On Mon, 18 Nov 2019 08:21:18 -0500 "Michael S. Tsirkin" <mst@redhat.com> wrote: > On Mon, Nov 18, 2019 at 09:18:01PM +0800, gengdongjiu wrote: > > On 2019/11/18 20:49, gengdongjiu wrote: > > >>> + */ > > >>> + build_append_int_noprefix(table_data, source_id, 2); > > >>> + /* Related Source Id */ > > >>> + build_append_int_noprefix(table_data, 0xffff, 2); > > >>> + /* Flags */ > > >>> + build_append_int_noprefix(table_data, 0, 1); > > >>> + /* Enabled */ > > >>> + build_append_int_noprefix(table_data, 1, 1); > > >>> + > > >>> + /* Number of Records To Pre-allocate */ > > >>> + build_append_int_noprefix(table_data, 1, 4); > > >>> + /* Max Sections Per Record */ > > >>> + build_append_int_noprefix(table_data, 1, 4); > > >>> + /* Max Raw Data Length */ > > >>> + build_append_int_noprefix(table_data, ACPI_GHES_MAX_RAW_DATA_LENGTH, 4); > > >>> + > > >>> + /* Error Status Address */ > > >>> + 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, > > >>> + ACPI_GHES_ERROR_STATUS_ADDRESS_OFFSET(hest_start, source_id), > > >> it's fine only if GHESv2 is the only entries in HEST, but once > > >> other types are added this macro will silently fall apart and > > >> cause table corruption. > > why silently fall? > > I think the acpi_ghes.c only support GHESv2 type, not support other type. > > > > >> > > >> Instead of offset from hest_start, I suggest to use offset relative > > >> to GAS structure, here is an idea>> > > >> #define GAS_ADDR_OFFSET 4 > > >> > > >> off = table->len > > >> build_append_gas() > > >> bios_linker_loader_add_pointer(..., > > >> off + GAS_ADDR_OFFSET, ... > > > > If use offset relative to GAS structure, the code does not easily extend to support more Generic Hardware Error Source. > > if use offset relative to hest_start, just use a loop, the code can support more error source, for example: > > for (source_id = 0; i<n; source_id++) > > { > > ...... > > bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE, > > ACPI_GHES_ERROR_STATUS_ADDRESS_OFFSET(hest_start, source_id), > > sizeof(uint64_t), ACPI_GHES_ERRORS_FW_CFG_FILE, > > source_id * sizeof(uint64_t)); > > ....... > > } > > > > My previous series patch support 2 error sources, but now only enable 'SEA' type Error Source > > I'd try to merge this, worry about extending things later. > This is at v21 and the simpler you can keep things, > the faster it'll go in. I don't think the series is ready for merging yet. It has a number of issues (not stylistic ones) that need to be fixed first. As for extending, I think I've suggested to simplify series to account for single error source only in some places so it would be easier on author and reviewers and worry about extending it later.
On 2019/11/25 17:48, Igor Mammedov wrote: >>> ...... >>> bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE, >>> ACPI_GHES_ERROR_STATUS_ADDRESS_OFFSET(hest_start, source_id), >>> sizeof(uint64_t), ACPI_GHES_ERRORS_FW_CFG_FILE, >>> source_id * sizeof(uint64_t)); >>> ....... >>> } >>> >>> My previous series patch support 2 error sources, but now only enable 'SEA' type Error Source >> I'd try to merge this, worry about extending things later. >> This is at v21 and the simpler you can keep things, >> the faster it'll go in. > I don't think the series is ready for merging yet. > It has a number of issues (not stylistic ones) that need to be fixed first. > > As for extending, I think I've suggested to simplify series > to account for single error source only in some places so it > would be easier on author and reviewers and worry about extending > it later. sure, thanks for the review, we are preparing another series which will fix the issues that you mentioned. >
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 1f2e0e7fde..5722f3130e 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -40,3 +40,4 @@ CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y CONFIG_FSL_IMX6UL=y CONFIG_SEMIHOSTING=y +CONFIG_ACPI_APEI=y diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig index 12e3f1e86e..ed8c34d238 100644 --- a/hw/acpi/Kconfig +++ b/hw/acpi/Kconfig @@ -23,6 +23,10 @@ config ACPI_NVDIMM bool depends on ACPI +config ACPI_APEI + bool + depends on ACPI + config ACPI_PCI bool depends on ACPI && PCI diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs index 655a9c1973..84474b0ca8 100644 --- a/hw/acpi/Makefile.objs +++ b/hw/acpi/Makefile.objs @@ -5,6 +5,7 @@ common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o +common-obj-$(CONFIG_ACPI_APEI) += acpi_ghes.o common-obj-$(CONFIG_ACPI_VMGENID) += vmgenid.o common-obj-$(CONFIG_ACPI_HW_REDUCED) += generic_event_device.o common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o diff --git a/hw/acpi/acpi_ghes.c b/hw/acpi/acpi_ghes.c new file mode 100644 index 0000000000..42c00ff3d3 --- /dev/null +++ b/hw/acpi/acpi_ghes.c @@ -0,0 +1,267 @@ +/* + * Support for generating APEI tables and recording CPER for Guests + * + * Copyright (c) 2019 HUAWEI TECHNOLOGIES CO., LTD. + * + * Author: Dongjiu Geng <gengdongjiu@huawei.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License along + * with this program; if not, see <http://www.gnu.org/licenses/>. + */ + +#include "qemu/osdep.h" +#include "hw/acpi/acpi.h" +#include "hw/acpi/aml-build.h" +#include "hw/acpi/acpi_ghes.h" +#include "hw/nvram/fw_cfg.h" +#include "sysemu/sysemu.h" +#include "qemu/error-report.h" + +#define ACPI_GHES_ERRORS_FW_CFG_FILE "etc/hardware_errors" +#define ACPI_GHES_DATA_ADDR_FW_CFG_FILE "etc/hardware_errors_addr" + +/* + * The size of Address field in Generic Address Structure. + * ACPI 2.0/3.0: 5.2.3.1 Generic Address Structure. + */ +#define ACPI_GHES_ADDRESS_SIZE 8 + +/* The max size in bytes for one error block */ +#define ACPI_GHES_MAX_RAW_DATA_LENGTH 0x1000 + +/* + * 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 + +/* + * | +--------------------------+ 0 + * | | Header | + * | +--------------------------+ 40---+- + * | | ................. | | + * | | error_status_address-----+ 60 | + * | | ................. | | + * | | read_ack_register--------+ 104 92 + * | | read_ack_preserve | | + * | | read_ack_write | | + * + +--------------------------+ 132--+- + * + * From above GHES definition, the error status address offset is 60; + * the Read Ack Register offset is 104, the whole size of GHESv2 is 92 + */ + +/* The error status address offset in GHES */ +#define ACPI_GHES_ERROR_STATUS_ADDRESS_OFFSET(start_addr, n) (start_addr + \ + 60 + offsetof(struct AcpiGenericAddress, address) + n * 92) + +/* The Read Ack Register offset in GHES */ +#define ACPI_GHES_READ_ACK_REGISTER_ADDRESS_OFFSET(start_addr, n) (start_addr +\ + 104 + offsetof(struct AcpiGenericAddress, address) + n * 92) + +typedef struct AcpiGhesState { + uint64_t ghes_addr_le; +} AcpiGhesState; + +/* + * Hardware Error Notification + * ACPI 4.0: 17.3.2.7 Hardware Error Notification + */ +static void acpi_ghes_build_notify(GArray *table, const uint8_t type) +{ + /* Type */ + build_append_int_noprefix(table, type, 1); + /* + * Length: + * Total length of the structure in bytes + */ + build_append_int_noprefix(table, 28, 1); + /* Configuration Write Enable */ + build_append_int_noprefix(table, 0, 2); + /* Poll Interval */ + build_append_int_noprefix(table, 0, 4); + /* Vector */ + build_append_int_noprefix(table, 0, 4); + /* Switch To Polling Threshold Value */ + build_append_int_noprefix(table, 0, 4); + /* Switch To Polling Threshold Window */ + build_append_int_noprefix(table, 0, 4); + /* Error Threshold Value */ + build_append_int_noprefix(table, 0, 4); + /* Error Threshold Window */ + build_append_int_noprefix(table, 0, 4); +} + +/* Build table for the hardware error fw_cfg blob */ +void acpi_ghes_build_error_table(GArray *hardware_errors, BIOSLinker *linker) +{ + int i, error_status_block_offset; + + /* + * | +--------------------------+ + * | | error_block_address | + * | | .......... | + * | +--------------------------+ + * | | read_ack_register | + * | | ........... | + * | +--------------------------+ + * | | Error Status Data Block | + * | | ........ | + * | +--------------------------+ + */ + + /* Build error_block_address */ + for (i = 0; i < ACPI_GHES_ERROR_SOURCE_COUNT; i++) { + build_append_int_noprefix(hardware_errors, 0, ACPI_GHES_ADDRESS_SIZE); + } + + /* Build read_ack_register */ + for (i = 0; i < ACPI_GHES_ERROR_SOURCE_COUNT; i++) { + /* + * Initialize the value of read_ack_register to 1, so GHES can be + * writeable in the first time. + * ACPI 6.2: 18.3.2.8 Generic Hardware Error Source version 2 + * (GHESv2 - Type 10) + */ + build_append_int_noprefix(hardware_errors, 1, ACPI_GHES_ADDRESS_SIZE); + } + + /* Generic Error Status Block offset in the hardware error fw_cfg blob */ + error_status_block_offset = hardware_errors->len; + + /* Build Error Status Data Block */ + build_append_int_noprefix(hardware_errors, 0, + ACPI_GHES_MAX_RAW_DATA_LENGTH * ACPI_GHES_ERROR_SOURCE_COUNT); + + /* Allocate guest memory for the hardware error fw_cfg blob */ + bios_linker_loader_alloc(linker, ACPI_GHES_ERRORS_FW_CFG_FILE, + hardware_errors, 1, false); + + for (i = 0; i < ACPI_GHES_ERROR_SOURCE_COUNT; i++) { + /* + * Patch the address of Error Status Data Block into + * the error_block_address of hardware_errors fw_cfg blob + */ + bios_linker_loader_add_pointer(linker, + ACPI_GHES_ERRORS_FW_CFG_FILE, ACPI_GHES_ADDRESS_SIZE * i, + ACPI_GHES_ADDRESS_SIZE, ACPI_GHES_ERRORS_FW_CFG_FILE, + error_status_block_offset + i * ACPI_GHES_MAX_RAW_DATA_LENGTH); + } + + /* + * Write the address of hardware_errors fw_cfg blob into the + * hardware_errors_addr fw_cfg blob. + */ + bios_linker_loader_write_pointer(linker, ACPI_GHES_DATA_ADDR_FW_CFG_FILE, + 0, ACPI_GHES_ADDRESS_SIZE, ACPI_GHES_ERRORS_FW_CFG_FILE, 0); +} + +/* Build Hardware Error Source Table */ +void acpi_ghes_build_hest(GArray *table_data, GArray *hardware_errors, + BIOSLinker *linker) +{ + uint32_t hest_start = table_data->len; + uint32_t source_id = 0; + + /* Hardware Error Source Table header*/ + acpi_data_push(table_data, sizeof(AcpiTableHeader)); + + /* Error Source Count */ + build_append_int_noprefix(table_data, ACPI_GHES_ERROR_SOURCE_COUNT, 4); + + /* + * Type: + * Generic Hardware Error Source version 2(GHESv2 - Type 10) + */ + build_append_int_noprefix(table_data, ACPI_GHES_SOURCE_GENERIC_ERROR_V2, 2); + /* + * Source Id + * Once we support more than one hardware error sources, we need to + * increase the value of this field. + */ + build_append_int_noprefix(table_data, source_id, 2); + /* Related Source Id */ + build_append_int_noprefix(table_data, 0xffff, 2); + /* Flags */ + build_append_int_noprefix(table_data, 0, 1); + /* Enabled */ + build_append_int_noprefix(table_data, 1, 1); + + /* Number of Records To Pre-allocate */ + build_append_int_noprefix(table_data, 1, 4); + /* Max Sections Per Record */ + build_append_int_noprefix(table_data, 1, 4); + /* Max Raw Data Length */ + build_append_int_noprefix(table_data, ACPI_GHES_MAX_RAW_DATA_LENGTH, 4); + + /* Error Status Address */ + 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, + ACPI_GHES_ERROR_STATUS_ADDRESS_OFFSET(hest_start, source_id), + ACPI_GHES_ADDRESS_SIZE, ACPI_GHES_ERRORS_FW_CFG_FILE, + source_id * ACPI_GHES_ADDRESS_SIZE); + + /* + * Notification Structure + * Now only enable ARMv8 SEA notification type + */ + acpi_ghes_build_notify(table_data, ACPI_GHES_NOTIFY_SEA); + + /* Error Status Block Length */ + build_append_int_noprefix(table_data, ACPI_GHES_MAX_RAW_DATA_LENGTH, 4); + + /* + * Read Ack Register + * ACPI 6.1: 18.3.2.8 Generic Hardware Error Source + * version 2 (GHESv2 - Type 10) + */ + 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, + ACPI_GHES_READ_ACK_REGISTER_ADDRESS_OFFSET(hest_start, 0), + ACPI_GHES_ADDRESS_SIZE, ACPI_GHES_ERRORS_FW_CFG_FILE, + (ACPI_GHES_ERROR_SOURCE_COUNT + source_id) * ACPI_GHES_ADDRESS_SIZE); + + /* + * Read Ack Preserve + * We only provide the first bit in Read Ack Register to OSPM to write + * while the other bits are preserved. + */ + build_append_int_noprefix(table_data, ~0x1ULL, 8); + /* Read Ack Write */ + build_append_int_noprefix(table_data, 0x1, 8); + + build_header(linker, table_data, (void *)(table_data->data + hest_start), + "HEST", table_data->len - hest_start, 1, NULL, "GHES"); +} + +static AcpiGhesState ges; +void acpi_ghes_add_fw_cfg(FWCfgState *s, GArray *hardware_error) +{ + + size_t size = 2 * ACPI_GHES_ADDRESS_SIZE + ACPI_GHES_MAX_RAW_DATA_LENGTH; + size_t request_block_size = ACPI_GHES_ERROR_SOURCE_COUNT * size; + + /* Create a read-only fw_cfg file for GHES */ + fw_cfg_add_file(s, ACPI_GHES_ERRORS_FW_CFG_FILE, hardware_error->data, + request_block_size); + + /* Create a read-write fw_cfg file for Address */ + fw_cfg_add_file_callback(s, ACPI_GHES_DATA_ADDR_FW_CFG_FILE, NULL, NULL, + NULL, &ges.ghes_addr_le, sizeof(ges.ghes_addr_le), false); +} diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 2c3702b882..3681ec6e3d 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -1578,6 +1578,7 @@ void acpi_build_tables_init(AcpiBuildTables *tables) tables->table_data = g_array_new(false, true /* clear */, 1); tables->tcpalog = g_array_new(false, true /* clear */, 1); tables->vmgenid = g_array_new(false, true /* clear */, 1); + tables->hardware_errors = g_array_new(false, true /* clear */, 1); tables->linker = bios_linker_loader_init(); } @@ -1588,6 +1589,7 @@ void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre) g_array_free(tables->table_data, true); g_array_free(tables->tcpalog, mfre); g_array_free(tables->vmgenid, mfre); + g_array_free(tables->hardware_errors, mfre); } /* diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 4cd50175e0..1b1fd273e4 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -48,6 +48,7 @@ #include "sysemu/reset.h" #include "kvm_arm.h" #include "migration/vmstate.h" +#include "hw/acpi/acpi_ghes.h" #define ARM_SPI_BASE 32 @@ -825,6 +826,13 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) acpi_add_table(table_offsets, tables_blob); build_spcr(tables_blob, tables->linker, vms); + if (vms->ras) { + acpi_add_table(table_offsets, tables_blob); + acpi_ghes_build_error_table(tables->hardware_errors, tables->linker); + acpi_ghes_build_hest(tables_blob, tables->hardware_errors, + tables->linker); + } + if (ms->numa_state->num_nodes > 0) { acpi_add_table(table_offsets, tables_blob); build_srat(tables_blob, tables->linker, vms); @@ -942,6 +950,10 @@ void virt_acpi_setup(VirtMachineState *vms) fw_cfg_add_file(vms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, tables.tcpalog->data, acpi_data_len(tables.tcpalog)); + if (vms->ras) { + acpi_ghes_add_fw_cfg(vms->fw_cfg, tables.hardware_errors); + } + build_state->rsdp_mr = acpi_add_rom_blob(virt_acpi_build_update, build_state, tables.rsdp, ACPI_BUILD_RSDP_FILE, 0); diff --git a/include/hw/acpi/acpi_ghes.h b/include/hw/acpi/acpi_ghes.h new file mode 100644 index 0000000000..cb62ec9c7b --- /dev/null +++ b/include/hw/acpi/acpi_ghes.h @@ -0,0 +1,56 @@ +/* + * Support for generating APEI tables and recording CPER for Guests + * + * Copyright (c) 2019 HUAWEI TECHNOLOGIES CO., LTD. + * + * Author: Dongjiu Geng <gengdongjiu@huawei.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License along + * with this program; if not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef ACPI_GHES_H +#define ACPI_GHES_H + +#include "hw/acpi/bios-linker-loader.h" + +/* + * Values for Hardware Error Notification Type field + */ +enum AcpiGhesNotifyType { + ACPI_GHES_NOTIFY_POLLED = 0, /* Polled */ + ACPI_GHES_NOTIFY_EXTERNAL = 1, /* External Interrupt */ + ACPI_GHES_NOTIFY_LOCAL = 2, /* Local Interrupt */ + ACPI_GHES_NOTIFY_SCI = 3, /* SCI */ + ACPI_GHES_NOTIFY_NMI = 4, /* NMI */ + ACPI_GHES_NOTIFY_CMCI = 5, /* CMCI, ACPI 5.0: 18.3.2.7, Table 18-290 */ + ACPI_GHES_NOTIFY_MCE = 6, /* MCE, ACPI 5.0: 18.3.2.7, Table 18-290 */ + /* GPIO-Signal, ACPI 6.0: 18.3.2.7, Table 18-332 */ + ACPI_GHES_NOTIFY_GPIO = 7, + /* ARMv8 SEA, ACPI 6.1: 18.3.2.9, Table 18-345 */ + ACPI_GHES_NOTIFY_SEA = 8, + /* ARMv8 SEI, ACPI 6.1: 18.3.2.9, Table 18-345 */ + ACPI_GHES_NOTIFY_SEI = 9, + /* External Interrupt - GSIV, ACPI 6.1: 18.3.2.9, Table 18-345 */ + ACPI_GHES_NOTIFY_GSIV = 10, + /* Software Delegated Exception, ACPI 6.2: 18.3.2.9, Table 18-383 */ + ACPI_GHES_NOTIFY_SDEI = 11, + ACPI_GHES_NOTIFY_RESERVED = 12 /* 12 and greater are reserved */ +}; + +void acpi_ghes_build_hest(GArray *table_data, GArray *hardware_error, + BIOSLinker *linker); + +void acpi_ghes_build_error_table(GArray *hardware_errors, BIOSLinker *linker); +void acpi_ghes_add_fw_cfg(FWCfgState *s, GArray *hardware_errors); +#endif diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index de4a406568..8f13620701 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -220,6 +220,7 @@ struct AcpiBuildTables { GArray *rsdp; GArray *tcpalog; GArray *vmgenid; + GArray *hardware_errors; BIOSLinker *linker; } AcpiBuildTables;