From: James Morse <james.morse@arm.com>
To: linux-acpi@vger.kernel.org
Cc: kvmarm@lists.cs.columbia.edu,
linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org,
Borislav Petkov <bp@alien8.de>,
Marc Zyngier <marc.zyngier@arm.com>,
Christoffer Dall <christoffer.dall@arm.com>,
Will Deacon <will.deacon@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>,
Rafael Wysocki <rjw@rjwysocki.net>, Len Brown <lenb@kernel.org>,
Tony Luck <tony.luck@intel.com>,
Dongjiu Geng <gengdongjiu@huawei.com>,
Xie XiuQi <xiexiuqi@huawei.com>,
james.morse@arm.com
Subject: [PATCH v8 12/26] ACPI / APEI: Switch NOTIFY_SEA to use the estatus queue
Date: Tue, 29 Jan 2019 18:48:48 +0000 [thread overview]
Message-ID: <20190129184902.102850-13-james.morse@arm.com> (raw)
In-Reply-To: <20190129184902.102850-1-james.morse@arm.com>
Now that the estatus queue can be used by more than one notification
method, we can move notifications that have NMI-like behaviour over.
Switch NOTIFY_SEA over to use the estatus queue. This makes it behave
in the same way as x86's NOTIFY_NMI.
Remove Kconfig's ability to turn ACPI_APEI_SEA off if ACPI_APEI_GHES
is selected. This roughly matches the x86 NOTIFY_NMI behaviour, and means
each architecture has at least one user of the estatus-queue, meaning it
doesn't need guarding with ifdef.
Signed-off-by: James Morse <james.morse@arm.com>
---
Changes since v6:
* Lost all the pool grow/shrink stuff,
* Changed Kconfig so this can't be turned off to avoid kconfig complexity:
* Dropped Tyler's tested-by.
* For now we need #ifdef around the SEA code as the arch code assumes its there.
* Removed Punit's reviewed-by due to the swirling #ifdeffery
---
drivers/acpi/apei/Kconfig | 12 +-----------
drivers/acpi/apei/ghes.c | 22 +++++-----------------
2 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/drivers/acpi/apei/Kconfig b/drivers/acpi/apei/Kconfig
index 52ae5438edeb..6b18f8bc7be3 100644
--- a/drivers/acpi/apei/Kconfig
+++ b/drivers/acpi/apei/Kconfig
@@ -41,19 +41,9 @@ config ACPI_APEI_PCIEAER
Turn on this option to enable the corresponding support.
config ACPI_APEI_SEA
- bool "APEI Synchronous External Abort logging/recovering support"
+ bool
depends on ARM64 && ACPI_APEI_GHES
default y
- help
- This option should be enabled if the system supports
- firmware first handling of SEA (Synchronous External Abort).
- SEA happens with certain faults of data abort or instruction
- abort synchronous exceptions on ARMv8 systems. If a system
- supports firmware first handling of SEA, the platform analyzes
- and handles hardware error notifications from SEA, and it may then
- form a HW error record for the OS to parse and handle. This
- option allows the OS to look for such hardware error record, and
- take appropriate action.
config ACPI_APEI_MEMORY_FAILURE
bool "APEI memory error recovering support"
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 576dce29159d..ab794ab29554 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -767,7 +767,6 @@ static struct notifier_block ghes_notifier_hed = {
.notifier_call = ghes_notify_hed,
};
-#ifdef CONFIG_HAVE_ACPI_APEI_NMI
/*
* Handlers for CPER records may not be NMI safe. For example,
* memory_failure_queue() takes spinlocks and calls schedule_work_on().
@@ -904,7 +903,6 @@ static int ghes_in_nmi_spool_from_list(struct list_head *rcu_list)
return ret;
}
-#endif /* CONFIG_HAVE_ACPI_APEI_NMI */
#ifdef CONFIG_ACPI_APEI_SEA
static LIST_HEAD(ghes_sea);
@@ -915,16 +913,7 @@ static LIST_HEAD(ghes_sea);
*/
int ghes_notify_sea(void)
{
- struct ghes *ghes;
- int ret = -ENOENT;
-
- rcu_read_lock();
- list_for_each_entry_rcu(ghes, &ghes_sea, list) {
- if (!ghes_proc(ghes))
- ret = 0;
- }
- rcu_read_unlock();
- return ret;
+ return ghes_in_nmi_spool_from_list(&ghes_sea);
}
static void ghes_sea_add(struct ghes *ghes)
@@ -992,16 +981,15 @@ static void ghes_nmi_remove(struct ghes *ghes)
*/
synchronize_rcu();
}
+#else /* CONFIG_HAVE_ACPI_APEI_NMI */
+static inline void ghes_nmi_add(struct ghes *ghes) { }
+static inline void ghes_nmi_remove(struct ghes *ghes) { }
+#endif /* CONFIG_HAVE_ACPI_APEI_NMI */
static void ghes_nmi_init_cxt(void)
{
init_irq_work(&ghes_proc_irq_work, ghes_proc_in_irq);
}
-#else /* CONFIG_HAVE_ACPI_APEI_NMI */
-static inline void ghes_nmi_add(struct ghes *ghes) { }
-static inline void ghes_nmi_remove(struct ghes *ghes) { }
-static inline void ghes_nmi_init_cxt(void) { }
-#endif /* CONFIG_HAVE_ACPI_APEI_NMI */
static int ghes_probe(struct platform_device *ghes_dev)
{
--
2.20.1
next prev parent reply other threads:[~2019-01-29 18:50 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-29 18:48 [PATCH v8 00/26] APEI in_nmi() rework and SDEI wire-up James Morse
2019-01-29 18:48 ` [PATCH v8 01/26] ACPI / APEI: Don't wait to serialise with oops messages when panic()ing James Morse
2019-01-29 18:48 ` [PATCH v8 02/26] ACPI / APEI: Remove silent flag from ghes_read_estatus() James Morse
2019-01-29 18:48 ` [PATCH v8 03/26] ACPI / APEI: Switch estatus pool to use vmalloc memory James Morse
2019-01-29 18:48 ` [PATCH v8 04/26] ACPI / APEI: Make hest.c manage the estatus memory pool James Morse
2019-02-01 13:20 ` Borislav Petkov
2019-01-29 18:48 ` [PATCH v8 05/26] ACPI / APEI: Make estatus pool allocation a static size James Morse
2019-01-29 18:48 ` [PATCH v8 06/26] ACPI / APEI: Don't store CPER records physical address in struct ghes James Morse
2019-01-29 18:48 ` [PATCH v8 07/26] ACPI / APEI: Remove spurious GHES_TO_CLEAR check James Morse
2019-01-29 18:48 ` [PATCH v8 08/26] ACPI / APEI: Don't update struct ghes' flags in read/clear estatus James Morse
2019-01-29 18:48 ` [PATCH v8 09/26] ACPI / APEI: Generalise the estatus queue's notify code James Morse
2019-02-01 13:46 ` Borislav Petkov
2019-01-29 18:48 ` [PATCH v8 10/26] ACPI / APEI: Don't allow ghes_ack_error() to mask earlier errors James Morse
2019-01-29 18:48 ` [PATCH v8 11/26] ACPI / APEI: Move NOTIFY_SEA between the estatus-queue and NOTIFY_NMI James Morse
2019-01-29 18:48 ` James Morse [this message]
2019-01-29 18:48 ` [PATCH v8 13/26] KVM: arm/arm64: Add kvm_ras.h to collect kvm specific RAS plumbing James Morse
2019-01-29 18:48 ` [PATCH v8 14/26] arm64: KVM/mm: Move SEA handling behind a single 'claim' interface James Morse
2019-01-29 18:48 ` [PATCH v8 15/26] ACPI / APEI: Move locking to the notification helper James Morse
2019-01-29 18:48 ` [PATCH v8 16/26] ACPI / APEI: Let the notification helper specify the fixmap slot James Morse
2019-01-29 18:48 ` [PATCH v8 17/26] ACPI / APEI: Pass ghes and estatus separately to avoid a later copy James Morse
2019-01-29 18:48 ` [PATCH v8 18/26] ACPI / APEI: Make GHES estatus header validation more user friendly James Morse
2019-02-01 14:30 ` Borislav Petkov
2019-01-29 18:48 ` [PATCH v8 19/26] ACPI / APEI: Split ghes_read_estatus() to allow a peek at the CPER length James Morse
2019-01-29 18:48 ` [PATCH v8 20/26] ACPI / APEI: Only use queued estatus entry during in_nmi_queue_one_entry() James Morse
2019-01-29 18:48 ` [PATCH v8 21/26] ACPI / APEI: Use separate fixmap pages for arm64 NMI-like notifications James Morse
2019-01-29 18:48 ` [PATCH v8 22/26] mm/memory-failure: Add memory_failure_queue_kick() James Morse
2019-01-29 18:48 ` [PATCH v8 23/26] ACPI / APEI: Kick the memory_failure() queue for synchronous errors James Morse
2019-01-29 18:49 ` [PATCH v8 24/26] arm64: acpi: Make apei_claim_sea() synchronise with APEI's irq work James Morse
2019-01-30 8:56 ` Julien Thierry
2019-01-29 18:49 ` [PATCH v8 25/26] firmware: arm_sdei: Add ACPI GHES registration helper James Morse
2019-01-29 18:49 ` [PATCH v8 26/26] ACPI / APEI: Add support for the SDEI GHES Notification type James Morse
2019-02-08 11:40 ` [PATCH v8 00/26] APEI in_nmi() rework and SDEI wire-up Rafael J. Wysocki
2019-02-08 14:13 ` James Morse
2019-02-11 11:05 ` Rafael J. Wysocki
2019-02-11 18:35 ` James Morse
2019-02-12 22:14 ` Rafael J. Wysocki
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=20190129184902.102850-13-james.morse@arm.com \
--to=james.morse@arm.com \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=christoffer.dall@arm.com \
--cc=gengdongjiu@huawei.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mm@kvack.org \
--cc=marc.zyngier@arm.com \
--cc=n-horiguchi@ah.jp.nec.com \
--cc=rjw@rjwysocki.net \
--cc=tony.luck@intel.com \
--cc=will.deacon@arm.com \
--cc=xiexiuqi@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).