From: "Michael S. Tsirkin" <mst@redhat.com>
To: Dongjiu Geng <gengdongjiu@huawei.com>
Cc: fam@euphon.net, peter.maydell@linaro.org,
xiaoguangrong.eric@gmail.com, kvm@vger.kernel.org,
mtosatti@redhat.com, qemu-devel@nongnu.org, ehabkost@redhat.com,
linuxarm@huawei.com, shannon.zhaosl@gmail.com,
zhengxiang9@huawei.com, qemu-arm@nongnu.org,
Jonathan.Cameron@huawei.com, pbonzini@redhat.com,
imammedo@redhat.com, rth@twiddle.net
Subject: Re: [PATCH v25 04/10] ACPI: Build related register address fields via hardware error fw_cfg blob
Date: Wed, 6 May 2020 16:22:39 -0400 [thread overview]
Message-ID: <20200506162234-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20200410114639.32844-5-gengdongjiu@huawei.com>
On Fri, Apr 10, 2020 at 07:46:33PM +0800, Dongjiu Geng wrote:
> This patch builds error_block_address and read_ack_register fields
> in hardware errors table , the error_block_address points to Generic
> Error Status Block(GESB) via bios_linker. The max size for one GESB
> is 1kb, For more detailed information, please refer to
> document: docs/specs/acpi_hest_ghes.rst
>
> Now we only support one Error source, if necessary, we can extend to
> support more.
>
> Suggested-by: Laszlo Ersek <lersek@redhat.com>
> Signed-off-by: Xiang Zheng <zhengxiang9@huawei.com>
> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> Signed-off-by: Dongjiu Geng <gengdongjiu@huawei.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> change since v24:
> 1.move acpi_add_table() to the patch that adds acpi_build_hest()
> ---
> default-configs/arm-softmmu.mak | 1 +
> hw/acpi/Kconfig | 4 ++
> hw/acpi/Makefile.objs | 1 +
> hw/acpi/aml-build.c | 2 +
> hw/acpi/ghes.c | 89 +++++++++++++++++++++++++++++++++++++++++
> hw/arm/virt-acpi-build.c | 5 +++
> include/hw/acpi/aml-build.h | 1 +
> include/hw/acpi/ghes.h | 28 +++++++++++++
> 8 files changed, 131 insertions(+)
> create mode 100644 hw/acpi/ghes.c
> create mode 100644 include/hw/acpi/ghes.h
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 36a0e89..8fc09a4 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -42,3 +42,4 @@ CONFIG_FSL_IMX7=y
> CONFIG_FSL_IMX6UL=y
> CONFIG_SEMIHOSTING=y
> CONFIG_ALLWINNER_H3=y
> +CONFIG_ACPI_APEI=y
> diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig
> index 54209c6..1932f66 100644
> --- a/hw/acpi/Kconfig
> +++ b/hw/acpi/Kconfig
> @@ -28,6 +28,10 @@ config ACPI_HMAT
> bool
> depends on ACPI
>
> +config ACPI_APEI
> + bool
> + depends on ACPI
> +
> config ACPI_PCI
> bool
> depends on ACPI && PCI
> diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
> index 777da07..28c5ddb 100644
> --- a/hw/acpi/Makefile.objs
> +++ b/hw/acpi/Makefile.objs
> @@ -8,6 +8,7 @@ common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o
> common-obj-$(CONFIG_ACPI_VMGENID) += vmgenid.o
> common-obj-$(CONFIG_ACPI_HW_REDUCED) += generic_event_device.o
> common-obj-$(CONFIG_ACPI_HMAT) += hmat.o
> +common-obj-$(CONFIG_ACPI_APEI) += ghes.o
> common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o
> common-obj-$(call lnot,$(CONFIG_PC)) += acpi-x86-stub.o
>
> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> index 2c3702b..3681ec6 100644
> --- a/hw/acpi/aml-build.c
> +++ b/hw/acpi/aml-build.c
> @@ -1578,6 +1578,7 @@ void acpi_build_tables_init(AcpiBuildTables *tables)
> tables->table_data = g_array_new(false, true /* clear */, 1);
> tables->tcpalog = g_array_new(false, true /* clear */, 1);
> tables->vmgenid = g_array_new(false, true /* clear */, 1);
> + tables->hardware_errors = g_array_new(false, true /* clear */, 1);
> tables->linker = bios_linker_loader_init();
> }
>
> @@ -1588,6 +1589,7 @@ void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre)
> g_array_free(tables->table_data, true);
> g_array_free(tables->tcpalog, mfre);
> g_array_free(tables->vmgenid, mfre);
> + g_array_free(tables->hardware_errors, mfre);
> }
>
> /*
> diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c
> new file mode 100644
> index 0000000..e1b3f8f
> --- /dev/null
> +++ b/hw/acpi/ghes.c
> @@ -0,0 +1,89 @@
> +/*
> + * Support for generating APEI tables and recording CPER for Guests
> + *
> + * Copyright (c) 2020 HUAWEI TECHNOLOGIES CO., LTD.
> + *
> + * Author: Dongjiu Geng <gengdongjiu@huawei.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> +
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> +
> + * You should have received a copy of the GNU General Public License along
> + * with this program; if not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qemu/units.h"
> +#include "hw/acpi/ghes.h"
> +#include "hw/acpi/aml-build.h"
> +
> +#define ACPI_GHES_ERRORS_FW_CFG_FILE "etc/hardware_errors"
> +#define ACPI_GHES_DATA_ADDR_FW_CFG_FILE "etc/hardware_errors_addr"
> +
> +/* The max size in bytes for one error block */
> +#define ACPI_GHES_MAX_RAW_DATA_LENGTH (1 * KiB)
> +
> +/* Now only support ARMv8 SEA notification type error source */
> +#define ACPI_GHES_ERROR_SOURCE_COUNT 1
> +
> +/*
> + * Build table for the hardware error fw_cfg blob.
> + * Initialize "etc/hardware_errors" and "etc/hardware_errors_addr" fw_cfg blobs.
> + * See docs/specs/acpi_hest_ghes.rst for blobs format.
> + */
> +void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker)
> +{
> + int i, error_status_block_offset;
> +
> + /* Build error_block_address */
> + for (i = 0; i < ACPI_GHES_ERROR_SOURCE_COUNT; i++) {
> + build_append_int_noprefix(hardware_errors, 0, sizeof(uint64_t));
> + }
> +
> + /* Build read_ack_register */
> + for (i = 0; i < ACPI_GHES_ERROR_SOURCE_COUNT; i++) {
> + /*
> + * Initialize the value of read_ack_register to 1, so GHES can be
> + * writeable after (re)boot.
> + * ACPI 6.2: 18.3.2.8 Generic Hardware Error Source version 2
> + * (GHESv2 - Type 10)
> + */
> + build_append_int_noprefix(hardware_errors, 1, sizeof(uint64_t));
> + }
> +
> + /* Generic Error Status Block offset in the hardware error fw_cfg blob */
> + error_status_block_offset = hardware_errors->len;
> +
> + /* Reserve space for Error Status Data Block */
> + acpi_data_push(hardware_errors,
> + ACPI_GHES_MAX_RAW_DATA_LENGTH * ACPI_GHES_ERROR_SOURCE_COUNT);
> +
> + /* Tell guest firmware to place hardware_errors blob into RAM */
> + bios_linker_loader_alloc(linker, ACPI_GHES_ERRORS_FW_CFG_FILE,
> + hardware_errors, sizeof(uint64_t), false);
> +
> + for (i = 0; i < ACPI_GHES_ERROR_SOURCE_COUNT; i++) {
> + /*
> + * Tell firmware to patch error_block_address entries to point to
> + * corresponding "Generic Error Status Block"
> + */
> + bios_linker_loader_add_pointer(linker,
> + ACPI_GHES_ERRORS_FW_CFG_FILE, sizeof(uint64_t) * i,
> + sizeof(uint64_t), ACPI_GHES_ERRORS_FW_CFG_FILE,
> + error_status_block_offset + i * ACPI_GHES_MAX_RAW_DATA_LENGTH);
> + }
> +
> + /*
> + * tell firmware to write hardware_errors GPA into
> + * hardware_errors_addr fw_cfg, once the former has been initialized.
> + */
> + bios_linker_loader_write_pointer(linker, ACPI_GHES_DATA_ADDR_FW_CFG_FILE,
> + 0, sizeof(uint64_t), ACPI_GHES_ERRORS_FW_CFG_FILE, 0);
> +}
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index 7ef0733..cc6ffcd 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -48,6 +48,7 @@
> #include "sysemu/reset.h"
> #include "kvm_arm.h"
> #include "migration/vmstate.h"
> +#include "hw/acpi/ghes.h"
>
> #define ARM_SPI_BASE 32
>
> @@ -817,6 +818,10 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)
> acpi_add_table(table_offsets, tables_blob);
> build_spcr(tables_blob, tables->linker, vms);
>
> + if (vms->ras) {
> + build_ghes_error_table(tables->hardware_errors, tables->linker);
> + }
> +
> if (ms->numa_state->num_nodes > 0) {
> acpi_add_table(table_offsets, tables_blob);
> build_srat(tables_blob, tables->linker, vms);
> diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
> index de4a406..8f13620 100644
> --- a/include/hw/acpi/aml-build.h
> +++ b/include/hw/acpi/aml-build.h
> @@ -220,6 +220,7 @@ struct AcpiBuildTables {
> GArray *rsdp;
> GArray *tcpalog;
> GArray *vmgenid;
> + GArray *hardware_errors;
> BIOSLinker *linker;
> } AcpiBuildTables;
>
> diff --git a/include/hw/acpi/ghes.h b/include/hw/acpi/ghes.h
> new file mode 100644
> index 0000000..50379b0
> --- /dev/null
> +++ b/include/hw/acpi/ghes.h
> @@ -0,0 +1,28 @@
> +/*
> + * Support for generating APEI tables and recording CPER for Guests
> + *
> + * Copyright (c) 2020 HUAWEI TECHNOLOGIES CO., LTD.
> + *
> + * Author: Dongjiu Geng <gengdongjiu@huawei.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> +
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> +
> + * You should have received a copy of the GNU General Public License along
> + * with this program; if not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#ifndef ACPI_GHES_H
> +#define ACPI_GHES_H
> +
> +#include "hw/acpi/bios-linker-loader.h"
> +
> +void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker);
> +#endif
> --
> 1.8.3.1
next prev parent reply other threads:[~2020-05-06 20:23 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-10 11:46 [PATCH v25 00/10] Add ARMv8 RAS virtualization support in QEMU Dongjiu Geng
2020-04-10 11:46 ` [PATCH v25 01/10] acpi: nvdimm: change NVDIMM_UUID_LE to a common macro Dongjiu Geng
2020-04-17 13:15 ` Peter Maydell
2020-04-10 11:46 ` [PATCH v25 02/10] hw/arm/virt: Introduce a RAS machine option Dongjiu Geng
2020-05-05 10:23 ` Igor Mammedov
2020-04-10 11:46 ` [PATCH v25 03/10] docs: APEI GHES generation and CPER record description Dongjiu Geng
2020-04-10 11:46 ` [PATCH v25 04/10] ACPI: Build related register address fields via hardware error fw_cfg blob Dongjiu Geng
2020-05-06 20:22 ` Michael S. Tsirkin [this message]
2020-04-10 11:46 ` [PATCH v25 05/10] ACPI: Build Hardware Error Source Table Dongjiu Geng
2020-05-05 10:29 ` Igor Mammedov
2020-05-06 20:22 ` Michael S. Tsirkin
2020-04-10 11:46 ` [PATCH v25 06/10] ACPI: Record the Generic Error Status Block address Dongjiu Geng
2020-05-05 10:31 ` Igor Mammedov
2020-05-06 20:23 ` Michael S. Tsirkin
2020-04-10 11:46 ` [PATCH v25 07/10] KVM: Move hwpoison page related functions into kvm-all.c Dongjiu Geng
2020-04-10 11:46 ` [PATCH v25 08/10] ACPI: Record Generic Error Status Block(GESB) table Dongjiu Geng
2020-05-05 10:44 ` Igor Mammedov
2020-05-06 11:20 ` gengdongjiu
2020-05-06 20:23 ` Michael S. Tsirkin
2020-04-10 11:46 ` [PATCH v25 09/10] target-arm: kvm64: handle SIGBUS signal from kernel or KVM Dongjiu Geng
2020-05-05 11:23 ` Igor Mammedov
2020-04-10 11:46 ` [PATCH v25 10/10] MAINTAINERS: Add ACPI/HEST/GHES entries Dongjiu Geng
2020-04-16 13:53 ` [PATCH v25 00/10] Add ARMv8 RAS virtualization support in QEMU gengdongjiu
[not found] ` <5e9863af.1c69fb81.dbe22.5caaSMTPIN_ADDED_BROKEN@mx.google.com>
2020-04-16 14:02 ` Peter Maydell
2020-04-17 13:32 ` Peter Maydell
2020-04-17 13:37 ` gengdongjiu
2020-04-18 2:40 ` gengdongjiu
2020-04-30 3:56 ` gengdongjiu
2020-04-30 12:00 ` Igor Mammedov
2020-05-06 11:42 ` gengdongjiu
2020-05-06 20:25 ` Michael S. Tsirkin
2020-05-07 4:30 ` gengdongjiu
2020-05-07 13:46 ` gengdongjiu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200506162234-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=ehabkost@redhat.com \
--cc=fam@euphon.net \
--cc=gengdongjiu@huawei.com \
--cc=imammedo@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=mtosatti@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=shannon.zhaosl@gmail.com \
--cc=xiaoguangrong.eric@gmail.com \
--cc=zhengxiang9@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).