From: Len Brown <lenb@kernel.org>
To: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org
Cc: Huang Ying <ying.huang@intel.com>, Len Brown <len.brown@intel.com>
Subject: [PATCH 16/19] ACPI, APEI, GHES: Add hardware memory error recovery support
Date: Tue, 02 Aug 2011 18:14:49 -0400 [thread overview]
Message-ID: <70738ef3836dfd4dbdaffef5522f4584b601770d.1312323131.git.len.brown@intel.com> (raw)
In-Reply-To: <1312323292-2986-1-git-send-email-lenb@kernel.org>
In-Reply-To: <ca7cc5110a313a609da40ae948978a585352564b.1312323131.git.len.brown@intel.com>
From: Huang Ying <ying.huang@intel.com>
memory_failure_queue() is called when recoverable memory errors are
notified by firmware to do the recovery work.
Signed-off-by: Huang Ying <ying.huang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---
drivers/acpi/apei/Kconfig | 7 +++++++
drivers/acpi/apei/ghes.c | 24 +++++++++++++++++-------
2 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/drivers/acpi/apei/Kconfig b/drivers/acpi/apei/Kconfig
index 35596ea..c34aa51 100644
--- a/drivers/acpi/apei/Kconfig
+++ b/drivers/acpi/apei/Kconfig
@@ -32,6 +32,13 @@ config ACPI_APEI_PCIEAER
PCIe AER errors may be reported via APEI firmware first mode.
Turn on this option to enable the corresponding support.
+config ACPI_APEI_MEMORY_FAILURE
+ bool "APEI memory error recovering support"
+ depends on ACPI_APEI && MEMORY_FAILURE
+ help
+ Memory errors may be reported via APEI firmware first mode.
+ Turn on this option to enable the memory recovering support.
+
config ACPI_APEI_EINJ
tristate "APEI Error INJection (EINJ)"
depends on ACPI_APEI && DEBUG_FS
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 931410d..e92c47c 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -451,20 +451,30 @@ static void ghes_clear_estatus(struct ghes *ghes)
static void ghes_do_proc(const struct acpi_hest_generic_status *estatus)
{
- int sev, processed = 0;
+ int sev, sec_sev;
struct acpi_hest_generic_data *gdata;
sev = ghes_severity(estatus->error_severity);
apei_estatus_for_each_section(estatus, gdata) {
-#ifdef CONFIG_X86_MCE
+ sec_sev = ghes_severity(gdata->error_severity);
if (!uuid_le_cmp(*(uuid_le *)gdata->section_type,
CPER_SEC_PLATFORM_MEM)) {
- apei_mce_report_mem_error(
- sev == GHES_SEV_CORRECTED,
- (struct cper_sec_mem_err *)(gdata+1));
- processed = 1;
- }
+ struct cper_sec_mem_err *mem_err;
+ mem_err = (struct cper_sec_mem_err *)(gdata+1);
+#ifdef CONFIG_X86_MCE
+ apei_mce_report_mem_error(sev == GHES_SEV_CORRECTED,
+ mem_err);
#endif
+#ifdef CONFIG_ACPI_APEI_MEMORY_FAILURE
+ if (sev == GHES_SEV_RECOVERABLE &&
+ sec_sev == GHES_SEV_RECOVERABLE &&
+ mem_err->validation_bits & CPER_MEM_VALID_PHYSICAL_ADDRESS) {
+ unsigned long pfn;
+ pfn = mem_err->physical_addr >> PAGE_SHIFT;
+ memory_failure_queue(pfn, 0, 0);
+ }
+#endif
+ }
}
}
--
1.7.6.396.ge0613
next prev parent reply other threads:[~2011-08-02 22:51 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-02 22:14 APEI patches for Linux 3.1 Len Brown
2011-08-02 22:14 ` [PATCH 01/19] ACPI, APEI, ERST, Prevent erst_dbg from loading if ERST is disabled Len Brown
2011-08-02 22:14 ` [PATCH 02/19] ACPI, APEI, ERST, Fix erst-dbg long record reading issue Len Brown
2011-08-02 22:14 ` [PATCH 03/19] ACPI, APEI, GHES, Do not ratelimit fatal error printk before panic Len Brown
2011-08-02 22:14 ` [PATCH 04/19] ACPI, APEI, Add apei_exec_run_optional Len Brown
2011-08-02 22:14 ` [PATCH 05/19] ACPI, APEI, Use apei_exec_run_optional in APEI EINJ and ERST Len Brown
2011-08-02 22:14 ` [PATCH 06/19] ACPI, APEI, GHES, Prevent GHES to be built as module Len Brown
2011-08-02 22:14 ` [PATCH 07/19] ACPI, APEI, GHES, Support disable GHES at boot time Len Brown
2011-08-02 22:14 ` [PATCH 08/19] ACPI, APEI, Add APEI bit support in generic _OSC call Len Brown
2011-08-02 22:14 ` [PATCH 09/19] ACPI, APEI, Add WHEA _OSC support Len Brown
2011-08-02 22:14 ` [PATCH 10/19] Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG Len Brown
2011-08-03 8:44 ` David Howells
2011-08-03 9:04 ` Ralf Baechle
2011-08-03 15:00 ` Richard Henderson
2011-08-02 22:14 ` [PATCH 11/19] lib, Add lock-less NULL terminated single list Len Brown
2011-08-02 22:14 ` [PATCH 12/19] lib, Make gen_pool memory allocator lockless Len Brown
2011-08-02 22:14 ` [PATCH 13/19] ACPI, APEI, GHES, printk support for recoverable error via NMI Len Brown
2011-08-02 22:14 ` [PATCH 14/19] ACPI, APEI, GHES, Error records content based throttle Len Brown
2011-08-02 22:14 ` [PATCH 15/19] HWPoison: add memory_failure_queue() Len Brown
2011-08-02 22:14 ` Len Brown [this message]
2011-08-02 22:14 ` [PATCH 17/19] ACPI: APEI build fix Len Brown
2011-08-02 22:14 ` [PATCH 18/19] APEI GHES: 32-bit buildfix Len Brown
2011-08-02 22:14 ` [PATCH 19/19] ACPI, APEI, EINJ Param support is disabled by default Len Brown
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=70738ef3836dfd4dbdaffef5522f4584b601770d.1312323131.git.len.brown@intel.com \
--to=lenb@kernel.org \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ying.huang@intel.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