* [PATCH 00/31] Prepare GHES driver to support error injection
@ 2024-12-06 17:12 Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 10/31] acpi/ghes: better name GHES memory error function Mauro Carvalho Chehab
2024-12-07 6:11 ` [PATCH 00/31] Prepare GHES driver to support error injection Markus Armbruster
0 siblings, 2 replies; 6+ messages in thread
From: Mauro Carvalho Chehab @ 2024-12-06 17:12 UTC (permalink / raw)
To: Michael S . Tsirkin
Cc: Jonathan Cameron, Shiju Jose, Mauro Carvalho Chehab,
Philippe Mathieu-Daudé, Ani Sinha, Cleber Rosa, Dongjiu Geng,
Eduardo Habkost, Eric Blake, Igor Mammedov, John Snow,
Marcel Apfelbaum, Markus Armbruster, Michael Roth, Paolo Bonzini,
Peter Maydell, Shannon Zhao, Yanan Wang, Zhao Liu, kvm,
linux-kernel, qemu-arm, qemu-devel
Hi Michael,
Could you please merge this series for ACPI stuff? All patches were already
reviewed by Igor. The changes against v4 are just on some patch descriptions,
plus the addition of Reviewed-by. No Code changes.
Thanks,
Mauro
-
During the development of a patch series meant to allow GHESv2 error injections,
it was requested a change on how CPER offsets are calculated, by adding a new
BIOS pointer and reworking the GHES logic. See:
https://lore.kernel.org/qemu-devel/cover.1726293808.git.mchehab+huawei@kernel.org/
Such change ended being a big patch, so several intermediate steps are needed,
together with several cleanups and renames.
As agreed duing v10 review, I'll be splitting the big patch series into separate pull
requests, starting with the cleanup series. This is the first patch set, containing
only such preparation patches.
The next series will contain the shift to use offsets from the location of the
HEST table, together with a migration logic to make it compatible with 9.1.
---
v5:
- some changes at patches description and added some R-B;
- no changes at the code.
v4:
- merged a patch renaming the function which calculate offsets to:
get_hw_error_offsets(), to avoid the need of such change at the next
patch series;
- removed a functional change at the logic which makes
the GHES record generation more generic;
- a couple of trivial changes on patch descriptions and line break cleanups.
v3:
- improved some patch descriptions;
- some patches got reordered to better reflect the changes;
- patch v2 08/15: acpi/ghes: Prepare to support multiple sources on ghes
was split on two patches. The first one is in this cleanup series:
acpi/ghes: Change ghes fill logic to work with only one source
contains just the simplification logic. The actual preparation will
be moved to this series:
https://lore.kernel.org/qemu-devel/cover.1727782588.git.mchehab+huawei@kernel.org/
v2:
- some indentation fixes;
- some description improvements;
- fixed a badly-solved merge conflict that ended renaming a parameter.
Mauro Carvalho Chehab (31):
acpi/ghes: get rid of ACPI_HEST_SRC_ID_RESERVED
acpi/ghes: simplify acpi_ghes_record_errors() code
acpi/ghes: simplify the per-arch caller to build HEST table
acpi/ghes: better handle source_id and notification
acpi/ghes: Fix acpi_ghes_record_errors() argument
acpi/ghes: Remove a duplicated out of bounds check
acpi/ghes: Change the type for source_id
acpi/ghes: don't check if physical_address is not zero
acpi/ghes: make the GHES record generation more generic
acpi/ghes: better name GHES memory error function
acpi/ghes: don't crash QEMU if ghes GED is not found
acpi/ghes: rename etc/hardware_error file macros
acpi/ghes: better name the offset of the hardware error firmware
acpi/ghes: Prepare to support multiple sources on ghes
acpi/ghes: add a firmware file with HEST address
acpi/ghes: Use HEST table offsets when preparing GHES records
acpi/generic_event_device: Update GHES migration to cover hest addr
acpi/generic_event_device: add logic to detect if HEST addr is
available
acpi/ghes: add a notifier to notify when error data is ready
acpi/generic_event_device: add an APEI error device
arm/virt: Wire up a GED error device for ACPI / GHES
qapi/acpi-hest: add an interface to do generic CPER error injection
scripts/ghes_inject: add a script to generate GHES error inject
target/arm: add an experimental mpidr arm cpu property object
scripts/arm_processor_error.py: retrieve mpidr if not filled
acpi/ghes: move offset calculus to a separate function
DEBUG
acpi/ghes: Change ghes fill logic to work with only one source
HACK: use GPIO as source ID for virt-9.1 machines
docs: acpi_hest_ghes: fix documentation for CPER size
FIXME: acpi/ghes: properly set data record size
MAINTAINERS | 10 +
docs/specs/acpi_hest_ghes.rst | 6 +-
hw/acpi/Kconfig | 5 +
hw/acpi/aml-build.c | 10 +
hw/acpi/generic_event_device.c | 42 +-
hw/acpi/ghes-stub.c | 2 +-
hw/acpi/ghes.c | 391 ++++++++++----
hw/acpi/ghes_cper.c | 32 ++
hw/acpi/ghes_cper_stub.c | 19 +
hw/acpi/meson.build | 2 +
hw/arm/virt-acpi-build.c | 36 +-
hw/arm/virt.c | 19 +-
hw/core/machine.c | 2 +
include/hw/acpi/acpi_dev_interface.h | 1 +
include/hw/acpi/aml-build.h | 2 +
include/hw/acpi/generic_event_device.h | 1 +
include/hw/acpi/ghes.h | 39 +-
include/hw/arm/virt.h | 2 +
qapi/acpi-hest.json | 35 ++
qapi/meson.build | 1 +
qapi/qapi-schema.json | 1 +
scripts/arm_processor_error.py | 390 ++++++++++++++
scripts/ghes_inject.py | 51 ++
scripts/qmp_helper.py | 702 +++++++++++++++++++++++++
target/arm/cpu.c | 1 +
target/arm/cpu.h | 1 +
target/arm/helper.c | 10 +-
target/arm/kvm.c | 2 +-
28 files changed, 1678 insertions(+), 137 deletions(-)
create mode 100644 hw/acpi/ghes_cper.c
create mode 100644 hw/acpi/ghes_cper_stub.c
create mode 100644 qapi/acpi-hest.json
create mode 100644 scripts/arm_processor_error.py
create mode 100755 scripts/ghes_inject.py
create mode 100644 scripts/qmp_helper.py
--
2.47.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 10/31] acpi/ghes: better name GHES memory error function
2024-12-06 17:12 [PATCH 00/31] Prepare GHES driver to support error injection Mauro Carvalho Chehab
@ 2024-12-06 17:12 ` Mauro Carvalho Chehab
2024-12-07 6:11 ` [PATCH 00/31] Prepare GHES driver to support error injection Markus Armbruster
1 sibling, 0 replies; 6+ messages in thread
From: Mauro Carvalho Chehab @ 2024-12-06 17:12 UTC (permalink / raw)
To: Michael S . Tsirkin
Cc: Jonathan Cameron, Shiju Jose, Mauro Carvalho Chehab, Ani Sinha,
Dongjiu Geng, Igor Mammedov, Paolo Bonzini, Peter Maydell, kvm,
linux-kernel, qemu-arm, qemu-devel
The current function used to generate GHES data is specific for
memory errors. Give a better name for it, as we now have a generic
function as well.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
hw/acpi/ghes-stub.c | 2 +-
hw/acpi/ghes.c | 2 +-
include/hw/acpi/ghes.h | 4 ++--
target/arm/kvm.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/acpi/ghes-stub.c b/hw/acpi/ghes-stub.c
index 2b64cbd2819a..7cec1812dad9 100644
--- a/hw/acpi/ghes-stub.c
+++ b/hw/acpi/ghes-stub.c
@@ -11,7 +11,7 @@
#include "qemu/osdep.h"
#include "hw/acpi/ghes.h"
-int acpi_ghes_record_errors(uint16_t source_id, uint64_t physical_address)
+int acpi_ghes_memory_errors(uint16_t source_id, uint64_t physical_address)
{
return -1;
}
diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c
index 4b5332f8c667..414a4a1ee00e 100644
--- a/hw/acpi/ghes.c
+++ b/hw/acpi/ghes.c
@@ -415,7 +415,7 @@ void ghes_record_cper_errors(const void *cper, size_t len,
return;
}
-int acpi_ghes_record_errors(uint16_t source_id, uint64_t physical_address)
+int acpi_ghes_memory_errors(uint16_t source_id, uint64_t physical_address)
{
/* Memory Error Section Type */
const uint8_t guid[] =
diff --git a/include/hw/acpi/ghes.h b/include/hw/acpi/ghes.h
index 8859346af51a..21666a4bcc8b 100644
--- a/include/hw/acpi/ghes.h
+++ b/include/hw/acpi/ghes.h
@@ -74,15 +74,15 @@ void acpi_build_hest(GArray *table_data, GArray *hardware_errors,
const char *oem_id, const char *oem_table_id);
void acpi_ghes_add_fw_cfg(AcpiGhesState *vms, FWCfgState *s,
GArray *hardware_errors);
+int acpi_ghes_memory_errors(uint16_t source_id, uint64_t error_physical_addr);
void ghes_record_cper_errors(const void *cper, size_t len,
uint16_t source_id, Error **errp);
-int acpi_ghes_record_errors(uint16_t source_id, uint64_t error_physical_addr);
/**
* acpi_ghes_present: Report whether ACPI GHES table is present
*
* Returns: true if the system has an ACPI GHES table and it is
- * safe to call acpi_ghes_record_errors() to record a memory error.
+ * safe to call acpi_ghes_memory_errors() to record a memory error.
*/
bool acpi_ghes_present(void);
#endif
diff --git a/target/arm/kvm.c b/target/arm/kvm.c
index 7b6812c0de2e..b4260467f8b9 100644
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -2387,7 +2387,7 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr)
*/
if (code == BUS_MCEERR_AR) {
kvm_cpu_synchronize_state(c);
- if (!acpi_ghes_record_errors(ACPI_HEST_SRC_ID_SEA, paddr)) {
+ if (!acpi_ghes_memory_errors(ACPI_HEST_SRC_ID_SEA, paddr)) {
kvm_inject_arm_sea(c);
} else {
error_report("failed to record the error");
--
2.47.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 00/31] Prepare GHES driver to support error injection
2024-12-06 17:12 [PATCH 00/31] Prepare GHES driver to support error injection Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 10/31] acpi/ghes: better name GHES memory error function Mauro Carvalho Chehab
@ 2024-12-07 6:11 ` Markus Armbruster
2024-12-07 6:15 ` Markus Armbruster
1 sibling, 1 reply; 6+ messages in thread
From: Markus Armbruster @ 2024-12-07 6:11 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Michael S . Tsirkin, Jonathan Cameron, Shiju Jose,
Philippe Mathieu-Daudé, Ani Sinha, Cleber Rosa, Dongjiu Geng,
Eduardo Habkost, Eric Blake, Igor Mammedov, John Snow,
Marcel Apfelbaum, Michael Roth, Paolo Bonzini, Peter Maydell,
Shannon Zhao, Yanan Wang, Zhao Liu, kvm, linux-kernel, qemu-arm,
qemu-devel
This is v10, right?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 00/31] Prepare GHES driver to support error injection
2024-12-07 6:11 ` [PATCH 00/31] Prepare GHES driver to support error injection Markus Armbruster
@ 2024-12-07 6:15 ` Markus Armbruster
2024-12-07 8:39 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 6+ messages in thread
From: Markus Armbruster @ 2024-12-07 6:15 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Michael S . Tsirkin, Jonathan Cameron, Shiju Jose,
Philippe Mathieu-Daudé, Ani Sinha, Cleber Rosa, Dongjiu Geng,
Eduardo Habkost, Eric Blake, Igor Mammedov, John Snow,
Marcel Apfelbaum, Michael Roth, Paolo Bonzini, Peter Maydell,
Shannon Zhao, Yanan Wang, Zhao Liu, kvm, linux-kernel, qemu-arm,
qemu-devel
Markus Armbruster <armbru@redhat.com> writes:
> This is v10, right?
Scratch that, the cover letter explains: "As agreed duing v10 review,
I'll be splitting the big patch series into separate pull requests,
starting with the cleanup series. This is the first patch set,
containing only such preparation patches."
However, it doesn't apply for me. What's your base?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 00/31] Prepare GHES driver to support error injection
2024-12-07 6:15 ` Markus Armbruster
@ 2024-12-07 8:39 ` Mauro Carvalho Chehab
2024-12-07 15:16 ` Markus Armbruster
0 siblings, 1 reply; 6+ messages in thread
From: Mauro Carvalho Chehab @ 2024-12-07 8:39 UTC (permalink / raw)
To: Markus Armbruster
Cc: Michael S . Tsirkin, Jonathan Cameron, Shiju Jose,
Philippe Mathieu-Daudé, Ani Sinha, Cleber Rosa, Dongjiu Geng,
Eduardo Habkost, Eric Blake, Igor Mammedov, John Snow,
Marcel Apfelbaum, Michael Roth, Paolo Bonzini, Peter Maydell,
Shannon Zhao, Yanan Wang, Zhao Liu, kvm, linux-kernel, qemu-arm,
qemu-devel
Em Sat, 07 Dec 2024 07:15:19 +0100
Markus Armbruster <armbru@redhat.com> escreveu:
> Markus Armbruster <armbru@redhat.com> writes:
>
> > This is v10, right?
>
> Scratch that, the cover letter explains: "As agreed duing v10 review,
> I'll be splitting the big patch series into separate pull requests,
> starting with the cleanup series. This is the first patch set,
> containing only such preparation patches."
Please scratch this series. It seems I picked the wrong git range,
sending a lot more patches than intended.
> However, it doesn't apply for me. What's your base?
That's weird. Despite my mistake, the series is based on v9.2.0-rc3
(which was identical to master last time I rebased).
Should it be based against some other branch?
Thanks,
Mauro
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 00/31] Prepare GHES driver to support error injection
2024-12-07 8:39 ` Mauro Carvalho Chehab
@ 2024-12-07 15:16 ` Markus Armbruster
0 siblings, 0 replies; 6+ messages in thread
From: Markus Armbruster @ 2024-12-07 15:16 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Michael S . Tsirkin, Jonathan Cameron, Shiju Jose,
Philippe Mathieu-Daudé, Ani Sinha, Cleber Rosa, Dongjiu Geng,
Eduardo Habkost, Eric Blake, Igor Mammedov, John Snow,
Marcel Apfelbaum, Michael Roth, Paolo Bonzini, Peter Maydell,
Shannon Zhao, Yanan Wang, Zhao Liu, kvm, linux-kernel, qemu-arm,
qemu-devel
Mauro Carvalho Chehab <mchehab+huawei@kernel.org> writes:
[...]
>> However, it doesn't apply for me. What's your base?
>
> That's weird. Despite my mistake, the series is based on v9.2.0-rc3
> (which was identical to master last time I rebased).
Either something conflicting got committed meanwhile, or I screwed up
somehow.
> Should it be based against some other branch?
No, master is fine.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-12-07 15:16 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-06 17:12 [PATCH 00/31] Prepare GHES driver to support error injection Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 10/31] acpi/ghes: better name GHES memory error function Mauro Carvalho Chehab
2024-12-07 6:11 ` [PATCH 00/31] Prepare GHES driver to support error injection Markus Armbruster
2024-12-07 6:15 ` Markus Armbruster
2024-12-07 8:39 ` Mauro Carvalho Chehab
2024-12-07 15:16 ` Markus Armbruster
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox