* [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU
@ 2021-05-28 18:14 Eric DeVolder
2021-05-28 18:14 ` [PATCH v3 1/7] ACPI ERST: bios-tables-test.c steps 1 and 2 Eric DeVolder
` (7 more replies)
0 siblings, 8 replies; 15+ messages in thread
From: Eric DeVolder @ 2021-05-28 18:14 UTC (permalink / raw)
To: qemu-devel
Cc: ehabkost, mst, konrad.wilk, pbonzini, imammedo, boris.ostrovsky, rth
NOTE: Also, I wanted to push this v3 for review while alerting
that I will be on holiday through June 8 (possibly a few days
later).
NOTE: The patches are arranged such that each can be applied
in order and not break the build (except the 0001 patch). Igor
has hinted at changing this, but I'm unsure how else to
re-arrange these patches accordingly.
NOTE: With the conversion to TYPE_MEMORY_BACKEND_FILE, live
migration to a completely different host does not behave
properly (it loses the ERST contents because the file is not
present on the new host). This still needs to be worked out.
Other than live migration, this patchset fully works.
This patchset introduces support for the ACPI Error Record
Serialization Table, ERST.
Linux uses the persistent storage filesystem, pstore, to record
information (eg. dmesg tail) upon panics and shutdowns. Pstore is
independent of, and runs before, kdump. In certain scenarios (ie.
hosts/guests with root filesystems on NFS/iSCSI where networking
software and/or hardware fails), pstore may contain the only
information available for post-mortem debugging.
Two common storage backends for the pstore filesystem are ACPI ERST
and UEFI. Most BIOS implement ACPI ERST; however, ACPI ERST is not
currently supported in QEMU, and UEFI is not utilized in all guests.
By implementing ACPI ERST within QEMU, then the ACPI ERST becomes a
viable pstore storage backend for virtual machines (as it is now for
bare metal machines).
Enabling support for ACPI ERST facilitates a consistent method to
capture kernel panic information in a wide range of guests: from
resource-constrained microvms to very large guests, and in
particular, in direct-boot environments (which would lack UEFI
run-time services).
Note that Microsoft Windows also utilizes the ACPI ERST for certain
crash information, if available.
The ACPI ERST persistent storage is contained within a single backing
file, with a default size of 64KiB. The size and filename of the
backing file can be obtained from QEMU parameters.
The ACPI specification[1], in Chapter "ACPI Platform Error Interfaces
(APEI)", and specifically subsection "Error Serialization", outlines
a method for storing error records into persistent storage.
[1] "Advanced Configuration and Power Interface Specification",
version 6.2, May 2017.
https://www.uefi.org/sites/default/files/resources/ACPI_6_2.pdf
[2] "Unified Extensible Firmware Interface Specification",
version 2.8, March 2019.
https://uefi.org/sites/default/files/resources/UEFI_Spec_2_8_final.pdf
Suggested-by: Konrad Wilk <konrad.wilk@oracle.com>
Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
---
v3: 28may2021
- Converted to using a TYPE_MEMORY_BACKEND_FILE object rather than
internal array with explicit file operations, per Igor.
- Changed the way the qdev and base address are handled, allowing
ERST to be disabled at run-time. Also aligns better with other
existing code.
v2: 8feb2021
- Added qtest/smoke test per Paolo Bonzini
- Split patch into smaller chunks, per Igo Mammedov
- Did away with use of ACPI packed structures, per Igo Mammedov
v1: 26oct2020
- initial post
---
hw/acpi/erst.c | 909 +++++++++++++++++++++++++++++++++++++++++++++++++
hw/acpi/meson.build | 1 +
hw/i386/acpi-build.c | 4 +
include/hw/acpi/erst.h | 97 ++++++
4 files changed, 1011 insertions(+)
create mode 100644 hw/acpi/erst.c
create mode 100644 include/hw/acpi/erst.h
Eric DeVolder (7):
ACPI ERST: bios-tables-test.c steps 1 and 2
ACPI ERST: header file for ERST
ACPI ERST: support for ACPI ERST feature
ACPI ERST: include ERST feature in build of ACPI support
ACPI ERST: create ERST device for pc/x86 machines.
ACPI ERST: qtest for ERST
ACPI ERST: step 6 of bios-tables-test.c
hw/acpi/erst.c | 902 +++++++++++++++++++++++++++++++++++++++++++
hw/acpi/meson.build | 1 +
hw/i386/acpi-build.c | 7 +
hw/i386/pc.c | 31 ++
include/hw/acpi/erst.h | 82 ++++
include/hw/i386/pc.h | 1 +
tests/data/acpi/microvm/ERST | 0
tests/data/acpi/pc/ERST | Bin 0 -> 976 bytes
tests/data/acpi/q35/ERST | Bin 0 -> 976 bytes
tests/qtest/erst-test.c | 106 +++++
tests/qtest/meson.build | 2 +
11 files changed, 1132 insertions(+)
create mode 100644 hw/acpi/erst.c
create mode 100644 include/hw/acpi/erst.h
create mode 100644 tests/data/acpi/microvm/ERST
create mode 100644 tests/data/acpi/pc/ERST
create mode 100644 tests/data/acpi/q35/ERST
create mode 100644 tests/qtest/erst-test.c
--
1.8.3.1
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH v3 1/7] ACPI ERST: bios-tables-test.c steps 1 and 2 2021-05-28 18:14 [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU Eric DeVolder @ 2021-05-28 18:14 ` Eric DeVolder 2021-05-28 18:14 ` [PATCH v3 2/7] ACPI ERST: header file for ERST Eric DeVolder ` (6 subsequent siblings) 7 siblings, 0 replies; 15+ messages in thread From: Eric DeVolder @ 2021-05-28 18:14 UTC (permalink / raw) To: qemu-devel Cc: ehabkost, mst, konrad.wilk, pbonzini, imammedo, boris.ostrovsky, rth Following the guidelines in tests/qtest/bios-tables-test.c, this change adds empty placeholder files per step 1 for the new ERST table, and excludes resulting changed files in bios-tables-test-allowed-diff.h per step 2. Signed-off-by: Eric DeVolder <eric.devolder@oracle.com> --- tests/data/acpi/microvm/ERST | 0 tests/data/acpi/pc/ERST | 0 tests/data/acpi/q35/ERST | 0 tests/qtest/bios-tables-test-allowed-diff.h | 4 ++++ 4 files changed, 4 insertions(+) create mode 100644 tests/data/acpi/microvm/ERST create mode 100644 tests/data/acpi/pc/ERST create mode 100644 tests/data/acpi/q35/ERST diff --git a/tests/data/acpi/microvm/ERST b/tests/data/acpi/microvm/ERST new file mode 100644 index 0000000..e69de29 diff --git a/tests/data/acpi/pc/ERST b/tests/data/acpi/pc/ERST new file mode 100644 index 0000000..e69de29 diff --git a/tests/data/acpi/q35/ERST b/tests/data/acpi/q35/ERST new file mode 100644 index 0000000..e69de29 diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index dfb8523..e004c71 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,5 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/pc/ERST", +"tests/data/acpi/q35/ERST", +"tests/data/acpi/microvm/ERST", + -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v3 2/7] ACPI ERST: header file for ERST 2021-05-28 18:14 [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU Eric DeVolder 2021-05-28 18:14 ` [PATCH v3 1/7] ACPI ERST: bios-tables-test.c steps 1 and 2 Eric DeVolder @ 2021-05-28 18:14 ` Eric DeVolder 2021-05-28 18:14 ` [PATCH v3 3/7] ACPI ERST: support for ACPI ERST feature Eric DeVolder ` (5 subsequent siblings) 7 siblings, 0 replies; 15+ messages in thread From: Eric DeVolder @ 2021-05-28 18:14 UTC (permalink / raw) To: qemu-devel Cc: ehabkost, mst, konrad.wilk, pbonzini, imammedo, boris.ostrovsky, rth This change introduces the defintions for ACPI ERST. Signed-off-by: Eric DeVolder <eric.devolder@oracle.com> --- include/hw/acpi/erst.h | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 include/hw/acpi/erst.h diff --git a/include/hw/acpi/erst.h b/include/hw/acpi/erst.h new file mode 100644 index 0000000..8a8ac5c --- /dev/null +++ b/include/hw/acpi/erst.h @@ -0,0 +1,82 @@ +/* + * ACPI Error Record Serialization Table, ERST, Implementation + * + * Copyright (c) 2020 Oracle and/or its affiliates. + * + * See ACPI specification, "ACPI Platform Error Interfaces" + * "Error Serialization" + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2 of the License. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see <http://www.gnu.org/licenses/> + */ +#ifndef HW_ACPI_ERST_H +#define HW_ACPI_ERST_H + +void build_erst(GArray *table_data, BIOSLinker *linker, + const char *oem_id, const char *oem_table_id); +void setup_erst_dev(hwaddr base, Error *error_fatal); + +#define TYPE_ACPI_ERST "acpi-erst" +#define ACPI_ERST_BASE_PROP "base" +#define ACPI_ERST_SIZE_PROP "size" +#define ACPI_ERST_FILE_PROP "file" + +#define ACPI_ERST_ACTION_BEGIN_WRITE_OPERATION 0x0 +#define ACPI_ERST_ACTION_BEGIN_READ_OPERATION 0x1 +#define ACPI_ERST_ACTION_BEGIN_CLEAR_OPERATION 0x2 +#define ACPI_ERST_ACTION_END_OPERATION 0x3 +#define ACPI_ERST_ACTION_SET_RECORD_OFFSET 0x4 +#define ACPI_ERST_ACTION_EXECUTE_OPERATION 0x5 +#define ACPI_ERST_ACTION_CHECK_BUSY_STATUS 0x6 +#define ACPI_ERST_ACTION_GET_COMMAND_STATUS 0x7 +#define ACPI_ERST_ACTION_GET_RECORD_IDENTIFIER 0x8 +#define ACPI_ERST_ACTION_SET_RECORD_IDENTIFIER 0x9 +#define ACPI_ERST_ACTION_GET_RECORD_COUNT 0xA +#define ACPI_ERST_ACTION_BEGIN_DUMMY_WRITE_OPERATION 0xB +#define ACPI_ERST_ACTION_RESERVED 0xC +#define ACPI_ERST_ACTION_GET_ERROR_LOG_ADDRESS_RANGE 0xD +#define ACPI_ERST_ACTION_GET_ERROR_LOG_ADDRESS_LENGTH 0xE +#define ACPI_ERST_ACTION_GET_ERROR_LOG_ADDRESS_RANGE_ATTRIBUTES 0xF +#define ACPI_ERST_ACTION_GET_EXECUTE_OPERATION_TIMINGS 0x10 +#define ACPI_ERST_MAX_ACTIONS \ + (ACPI_ERST_ACTION_GET_EXECUTE_OPERATION_TIMINGS + 1) + +#define ACPI_ERST_STATUS_SUCCESS 0x00 +#define ACPI_ERST_STATUS_NOT_ENOUGH_SPACE 0x01 +#define ACPI_ERST_STATUS_HARDWARE_NOT_AVAILABLE 0x02 +#define ACPI_ERST_STATUS_FAILED 0x03 +#define ACPI_ERST_STATUS_RECORD_STORE_EMPTY 0x04 +#define ACPI_ERST_STATUS_RECORD_NOT_FOUND 0x05 + +#define ACPI_ERST_INST_READ_REGISTER 0x00 +#define ACPI_ERST_INST_READ_REGISTER_VALUE 0x01 +#define ACPI_ERST_INST_WRITE_REGISTER 0x02 +#define ACPI_ERST_INST_WRITE_REGISTER_VALUE 0x03 +#define ACPI_ERST_INST_NOOP 0x04 +#define ACPI_ERST_INST_LOAD_VAR1 0x05 +#define ACPI_ERST_INST_LOAD_VAR2 0x06 +#define ACPI_ERST_INST_STORE_VAR1 0x07 +#define ACPI_ERST_INST_ADD 0x08 +#define ACPI_ERST_INST_SUBTRACT 0x09 +#define ACPI_ERST_INST_ADD_VALUE 0x0A +#define ACPI_ERST_INST_SUBTRACT_VALUE 0x0B +#define ACPI_ERST_INST_STALL 0x0C +#define ACPI_ERST_INST_STALL_WHILE_TRUE 0x0D +#define ACPI_ERST_INST_SKIP_NEXT_INSTRUCTION_IF_TRUE 0x0E +#define ACPI_ERST_INST_GOTO 0x0F +#define ACPI_ERST_INST_SET_SRC_ADDRESS_BASE 0x10 +#define ACPI_ERST_INST_SET_DST_ADDRESS_BASE 0x11 +#define ACPI_ERST_INST_MOVE_DATA 0x12 + +#endif + -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v3 3/7] ACPI ERST: support for ACPI ERST feature 2021-05-28 18:14 [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU Eric DeVolder 2021-05-28 18:14 ` [PATCH v3 1/7] ACPI ERST: bios-tables-test.c steps 1 and 2 Eric DeVolder 2021-05-28 18:14 ` [PATCH v3 2/7] ACPI ERST: header file for ERST Eric DeVolder @ 2021-05-28 18:14 ` Eric DeVolder 2021-06-07 12:03 ` Igor Mammedov 2021-05-28 18:14 ` [PATCH v3 4/7] ACPI ERST: include ERST feature in build of ACPI support Eric DeVolder ` (4 subsequent siblings) 7 siblings, 1 reply; 15+ messages in thread From: Eric DeVolder @ 2021-05-28 18:14 UTC (permalink / raw) To: qemu-devel Cc: ehabkost, mst, konrad.wilk, pbonzini, imammedo, boris.ostrovsky, rth This change implements the support for the ACPI ERST feature[1,2]. The size of the ACPI ERST storage is declared via the QEMU global parameter acpi-erst.size. The size can range from 64KiB to to 64MiB. The default is 64KiB. The location of the ACPI ERST storage backing file is declared via the QEMU global parameter acpi-erst.file. The default is acpi-erst.backing. [1] "Advanced Configuration and Power Interface Specification", version 6.2, May 2017. https://www.uefi.org/sites/default/files/resources/ACPI_6_2.pdf [2] "Unified Extensible Firmware Interface Specification", version 2.8, March 2019. https://uefi.org/sites/default/files/resources/UEFI_Spec_2_8_final.pdf Signed-off-by: Eric DeVolder <eric.devolder@oracle.com> --- hw/acpi/erst.c | 902 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 902 insertions(+) create mode 100644 hw/acpi/erst.c diff --git a/hw/acpi/erst.c b/hw/acpi/erst.c new file mode 100644 index 0000000..645a904 --- /dev/null +++ b/hw/acpi/erst.c @@ -0,0 +1,902 @@ +/* + * ACPI Error Record Serialization Table, ERST, Implementation + * + * Copyright (c) 2021 Oracle and/or its affiliates. + * + * See ACPI specification, + * "ACPI Platform Error Interfaces" : "Error Serialization" + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2 of the License. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see <http://www.gnu.org/licenses/> + */ + +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/sysbus.h" +#include "qom/object_interfaces.h" +#include "qemu/error-report.h" +#include "migration/vmstate.h" +#include "hw/qdev-properties.h" +#include "hw/acpi/acpi.h" +#include "hw/acpi/acpi-defs.h" +#include "hw/acpi/aml-build.h" +#include "hw/acpi/bios-linker-loader.h" +#include "exec/address-spaces.h" +#include "sysemu/hostmem.h" +#include "hw/acpi/erst.h" + +#ifdef _ERST_DEBUG +#define erst_debug(fmt, ...) \ + do { fprintf(stderr, fmt, ## __VA_ARGS__); fflush(stderr); } while (0) +#else +#define erst_debug(fmt, ...) do { } while (0) +#endif + +/* See UEFI spec, Appendix N Common Platform Error Record */ +/* UEFI CPER allows for an OSPM book keeping area in the record */ +#define UEFI_CPER_RECORD_MIN_SIZE 128U +#define UEFI_CPER_SIZE_OFFSET 20U +#define UEFI_CPER_RECORD_ID_OFFSET 96U +#define IS_UEFI_CPER_RECORD(ptr) \ + (((ptr)[0] == 'C') && \ + ((ptr)[1] == 'P') && \ + ((ptr)[2] == 'E') && \ + ((ptr)[3] == 'R')) +#define THE_UEFI_CPER_RECORD_ID(ptr) \ + (*(uint64_t *)(&(ptr)[UEFI_CPER_RECORD_ID_OFFSET])) + +#define ERST_INVALID_RECORD_ID (~0UL) +#define ERST_EXECUTE_OPERATION_MAGIC 0x9CUL +#define ERST_CSR_ACTION (0UL << 3) /* action (cmd) */ +#define ERST_CSR_VALUE (1UL << 3) /* argument/value (data) */ + +/* + * As ERST_IOMEM_SIZE is used to map the ERST into the guest, + * it should/must be an integer multiple of PAGE_SIZE. + * NOTE that any change to this value will make any pre- + * existing backing files, not of the same ERST_IOMEM_SIZE, + * unusable to the guest. + */ +#define ERST_IOMEM_SIZE (2UL * 4096) + +/* + * This implementation is an ACTION (cmd) and VALUE (data) + * interface consisting of just two 64-bit registers. + */ +#define ERST_REG_LEN (2UL * sizeof(uint64_t)) + +/* + * The space not utilized by the register interface is the + * buffer for exchanging ERST record contents. + */ +#define ERST_RECORD_SIZE (ERST_IOMEM_SIZE - ERST_REG_LEN) + +/* + * Mode to be used for backing file + */ +#define ACPIERST(obj) \ + OBJECT_CHECK(ERSTDeviceState, (obj), TYPE_ACPI_ERST) +#define ACPIERST_CLASS(oc) \ + OBJECT_CLASS_CHECK(ERSTDeviceStateClass, (oc), TYPE_ACPI_ERST) +#define ACPIERST_GET_CLASS(obj) \ + OBJECT_GET_CLASS(ERSTDeviceStateClass, (obj), TYPE_ACPI_ERST) + +typedef struct { + SysBusDevice parent_obj; + Object *hostmem_obj; + HostMemoryBackend *hostmem; + + MemoryRegion iomem; + uint32_t prop_size; + hwaddr prop_base; + char *prop_path; + + uint8_t operation; + uint8_t busy_status; + uint8_t command_status; + uint32_t record_offset; + uint32_t record_count; + uint64_t reg_action; + uint64_t reg_value; + uint64_t record_identifier; + + unsigned next_record_index; + uint8_t record[ERST_RECORD_SIZE]; /* read/written directly by guest */ + uint8_t tmp_record[ERST_RECORD_SIZE]; /* intermediate manipulation buffer */ + +} ERSTDeviceState; + +static unsigned copy_from_nvram_by_index(ERSTDeviceState *s, unsigned index) +{ + /* Read an nvram entry into tmp_record */ + unsigned rc = ACPI_ERST_STATUS_FAILED; + off_t offset = (index * ERST_RECORD_SIZE); + + if ((offset + ERST_RECORD_SIZE) <= s->prop_size) { + MemoryRegion *mr; + mr = host_memory_backend_get_memory(s->hostmem); + if (mr) { + uint8_t *p = (uint8_t *)memory_region_get_ram_ptr(mr); + memcpy(s->tmp_record, p + offset, ERST_RECORD_SIZE); + rc = ACPI_ERST_STATUS_SUCCESS; + } + } + return rc; +} + +static unsigned copy_to_nvram_by_index(ERSTDeviceState *s, unsigned index) +{ + /* Write entry in tmp_record into nvram, and backing file */ + unsigned rc = ACPI_ERST_STATUS_FAILED; + off_t offset = (index * ERST_RECORD_SIZE); + + if ((offset + ERST_RECORD_SIZE) <= s->prop_size) { + MemoryRegion *mr; + mr = host_memory_backend_get_memory(s->hostmem); + if (mr) { + uint8_t *p = (uint8_t *)memory_region_get_ram_ptr(mr); + memcpy(p + offset, s->tmp_record, ERST_RECORD_SIZE); + rc = ACPI_ERST_STATUS_SUCCESS; + } + } + return rc; +} + +static int lookup_erst_record_by_identifier(ERSTDeviceState *s, + uint64_t record_identifier, bool *record_found, bool alloc_for_write) +{ + int rc = -1; + int empty_index = -1; + int index = 0; + unsigned rrc; + + *record_found = 0; + + do { + rrc = copy_from_nvram_by_index(s, (unsigned)index); + if (rrc == ACPI_ERST_STATUS_SUCCESS) { + uint64_t this_identifier; + this_identifier = THE_UEFI_CPER_RECORD_ID(s->tmp_record); + if (IS_UEFI_CPER_RECORD(s->tmp_record) && + (this_identifier == record_identifier)) { + rc = index; + *record_found = 1; + break; + } + if ((this_identifier == ERST_INVALID_RECORD_ID) && + (empty_index < 0)) { + empty_index = index; /* first available for write */ + } + } + ++index; + } while (rrc == ACPI_ERST_STATUS_SUCCESS); + + /* Record not found, allocate for writing */ + if ((rc < 0) && alloc_for_write) { + rc = empty_index; + } + + return rc; +} + +static unsigned clear_erst_record(ERSTDeviceState *s) +{ + unsigned rc = ACPI_ERST_STATUS_RECORD_NOT_FOUND; + bool record_found; + int index; + + index = lookup_erst_record_by_identifier(s, + s->record_identifier, &record_found, 0); + if (record_found) { + memset(s->tmp_record, 0xFF, ERST_RECORD_SIZE); + rc = copy_to_nvram_by_index(s, (unsigned)index); + if (rc == ACPI_ERST_STATUS_SUCCESS) { + s->record_count -= 1; + } + } + + return rc; +} + +static unsigned write_erst_record(ERSTDeviceState *s) +{ + unsigned rc = ACPI_ERST_STATUS_FAILED; + + if (s->record_offset < (ERST_RECORD_SIZE - UEFI_CPER_RECORD_MIN_SIZE)) { + uint64_t record_identifier; + uint8_t *record = &s->record[s->record_offset]; + bool record_found; + int index; + + record_identifier = (s->record_identifier == ERST_INVALID_RECORD_ID) + ? THE_UEFI_CPER_RECORD_ID(record) : s->record_identifier; + + index = lookup_erst_record_by_identifier(s, + record_identifier, &record_found, 1); + if (index < 0) { + rc = ACPI_ERST_STATUS_NOT_ENOUGH_SPACE; + } else { + if (0 != s->record_offset) { + memset(&s->tmp_record[ERST_RECORD_SIZE - s->record_offset], + 0xFF, s->record_offset); + } + memcpy(s->tmp_record, record, ERST_RECORD_SIZE - s->record_offset); + rc = copy_to_nvram_by_index(s, (unsigned)index); + if (rc == ACPI_ERST_STATUS_SUCCESS) { + if (!record_found) { /* not overwriting existing record */ + s->record_count += 1; /* writing new record */ + } + } + } + } + + return rc; +} + +static unsigned next_erst_record(ERSTDeviceState *s, + uint64_t *record_identifier) +{ + unsigned rc = ACPI_ERST_STATUS_RECORD_NOT_FOUND; + unsigned index; + unsigned rrc; + + *record_identifier = ERST_INVALID_RECORD_ID; + + index = s->next_record_index; + do { + rrc = copy_from_nvram_by_index(s, (unsigned)index); + if (rrc == ACPI_ERST_STATUS_SUCCESS) { + if (IS_UEFI_CPER_RECORD(s->tmp_record)) { + s->next_record_index = index + 1; /* where to start next time */ + *record_identifier = THE_UEFI_CPER_RECORD_ID(s->tmp_record); + rc = ACPI_ERST_STATUS_SUCCESS; + break; + } + ++index; + } else { + if (s->next_record_index == 0) { + rc = ACPI_ERST_STATUS_RECORD_STORE_EMPTY; + } + s->next_record_index = 0; /* at end, reset */ + } + } while (rrc == ACPI_ERST_STATUS_SUCCESS); + + return rc; +} + +static unsigned read_erst_record(ERSTDeviceState *s) +{ + unsigned rc = ACPI_ERST_STATUS_RECORD_NOT_FOUND; + bool record_found; + int index; + + index = lookup_erst_record_by_identifier(s, + s->record_identifier, &record_found, 0); + if (record_found) { + rc = copy_from_nvram_by_index(s, (unsigned)index); + if (rc == ACPI_ERST_STATUS_SUCCESS) { + if (s->record_offset < ERST_RECORD_SIZE) { + memcpy(&s->record[s->record_offset], s->tmp_record, + ERST_RECORD_SIZE - s->record_offset); + } + } + } + + return rc; +} + +static unsigned get_erst_record_count(ERSTDeviceState *s) +{ + /* Compute record_count */ + unsigned index = 0; + + s->record_count = 0; + while (copy_from_nvram_by_index(s, index) == ACPI_ERST_STATUS_SUCCESS) { + uint8_t *ptr = &s->tmp_record[0]; + uint64_t record_identifier = THE_UEFI_CPER_RECORD_ID(ptr); + if (IS_UEFI_CPER_RECORD(ptr) && + (ERST_INVALID_RECORD_ID != record_identifier)) { + s->record_count += 1; + } + ++index; + } + return s->record_count; +} + +static uint64_t erst_rd_reg64(hwaddr addr, + uint64_t reg, unsigned size) +{ + uint64_t rdval; + uint64_t mask; + unsigned shift; + + if (size == sizeof(uint64_t)) { + /* 64b access */ + mask = 0xFFFFFFFFFFFFFFFFUL; + shift = 0; + } else { + /* 32b access */ + mask = 0x00000000FFFFFFFFUL; + shift = ((addr & 0x4) == 0x4) ? 32 : 0; + } + + rdval = reg; + rdval >>= shift; + rdval &= mask; + + return rdval; +} + +static uint64_t erst_wr_reg64(hwaddr addr, + uint64_t reg, uint64_t val, unsigned size) +{ + uint64_t wrval; + uint64_t mask; + unsigned shift; + + if (size == sizeof(uint64_t)) { + /* 64b access */ + mask = 0xFFFFFFFFFFFFFFFFUL; + shift = 0; + } else { + /* 32b access */ + mask = 0x00000000FFFFFFFFUL; + shift = ((addr & 0x4) == 0x4) ? 32 : 0; + } + + val &= mask; + val <<= shift; + mask <<= shift; + wrval = reg; + wrval &= ~mask; + wrval |= val; + + return wrval; +} + +static void erst_write(void *opaque, hwaddr addr, + uint64_t val, unsigned size) +{ + ERSTDeviceState *s = (ERSTDeviceState *)opaque; + + if (addr < ERST_REG_LEN) { + /* + * NOTE: All actions/operations/side effects happen on the WRITE, + * by design. The READs simply return the reg_value contents. + */ + erst_debug("ERST write %016lx: val %016lx sz %u\n", addr, val, size); + /* The REGISTER region */ + switch (addr) { + case ERST_CSR_VALUE + 0: + case ERST_CSR_VALUE + 4: + s->reg_value = erst_wr_reg64(addr, s->reg_value, val, size); + break; + case ERST_CSR_ACTION + 0: +/* case ERST_CSR_ACTION+4: as coded, not really a 64b register */ + switch (val) { + case ACPI_ERST_ACTION_BEGIN_WRITE_OPERATION: + case ACPI_ERST_ACTION_BEGIN_READ_OPERATION: + case ACPI_ERST_ACTION_BEGIN_CLEAR_OPERATION: + case ACPI_ERST_ACTION_BEGIN_DUMMY_WRITE_OPERATION: + case ACPI_ERST_ACTION_END_OPERATION: + s->operation = val; + break; + case ACPI_ERST_ACTION_SET_RECORD_OFFSET: + s->record_offset = s->reg_value; + break; + case ACPI_ERST_ACTION_EXECUTE_OPERATION: + if ((uint8_t)s->reg_value == ERST_EXECUTE_OPERATION_MAGIC) { + s->busy_status = 1; + switch (s->operation) { + case ACPI_ERST_ACTION_BEGIN_WRITE_OPERATION: + s->command_status = write_erst_record(s); + break; + case ACPI_ERST_ACTION_BEGIN_READ_OPERATION: + s->command_status = read_erst_record(s); + break; + case ACPI_ERST_ACTION_BEGIN_CLEAR_OPERATION: + s->command_status = clear_erst_record(s); + break; + case ACPI_ERST_ACTION_BEGIN_DUMMY_WRITE_OPERATION: + s->command_status = ACPI_ERST_STATUS_SUCCESS; + break; + case ACPI_ERST_ACTION_END_OPERATION: + s->command_status = ACPI_ERST_STATUS_SUCCESS; + break; + default: + s->command_status = ACPI_ERST_STATUS_FAILED; + break; + } + s->record_identifier = ERST_INVALID_RECORD_ID; + s->busy_status = 0; + } + break; + case ACPI_ERST_ACTION_CHECK_BUSY_STATUS: + s->reg_value = s->busy_status; + break; + case ACPI_ERST_ACTION_GET_COMMAND_STATUS: + s->reg_value = s->command_status; + break; + case ACPI_ERST_ACTION_GET_RECORD_IDENTIFIER: + s->command_status = next_erst_record(s, &s->reg_value); + break; + case ACPI_ERST_ACTION_SET_RECORD_IDENTIFIER: + s->record_identifier = s->reg_value; + break; + case ACPI_ERST_ACTION_GET_RECORD_COUNT: + s->reg_value = s->record_count; + break; + case ACPI_ERST_ACTION_GET_ERROR_LOG_ADDRESS_RANGE: + s->reg_value = s->prop_base + ERST_REG_LEN; + break; + case ACPI_ERST_ACTION_GET_ERROR_LOG_ADDRESS_LENGTH: + s->reg_value = ERST_RECORD_SIZE; + break; + case ACPI_ERST_ACTION_GET_ERROR_LOG_ADDRESS_RANGE_ATTRIBUTES: + s->reg_value = 0; /* correct/intended value */ + break; + case ACPI_ERST_ACTION_GET_EXECUTE_OPERATION_TIMINGS: + /* + * 100UL is max, 10UL is nominal + */ + s->reg_value = ((100UL << 32) | (10UL << 0)); + break; + case ACPI_ERST_ACTION_RESERVED: + default: + /* + * NOP + */ + break; + } + break; + default: + /* + * All other register writes are NO-OPs + */ + break; + } + } else { + /* The RECORD region */ + unsigned offset = addr - ERST_REG_LEN; + uint8_t *ptr = &s->record[offset]; + switch (size) { + default: + case sizeof(uint8_t): + *(uint8_t *)ptr = (uint8_t)val; + break; + case sizeof(uint16_t): + *(uint16_t *)ptr = (uint16_t)val; + break; + case sizeof(uint32_t): + *(uint32_t *)ptr = (uint32_t)val; + break; + case sizeof(uint64_t): + *(uint64_t *)ptr = (uint64_t)val; + break; + } + } +} + +static uint64_t erst_read(void *opaque, hwaddr addr, + unsigned size) +{ + ERSTDeviceState *s = (ERSTDeviceState *)opaque; + uint64_t val = 0; + + if (addr < ERST_REG_LEN) { + switch (addr) { + case ERST_CSR_ACTION + 0: + case ERST_CSR_ACTION + 4: + val = erst_rd_reg64(addr, s->reg_action, size); + break; + case ERST_CSR_VALUE + 0: + case ERST_CSR_VALUE + 4: + val = erst_rd_reg64(addr, s->reg_value, size); + break; + default: + break; + } + } else { + /* + * The RECORD region + */ + uint8_t *ptr = &s->record[addr - ERST_REG_LEN]; + switch (size) { + default: + case sizeof(uint8_t): + val = *(uint8_t *)ptr; + break; + case sizeof(uint16_t): + val = *(uint16_t *)ptr; + break; + case sizeof(uint32_t): + val = *(uint32_t *)ptr; + break; + case sizeof(uint64_t): + val = *(uint64_t *)ptr; + break; + } + } + erst_debug("ERST read %016lx: val %016lx sz %u\n", addr, val, size); + return val; +} + +static size_t build_erst_action(GArray *table_data, + uint8_t serialization_action, + uint8_t instruction, + uint8_t flags, + uint8_t width, + uint64_t address, + uint64_t value, + uint64_t mask) +{ + /* See ACPI spec, Error Serialization */ + uint8_t access_width = 0; + build_append_int_noprefix(table_data, serialization_action, 1); + build_append_int_noprefix(table_data, instruction , 1); + build_append_int_noprefix(table_data, flags , 1); + build_append_int_noprefix(table_data, 0 , 1); + /* GAS space_id */ + build_append_int_noprefix(table_data, AML_SYSTEM_MEMORY , 1); + /* GAS bit_width */ + build_append_int_noprefix(table_data, width , 1); + /* GAS bit_offset */ + build_append_int_noprefix(table_data, 0 , 1); + /* GAS access_width */ + switch (width) { + case 8: + access_width = 1; + break; + case 16: + access_width = 2; + break; + case 32: + access_width = 3; + break; + case 64: + access_width = 4; + break; + default: + access_width = 0; + break; + } + build_append_int_noprefix(table_data, access_width , 1); + /* GAS address */ + build_append_int_noprefix(table_data, address, 8); + /* value */ + build_append_int_noprefix(table_data, value , 8); + /* mask */ + build_append_int_noprefix(table_data, mask , 8); + + return 1; +} + +static const MemoryRegionOps erst_rw_ops = { + .read = erst_read, + .write = erst_write, + .endianness = DEVICE_NATIVE_ENDIAN, +}; + +void build_erst(GArray *table_data, BIOSLinker *linker, + const char *oem_id, const char *oem_table_id) +{ + unsigned action, insns = 0; + unsigned erst_start = table_data->len; + unsigned iec_offset = 0; + Object *obj; + hwaddr base = 0x0UL; + + obj = object_resolve_path_type("", TYPE_ACPI_ERST, NULL); + if (obj) { + base = ACPIERST(obj)->prop_base; + } + + /* See ACPI spec, Error Serialization */ + acpi_data_push(table_data, sizeof(AcpiTableHeader)); + /* serialization_header_length */ + build_append_int_noprefix(table_data, 48, 4); + /* reserved */ + build_append_int_noprefix(table_data, 0, 4); + iec_offset = table_data->len; + /* instruction_entry_count (placeholder) */ + build_append_int_noprefix(table_data, 0, 4); + +#define BEA(I, F, W, ADDR, VAL, MASK) \ + build_erst_action(table_data, action, \ + ACPI_ERST_INST_##I, F, W, base + ADDR, VAL, MASK) +#define MASK8 0x00000000000000FFUL +#define MASK16 0x000000000000FFFFUL +#define MASK32 0x00000000FFFFFFFFUL +#define MASK64 0xFFFFFFFFFFFFFFFFUL + + for (action = 0; action < ACPI_ERST_MAX_ACTIONS; ++action) { + switch (action) { + case ACPI_ERST_ACTION_BEGIN_WRITE_OPERATION: + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, + ERST_CSR_ACTION, action, MASK8); + break; + case ACPI_ERST_ACTION_BEGIN_READ_OPERATION: + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, + ERST_CSR_ACTION, action, MASK8); + break; + case ACPI_ERST_ACTION_BEGIN_CLEAR_OPERATION: + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, + ERST_CSR_ACTION, action, MASK8); + break; + case ACPI_ERST_ACTION_END_OPERATION: + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, + ERST_CSR_ACTION, action, MASK8); + break; + case ACPI_ERST_ACTION_SET_RECORD_OFFSET: + insns += BEA(WRITE_REGISTER , 0, 32, + ERST_CSR_VALUE , 0, MASK32); + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, + ERST_CSR_ACTION, action, MASK8); + break; + case ACPI_ERST_ACTION_EXECUTE_OPERATION: + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, + ERST_CSR_VALUE , ERST_EXECUTE_OPERATION_MAGIC, MASK8); + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, + ERST_CSR_ACTION, action, MASK8); + break; + case ACPI_ERST_ACTION_CHECK_BUSY_STATUS: + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, + ERST_CSR_ACTION, action, MASK8); + insns += BEA(READ_REGISTER_VALUE , 0, 32, + ERST_CSR_VALUE, 0x01, MASK8); + break; + case ACPI_ERST_ACTION_GET_COMMAND_STATUS: + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, + ERST_CSR_ACTION, action, MASK8); + insns += BEA(READ_REGISTER , 0, 32, + ERST_CSR_VALUE, 0, MASK8); + break; + case ACPI_ERST_ACTION_GET_RECORD_IDENTIFIER: + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, + ERST_CSR_ACTION, action, MASK8); + insns += BEA(READ_REGISTER , 0, 64, + ERST_CSR_VALUE, 0, MASK64); + break; + case ACPI_ERST_ACTION_SET_RECORD_IDENTIFIER: + insns += BEA(WRITE_REGISTER , 0, 64, + ERST_CSR_VALUE , 0, MASK64); + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, + ERST_CSR_ACTION, action, MASK8); + break; + case ACPI_ERST_ACTION_GET_RECORD_COUNT: + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, + ERST_CSR_ACTION, action, MASK8); + insns += BEA(READ_REGISTER , 0, 32, + ERST_CSR_VALUE, 0, MASK32); + break; + case ACPI_ERST_ACTION_BEGIN_DUMMY_WRITE_OPERATION: + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, + ERST_CSR_ACTION, action, MASK8); + break; + case ACPI_ERST_ACTION_RESERVED: + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, + ERST_CSR_ACTION, action, MASK8); + break; + case ACPI_ERST_ACTION_GET_ERROR_LOG_ADDRESS_RANGE: + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, + ERST_CSR_ACTION, action, MASK8); + insns += BEA(READ_REGISTER , 0, 64, + ERST_CSR_VALUE, 0, MASK64); + break; + case ACPI_ERST_ACTION_GET_ERROR_LOG_ADDRESS_LENGTH: + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, + ERST_CSR_ACTION, action, MASK8); + insns += BEA(READ_REGISTER , 0, 64, + ERST_CSR_VALUE, 0, MASK32); + break; + case ACPI_ERST_ACTION_GET_ERROR_LOG_ADDRESS_RANGE_ATTRIBUTES: + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, + ERST_CSR_ACTION, action, MASK8); + insns += BEA(READ_REGISTER , 0, 32, + ERST_CSR_VALUE, 0, MASK32); + break; + case ACPI_ERST_ACTION_GET_EXECUTE_OPERATION_TIMINGS: + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, + ERST_CSR_ACTION, action, MASK8); + insns += BEA(READ_REGISTER , 0, 64, + ERST_CSR_VALUE, 0, MASK64); + default: + insns += BEA(NOOP, 0, 0, 0, action, 0); + break; + } + } + + /* acpi_data_push() within BEA() can result in new GArray pointer */ + *(uint32_t *)(table_data->data + iec_offset) = cpu_to_le32(insns); + + build_header(linker, table_data, + (void *)(table_data->data + erst_start), + "ERST", table_data->len - erst_start, + 1, oem_id, oem_table_id); +} + +/*******************************************************************/ +/*******************************************************************/ +static int erst_post_load(void *opaque, int version_id) +{ + /*ERSTDeviceState *s = opaque;*/ + erst_debug("+erst_post_load(%d)\n", version_id); + /* Ensure nvram persists into backing file */ + erst_debug("-erst_post_load()\n"); + return 0; +} + +static const VMStateDescription erst_vmstate = { + .name = "acpi-erst", + .version_id = 1, + .minimum_version_id = 1, + .post_load = erst_post_load, + .fields = (VMStateField[]) { + VMSTATE_UINT8(operation, ERSTDeviceState), + VMSTATE_UINT8(busy_status, ERSTDeviceState), + VMSTATE_UINT8(command_status, ERSTDeviceState), + VMSTATE_UINT32(record_offset, ERSTDeviceState), + VMSTATE_UINT32(record_count, ERSTDeviceState), + VMSTATE_UINT64(reg_action, ERSTDeviceState), + VMSTATE_UINT64(reg_value, ERSTDeviceState), + VMSTATE_UINT64(record_identifier, ERSTDeviceState), + VMSTATE_UINT8_ARRAY(record, ERSTDeviceState, ERST_RECORD_SIZE), + VMSTATE_UINT8_ARRAY(tmp_record, ERSTDeviceState, ERST_RECORD_SIZE), + VMSTATE_END_OF_LIST() + } +}; + +static void erst_realizefn(DeviceState *dev, Error **errp) +{ + SysBusDevice *d = SYS_BUS_DEVICE(dev); + ERSTDeviceState *s = ACPIERST(dev); + unsigned index = 0; + + erst_debug("+erst_realizefn()\n"); + + if (!(s->prop_size > ERST_RECORD_SIZE) && + (s->prop_size <= 0x04000000)) { + error_setg(errp, "'size' property %d is not set properly", + s->prop_size); + return; + } + + if (!s->prop_path) { + s->prop_path = (char *)(TYPE_ACPI_ERST ".backing"); + } + + s->hostmem = NULL; + s->hostmem_obj = object_new(TYPE_MEMORY_BACKEND_FILE); + object_property_set_str(s->hostmem_obj, "mem-path", s->prop_path, &error_fatal); + object_property_set_bool(s->hostmem_obj, "share", true, &error_fatal); + + /* MemoryBackend upsizes to a PAGE_SIZE multiple for prop_size */ + object_property_set_int(s->hostmem_obj, "size", s->prop_size, &error_fatal); + user_creatable_complete(USER_CREATABLE(s->hostmem_obj), &error_fatal); + s->hostmem = MEMORY_BACKEND(s->hostmem_obj); + + /* Convert prop_size to integer multiple of ERST_RECORD_SIZE */ + s->prop_size -= (s->prop_size % ERST_RECORD_SIZE); + + /* + * MemoryBackend initializes contents to zero, but we actually + * want contents initialized to 0xFF. + */ + if (copy_from_nvram_by_index(s, 0) == ACPI_ERST_STATUS_SUCCESS) { + if (s->tmp_record[0] == 0x00) { + memset(s->tmp_record, 0xFF, ERST_RECORD_SIZE); + index = 0; + while (copy_to_nvram_by_index(s, index) == ACPI_ERST_STATUS_SUCCESS) { + ++index; + } + } + } + + /* Initialize record_count */ + get_erst_record_count(s); + + erst_debug(ACPI_ERST_BASE_PROP" %016llx\n", (unsigned long long)s->prop_base); + erst_debug(ACPI_ERST_SIZE_PROP" %x\n", s->prop_size); + erst_debug(ACPI_ERST_FILE_PROP" %s\n", s->prop_path); + + memory_region_init_io(&s->iomem, OBJECT(s), &erst_rw_ops, s, + TYPE_ACPI_ERST, ERST_IOMEM_SIZE); + sysbus_init_mmio(d, &s->iomem); + erst_debug("-erst_realizefn()\n"); +} + +static void erst_unrealizefn(DeviceState *dev) +{ + ERSTDeviceState *s = ACPIERST(dev); + + erst_debug("+erst_unrealizefn()\n"); + + if (s->hostmem_obj) { + object_unref(s->hostmem_obj); + } + + erst_debug("-erst_unrealizefn()\n"); +} + +static void erst_reset(DeviceState *dev) +{ + ERSTDeviceState *s = ACPIERST(dev); + + erst_debug("+erst_reset(%p) %d\n", s, s->record_count); + s->operation = 0; + s->busy_status = 0; + s->command_status = ACPI_ERST_STATUS_SUCCESS; + /* indicate empty/no-more until further notice */ + s->record_identifier = ERST_INVALID_RECORD_ID; + s->record_offset = 0; + s->next_record_index = 0; + /* NOTE: record_count and nvram are initialized elsewhere */ + erst_debug("-erst_reset()\n"); +} + +void setup_erst_dev(hwaddr base, Error *error_fatal) +{ + SysBusDevice *s; + DeviceState *dev; + ERSTDeviceState *e; + + dev = qdev_try_new(TYPE_ACPI_ERST); + if (!dev) { + error_report("couldn't create ERST device"); + exit(1); + } + e = ACPIERST(dev); + e->prop_base = base; + s = SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(s, &error_fatal); + sysbus_mmio_map(s, 0, base); +} + +static Property erst_properties[] = { + DEFINE_PROP_UINT32(ACPI_ERST_SIZE_PROP, ERSTDeviceState, prop_size, 0x00010000), + DEFINE_PROP_STRING(ACPI_ERST_FILE_PROP, ERSTDeviceState, prop_path), + DEFINE_PROP_END_OF_LIST(), +}; + +static void erst_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + erst_debug("+erst_class_init()\n"); + dc->realize = erst_realizefn; + dc->unrealize = erst_unrealizefn; + dc->reset = erst_reset; + dc->vmsd = &erst_vmstate; + device_class_set_props(dc, erst_properties); + dc->desc = "ACPI Error Record Serialization Table (ERST) device"; + set_bit(DEVICE_CATEGORY_MISC, dc->categories); + erst_debug("-erst_class_init()\n"); +} + +static const TypeInfo erst_type_info = { + .name = TYPE_ACPI_ERST, + .parent = TYPE_SYS_BUS_DEVICE, + .class_init = erst_class_init, + .instance_size = sizeof(ERSTDeviceState), +}; + +static void erst_register_types(void) +{ + type_register_static(&erst_type_info); +} + +type_init(erst_register_types) -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v3 3/7] ACPI ERST: support for ACPI ERST feature 2021-05-28 18:14 ` [PATCH v3 3/7] ACPI ERST: support for ACPI ERST feature Eric DeVolder @ 2021-06-07 12:03 ` Igor Mammedov 0 siblings, 0 replies; 15+ messages in thread From: Igor Mammedov @ 2021-06-07 12:03 UTC (permalink / raw) To: Eric DeVolder Cc: ehabkost, mst, konrad.wilk, qemu-devel, pbonzini, boris.ostrovsky, rth On Fri, 28 May 2021 14:14:15 -0400 Eric DeVolder <eric.devolder@oracle.com> wrote: > This change implements the support for the ACPI ERST feature[1,2]. > > The size of the ACPI ERST storage is declared via the QEMU > global parameter acpi-erst.size. The size can range from 64KiB > to to 64MiB. The default is 64KiB. > > The location of the ACPI ERST storage backing file is declared > via the QEMU global parameter acpi-erst.file. The default > is acpi-erst.backing. > > [1] "Advanced Configuration and Power Interface Specification", > version 6.2, May 2017. > https://www.uefi.org/sites/default/files/resources/ACPI_6_2.pdf > > [2] "Unified Extensible Firmware Interface Specification", > version 2.8, March 2019. > https://uefi.org/sites/default/files/resources/UEFI_Spec_2_8_final.pdf > > Signed-off-by: Eric DeVolder <eric.devolder@oracle.com> > --- > hw/acpi/erst.c | 902 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 902 insertions(+) > create mode 100644 hw/acpi/erst.c > > diff --git a/hw/acpi/erst.c b/hw/acpi/erst.c > new file mode 100644 > index 0000000..645a904 > --- /dev/null > +++ b/hw/acpi/erst.c > @@ -0,0 +1,902 @@ > +/* > + * ACPI Error Record Serialization Table, ERST, Implementation > + * > + * Copyright (c) 2021 Oracle and/or its affiliates. > + * > + * See ACPI specification, > + * "ACPI Platform Error Interfaces" : "Error Serialization" > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; > + * version 2 of the License. > + * > + * This library 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 > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, see <http://www.gnu.org/licenses/> > + */ > + > +#include <sys/types.h> > +#include <sys/stat.h> > +#include <unistd.h> > + > +#include "qemu/osdep.h" > +#include "qapi/error.h" > +#include "hw/sysbus.h" > +#include "qom/object_interfaces.h" > +#include "qemu/error-report.h" > +#include "migration/vmstate.h" > +#include "hw/qdev-properties.h" > +#include "hw/acpi/acpi.h" > +#include "hw/acpi/acpi-defs.h" > +#include "hw/acpi/aml-build.h" > +#include "hw/acpi/bios-linker-loader.h" > +#include "exec/address-spaces.h" > +#include "sysemu/hostmem.h" > +#include "hw/acpi/erst.h" > + > +#ifdef _ERST_DEBUG > +#define erst_debug(fmt, ...) \ > + do { fprintf(stderr, fmt, ## __VA_ARGS__); fflush(stderr); } while (0) > +#else > +#define erst_debug(fmt, ...) do { } while (0) > +#endif > + > +/* See UEFI spec, Appendix N Common Platform Error Record */ > +/* UEFI CPER allows for an OSPM book keeping area in the record */ > +#define UEFI_CPER_RECORD_MIN_SIZE 128U > +#define UEFI_CPER_SIZE_OFFSET 20U > +#define UEFI_CPER_RECORD_ID_OFFSET 96U > +#define IS_UEFI_CPER_RECORD(ptr) \ > + (((ptr)[0] == 'C') && \ > + ((ptr)[1] == 'P') && \ > + ((ptr)[2] == 'E') && \ > + ((ptr)[3] == 'R')) > +#define THE_UEFI_CPER_RECORD_ID(ptr) \ > + (*(uint64_t *)(&(ptr)[UEFI_CPER_RECORD_ID_OFFSET])) > + > +#define ERST_INVALID_RECORD_ID (~0UL) > +#define ERST_EXECUTE_OPERATION_MAGIC 0x9CUL > +#define ERST_CSR_ACTION (0UL << 3) /* action (cmd) */ > +#define ERST_CSR_VALUE (1UL << 3) /* argument/value (data) */ > + > +/* > + * As ERST_IOMEM_SIZE is used to map the ERST into the guest, > + * it should/must be an integer multiple of PAGE_SIZE. > + * NOTE that any change to this value will make any pre- > + * existing backing files, not of the same ERST_IOMEM_SIZE, > + * unusable to the guest. > + */ > +#define ERST_IOMEM_SIZE (2UL * 4096) > + > +/* > + * This implementation is an ACTION (cmd) and VALUE (data) > + * interface consisting of just two 64-bit registers. > + */ > +#define ERST_REG_LEN (2UL * sizeof(uint64_t)) > + > +/* > + * The space not utilized by the register interface is the > + * buffer for exchanging ERST record contents. > + */ > +#define ERST_RECORD_SIZE (ERST_IOMEM_SIZE - ERST_REG_LEN) > + > +/* > + * Mode to be used for backing file > + */ > +#define ACPIERST(obj) \ > + OBJECT_CHECK(ERSTDeviceState, (obj), TYPE_ACPI_ERST) > +#define ACPIERST_CLASS(oc) \ > + OBJECT_CLASS_CHECK(ERSTDeviceStateClass, (oc), TYPE_ACPI_ERST) > +#define ACPIERST_GET_CLASS(obj) \ > + OBJECT_GET_CLASS(ERSTDeviceStateClass, (obj), TYPE_ACPI_ERST) > + > +typedef struct { > + SysBusDevice parent_obj; > + Object *hostmem_obj; > + HostMemoryBackend *hostmem; > + > + MemoryRegion iomem; > + uint32_t prop_size; > + hwaddr prop_base; > + char *prop_path; > + > + uint8_t operation; > + uint8_t busy_status; > + uint8_t command_status; > + uint32_t record_offset; > + uint32_t record_count; > + uint64_t reg_action; > + uint64_t reg_value; > + uint64_t record_identifier; > + > + unsigned next_record_index; > + uint8_t record[ERST_RECORD_SIZE]; /* read/written directly by guest */ > + uint8_t tmp_record[ERST_RECORD_SIZE]; /* intermediate manipulation buffer */ > + > +} ERSTDeviceState; > + > +static unsigned copy_from_nvram_by_index(ERSTDeviceState *s, unsigned index) > +{ > + /* Read an nvram entry into tmp_record */ > + unsigned rc = ACPI_ERST_STATUS_FAILED; > + off_t offset = (index * ERST_RECORD_SIZE); > + > + if ((offset + ERST_RECORD_SIZE) <= s->prop_size) { > + MemoryRegion *mr; > + mr = host_memory_backend_get_memory(s->hostmem); > + if (mr) { > + uint8_t *p = (uint8_t *)memory_region_get_ram_ptr(mr); > + memcpy(s->tmp_record, p + offset, ERST_RECORD_SIZE); > + rc = ACPI_ERST_STATUS_SUCCESS; > + } > + } > + return rc; > +} > + > +static unsigned copy_to_nvram_by_index(ERSTDeviceState *s, unsigned index) > +{ > + /* Write entry in tmp_record into nvram, and backing file */ > + unsigned rc = ACPI_ERST_STATUS_FAILED; > + off_t offset = (index * ERST_RECORD_SIZE); > + > + if ((offset + ERST_RECORD_SIZE) <= s->prop_size) { > + MemoryRegion *mr; > + mr = host_memory_backend_get_memory(s->hostmem); > + if (mr) { > + uint8_t *p = (uint8_t *)memory_region_get_ram_ptr(mr); > + memcpy(p + offset, s->tmp_record, ERST_RECORD_SIZE); > + rc = ACPI_ERST_STATUS_SUCCESS; > + } > + } > + return rc; > +} > + > +static int lookup_erst_record_by_identifier(ERSTDeviceState *s, > + uint64_t record_identifier, bool *record_found, bool alloc_for_write) > +{ > + int rc = -1; > + int empty_index = -1; > + int index = 0; > + unsigned rrc; > + > + *record_found = 0; > + > + do { > + rrc = copy_from_nvram_by_index(s, (unsigned)index); > + if (rrc == ACPI_ERST_STATUS_SUCCESS) { > + uint64_t this_identifier; > + this_identifier = THE_UEFI_CPER_RECORD_ID(s->tmp_record); > + if (IS_UEFI_CPER_RECORD(s->tmp_record) && > + (this_identifier == record_identifier)) { > + rc = index; > + *record_found = 1; > + break; > + } > + if ((this_identifier == ERST_INVALID_RECORD_ID) && > + (empty_index < 0)) { > + empty_index = index; /* first available for write */ > + } > + } > + ++index; > + } while (rrc == ACPI_ERST_STATUS_SUCCESS); > + > + /* Record not found, allocate for writing */ > + if ((rc < 0) && alloc_for_write) { > + rc = empty_index; > + } > + > + return rc; > +} > + > +static unsigned clear_erst_record(ERSTDeviceState *s) > +{ > + unsigned rc = ACPI_ERST_STATUS_RECORD_NOT_FOUND; > + bool record_found; > + int index; > + > + index = lookup_erst_record_by_identifier(s, > + s->record_identifier, &record_found, 0); > + if (record_found) { > + memset(s->tmp_record, 0xFF, ERST_RECORD_SIZE); > + rc = copy_to_nvram_by_index(s, (unsigned)index); > + if (rc == ACPI_ERST_STATUS_SUCCESS) { > + s->record_count -= 1; > + } > + } > + > + return rc; > +} > + > +static unsigned write_erst_record(ERSTDeviceState *s) > +{ > + unsigned rc = ACPI_ERST_STATUS_FAILED; > + > + if (s->record_offset < (ERST_RECORD_SIZE - UEFI_CPER_RECORD_MIN_SIZE)) { > + uint64_t record_identifier; > + uint8_t *record = &s->record[s->record_offset]; > + bool record_found; > + int index; > + > + record_identifier = (s->record_identifier == ERST_INVALID_RECORD_ID) > + ? THE_UEFI_CPER_RECORD_ID(record) : s->record_identifier; > + > + index = lookup_erst_record_by_identifier(s, > + record_identifier, &record_found, 1); > + if (index < 0) { > + rc = ACPI_ERST_STATUS_NOT_ENOUGH_SPACE; > + } else { > + if (0 != s->record_offset) { > + memset(&s->tmp_record[ERST_RECORD_SIZE - s->record_offset], > + 0xFF, s->record_offset); > + } > + memcpy(s->tmp_record, record, ERST_RECORD_SIZE - s->record_offset); > + rc = copy_to_nvram_by_index(s, (unsigned)index); > + if (rc == ACPI_ERST_STATUS_SUCCESS) { > + if (!record_found) { /* not overwriting existing record */ > + s->record_count += 1; /* writing new record */ > + } > + } > + } > + } > + > + return rc; > +} > + > +static unsigned next_erst_record(ERSTDeviceState *s, > + uint64_t *record_identifier) > +{ > + unsigned rc = ACPI_ERST_STATUS_RECORD_NOT_FOUND; > + unsigned index; > + unsigned rrc; > + > + *record_identifier = ERST_INVALID_RECORD_ID; > + > + index = s->next_record_index; > + do { > + rrc = copy_from_nvram_by_index(s, (unsigned)index); > + if (rrc == ACPI_ERST_STATUS_SUCCESS) { > + if (IS_UEFI_CPER_RECORD(s->tmp_record)) { > + s->next_record_index = index + 1; /* where to start next time */ > + *record_identifier = THE_UEFI_CPER_RECORD_ID(s->tmp_record); > + rc = ACPI_ERST_STATUS_SUCCESS; > + break; > + } > + ++index; > + } else { > + if (s->next_record_index == 0) { > + rc = ACPI_ERST_STATUS_RECORD_STORE_EMPTY; > + } > + s->next_record_index = 0; /* at end, reset */ > + } > + } while (rrc == ACPI_ERST_STATUS_SUCCESS); > + > + return rc; > +} > + > +static unsigned read_erst_record(ERSTDeviceState *s) > +{ > + unsigned rc = ACPI_ERST_STATUS_RECORD_NOT_FOUND; > + bool record_found; > + int index; > + > + index = lookup_erst_record_by_identifier(s, > + s->record_identifier, &record_found, 0); > + if (record_found) { > + rc = copy_from_nvram_by_index(s, (unsigned)index); > + if (rc == ACPI_ERST_STATUS_SUCCESS) { > + if (s->record_offset < ERST_RECORD_SIZE) { > + memcpy(&s->record[s->record_offset], s->tmp_record, > + ERST_RECORD_SIZE - s->record_offset); > + } > + } > + } > + > + return rc; > +} > + > +static unsigned get_erst_record_count(ERSTDeviceState *s) > +{ > + /* Compute record_count */ > + unsigned index = 0; > + > + s->record_count = 0; > + while (copy_from_nvram_by_index(s, index) == ACPI_ERST_STATUS_SUCCESS) { > + uint8_t *ptr = &s->tmp_record[0]; > + uint64_t record_identifier = THE_UEFI_CPER_RECORD_ID(ptr); > + if (IS_UEFI_CPER_RECORD(ptr) && > + (ERST_INVALID_RECORD_ID != record_identifier)) { > + s->record_count += 1; > + } > + ++index; > + } > + return s->record_count; > +} > + > +static uint64_t erst_rd_reg64(hwaddr addr, > + uint64_t reg, unsigned size) > +{ > + uint64_t rdval; > + uint64_t mask; > + unsigned shift; > + > + if (size == sizeof(uint64_t)) { > + /* 64b access */ > + mask = 0xFFFFFFFFFFFFFFFFUL; > + shift = 0; > + } else { > + /* 32b access */ > + mask = 0x00000000FFFFFFFFUL; > + shift = ((addr & 0x4) == 0x4) ? 32 : 0; > + } > + > + rdval = reg; > + rdval >>= shift; > + rdval &= mask; > + > + return rdval; > +} > + > +static uint64_t erst_wr_reg64(hwaddr addr, > + uint64_t reg, uint64_t val, unsigned size) > +{ > + uint64_t wrval; > + uint64_t mask; > + unsigned shift; > + > + if (size == sizeof(uint64_t)) { > + /* 64b access */ > + mask = 0xFFFFFFFFFFFFFFFFUL; > + shift = 0; > + } else { > + /* 32b access */ > + mask = 0x00000000FFFFFFFFUL; > + shift = ((addr & 0x4) == 0x4) ? 32 : 0; > + } > + > + val &= mask; > + val <<= shift; > + mask <<= shift; > + wrval = reg; > + wrval &= ~mask; > + wrval |= val; > + > + return wrval; > +} > + > +static void erst_write(void *opaque, hwaddr addr, > + uint64_t val, unsigned size) > +{ > + ERSTDeviceState *s = (ERSTDeviceState *)opaque; > + > + if (addr < ERST_REG_LEN) { > + /* > + * NOTE: All actions/operations/side effects happen on the WRITE, > + * by design. The READs simply return the reg_value contents. > + */ > + erst_debug("ERST write %016lx: val %016lx sz %u\n", addr, val, size); > + /* The REGISTER region */ > + switch (addr) { > + case ERST_CSR_VALUE + 0: > + case ERST_CSR_VALUE + 4: > + s->reg_value = erst_wr_reg64(addr, s->reg_value, val, size); > + break; > + case ERST_CSR_ACTION + 0: > +/* case ERST_CSR_ACTION+4: as coded, not really a 64b register */ > + switch (val) { > + case ACPI_ERST_ACTION_BEGIN_WRITE_OPERATION: > + case ACPI_ERST_ACTION_BEGIN_READ_OPERATION: > + case ACPI_ERST_ACTION_BEGIN_CLEAR_OPERATION: > + case ACPI_ERST_ACTION_BEGIN_DUMMY_WRITE_OPERATION: > + case ACPI_ERST_ACTION_END_OPERATION: > + s->operation = val; > + break; > + case ACPI_ERST_ACTION_SET_RECORD_OFFSET: > + s->record_offset = s->reg_value; > + break; > + case ACPI_ERST_ACTION_EXECUTE_OPERATION: > + if ((uint8_t)s->reg_value == ERST_EXECUTE_OPERATION_MAGIC) { > + s->busy_status = 1; > + switch (s->operation) { > + case ACPI_ERST_ACTION_BEGIN_WRITE_OPERATION: > + s->command_status = write_erst_record(s); > + break; > + case ACPI_ERST_ACTION_BEGIN_READ_OPERATION: > + s->command_status = read_erst_record(s); > + break; > + case ACPI_ERST_ACTION_BEGIN_CLEAR_OPERATION: > + s->command_status = clear_erst_record(s); > + break; > + case ACPI_ERST_ACTION_BEGIN_DUMMY_WRITE_OPERATION: > + s->command_status = ACPI_ERST_STATUS_SUCCESS; > + break; > + case ACPI_ERST_ACTION_END_OPERATION: > + s->command_status = ACPI_ERST_STATUS_SUCCESS; > + break; > + default: > + s->command_status = ACPI_ERST_STATUS_FAILED; > + break; > + } > + s->record_identifier = ERST_INVALID_RECORD_ID; > + s->busy_status = 0; > + } > + break; > + case ACPI_ERST_ACTION_CHECK_BUSY_STATUS: > + s->reg_value = s->busy_status; > + break; > + case ACPI_ERST_ACTION_GET_COMMAND_STATUS: > + s->reg_value = s->command_status; > + break; > + case ACPI_ERST_ACTION_GET_RECORD_IDENTIFIER: > + s->command_status = next_erst_record(s, &s->reg_value); > + break; > + case ACPI_ERST_ACTION_SET_RECORD_IDENTIFIER: > + s->record_identifier = s->reg_value; > + break; > + case ACPI_ERST_ACTION_GET_RECORD_COUNT: > + s->reg_value = s->record_count; > + break; > + case ACPI_ERST_ACTION_GET_ERROR_LOG_ADDRESS_RANGE: > + s->reg_value = s->prop_base + ERST_REG_LEN; > + break; > + case ACPI_ERST_ACTION_GET_ERROR_LOG_ADDRESS_LENGTH: > + s->reg_value = ERST_RECORD_SIZE; > + break; > + case ACPI_ERST_ACTION_GET_ERROR_LOG_ADDRESS_RANGE_ATTRIBUTES: > + s->reg_value = 0; /* correct/intended value */ > + break; > + case ACPI_ERST_ACTION_GET_EXECUTE_OPERATION_TIMINGS: > + /* > + * 100UL is max, 10UL is nominal > + */ > + s->reg_value = ((100UL << 32) | (10UL << 0)); > + break; > + case ACPI_ERST_ACTION_RESERVED: > + default: > + /* > + * NOP > + */ > + break; > + } > + break; > + default: > + /* > + * All other register writes are NO-OPs > + */ > + break; > + } > + } else { > + /* The RECORD region */ > + unsigned offset = addr - ERST_REG_LEN; > + uint8_t *ptr = &s->record[offset]; > + switch (size) { > + default: > + case sizeof(uint8_t): > + *(uint8_t *)ptr = (uint8_t)val; > + break; > + case sizeof(uint16_t): > + *(uint16_t *)ptr = (uint16_t)val; > + break; > + case sizeof(uint32_t): > + *(uint32_t *)ptr = (uint32_t)val; > + break; > + case sizeof(uint64_t): > + *(uint64_t *)ptr = (uint64_t)val; > + break; > + } > + } > +} > + > +static uint64_t erst_read(void *opaque, hwaddr addr, > + unsigned size) > +{ > + ERSTDeviceState *s = (ERSTDeviceState *)opaque; > + uint64_t val = 0; > + > + if (addr < ERST_REG_LEN) { > + switch (addr) { > + case ERST_CSR_ACTION + 0: > + case ERST_CSR_ACTION + 4: > + val = erst_rd_reg64(addr, s->reg_action, size); > + break; > + case ERST_CSR_VALUE + 0: > + case ERST_CSR_VALUE + 4: > + val = erst_rd_reg64(addr, s->reg_value, size); > + break; > + default: > + break; > + } > + } else { > + /* > + * The RECORD region > + */ > + uint8_t *ptr = &s->record[addr - ERST_REG_LEN]; > + switch (size) { > + default: > + case sizeof(uint8_t): > + val = *(uint8_t *)ptr; > + break; > + case sizeof(uint16_t): > + val = *(uint16_t *)ptr; > + break; > + case sizeof(uint32_t): > + val = *(uint32_t *)ptr; > + break; > + case sizeof(uint64_t): > + val = *(uint64_t *)ptr; > + break; > + } > + } > + erst_debug("ERST read %016lx: val %016lx sz %u\n", addr, val, size); > + return val; > +} > + > +static size_t build_erst_action(GArray *table_data, > + uint8_t serialization_action, > + uint8_t instruction, > + uint8_t flags, > + uint8_t width, > + uint64_t address, > + uint64_t value, > + uint64_t mask) > +{ > + /* See ACPI spec, Error Serialization */ > + uint8_t access_width = 0; > + build_append_int_noprefix(table_data, serialization_action, 1); > + build_append_int_noprefix(table_data, instruction , 1); > + build_append_int_noprefix(table_data, flags , 1); > + build_append_int_noprefix(table_data, 0 , 1); > + /* GAS space_id */ > + build_append_int_noprefix(table_data, AML_SYSTEM_MEMORY , 1); > + /* GAS bit_width */ > + build_append_int_noprefix(table_data, width , 1); > + /* GAS bit_offset */ > + build_append_int_noprefix(table_data, 0 , 1); > + /* GAS access_width */ > + switch (width) { > + case 8: > + access_width = 1; > + break; > + case 16: > + access_width = 2; > + break; > + case 32: > + access_width = 3; > + break; > + case 64: > + access_width = 4; > + break; > + default: > + access_width = 0; > + break; > + } > + build_append_int_noprefix(table_data, access_width , 1); > + /* GAS address */ > + build_append_int_noprefix(table_data, address, 8); > + /* value */ > + build_append_int_noprefix(table_data, value , 8); > + /* mask */ > + build_append_int_noprefix(table_data, mask , 8); > + > + return 1; > +} > + > +static const MemoryRegionOps erst_rw_ops = { > + .read = erst_read, > + .write = erst_write, > + .endianness = DEVICE_NATIVE_ENDIAN, > +}; > + > +void build_erst(GArray *table_data, BIOSLinker *linker, > + const char *oem_id, const char *oem_table_id) > +{ > + unsigned action, insns = 0; > + unsigned erst_start = table_data->len; > + unsigned iec_offset = 0; > + Object *obj; > + hwaddr base = 0x0UL; > + > + obj = object_resolve_path_type("", TYPE_ACPI_ERST, NULL); > + if (obj) { > + base = ACPIERST(obj)->prop_base; > + } > + > + /* See ACPI spec, Error Serialization */ > + acpi_data_push(table_data, sizeof(AcpiTableHeader)); > + /* serialization_header_length */ > + build_append_int_noprefix(table_data, 48, 4); > + /* reserved */ > + build_append_int_noprefix(table_data, 0, 4); > + iec_offset = table_data->len; > + /* instruction_entry_count (placeholder) */ > + build_append_int_noprefix(table_data, 0, 4); > + > +#define BEA(I, F, W, ADDR, VAL, MASK) \ > + build_erst_action(table_data, action, \ > + ACPI_ERST_INST_##I, F, W, base + ADDR, VAL, MASK) > +#define MASK8 0x00000000000000FFUL > +#define MASK16 0x000000000000FFFFUL > +#define MASK32 0x00000000FFFFFFFFUL > +#define MASK64 0xFFFFFFFFFFFFFFFFUL > + > + for (action = 0; action < ACPI_ERST_MAX_ACTIONS; ++action) { > + switch (action) { > + case ACPI_ERST_ACTION_BEGIN_WRITE_OPERATION: > + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, > + ERST_CSR_ACTION, action, MASK8); > + break; > + case ACPI_ERST_ACTION_BEGIN_READ_OPERATION: > + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, > + ERST_CSR_ACTION, action, MASK8); > + break; > + case ACPI_ERST_ACTION_BEGIN_CLEAR_OPERATION: > + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, > + ERST_CSR_ACTION, action, MASK8); > + break; > + case ACPI_ERST_ACTION_END_OPERATION: > + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, > + ERST_CSR_ACTION, action, MASK8); > + break; > + case ACPI_ERST_ACTION_SET_RECORD_OFFSET: > + insns += BEA(WRITE_REGISTER , 0, 32, > + ERST_CSR_VALUE , 0, MASK32); > + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, > + ERST_CSR_ACTION, action, MASK8); > + break; > + case ACPI_ERST_ACTION_EXECUTE_OPERATION: > + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, > + ERST_CSR_VALUE , ERST_EXECUTE_OPERATION_MAGIC, MASK8); > + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, > + ERST_CSR_ACTION, action, MASK8); > + break; > + case ACPI_ERST_ACTION_CHECK_BUSY_STATUS: > + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, > + ERST_CSR_ACTION, action, MASK8); > + insns += BEA(READ_REGISTER_VALUE , 0, 32, > + ERST_CSR_VALUE, 0x01, MASK8); > + break; > + case ACPI_ERST_ACTION_GET_COMMAND_STATUS: > + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, > + ERST_CSR_ACTION, action, MASK8); > + insns += BEA(READ_REGISTER , 0, 32, > + ERST_CSR_VALUE, 0, MASK8); > + break; > + case ACPI_ERST_ACTION_GET_RECORD_IDENTIFIER: > + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, > + ERST_CSR_ACTION, action, MASK8); > + insns += BEA(READ_REGISTER , 0, 64, > + ERST_CSR_VALUE, 0, MASK64); > + break; > + case ACPI_ERST_ACTION_SET_RECORD_IDENTIFIER: > + insns += BEA(WRITE_REGISTER , 0, 64, > + ERST_CSR_VALUE , 0, MASK64); > + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, > + ERST_CSR_ACTION, action, MASK8); > + break; > + case ACPI_ERST_ACTION_GET_RECORD_COUNT: > + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, > + ERST_CSR_ACTION, action, MASK8); > + insns += BEA(READ_REGISTER , 0, 32, > + ERST_CSR_VALUE, 0, MASK32); > + break; > + case ACPI_ERST_ACTION_BEGIN_DUMMY_WRITE_OPERATION: > + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, > + ERST_CSR_ACTION, action, MASK8); > + break; > + case ACPI_ERST_ACTION_RESERVED: > + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, > + ERST_CSR_ACTION, action, MASK8); > + break; > + case ACPI_ERST_ACTION_GET_ERROR_LOG_ADDRESS_RANGE: > + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, > + ERST_CSR_ACTION, action, MASK8); > + insns += BEA(READ_REGISTER , 0, 64, > + ERST_CSR_VALUE, 0, MASK64); > + break; > + case ACPI_ERST_ACTION_GET_ERROR_LOG_ADDRESS_LENGTH: > + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, > + ERST_CSR_ACTION, action, MASK8); > + insns += BEA(READ_REGISTER , 0, 64, > + ERST_CSR_VALUE, 0, MASK32); > + break; > + case ACPI_ERST_ACTION_GET_ERROR_LOG_ADDRESS_RANGE_ATTRIBUTES: > + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, > + ERST_CSR_ACTION, action, MASK8); > + insns += BEA(READ_REGISTER , 0, 32, > + ERST_CSR_VALUE, 0, MASK32); > + break; > + case ACPI_ERST_ACTION_GET_EXECUTE_OPERATION_TIMINGS: > + insns += BEA(WRITE_REGISTER_VALUE, 0, 32, > + ERST_CSR_ACTION, action, MASK8); > + insns += BEA(READ_REGISTER , 0, 64, > + ERST_CSR_VALUE, 0, MASK64); > + default: > + insns += BEA(NOOP, 0, 0, 0, action, 0); > + break; > + } > + } > + > + /* acpi_data_push() within BEA() can result in new GArray pointer */ > + *(uint32_t *)(table_data->data + iec_offset) = cpu_to_le32(insns); > + > + build_header(linker, table_data, > + (void *)(table_data->data + erst_start), > + "ERST", table_data->len - erst_start, > + 1, oem_id, oem_table_id); > +} > + > +/*******************************************************************/ > +/*******************************************************************/ > +static int erst_post_load(void *opaque, int version_id) > +{ > + /*ERSTDeviceState *s = opaque;*/ > + erst_debug("+erst_post_load(%d)\n", version_id); > + /* Ensure nvram persists into backing file */ > + erst_debug("-erst_post_load()\n"); > + return 0; > +} > + > +static const VMStateDescription erst_vmstate = { > + .name = "acpi-erst", > + .version_id = 1, > + .minimum_version_id = 1, > + .post_load = erst_post_load, > + .fields = (VMStateField[]) { > + VMSTATE_UINT8(operation, ERSTDeviceState), > + VMSTATE_UINT8(busy_status, ERSTDeviceState), > + VMSTATE_UINT8(command_status, ERSTDeviceState), > + VMSTATE_UINT32(record_offset, ERSTDeviceState), > + VMSTATE_UINT32(record_count, ERSTDeviceState), > + VMSTATE_UINT64(reg_action, ERSTDeviceState), > + VMSTATE_UINT64(reg_value, ERSTDeviceState), > + VMSTATE_UINT64(record_identifier, ERSTDeviceState), > + VMSTATE_UINT8_ARRAY(record, ERSTDeviceState, ERST_RECORD_SIZE), > + VMSTATE_UINT8_ARRAY(tmp_record, ERSTDeviceState, ERST_RECORD_SIZE), > + VMSTATE_END_OF_LIST() > + } > +}; > + > +static void erst_realizefn(DeviceState *dev, Error **errp) > +{ > + SysBusDevice *d = SYS_BUS_DEVICE(dev); > + ERSTDeviceState *s = ACPIERST(dev); > + unsigned index = 0; > + > + erst_debug("+erst_realizefn()\n"); > + > + if (!(s->prop_size > ERST_RECORD_SIZE) && > + (s->prop_size <= 0x04000000)) { > + error_setg(errp, "'size' property %d is not set properly", > + s->prop_size); > + return; > + } > + > + if (!s->prop_path) { > + s->prop_path = (char *)(TYPE_ACPI_ERST ".backing"); > + } > + > + s->hostmem = NULL; > + s->hostmem_obj = object_new(TYPE_MEMORY_BACKEND_FILE); > + object_property_set_str(s->hostmem_obj, "mem-path", s->prop_path, &error_fatal); > + object_property_set_bool(s->hostmem_obj, "share", true, &error_fatal); > + > + /* MemoryBackend upsizes to a PAGE_SIZE multiple for prop_size */ > + object_property_set_int(s->hostmem_obj, "size", s->prop_size, &error_fatal); > + user_creatable_complete(USER_CREATABLE(s->hostmem_obj), &error_fatal); instead of manually creating backend, let user to specify it. i.e. -object memory-backend-file,id=erst_backend,mem-path=/foo[,size=x] \ -device acpi-erst,backend=erst_backend that way way you should be able to drop above hunk + code that duplicates back-end's properties (i.e. path and size) > + s->hostmem = MEMORY_BACKEND(s->hostmem_obj); see hw/mem/pc-dimm.c for an example how to work with user provided back-end, i.e: 1: DEFINE_PROP_LINK(PC_DIMM_MEMDEV_PROP, PCDIMMDevice, hostmem, 2: host_memory_backend_get_memory(dimm->hostmem); > + > + /* Convert prop_size to integer multiple of ERST_RECORD_SIZE */ > + s->prop_size -= (s->prop_size % ERST_RECORD_SIZE); > + > + /* > + * MemoryBackend initializes contents to zero, but we actually > + * want contents initialized to 0xFF. > + */ > + if (copy_from_nvram_by_index(s, 0) == ACPI_ERST_STATUS_SUCCESS) { > + if (s->tmp_record[0] == 0x00) { > + memset(s->tmp_record, 0xFF, ERST_RECORD_SIZE); > + index = 0; > + while (copy_to_nvram_by_index(s, index) == ACPI_ERST_STATUS_SUCCESS) { > + ++index; > + } > + } > + } > + > + /* Initialize record_count */ > + get_erst_record_count(s); > + > + erst_debug(ACPI_ERST_BASE_PROP" %016llx\n", (unsigned long long)s->prop_base); > + erst_debug(ACPI_ERST_SIZE_PROP" %x\n", s->prop_size); > + erst_debug(ACPI_ERST_FILE_PROP" %s\n", s->prop_path); > + > + memory_region_init_io(&s->iomem, OBJECT(s), &erst_rw_ops, s, > + TYPE_ACPI_ERST, ERST_IOMEM_SIZE); > + sysbus_init_mmio(d, &s->iomem); > + erst_debug("-erst_realizefn()\n"); > +} > + > +static void erst_unrealizefn(DeviceState *dev) > +{ > + ERSTDeviceState *s = ACPIERST(dev); > + > + erst_debug("+erst_unrealizefn()\n"); > + > + if (s->hostmem_obj) { > + object_unref(s->hostmem_obj); > + } > + > + erst_debug("-erst_unrealizefn()\n"); > +} > + > +static void erst_reset(DeviceState *dev) > +{ > + ERSTDeviceState *s = ACPIERST(dev); > + > + erst_debug("+erst_reset(%p) %d\n", s, s->record_count); > + s->operation = 0; > + s->busy_status = 0; > + s->command_status = ACPI_ERST_STATUS_SUCCESS; > + /* indicate empty/no-more until further notice */ > + s->record_identifier = ERST_INVALID_RECORD_ID; > + s->record_offset = 0; > + s->next_record_index = 0; > + /* NOTE: record_count and nvram are initialized elsewhere */ > + erst_debug("-erst_reset()\n"); > +} > + > +void setup_erst_dev(hwaddr base, Error *error_fatal) > +{ > + SysBusDevice *s; > + DeviceState *dev; > + ERSTDeviceState *e; > + > + dev = qdev_try_new(TYPE_ACPI_ERST); > + if (!dev) { > + error_report("couldn't create ERST device"); > + exit(1); > + } > + e = ACPIERST(dev); > + e->prop_base = base; > + s = SYS_BUS_DEVICE(dev); > + sysbus_realize_and_unref(s, &error_fatal); > + sysbus_mmio_map(s, 0, base); This approach hasn't been addressed from v2 review (so all issues brings are still here) Have you tried using PCI device instead of SYSBUS one, as was suggested earlier? > +} > + > +static Property erst_properties[] = { > + DEFINE_PROP_UINT32(ACPI_ERST_SIZE_PROP, ERSTDeviceState, prop_size, 0x00010000), > + DEFINE_PROP_STRING(ACPI_ERST_FILE_PROP, ERSTDeviceState, prop_path), > + DEFINE_PROP_END_OF_LIST(), > +}; > + > +static void erst_class_init(ObjectClass *klass, void *data) > +{ > + DeviceClass *dc = DEVICE_CLASS(klass); > + > + erst_debug("+erst_class_init()\n"); > + dc->realize = erst_realizefn; > + dc->unrealize = erst_unrealizefn; > + dc->reset = erst_reset; > + dc->vmsd = &erst_vmstate; > + device_class_set_props(dc, erst_properties); > + dc->desc = "ACPI Error Record Serialization Table (ERST) device"; > + set_bit(DEVICE_CATEGORY_MISC, dc->categories); > + erst_debug("-erst_class_init()\n"); > +} > + > +static const TypeInfo erst_type_info = { > + .name = TYPE_ACPI_ERST, > + .parent = TYPE_SYS_BUS_DEVICE, > + .class_init = erst_class_init, > + .instance_size = sizeof(ERSTDeviceState), > +}; > + > +static void erst_register_types(void) > +{ > + type_register_static(&erst_type_info); > +} > + > +type_init(erst_register_types) ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v3 4/7] ACPI ERST: include ERST feature in build of ACPI support 2021-05-28 18:14 [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU Eric DeVolder ` (2 preceding siblings ...) 2021-05-28 18:14 ` [PATCH v3 3/7] ACPI ERST: support for ACPI ERST feature Eric DeVolder @ 2021-05-28 18:14 ` Eric DeVolder 2021-06-07 12:32 ` Igor Mammedov 2021-05-28 18:14 ` [PATCH v3 5/7] ACPI ERST: create ERST device for pc/x86 machines Eric DeVolder ` (3 subsequent siblings) 7 siblings, 1 reply; 15+ messages in thread From: Eric DeVolder @ 2021-05-28 18:14 UTC (permalink / raw) To: qemu-devel Cc: ehabkost, mst, konrad.wilk, pbonzini, imammedo, boris.ostrovsky, rth This change includes ERST in the build of ACPI. Signed-off-by: Eric DeVolder <eric.devolder@orace.com> --- hw/acpi/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build index dd69577..262a8ee 100644 --- a/hw/acpi/meson.build +++ b/hw/acpi/meson.build @@ -4,6 +4,7 @@ acpi_ss.add(files( 'aml-build.c', 'bios-linker-loader.c', 'utils.c', + 'erst.c', )) acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_true: files('cpu.c')) acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_true: files('cpu_hotplug.c')) -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v3 4/7] ACPI ERST: include ERST feature in build of ACPI support 2021-05-28 18:14 ` [PATCH v3 4/7] ACPI ERST: include ERST feature in build of ACPI support Eric DeVolder @ 2021-06-07 12:32 ` Igor Mammedov 0 siblings, 0 replies; 15+ messages in thread From: Igor Mammedov @ 2021-06-07 12:32 UTC (permalink / raw) To: Eric DeVolder Cc: ehabkost, mst, konrad.wilk, qemu-devel, pbonzini, boris.ostrovsky, rth On Fri, 28 May 2021 14:14:16 -0400 Eric DeVolder <eric.devolder@oracle.com> wrote: > This change includes ERST in the build of ACPI. > > Signed-off-by: Eric DeVolder <eric.devolder@orace.com> > --- > hw/acpi/meson.build | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build > index dd69577..262a8ee 100644 > --- a/hw/acpi/meson.build > +++ b/hw/acpi/meson.build > @@ -4,6 +4,7 @@ acpi_ss.add(files( > 'aml-build.c', > 'bios-linker-loader.c', > 'utils.c', > + 'erst.c', > )) > acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_true: files('cpu.c')) > acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_true: files('cpu_hotplug.c')) this should be part of the patch that introduces erst.c, unless there is a good reason for not doing so. ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v3 5/7] ACPI ERST: create ERST device for pc/x86 machines. 2021-05-28 18:14 [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU Eric DeVolder ` (3 preceding siblings ...) 2021-05-28 18:14 ` [PATCH v3 4/7] ACPI ERST: include ERST feature in build of ACPI support Eric DeVolder @ 2021-05-28 18:14 ` Eric DeVolder 2021-06-07 12:28 ` Igor Mammedov 2021-05-28 18:14 ` [PATCH v3 6/7] ACPI ERST: qtest for ERST Eric DeVolder ` (2 subsequent siblings) 7 siblings, 1 reply; 15+ messages in thread From: Eric DeVolder @ 2021-05-28 18:14 UTC (permalink / raw) To: qemu-devel Cc: ehabkost, mst, konrad.wilk, pbonzini, imammedo, boris.ostrovsky, rth This change enables ERST support for x86 guests. ERST can be disabled at run-time, for example, with: -machine q35,erst=off Signed-off-by: Eric DeVolder <eric.devolder@oracle.com> --- hw/i386/acpi-build.c | 7 +++++++ hw/i386/pc.c | 31 +++++++++++++++++++++++++++++++ include/hw/i386/pc.h | 1 + 3 files changed, 39 insertions(+) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index de98750..6ba79db 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -43,6 +43,7 @@ #include "sysemu/tpm.h" #include "hw/acpi/tpm.h" #include "hw/acpi/vmgenid.h" +#include "hw/acpi/erst.h" #include "hw/boards.h" #include "sysemu/tpm_backend.h" #include "hw/rtc/mc146818rtc_regs.h" @@ -2388,6 +2389,12 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) ACPI_DEVICE_IF(x86ms->acpi_dev), x86ms->oem_id, x86ms->oem_table_id); + if (pcms->erst_enabled) { + acpi_add_table(table_offsets, tables_blob); + build_erst(tables_blob, tables->linker, + x86ms->oem_id, x86ms->oem_table_id); + } + vmgenid_dev = find_vmgenid_dev(); if (vmgenid_dev) { acpi_add_table(table_offsets, tables_blob); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 8a84b25..b7b4cc4 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -74,6 +74,7 @@ #include "qemu/cutils.h" #include "hw/acpi/acpi.h" #include "hw/acpi/cpu_hotplug.h" +#include "hw/acpi/erst.h" #include "hw/boards.h" #include "acpi-build.h" #include "hw/mem/pc-dimm.h" @@ -1111,6 +1112,7 @@ void pc_basic_device_init(struct PCMachineState *pcms, ISADevice *pit = NULL; MemoryRegion *ioport80_io = g_new(MemoryRegion, 1); MemoryRegion *ioportF0_io = g_new(MemoryRegion, 1); + const X86MachineState *x86ms = X86_MACHINE(pcms); memory_region_init_io(ioport80_io, NULL, &ioport80_io_ops, NULL, "ioport80", 1); memory_region_add_subregion(isa_bus->address_space_io, 0x80, ioport80_io); @@ -1153,6 +1155,11 @@ void pc_basic_device_init(struct PCMachineState *pcms, } *rtc_state = mc146818_rtc_init(isa_bus, 2000, rtc_irq); + if (pcms->erst_enabled && x86_machine_is_acpi_enabled(x86ms)) { + hwaddr base = HPET_BASE + 0x10000UL; + setup_erst_dev(base, error_fatal); + } + qemu_register_boot_set(pc_boot_set, *rtc_state); if (!xen_enabled() && pcms->pit_enabled) { @@ -1529,6 +1536,22 @@ static void pc_machine_set_hpet(Object *obj, bool value, Error **errp) pcms->hpet_enabled = value; } +#ifdef CONFIG_ACPI +static bool pc_machine_get_erst(Object *obj, Error **errp) +{ + PCMachineState *pcms = PC_MACHINE(obj); + + return pcms->erst_enabled; +} + +static void pc_machine_set_erst(Object *obj, bool value, Error **errp) +{ + PCMachineState *pcms = PC_MACHINE(obj); + + pcms->erst_enabled = value; +} +#endif + static void pc_machine_get_max_ram_below_4g(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) @@ -1628,6 +1651,9 @@ static void pc_machine_initfn(Object *obj) #ifdef CONFIG_HPET pcms->hpet_enabled = true; #endif +#ifdef CONFIG_ACPI + pcms->erst_enabled = true; +#endif pc_system_flash_create(pcms); pcms->pcspk = isa_new(TYPE_PC_SPEAKER); @@ -1752,6 +1778,11 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) object_class_property_add_bool(oc, "hpet", pc_machine_get_hpet, pc_machine_set_hpet); +#ifdef CONFIG_ACPI + object_class_property_add_bool(oc, "erst", + pc_machine_get_erst, pc_machine_set_erst); +#endif + object_class_property_add(oc, PC_MACHINE_MAX_FW_SIZE, "size", pc_machine_get_max_fw_size, pc_machine_set_max_fw_size, NULL, NULL); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index dcf060b..4458c8f 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -45,6 +45,7 @@ typedef struct PCMachineState { bool sata_enabled; bool pit_enabled; bool hpet_enabled; + bool erst_enabled; uint64_t max_fw_size; /* NUMA information: */ -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v3 5/7] ACPI ERST: create ERST device for pc/x86 machines. 2021-05-28 18:14 ` [PATCH v3 5/7] ACPI ERST: create ERST device for pc/x86 machines Eric DeVolder @ 2021-06-07 12:28 ` Igor Mammedov 0 siblings, 0 replies; 15+ messages in thread From: Igor Mammedov @ 2021-06-07 12:28 UTC (permalink / raw) To: Eric DeVolder Cc: ehabkost, mst, konrad.wilk, qemu-devel, pbonzini, boris.ostrovsky, rth On Fri, 28 May 2021 14:14:17 -0400 Eric DeVolder <eric.devolder@oracle.com> wrote: > This change enables ERST support for x86 guests. > > ERST can be disabled at run-time, for example, with: > > -machine q35,erst=off 1st: not everyone needs this feature so I'd turn it off by default 2nd: it looks to me that patch breaks cross version migration (one more reason to disable ERST by default for simplicity sake), or it needs to be disabled on old machine types at least. 3rd: patch should not be necessary at all, if PCI device is used as a template for your device (see comments on 3/7) 4th: try to avoid using "ifdefs" (if you follow trhough #3 as suggested this patch including ifdefs can be dropped), on top of that in 3/7 I'd split out ACPI table related code into a separate object file so that the device itself could be easily compiled out or made dynamically loadable as a module. > Signed-off-by: Eric DeVolder <eric.devolder@oracle.com> > --- > hw/i386/acpi-build.c | 7 +++++++ > hw/i386/pc.c | 31 +++++++++++++++++++++++++++++++ > include/hw/i386/pc.h | 1 + > 3 files changed, 39 insertions(+) > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index de98750..6ba79db 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -43,6 +43,7 @@ > #include "sysemu/tpm.h" > #include "hw/acpi/tpm.h" > #include "hw/acpi/vmgenid.h" > +#include "hw/acpi/erst.h" > #include "hw/boards.h" > #include "sysemu/tpm_backend.h" > #include "hw/rtc/mc146818rtc_regs.h" > @@ -2388,6 +2389,12 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) > ACPI_DEVICE_IF(x86ms->acpi_dev), x86ms->oem_id, > x86ms->oem_table_id); > > + if (pcms->erst_enabled) { > + acpi_add_table(table_offsets, tables_blob); > + build_erst(tables_blob, tables->linker, > + x86ms->oem_id, x86ms->oem_table_id); > + } > + > vmgenid_dev = find_vmgenid_dev(); > if (vmgenid_dev) { > acpi_add_table(table_offsets, tables_blob); > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 8a84b25..b7b4cc4 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -74,6 +74,7 @@ > #include "qemu/cutils.h" > #include "hw/acpi/acpi.h" > #include "hw/acpi/cpu_hotplug.h" > +#include "hw/acpi/erst.h" > #include "hw/boards.h" > #include "acpi-build.h" > #include "hw/mem/pc-dimm.h" > @@ -1111,6 +1112,7 @@ void pc_basic_device_init(struct PCMachineState *pcms, > ISADevice *pit = NULL; > MemoryRegion *ioport80_io = g_new(MemoryRegion, 1); > MemoryRegion *ioportF0_io = g_new(MemoryRegion, 1); > + const X86MachineState *x86ms = X86_MACHINE(pcms); > > memory_region_init_io(ioport80_io, NULL, &ioport80_io_ops, NULL, "ioport80", 1); > memory_region_add_subregion(isa_bus->address_space_io, 0x80, ioport80_io); > @@ -1153,6 +1155,11 @@ void pc_basic_device_init(struct PCMachineState *pcms, > } > *rtc_state = mc146818_rtc_init(isa_bus, 2000, rtc_irq); > > + if (pcms->erst_enabled && x86_machine_is_acpi_enabled(x86ms)) { > + hwaddr base = HPET_BASE + 0x10000UL; > + setup_erst_dev(base, error_fatal); > + } > + > qemu_register_boot_set(pc_boot_set, *rtc_state); > > if (!xen_enabled() && pcms->pit_enabled) { > @@ -1529,6 +1536,22 @@ static void pc_machine_set_hpet(Object *obj, bool value, Error **errp) > pcms->hpet_enabled = value; > } > > +#ifdef CONFIG_ACPI > +static bool pc_machine_get_erst(Object *obj, Error **errp) > +{ > + PCMachineState *pcms = PC_MACHINE(obj); > + > + return pcms->erst_enabled; > +} > + > +static void pc_machine_set_erst(Object *obj, bool value, Error **errp) > +{ > + PCMachineState *pcms = PC_MACHINE(obj); > + > + pcms->erst_enabled = value; > +} > +#endif > + > static void pc_machine_get_max_ram_below_4g(Object *obj, Visitor *v, > const char *name, void *opaque, > Error **errp) > @@ -1628,6 +1651,9 @@ static void pc_machine_initfn(Object *obj) > #ifdef CONFIG_HPET > pcms->hpet_enabled = true; > #endif > +#ifdef CONFIG_ACPI > + pcms->erst_enabled = true; > +#endif > > pc_system_flash_create(pcms); > pcms->pcspk = isa_new(TYPE_PC_SPEAKER); > @@ -1752,6 +1778,11 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) > object_class_property_add_bool(oc, "hpet", > pc_machine_get_hpet, pc_machine_set_hpet); > > +#ifdef CONFIG_ACPI > + object_class_property_add_bool(oc, "erst", > + pc_machine_get_erst, pc_machine_set_erst); > +#endif > + > object_class_property_add(oc, PC_MACHINE_MAX_FW_SIZE, "size", > pc_machine_get_max_fw_size, pc_machine_set_max_fw_size, > NULL, NULL); > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index dcf060b..4458c8f 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -45,6 +45,7 @@ typedef struct PCMachineState { > bool sata_enabled; > bool pit_enabled; > bool hpet_enabled; > + bool erst_enabled; > uint64_t max_fw_size; > > /* NUMA information: */ ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v3 6/7] ACPI ERST: qtest for ERST 2021-05-28 18:14 [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU Eric DeVolder ` (4 preceding siblings ...) 2021-05-28 18:14 ` [PATCH v3 5/7] ACPI ERST: create ERST device for pc/x86 machines Eric DeVolder @ 2021-05-28 18:14 ` Eric DeVolder 2021-05-28 18:14 ` [PATCH v3 7/7] ACPI ERST: step 6 of bios-tables-test.c Eric DeVolder 2021-06-07 12:49 ` [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU Igor Mammedov 7 siblings, 0 replies; 15+ messages in thread From: Eric DeVolder @ 2021-05-28 18:14 UTC (permalink / raw) To: qemu-devel Cc: ehabkost, mst, konrad.wilk, pbonzini, imammedo, boris.ostrovsky, rth This change provides a qtest that locates and then does a simple interrogation of the ERST feature within the guest. Signed-off-by: Eric DeVolder <eric.devolder@oracle.com> --- tests/qtest/erst-test.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/qtest/meson.build | 2 + 2 files changed, 108 insertions(+) create mode 100644 tests/qtest/erst-test.c diff --git a/tests/qtest/erst-test.c b/tests/qtest/erst-test.c new file mode 100644 index 0000000..ce7fc70 --- /dev/null +++ b/tests/qtest/erst-test.c @@ -0,0 +1,106 @@ +/* + * QTest testcase for ACPI ERST + * + * Copyright (c) 2021 Oracle + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qemu/bitmap.h" +#include "qemu/uuid.h" +#include "hw/acpi/acpi-defs.h" +#include "boot-sector.h" +#include "acpi-utils.h" +#include "libqos/libqtest.h" +#include "qapi/qmp/qdict.h" + +#define RSDP_ADDR_INVALID 0x100000 /* RSDP must be below this address */ + +static uint64_t acpi_find_erst(QTestState *qts) +{ + uint32_t rsdp_offset; + uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */]; + uint32_t rsdt_len, table_length; + uint8_t *rsdt, *ent; + uint64_t base = 0; + + /* Wait for guest firmware to finish and start the payload. */ + boot_sector_test(qts); + + /* Tables should be initialized now. */ + rsdp_offset = acpi_find_rsdp_address(qts); + + g_assert_cmphex(rsdp_offset, <, RSDP_ADDR_INVALID); + + acpi_fetch_rsdp_table(qts, rsdp_offset, rsdp_table); + acpi_fetch_table(qts, &rsdt, &rsdt_len, &rsdp_table[16 /* RsdtAddress */], + 4, "RSDT", true); + + ACPI_FOREACH_RSDT_ENTRY(rsdt, rsdt_len, ent, 4 /* Entry size */) { + uint8_t *table_aml; + acpi_fetch_table(qts, &table_aml, &table_length, ent, 4, NULL, true); + if (!memcmp(table_aml + 0 /* Header Signature */, "ERST", 4)) { + /* + * Picking up ERST base address from the Register Region + * specified as part of the first Serialization Instruction + * Action (which is a Begin Write Operation). + */ + memcpy(&base, &table_aml[56], sizeof(base)); + g_free(table_aml); + break; + } + g_free(table_aml); + } + g_free(rsdt); + return base; +} + +static char disk[] = "tests/erst-test-disk-XXXXXX"; + +#define ERST_CMD() \ + "-accel kvm -accel tcg " \ + "-drive id=hd0,if=none,file=%s,format=raw " \ + "-device ide-hd,drive=hd0 ", disk + +static void erst_get_error_log_address_range(void) +{ + QTestState *qts; + uint64_t log_address_range = 0; + + qts = qtest_initf(ERST_CMD()); + + uint64_t base = acpi_find_erst(qts); + g_assert(base != 0); + + /* Issue GET_ERROR_LOG_ADDRESS_RANGE command */ + qtest_writel(qts, base + 0, 0xD); + /* Read GET_ERROR_LOG_ADDRESS_RANGE result */ + log_address_range = qtest_readq(qts, base + 8);\ + + /* Check addr_range is offset of base */ + g_assert((base + 16) == log_address_range); + + qtest_quit(qts); +} + +int main(int argc, char **argv) +{ + int ret; + + ret = boot_sector_init(disk); + if (ret) { + return ret; + } + + g_test_init(&argc, &argv, NULL); + + qtest_add_func("/erst/get-error-log-address-range", + erst_get_error_log_address_range); + + ret = g_test_run(); + boot_sector_cleanup(disk); + + return ret; +} diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 0c76738..deae443 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -66,6 +66,7 @@ qtests_i386 = \ (config_all_devices.has_key('CONFIG_RTL8139_PCI') ? ['rtl8139-test'] : []) + \ (config_all_devices.has_key('CONFIG_E1000E_PCI_EXPRESS') ? ['fuzz-e1000e-test'] : []) + \ (config_all_devices.has_key('CONFIG_ESP_PCI') ? ['am53c974-test'] : []) + \ + (config_all_devices.has_key('CONFIG_ACPI') ? ['erst-test'] : []) + \ qtests_pci + \ ['fdc-test', 'ide-test', @@ -237,6 +238,7 @@ qtests = { 'bios-tables-test': [io, 'boot-sector.c', 'acpi-utils.c', 'tpm-emu.c'], 'cdrom-test': files('boot-sector.c'), 'dbus-vmstate-test': files('migration-helpers.c') + dbus_vmstate1, + 'erst-test': files('erst-test.c', 'boot-sector.c', 'acpi-utils.c'), 'ivshmem-test': [rt, '../../contrib/ivshmem-server/ivshmem-server.c'], 'migration-test': files('migration-helpers.c'), 'pxe-test': files('boot-sector.c'), -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v3 7/7] ACPI ERST: step 6 of bios-tables-test.c 2021-05-28 18:14 [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU Eric DeVolder ` (5 preceding siblings ...) 2021-05-28 18:14 ` [PATCH v3 6/7] ACPI ERST: qtest for ERST Eric DeVolder @ 2021-05-28 18:14 ` Eric DeVolder 2021-06-07 12:49 ` [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU Igor Mammedov 7 siblings, 0 replies; 15+ messages in thread From: Eric DeVolder @ 2021-05-28 18:14 UTC (permalink / raw) To: qemu-devel Cc: ehabkost, mst, konrad.wilk, pbonzini, imammedo, boris.ostrovsky, rth Signed-off-by: Eric DeVolder <eric.devolder@oracle.com> --- tests/data/acpi/pc/ERST | Bin 0 -> 976 bytes tests/data/acpi/q35/ERST | Bin 0 -> 976 bytes tests/qtest/bios-tables-test-allowed-diff.h | 4 ---- 3 files changed, 4 deletions(-) diff --git a/tests/data/acpi/pc/ERST b/tests/data/acpi/pc/ERST index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7236018951f9d111d8cacaa93ee07a8dc3294f18 100644 GIT binary patch literal 976 zcmaKqSq_3Q6h#Y^dE9^rOK=GWV&b1h{BUvZ#VzQD#NN_}<VJW2!{zj}Jj(Gp++KlF z-m^RRr=jicm%cUSDW!0a>)srw9ZqJfYH@yl5T!<U;}M6C67CcCCp`0jI3h}X4Z*CR z@cQFuhiLM(wSRu-xcHA1F8zhXBbq;Aj)oWS$Nk6T$K>0*@ExA}PsmTmxA~y7^f&wF z`=C;Mzb#Jlr!;>?JY$ah@BPi%Ksot29-5N<Er=Hro_R^UWRASiUqyaJzRfE>hSucQ c<lDT_e?xvlzRfG^WB(fYq22#4zMDpU0r#ed0RR91 literal 0 HcmV?d00001 diff --git a/tests/data/acpi/q35/ERST b/tests/data/acpi/q35/ERST index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7236018951f9d111d8cacaa93ee07a8dc3294f18 100644 GIT binary patch literal 976 zcmaKqSq_3Q6h#Y^dE9^rOK=GWV&b1h{BUvZ#VzQD#NN_}<VJW2!{zj}Jj(Gp++KlF z-m^RRr=jicm%cUSDW!0a>)srw9ZqJfYH@yl5T!<U;}M6C67CcCCp`0jI3h}X4Z*CR z@cQFuhiLM(wSRu-xcHA1F8zhXBbq;Aj)oWS$Nk6T$K>0*@ExA}PsmTmxA~y7^f&wF z`=C;Mzb#Jlr!;>?JY$ah@BPi%Ksot29-5N<Er=Hro_R^UWRASiUqyaJzRfE>hSucQ c<lDT_e?xvlzRfG^WB(fYq22#4zMDpU0r#ed0RR91 literal 0 HcmV?d00001 diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index e004c71..dfb8523 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,5 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/pc/ERST", -"tests/data/acpi/q35/ERST", -"tests/data/acpi/microvm/ERST", - -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU 2021-05-28 18:14 [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU Eric DeVolder ` (6 preceding siblings ...) 2021-05-28 18:14 ` [PATCH v3 7/7] ACPI ERST: step 6 of bios-tables-test.c Eric DeVolder @ 2021-06-07 12:49 ` Igor Mammedov 2021-06-07 21:03 ` Eric DeVolder 7 siblings, 1 reply; 15+ messages in thread From: Igor Mammedov @ 2021-06-07 12:49 UTC (permalink / raw) To: Eric DeVolder Cc: ehabkost, mst, konrad.wilk, qemu-devel, pbonzini, boris.ostrovsky, rth On Fri, 28 May 2021 14:14:12 -0400 Eric DeVolder <eric.devolder@oracle.com> wrote: > NOTE: Also, I wanted to push this v3 for review while alerting > that I will be on holiday through June 8 (possibly a few days > later). this version addressed only the way the host storage is accessed (and even that is only partially and needs more work to put into it) The rest of the comments on v2 are still not addressed. > NOTE: The patches are arranged such that each can be applied > in order and not break the build (except the 0001 patch). Igor > has hinted at changing this, but I'm unsure how else to > re-arrange these patches accordingly. as minimum, see suggestion for splitting #4 in 5/7 > NOTE: With the conversion to TYPE_MEMORY_BACKEND_FILE, live > migration to a completely different host does not behave > properly (it loses the ERST contents because the file is not > present on the new host). This still needs to be worked out. > Other than live migration, this patchset fully works. see: vmstate_register_ram_global() > This patchset introduces support for the ACPI Error Record > Serialization Table, ERST. > > Linux uses the persistent storage filesystem, pstore, to record > information (eg. dmesg tail) upon panics and shutdowns. Pstore is > independent of, and runs before, kdump. In certain scenarios (ie. > hosts/guests with root filesystems on NFS/iSCSI where networking > software and/or hardware fails), pstore may contain the only > information available for post-mortem debugging. > > Two common storage backends for the pstore filesystem are ACPI ERST > and UEFI. Most BIOS implement ACPI ERST; however, ACPI ERST is not > currently supported in QEMU, and UEFI is not utilized in all guests. > By implementing ACPI ERST within QEMU, then the ACPI ERST becomes a > viable pstore storage backend for virtual machines (as it is now for > bare metal machines). > > Enabling support for ACPI ERST facilitates a consistent method to > capture kernel panic information in a wide range of guests: from > resource-constrained microvms to very large guests, and in > particular, in direct-boot environments (which would lack UEFI > run-time services). > > Note that Microsoft Windows also utilizes the ACPI ERST for certain > crash information, if available. > > The ACPI ERST persistent storage is contained within a single backing > file, with a default size of 64KiB. The size and filename of the > backing file can be obtained from QEMU parameters. > > The ACPI specification[1], in Chapter "ACPI Platform Error Interfaces > (APEI)", and specifically subsection "Error Serialization", outlines > a method for storing error records into persistent storage. > > [1] "Advanced Configuration and Power Interface Specification", > version 6.2, May 2017. > https://www.uefi.org/sites/default/files/resources/ACPI_6_2.pdf > > [2] "Unified Extensible Firmware Interface Specification", > version 2.8, March 2019. > https://uefi.org/sites/default/files/resources/UEFI_Spec_2_8_final.pdf > > Suggested-by: Konrad Wilk <konrad.wilk@oracle.com> > Signed-off-by: Eric DeVolder <eric.devolder@oracle.com> > > --- > v3: 28may2021 > - Converted to using a TYPE_MEMORY_BACKEND_FILE object rather than > internal array with explicit file operations, per Igor. good start but it's not complete yet. > - Changed the way the qdev and base address are handled, allowing > ERST to be disabled at run-time. Also aligns better with other > existing code. it aligns with ancient code template and the way it used to plumb into board (it's fine for pre-existing devices but not for new ones (unless there is no other way )). v2 had suggestions how to proceed (you asked some questions back then, but result is not reflected in this series, which still has the old code as it was in v2). > v2: 8feb2021 > - Added qtest/smoke test per Paolo Bonzini > - Split patch into smaller chunks, per Igo Mammedov > - Did away with use of ACPI packed structures, per Igo Mammedov > > v1: 26oct2020 > - initial post > > --- > hw/acpi/erst.c | 909 +++++++++++++++++++++++++++++++++++++++++++++++++ > hw/acpi/meson.build | 1 + > hw/i386/acpi-build.c | 4 + > include/hw/acpi/erst.h | 97 ++++++ > 4 files changed, 1011 insertions(+) > create mode 100644 hw/acpi/erst.c > create mode 100644 include/hw/acpi/erst.h > > > Eric DeVolder (7): > ACPI ERST: bios-tables-test.c steps 1 and 2 > ACPI ERST: header file for ERST > ACPI ERST: support for ACPI ERST feature > ACPI ERST: include ERST feature in build of ACPI support > ACPI ERST: create ERST device for pc/x86 machines. > ACPI ERST: qtest for ERST > ACPI ERST: step 6 of bios-tables-test.c > > hw/acpi/erst.c | 902 +++++++++++++++++++++++++++++++++++++++++++ > hw/acpi/meson.build | 1 + > hw/i386/acpi-build.c | 7 + > hw/i386/pc.c | 31 ++ > include/hw/acpi/erst.h | 82 ++++ > include/hw/i386/pc.h | 1 + > tests/data/acpi/microvm/ERST | 0 > tests/data/acpi/pc/ERST | Bin 0 -> 976 bytes > tests/data/acpi/q35/ERST | Bin 0 -> 976 bytes > tests/qtest/erst-test.c | 106 +++++ > tests/qtest/meson.build | 2 + > 11 files changed, 1132 insertions(+) > create mode 100644 hw/acpi/erst.c > create mode 100644 include/hw/acpi/erst.h > create mode 100644 tests/data/acpi/microvm/ERST > create mode 100644 tests/data/acpi/pc/ERST > create mode 100644 tests/data/acpi/q35/ERST > create mode 100644 tests/qtest/erst-test.c > ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU 2021-06-07 12:49 ` [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU Igor Mammedov @ 2021-06-07 21:03 ` Eric DeVolder 2021-06-14 8:14 ` Igor Mammedov 0 siblings, 1 reply; 15+ messages in thread From: Eric DeVolder @ 2021-06-07 21:03 UTC (permalink / raw) To: Igor Mammedov Cc: ehabkost, mst, Konrad Wilk, qemu-devel, pbonzini, Boris Ostrovsky, rth [-- Attachment #1: Type: text/plain, Size: 6571 bytes --] Igor, Thanks for the information/feedback. I am working to implement all your suggestions; from my perspective, there were two big changes requested, and the use of hostmem-file was the first, and the conversion to PCI the second. V3 was the hostmem-file, and hopefully all changes then in v4. Regards, eric ________________________________ From: Igor Mammedov <imammedo@redhat.com> Sent: Monday, June 7, 2021 7:49 AM To: Eric DeVolder <eric.devolder@oracle.com> Cc: qemu-devel@nongnu.org <qemu-devel@nongnu.org>; mst@redhat.com <mst@redhat.com>; marcel.apfelbaum@gmail.com <marcel.apfelbaum@gmail.com>; pbonzini@redhat.com <pbonzini@redhat.com>; rth@twiddle.net <rth@twiddle.net>; ehabkost@redhat.com <ehabkost@redhat.com>; Konrad Wilk <konrad.wilk@oracle.com>; Boris Ostrovsky <boris.ostrovsky@oracle.com> Subject: Re: [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU On Fri, 28 May 2021 14:14:12 -0400 Eric DeVolder <eric.devolder@oracle.com> wrote: > NOTE: Also, I wanted to push this v3 for review while alerting > that I will be on holiday through June 8 (possibly a few days > later). this version addressed only the way the host storage is accessed (and even that is only partially and needs more work to put into it) The rest of the comments on v2 are still not addressed. > NOTE: The patches are arranged such that each can be applied > in order and not break the build (except the 0001 patch). Igor > has hinted at changing this, but I'm unsure how else to > re-arrange these patches accordingly. as minimum, see suggestion for splitting #4 in 5/7 > NOTE: With the conversion to TYPE_MEMORY_BACKEND_FILE, live > migration to a completely different host does not behave > properly (it loses the ERST contents because the file is not > present on the new host). This still needs to be worked out. > Other than live migration, this patchset fully works. see: vmstate_register_ram_global() > This patchset introduces support for the ACPI Error Record > Serialization Table, ERST. > > Linux uses the persistent storage filesystem, pstore, to record > information (eg. dmesg tail) upon panics and shutdowns. Pstore is > independent of, and runs before, kdump. In certain scenarios (ie. > hosts/guests with root filesystems on NFS/iSCSI where networking > software and/or hardware fails), pstore may contain the only > information available for post-mortem debugging. > > Two common storage backends for the pstore filesystem are ACPI ERST > and UEFI. Most BIOS implement ACPI ERST; however, ACPI ERST is not > currently supported in QEMU, and UEFI is not utilized in all guests. > By implementing ACPI ERST within QEMU, then the ACPI ERST becomes a > viable pstore storage backend for virtual machines (as it is now for > bare metal machines). > > Enabling support for ACPI ERST facilitates a consistent method to > capture kernel panic information in a wide range of guests: from > resource-constrained microvms to very large guests, and in > particular, in direct-boot environments (which would lack UEFI > run-time services). > > Note that Microsoft Windows also utilizes the ACPI ERST for certain > crash information, if available. > > The ACPI ERST persistent storage is contained within a single backing > file, with a default size of 64KiB. The size and filename of the > backing file can be obtained from QEMU parameters. > > The ACPI specification[1], in Chapter "ACPI Platform Error Interfaces > (APEI)", and specifically subsection "Error Serialization", outlines > a method for storing error records into persistent storage. > > [1] "Advanced Configuration and Power Interface Specification", > version 6.2, May 2017. > https://www.uefi.org/sites/default/files/resources/ACPI_6_2.pdf > > [2] "Unified Extensible Firmware Interface Specification", > version 2.8, March 2019. > https://uefi.org/sites/default/files/resources/UEFI_Spec_2_8_final.pdf > > Suggested-by: Konrad Wilk <konrad.wilk@oracle.com> > Signed-off-by: Eric DeVolder <eric.devolder@oracle.com> > > --- > v3: 28may2021 > - Converted to using a TYPE_MEMORY_BACKEND_FILE object rather than > internal array with explicit file operations, per Igor. good start but it's not complete yet. > - Changed the way the qdev and base address are handled, allowing > ERST to be disabled at run-time. Also aligns better with other > existing code. it aligns with ancient code template and the way it used to plumb into board (it's fine for pre-existing devices but not for new ones (unless there is no other way )). v2 had suggestions how to proceed (you asked some questions back then, but result is not reflected in this series, which still has the old code as it was in v2). > v2: 8feb2021 > - Added qtest/smoke test per Paolo Bonzini > - Split patch into smaller chunks, per Igo Mammedov > - Did away with use of ACPI packed structures, per Igo Mammedov > > v1: 26oct2020 > - initial post > > --- > hw/acpi/erst.c | 909 +++++++++++++++++++++++++++++++++++++++++++++++++ > hw/acpi/meson.build | 1 + > hw/i386/acpi-build.c | 4 + > include/hw/acpi/erst.h | 97 ++++++ > 4 files changed, 1011 insertions(+) > create mode 100644 hw/acpi/erst.c > create mode 100644 include/hw/acpi/erst.h > > > Eric DeVolder (7): > ACPI ERST: bios-tables-test.c steps 1 and 2 > ACPI ERST: header file for ERST > ACPI ERST: support for ACPI ERST feature > ACPI ERST: include ERST feature in build of ACPI support > ACPI ERST: create ERST device for pc/x86 machines. > ACPI ERST: qtest for ERST > ACPI ERST: step 6 of bios-tables-test.c > > hw/acpi/erst.c | 902 +++++++++++++++++++++++++++++++++++++++++++ > hw/acpi/meson.build | 1 + > hw/i386/acpi-build.c | 7 + > hw/i386/pc.c | 31 ++ > include/hw/acpi/erst.h | 82 ++++ > include/hw/i386/pc.h | 1 + > tests/data/acpi/microvm/ERST | 0 > tests/data/acpi/pc/ERST | Bin 0 -> 976 bytes > tests/data/acpi/q35/ERST | Bin 0 -> 976 bytes > tests/qtest/erst-test.c | 106 +++++ > tests/qtest/meson.build | 2 + > 11 files changed, 1132 insertions(+) > create mode 100644 hw/acpi/erst.c > create mode 100644 include/hw/acpi/erst.h > create mode 100644 tests/data/acpi/microvm/ERST > create mode 100644 tests/data/acpi/pc/ERST > create mode 100644 tests/data/acpi/q35/ERST > create mode 100644 tests/qtest/erst-test.c > [-- Attachment #2: Type: text/html, Size: 9871 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU 2021-06-07 21:03 ` Eric DeVolder @ 2021-06-14 8:14 ` Igor Mammedov 2021-06-14 12:45 ` Eric DeVolder 0 siblings, 1 reply; 15+ messages in thread From: Igor Mammedov @ 2021-06-14 8:14 UTC (permalink / raw) To: Eric DeVolder Cc: ehabkost, mst, Konrad Wilk, qemu-devel, pbonzini, Boris Ostrovsky, rth On Mon, 7 Jun 2021 21:03:06 +0000 Eric DeVolder <eric.devolder@oracle.com> wrote: > Igor, > Thanks for the information/feedback. I am working to implement all your suggestions; from my perspective, there were two big changes requested, and the use of hostmem-file was the first, and the conversion to PCI the second. V3 was the hostmem-file, and hopefully all changes then in v4. if series is work in progress and not ready for merging, one should use RFC instead of PATCH tag > Regards, > eric > > ________________________________ > From: Igor Mammedov <imammedo@redhat.com> > Sent: Monday, June 7, 2021 7:49 AM > To: Eric DeVolder <eric.devolder@oracle.com> > Cc: qemu-devel@nongnu.org <qemu-devel@nongnu.org>; mst@redhat.com <mst@redhat.com>; marcel.apfelbaum@gmail.com <marcel.apfelbaum@gmail.com>; pbonzini@redhat.com <pbonzini@redhat.com>; rth@twiddle.net <rth@twiddle.net>; ehabkost@redhat.com <ehabkost@redhat.com>; Konrad Wilk <konrad.wilk@oracle.com>; Boris Ostrovsky <boris.ostrovsky@oracle.com> > Subject: Re: [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU > > On Fri, 28 May 2021 14:14:12 -0400 > Eric DeVolder <eric.devolder@oracle.com> wrote: > > > NOTE: Also, I wanted to push this v3 for review while alerting > > that I will be on holiday through June 8 (possibly a few days > > later). > this version addressed only the way the host storage is accessed > (and even that is only partially and needs more work to put into it) > The rest of the comments on v2 are still not addressed. > > > NOTE: The patches are arranged such that each can be applied > > in order and not break the build (except the 0001 patch). Igor > > has hinted at changing this, but I'm unsure how else to > > re-arrange these patches accordingly. > as minimum, see suggestion for splitting #4 in 5/7 > > > NOTE: With the conversion to TYPE_MEMORY_BACKEND_FILE, live > > migration to a completely different host does not behave > > properly (it loses the ERST contents because the file is not > > present on the new host). This still needs to be worked out. > > Other than live migration, this patchset fully works. > > see: vmstate_register_ram_global() > > > This patchset introduces support for the ACPI Error Record > > Serialization Table, ERST. > > > > Linux uses the persistent storage filesystem, pstore, to record > > information (eg. dmesg tail) upon panics and shutdowns. Pstore is > > independent of, and runs before, kdump. In certain scenarios (ie. > > hosts/guests with root filesystems on NFS/iSCSI where networking > > software and/or hardware fails), pstore may contain the only > > information available for post-mortem debugging. > > > > Two common storage backends for the pstore filesystem are ACPI ERST > > and UEFI. Most BIOS implement ACPI ERST; however, ACPI ERST is not > > currently supported in QEMU, and UEFI is not utilized in all guests. > > By implementing ACPI ERST within QEMU, then the ACPI ERST becomes a > > viable pstore storage backend for virtual machines (as it is now for > > bare metal machines). > > > > Enabling support for ACPI ERST facilitates a consistent method to > > capture kernel panic information in a wide range of guests: from > > resource-constrained microvms to very large guests, and in > > particular, in direct-boot environments (which would lack UEFI > > run-time services). > > > > Note that Microsoft Windows also utilizes the ACPI ERST for certain > > crash information, if available. > > > > The ACPI ERST persistent storage is contained within a single backing > > file, with a default size of 64KiB. The size and filename of the > > backing file can be obtained from QEMU parameters. > > > > The ACPI specification[1], in Chapter "ACPI Platform Error Interfaces > > (APEI)", and specifically subsection "Error Serialization", outlines > > a method for storing error records into persistent storage. > > > > [1] "Advanced Configuration and Power Interface Specification", > > version 6.2, May 2017. > > https://www.uefi.org/sites/default/files/resources/ACPI_6_2.pdf > > > > [2] "Unified Extensible Firmware Interface Specification", > > version 2.8, March 2019. > > https://uefi.org/sites/default/files/resources/UEFI_Spec_2_8_final.pdf > > > > Suggested-by: Konrad Wilk <konrad.wilk@oracle.com> > > Signed-off-by: Eric DeVolder <eric.devolder@oracle.com> > > > > --- > > v3: 28may2021 > > - Converted to using a TYPE_MEMORY_BACKEND_FILE object rather than > > internal array with explicit file operations, per Igor. > good start but it's not complete yet. > > > - Changed the way the qdev and base address are handled, allowing > > ERST to be disabled at run-time. Also aligns better with other > > existing code. > it aligns with ancient code template and the way it used to plumb > into board (it's fine for pre-existing devices but not for new ones > (unless there is no other way )). > v2 had suggestions how to proceed (you asked some questions back then, > but result is not reflected in this series, which still has the old > code as it was in v2). > > > > v2: 8feb2021 > > - Added qtest/smoke test per Paolo Bonzini > > - Split patch into smaller chunks, per Igo Mammedov > > - Did away with use of ACPI packed structures, per Igo Mammedov > > > > v1: 26oct2020 > > - initial post > > > > --- > > hw/acpi/erst.c | 909 +++++++++++++++++++++++++++++++++++++++++++++++++ > > hw/acpi/meson.build | 1 + > > hw/i386/acpi-build.c | 4 + > > include/hw/acpi/erst.h | 97 ++++++ > > 4 files changed, 1011 insertions(+) > > create mode 100644 hw/acpi/erst.c > > create mode 100644 include/hw/acpi/erst.h > > > > > > Eric DeVolder (7): > > ACPI ERST: bios-tables-test.c steps 1 and 2 > > ACPI ERST: header file for ERST > > ACPI ERST: support for ACPI ERST feature > > ACPI ERST: include ERST feature in build of ACPI support > > ACPI ERST: create ERST device for pc/x86 machines. > > ACPI ERST: qtest for ERST > > ACPI ERST: step 6 of bios-tables-test.c > > > > hw/acpi/erst.c | 902 +++++++++++++++++++++++++++++++++++++++++++ > > hw/acpi/meson.build | 1 + > > hw/i386/acpi-build.c | 7 + > > hw/i386/pc.c | 31 ++ > > include/hw/acpi/erst.h | 82 ++++ > > include/hw/i386/pc.h | 1 + > > tests/data/acpi/microvm/ERST | 0 > > tests/data/acpi/pc/ERST | Bin 0 -> 976 bytes > > tests/data/acpi/q35/ERST | Bin 0 -> 976 bytes > > tests/qtest/erst-test.c | 106 +++++ > > tests/qtest/meson.build | 2 + > > 11 files changed, 1132 insertions(+) > > create mode 100644 hw/acpi/erst.c > > create mode 100644 include/hw/acpi/erst.h > > create mode 100644 tests/data/acpi/microvm/ERST > > create mode 100644 tests/data/acpi/pc/ERST > > create mode 100644 tests/data/acpi/q35/ERST > > create mode 100644 tests/qtest/erst-test.c > > > ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU 2021-06-14 8:14 ` Igor Mammedov @ 2021-06-14 12:45 ` Eric DeVolder 0 siblings, 0 replies; 15+ messages in thread From: Eric DeVolder @ 2021-06-14 12:45 UTC (permalink / raw) To: Igor Mammedov Cc: ehabkost, mst, Konrad Wilk, qemu-devel, pbonzini, Boris Ostrovsky, rth [-- Attachment #1: Type: text/plain, Size: 7763 bytes --] Igor, Thanks, I sent out V4 Friday; I believe it has all the changes in it that you have requested. Regards, eric ________________________________ From: Igor Mammedov <imammedo@redhat.com> Sent: Monday, June 14, 2021 3:14 AM To: Eric DeVolder <eric.devolder@oracle.com> Cc: qemu-devel@nongnu.org <qemu-devel@nongnu.org>; mst@redhat.com <mst@redhat.com>; marcel.apfelbaum@gmail.com <marcel.apfelbaum@gmail.com>; pbonzini@redhat.com <pbonzini@redhat.com>; rth@twiddle.net <rth@twiddle.net>; ehabkost@redhat.com <ehabkost@redhat.com>; Konrad Wilk <konrad.wilk@oracle.com>; Boris Ostrovsky <boris.ostrovsky@oracle.com> Subject: Re: [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU On Mon, 7 Jun 2021 21:03:06 +0000 Eric DeVolder <eric.devolder@oracle.com> wrote: > Igor, > Thanks for the information/feedback. I am working to implement all your suggestions; from my perspective, there were two big changes requested, and the use of hostmem-file was the first, and the conversion to PCI the second. V3 was the hostmem-file, and hopefully all changes then in v4. if series is work in progress and not ready for merging, one should use RFC instead of PATCH tag > Regards, > eric > > ________________________________ > From: Igor Mammedov <imammedo@redhat.com> > Sent: Monday, June 7, 2021 7:49 AM > To: Eric DeVolder <eric.devolder@oracle.com> > Cc: qemu-devel@nongnu.org <qemu-devel@nongnu.org>; mst@redhat.com <mst@redhat.com>; marcel.apfelbaum@gmail.com <marcel.apfelbaum@gmail.com>; pbonzini@redhat.com <pbonzini@redhat.com>; rth@twiddle.net <rth@twiddle.net>; ehabkost@redhat.com <ehabkost@redhat.com>; Konrad Wilk <konrad.wilk@oracle.com>; Boris Ostrovsky <boris.ostrovsky@oracle.com> > Subject: Re: [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU > > On Fri, 28 May 2021 14:14:12 -0400 > Eric DeVolder <eric.devolder@oracle.com> wrote: > > > NOTE: Also, I wanted to push this v3 for review while alerting > > that I will be on holiday through June 8 (possibly a few days > > later). > this version addressed only the way the host storage is accessed > (and even that is only partially and needs more work to put into it) > The rest of the comments on v2 are still not addressed. > > > NOTE: The patches are arranged such that each can be applied > > in order and not break the build (except the 0001 patch). Igor > > has hinted at changing this, but I'm unsure how else to > > re-arrange these patches accordingly. > as minimum, see suggestion for splitting #4 in 5/7 > > > NOTE: With the conversion to TYPE_MEMORY_BACKEND_FILE, live > > migration to a completely different host does not behave > > properly (it loses the ERST contents because the file is not > > present on the new host). This still needs to be worked out. > > Other than live migration, this patchset fully works. > > see: vmstate_register_ram_global() > > > This patchset introduces support for the ACPI Error Record > > Serialization Table, ERST. > > > > Linux uses the persistent storage filesystem, pstore, to record > > information (eg. dmesg tail) upon panics and shutdowns. Pstore is > > independent of, and runs before, kdump. In certain scenarios (ie. > > hosts/guests with root filesystems on NFS/iSCSI where networking > > software and/or hardware fails), pstore may contain the only > > information available for post-mortem debugging. > > > > Two common storage backends for the pstore filesystem are ACPI ERST > > and UEFI. Most BIOS implement ACPI ERST; however, ACPI ERST is not > > currently supported in QEMU, and UEFI is not utilized in all guests. > > By implementing ACPI ERST within QEMU, then the ACPI ERST becomes a > > viable pstore storage backend for virtual machines (as it is now for > > bare metal machines). > > > > Enabling support for ACPI ERST facilitates a consistent method to > > capture kernel panic information in a wide range of guests: from > > resource-constrained microvms to very large guests, and in > > particular, in direct-boot environments (which would lack UEFI > > run-time services). > > > > Note that Microsoft Windows also utilizes the ACPI ERST for certain > > crash information, if available. > > > > The ACPI ERST persistent storage is contained within a single backing > > file, with a default size of 64KiB. The size and filename of the > > backing file can be obtained from QEMU parameters. > > > > The ACPI specification[1], in Chapter "ACPI Platform Error Interfaces > > (APEI)", and specifically subsection "Error Serialization", outlines > > a method for storing error records into persistent storage. > > > > [1] "Advanced Configuration and Power Interface Specification", > > version 6.2, May 2017. > > https://www.uefi.org/sites/default/files/resources/ACPI_6_2.pdf > > > > [2] "Unified Extensible Firmware Interface Specification", > > version 2.8, March 2019. > > https://uefi.org/sites/default/files/resources/UEFI_Spec_2_8_final.pdf > > > > Suggested-by: Konrad Wilk <konrad.wilk@oracle.com> > > Signed-off-by: Eric DeVolder <eric.devolder@oracle.com> > > > > --- > > v3: 28may2021 > > - Converted to using a TYPE_MEMORY_BACKEND_FILE object rather than > > internal array with explicit file operations, per Igor. > good start but it's not complete yet. > > > - Changed the way the qdev and base address are handled, allowing > > ERST to be disabled at run-time. Also aligns better with other > > existing code. > it aligns with ancient code template and the way it used to plumb > into board (it's fine for pre-existing devices but not for new ones > (unless there is no other way )). > v2 had suggestions how to proceed (you asked some questions back then, > but result is not reflected in this series, which still has the old > code as it was in v2). > > > > v2: 8feb2021 > > - Added qtest/smoke test per Paolo Bonzini > > - Split patch into smaller chunks, per Igo Mammedov > > - Did away with use of ACPI packed structures, per Igo Mammedov > > > > v1: 26oct2020 > > - initial post > > > > --- > > hw/acpi/erst.c | 909 +++++++++++++++++++++++++++++++++++++++++++++++++ > > hw/acpi/meson.build | 1 + > > hw/i386/acpi-build.c | 4 + > > include/hw/acpi/erst.h | 97 ++++++ > > 4 files changed, 1011 insertions(+) > > create mode 100644 hw/acpi/erst.c > > create mode 100644 include/hw/acpi/erst.h > > > > > > Eric DeVolder (7): > > ACPI ERST: bios-tables-test.c steps 1 and 2 > > ACPI ERST: header file for ERST > > ACPI ERST: support for ACPI ERST feature > > ACPI ERST: include ERST feature in build of ACPI support > > ACPI ERST: create ERST device for pc/x86 machines. > > ACPI ERST: qtest for ERST > > ACPI ERST: step 6 of bios-tables-test.c > > > > hw/acpi/erst.c | 902 +++++++++++++++++++++++++++++++++++++++++++ > > hw/acpi/meson.build | 1 + > > hw/i386/acpi-build.c | 7 + > > hw/i386/pc.c | 31 ++ > > include/hw/acpi/erst.h | 82 ++++ > > include/hw/i386/pc.h | 1 + > > tests/data/acpi/microvm/ERST | 0 > > tests/data/acpi/pc/ERST | Bin 0 -> 976 bytes > > tests/data/acpi/q35/ERST | Bin 0 -> 976 bytes > > tests/qtest/erst-test.c | 106 +++++ > > tests/qtest/meson.build | 2 + > > 11 files changed, 1132 insertions(+) > > create mode 100644 hw/acpi/erst.c > > create mode 100644 include/hw/acpi/erst.h > > create mode 100644 tests/data/acpi/microvm/ERST > > create mode 100644 tests/data/acpi/pc/ERST > > create mode 100644 tests/data/acpi/q35/ERST > > create mode 100644 tests/qtest/erst-test.c > > > [-- Attachment #2: Type: text/html, Size: 11625 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2021-06-14 12:46 UTC | newest] Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-05-28 18:14 [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU Eric DeVolder 2021-05-28 18:14 ` [PATCH v3 1/7] ACPI ERST: bios-tables-test.c steps 1 and 2 Eric DeVolder 2021-05-28 18:14 ` [PATCH v3 2/7] ACPI ERST: header file for ERST Eric DeVolder 2021-05-28 18:14 ` [PATCH v3 3/7] ACPI ERST: support for ACPI ERST feature Eric DeVolder 2021-06-07 12:03 ` Igor Mammedov 2021-05-28 18:14 ` [PATCH v3 4/7] ACPI ERST: include ERST feature in build of ACPI support Eric DeVolder 2021-06-07 12:32 ` Igor Mammedov 2021-05-28 18:14 ` [PATCH v3 5/7] ACPI ERST: create ERST device for pc/x86 machines Eric DeVolder 2021-06-07 12:28 ` Igor Mammedov 2021-05-28 18:14 ` [PATCH v3 6/7] ACPI ERST: qtest for ERST Eric DeVolder 2021-05-28 18:14 ` [PATCH v3 7/7] ACPI ERST: step 6 of bios-tables-test.c Eric DeVolder 2021-06-07 12:49 ` [PATCH v3 0/7] acpi: Error Record Serialization Table, ERST, support for QEMU Igor Mammedov 2021-06-07 21:03 ` Eric DeVolder 2021-06-14 8:14 ` Igor Mammedov 2021-06-14 12:45 ` Eric DeVolder
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.