From patchwork Tue Apr 21 13:21:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiju Jose X-Patchwork-Id: 11501361 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9DF666CA for ; Tue, 21 Apr 2020 13:23:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8F0852078C for ; Tue, 21 Apr 2020 13:23:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729024AbgDUNXo (ORCPT ); Tue, 21 Apr 2020 09:23:44 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:2822 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728864AbgDUNXn (ORCPT ); Tue, 21 Apr 2020 09:23:43 -0400 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 0F239F6509CB6C65CFB; Tue, 21 Apr 2020 21:23:41 +0800 (CST) Received: from DESKTOP-6T4S3DQ.china.huawei.com (10.47.83.77) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.487.0; Tue, 21 Apr 2020 21:23:34 +0800 From: Shiju Jose To: , , , , , , , , , , , , CC: , , , , Shiju Jose Subject: [RESEND PATCH v7 2/6] ACPI / APEI: Add callback for memory errors to the GHES notifier Date: Tue, 21 Apr 2020 14:21:32 +0100 Message-ID: <20200421132136.1595-3-shiju.jose@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 In-Reply-To: <20200421132136.1595-1-shiju.jose@huawei.com> References: <20200421132136.1595-1-shiju.jose@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.47.83.77] X-CFilter-Loop: Reflected Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Add callback function for handling the memory errors to the GHES notifier. Signed-off-by: Shiju Jose --- drivers/acpi/apei/ghes.c | 55 ++++++++++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 13 deletions(-) diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 5c0ab5422311..053c4a2ed96c 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -471,23 +471,33 @@ static void ghes_clear_estatus(struct ghes *ghes, ghes_ack_error(ghes->generic_v2); } -static void ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata, int sev) +static int ghes_handle_memory_failure(struct notifier_block *nb, + unsigned long event, void *data) { #ifdef CONFIG_ACPI_APEI_MEMORY_FAILURE unsigned long pfn; int flags = -1; + int sev = event; + struct acpi_hest_generic_data *gdata = data; int sec_sev = ghes_severity(gdata->error_severity); struct cper_sec_mem_err *mem_err = acpi_hest_get_payload(gdata); + if (!guid_equal((guid_t *)gdata->section_type, &CPER_SEC_PLATFORM_MEM)) + return NOTIFY_DONE; + + ghes_edac_report_mem_error(sev, mem_err); + + arch_apei_report_mem_error(sev, mem_err); + if (!(mem_err->validation_bits & CPER_MEM_VALID_PA)) - return; + return NOTIFY_STOP; pfn = mem_err->physical_addr >> PAGE_SHIFT; if (!pfn_valid(pfn)) { pr_warn_ratelimited(FW_WARN GHES_PFX "Invalid address in generic error data: %#llx\n", mem_err->physical_addr); - return; + return NOTIFY_STOP; } /* iff following two events can be handled properly by now */ @@ -500,6 +510,7 @@ static void ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata, int if (flags != -1) memory_failure_queue(pfn, flags); #endif + return NOTIFY_STOP; } /* @@ -547,6 +558,22 @@ static void ghes_handle_aer(struct acpi_hest_generic_data *gdata) #endif } +static struct notifier_block ghes_notifier_mem_error = { + .notifier_call = ghes_handle_memory_failure, +}; + +struct ghes_error_handler_list { + const char *name; + struct notifier_block *nb; +}; + +static const struct ghes_error_handler_list ghes_error_handler_list[] = { + { + .name = "ghes_notifier_mem_error", + .nb = &ghes_notifier_mem_error, + }, +}; + static BLOCKING_NOTIFIER_HEAD(ghes_event_notify_list); /** @@ -630,15 +657,7 @@ static void ghes_do_proc(struct ghes *ghes, break; } - if (guid_equal(sec_type, &CPER_SEC_PLATFORM_MEM)) { - struct cper_sec_mem_err *mem_err = acpi_hest_get_payload(gdata); - - ghes_edac_report_mem_error(sev, mem_err); - - arch_apei_report_mem_error(sev, mem_err); - ghes_handle_memory_failure(gdata, sev); - } - else if (guid_equal(sec_type, &CPER_SEC_PCIE)) { + if (guid_equal(sec_type, &CPER_SEC_PCIE)) { ghes_handle_aer(gdata); } else if (guid_equal(sec_type, &CPER_SEC_PROC_ARM)) { @@ -1431,7 +1450,7 @@ static struct platform_driver ghes_platform_driver = { static int __init ghes_init(void) { - int rc; + int rc, i; if (acpi_disabled) return -ENODEV; @@ -1473,6 +1492,16 @@ static int __init ghes_init(void) goto err; } + for (i = 0; i < ARRAY_SIZE(ghes_error_handler_list); i++) { + const struct ghes_error_handler_list *list = + &ghes_error_handler_list[i]; + rc = ghes_register_event_notifier(list->nb); + if (rc) { + pr_warn(GHES_PFX "fail to register %s\n", list->name); + goto err; + } + } + return 0; err: return rc;