From patchwork Sat Apr 8 09:13:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuai Xue X-Patchwork-Id: 13205623 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BA3BC77B73 for ; Sat, 8 Apr 2023 09:14:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ADEEE6B0078; Sat, 8 Apr 2023 05:14:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A9ACF6B007B; Sat, 8 Apr 2023 05:14:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 913C56B007B; Sat, 8 Apr 2023 05:14:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 80AC26B0074 for ; Sat, 8 Apr 2023 05:14:14 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 4E2951A039B for ; Sat, 8 Apr 2023 09:14:14 +0000 (UTC) X-FDA: 80657662428.18.9CE09C2 Received: from out30-132.freemail.mail.aliyun.com (out30-132.freemail.mail.aliyun.com [115.124.30.132]) by imf16.hostedemail.com (Postfix) with ESMTP id 17E36180014 for ; Sat, 8 Apr 2023 09:14:10 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of xueshuai@linux.alibaba.com designates 115.124.30.132 as permitted sender) smtp.mailfrom=xueshuai@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680945251; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BWw8zWHfZFEDDT2T6xd4sS+5GxWz39NX58w2Z74duR0=; b=kWGKHWb5WeWq79GmGMQ2UbzqS3pqrcWFfiAhzjLPkREuM99n2KdEhnerbX768A8GaUsD+Q CNfPR3Dcz6cZIXYRyPcZFOKQwQIm+WCTezk59WPyTzbKYZxwsU5K78lpl0pAE7nfE7L/W9 Ol3aBR39J2fZv0JNr7TPHVTsVZGxllI= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of xueshuai@linux.alibaba.com designates 115.124.30.132 as permitted sender) smtp.mailfrom=xueshuai@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680945252; a=rsa-sha256; cv=none; b=kj1DrSQFjfU6429R/TbtV5BGgX233t5LiCJL+FFJYt2sjv6tRzbOev4YLEKZG6+E+8ELkO TqnmgHmeN0ZdT7T7JLMpMonYud+fJzE+T4MRjYnDOtFpnF3MF0rWv51BvRsIdrnoWJwNi5 QtKfkbcz6X4NZ0GdWivgDqC+bV9yeX4= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R171e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045176;MF=xueshuai@linux.alibaba.com;NM=1;PH=DS;RN=24;SR=0;TI=SMTPD_---0VfZZJef_1680945244; Received: from localhost.localdomain(mailfrom:xueshuai@linux.alibaba.com fp:SMTPD_---0VfZZJef_1680945244) by smtp.aliyun-inc.com; Sat, 08 Apr 2023 17:14:06 +0800 From: Shuai Xue To: tanxiaofei@huawei.com, mawupeng1@huawei.com, tony.luck@intel.com, naoya.horiguchi@nec.com Cc: linux-acpi@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, xueshuai@linux.alibaba.com, justin.he@arm.com, akpm@linux-foundation.org, ardb@kernel.org, ashish.kalra@amd.com, baolin.wang@linux.alibaba.com, bp@alien8.de, cuibixuan@linux.alibaba.com, dave.hansen@linux.intel.com, james.morse@arm.com, jarkko@kernel.org, lenb@kernel.org, linmiaohe@huawei.com, lvying6@huawei.com, rafael@kernel.org, xiexiuqi@huawei.com, zhuo.song@linux.alibaba.com Subject: [PATCH v4 1/2] ACPI: APEI: set memory failure flags as MF_ACTION_REQUIRED on synchronous events Date: Sat, 8 Apr 2023 17:13:58 +0800 Message-Id: <20230408091359.31554-2-xueshuai@linux.alibaba.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027042445.60108-1-xueshuai@linux.alibaba.com> References: <20221027042445.60108-1-xueshuai@linux.alibaba.com> MIME-Version: 1.0 X-Stat-Signature: 3ozscki65uadaaxoqc3x4xzoepd43mk6 X-Rspam-User: X-Rspamd-Queue-Id: 17E36180014 X-Rspamd-Server: rspam06 X-HE-Tag: 1680945250-963429 X-HE-Meta: U2FsdGVkX1+gHyTU1wBqwueHwoJaJkWXDFCXWm8YB7fXbXGhNGOWBqncGDWi0EZrk/ZPzhkiMfXhijKUywlba9pVwxGSPdZthzKIH+pwPwi9tEIQ50jLmCuLSE5f6rhVSfQTxl7QGoOgDYAaqoC4f+kwyVywYgeylJ7B1mvxQp4eP5t4Twp9oSyg3MbtY/TGKKT+d4qG28R+QZWOWC73THbc43B7AMfGxdD29Ufi2mW0tNsFF5DJVBxamoGcHxaWa2idnuEYIW5/8XteEX/z8CL312rTZH07Poe8bkmA77oMcdx5L+sJway/vKl2Z76GKbqADNgWpn8Al2LhSp9Q20koMbnVd7OM057lCtZ6XN8xtkTBZAHH5nfQk6mp147/xClOqJnf1JPQpHxEl9HmDkaHoZCR6x8bfo+B+wwwrSAZlOg/TJhBRli4NSAi7/oTeo2GDwiuXkmSOWHhHFI2i3hsED649qSsBjitOzgvJCe+gOGfy8ljbSBfDNMNmIkAZW8IneriAieEKV+GjfkLxonkETbjZijvC13OF3DtZqf6Wr9t5Sia56Pw5kTFywq2yI8Xlqr/aqXRV48ZTtVUn7SY/hoBspInPKMnwAb7gq5YBRo9rAfg66kpUjWC44wD3oU1RxgAXlvu57kov0e7JfH+CZpQPU6ryzvhlMulRQTJAAZOsVRM7oY9gcELvZx2880O/Yo1EXl18HtLdQ0xW21W6Dv+aLus75LU3BnCdLlnnLbqTzetBxP4AsHEhXp3QLcBTGtkvfEB6L2XPMi1LTGuGkZlmVOTC1ekdj0DGyg7GQwLh2QGewTVu9a99otxcgs3XVkSCZRxVTRor9ckHWU92RFeiTjHL9zVGaRwKe/z59PP4BrqcTj5TJtu/xrrVEmG28V9JXMuEn36h++KCDsF8GtpOGG2zZB0HnDOG29lZkaTbqONZhf5qc1lwfDehyKgEK4UDAywufdtYkR CJZ9fDHs az68/vlGGFFM3jq1PMHB8vbk2xhePbIkEsC17W2MIqggetMGqahCncbtKVPwp95B1/qAsiaeD9lHgqCoRICFRd5xqd8qw1zAC+uqd89xOisRSsxX3835fy23klsAmhmG74YgNuTpqIUkapMRiQ+AMmLPoEwSlvl8iOHJyhPBXxRNtci4UyNN5ncRrHra44O+OlMcO X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: There are two major types of uncorrected recoverable (UCR) errors : - Action Required (AR): The error is detected and the processor already consumes the memory. OS requires to take action (for example, offline failure page/kill failure thread) to recover this uncorrectable error. - Action Optional (AO): The error is detected out of processor execution context. Some data in the memory are corrupted. But the data have not been consumed. OS is optional to take action to recover this uncorrectable error. The essential difference between AR and AO errors is that AR is a synchronous event, while AO is an asynchronous event. The hardware will signal a synchronous exception (Machine Check Exception on X86 and Synchronous External Abort on Arm64) when an error is detected and the memory access has been architecturally executed. When APEI firmware first is enabled, a platform may describe one error source for the handling of synchronous errors (e.g. MCE or SEA notification ), or for handling asynchronous errors (e.g. SCI or External Interrupt notification). In other words, we can distinguish synchronous errors by APEI notification. For AR errors, kernel will kill current process accessing the poisoned page by sending SIGBUS with BUS_MCEERR_AR. In addition, for AO errors, kernel will notify the process who owns the poisoned page by sending SIGBUS with BUS_MCEERR_AO in early kill mode. However, the GHES driver always sets mf_flags to 0 so that all UCR errors are handled as AO errors in memory failure. To this end, set memory failure flags as MF_ACTION_REQUIRED on synchronous events. Fixes: ba61ca4aab47 ("ACPI, APEI, GHES: Add hardware memory error recovery support")' Signed-off-by: Shuai Xue Tested-by: Ma Wupeng --- drivers/acpi/apei/ghes.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 34ad071a64e9..c479b85899f5 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -101,6 +101,20 @@ static inline bool is_hest_type_generic_v2(struct ghes *ghes) return ghes->generic->header.type == ACPI_HEST_TYPE_GENERIC_ERROR_V2; } +/* + * A platform may describe one error source for the handling of synchronous + * errors (e.g. MCE or SEA), or for handling asynchronous errors (e.g. SCI + * or External Interrupt). On x86, the HEST notifications are always + * asynchronous, so only SEA on ARM is delivered as a synchronous + * notification. + */ +static inline bool is_hest_sync_notify(struct ghes *ghes) +{ + u8 notify_type = ghes->generic->notify.type; + + return notify_type == ACPI_HEST_NOTIFY_SEA; +} + /* * This driver isn't really modular, however for the time being, * continuing to use module_param is the easiest way to remain @@ -477,7 +491,7 @@ static bool ghes_do_memory_failure(u64 physical_addr, int flags) } static bool ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata, - int sev) + int sev, bool sync) { int flags = -1; int sec_sev = ghes_severity(gdata->error_severity); @@ -491,7 +505,7 @@ static bool ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata, (gdata->flags & CPER_SEC_ERROR_THRESHOLD_EXCEEDED)) flags = MF_SOFT_OFFLINE; if (sev == GHES_SEV_RECOVERABLE && sec_sev == GHES_SEV_RECOVERABLE) - flags = 0; + flags = sync ? MF_ACTION_REQUIRED : 0; if (flags != -1) return ghes_do_memory_failure(mem_err->physical_addr, flags); @@ -499,9 +513,11 @@ static bool ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata, return false; } -static bool ghes_handle_arm_hw_error(struct acpi_hest_generic_data *gdata, int sev) +static bool ghes_handle_arm_hw_error(struct acpi_hest_generic_data *gdata, + int sev, bool sync) { struct cper_sec_proc_arm *err = acpi_hest_get_payload(gdata); + int flags = sync ? MF_ACTION_REQUIRED : 0; bool queued = false; int sec_sev, i; char *p; @@ -526,7 +542,7 @@ static bool ghes_handle_arm_hw_error(struct acpi_hest_generic_data *gdata, int s * and don't filter out 'corrected' error here. */ if (is_cache && has_pa) { - queued = ghes_do_memory_failure(err_info->physical_fault_addr, 0); + queued = ghes_do_memory_failure(err_info->physical_fault_addr, flags); p += err_info->length; continue; } @@ -647,6 +663,7 @@ static bool ghes_do_proc(struct ghes *ghes, const guid_t *fru_id = &guid_null; char *fru_text = ""; bool queued = false; + bool sync = is_hest_sync_notify(ghes); sev = ghes_severity(estatus->error_severity); apei_estatus_for_each_section(estatus, gdata) { @@ -664,13 +681,13 @@ static bool ghes_do_proc(struct ghes *ghes, atomic_notifier_call_chain(&ghes_report_chain, sev, mem_err); arch_apei_report_mem_error(sev, mem_err); - queued = ghes_handle_memory_failure(gdata, sev); + queued = ghes_handle_memory_failure(gdata, sev, sync); } else if (guid_equal(sec_type, &CPER_SEC_PCIE)) { ghes_handle_aer(gdata); } else if (guid_equal(sec_type, &CPER_SEC_PROC_ARM)) { - queued = ghes_handle_arm_hw_error(gdata, sev); + queued = ghes_handle_arm_hw_error(gdata, sev, sync); } else { void *err = acpi_hest_get_payload(gdata); From patchwork Sat Apr 8 09:13:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuai Xue X-Patchwork-Id: 13205624 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 268C3C77B71 for ; Sat, 8 Apr 2023 09:14:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DEB236B0075; Sat, 8 Apr 2023 05:14:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D9DBC6B007B; Sat, 8 Apr 2023 05:14:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BC5DF6B0075; Sat, 8 Apr 2023 05:14:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 8DB1A6B0078 for ; Sat, 8 Apr 2023 05:14:14 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 645E51C656A for ; Sat, 8 Apr 2023 09:14:14 +0000 (UTC) X-FDA: 80657662428.15.F3D659E Received: from out30-118.freemail.mail.aliyun.com (out30-118.freemail.mail.aliyun.com [115.124.30.118]) by imf04.hostedemail.com (Postfix) with ESMTP id 05F1B4000B for ; Sat, 8 Apr 2023 09:14:11 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf04.hostedemail.com: domain of xueshuai@linux.alibaba.com designates 115.124.30.118 as permitted sender) smtp.mailfrom=xueshuai@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680945252; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lu4NJa9f2PzykcO9ZcZOgL8BedGMa5LAj0QRHqOXuR4=; b=ZluEWVOQGjhGMb+yteoEoGzfqoT93uKbolP3koDSF/c72N078AOhUZbNkISQjUgSIBPCGt gWCsE5J8C3e2Ceks5DqDuQoyoTZOtN/U6jg2XQY4lWdWPc2z6lCv0vaCsGz0P8Ahy3aw5t 2bY2C+TjNDgGiF7PrlE66gxuVgBF2Bo= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf04.hostedemail.com: domain of xueshuai@linux.alibaba.com designates 115.124.30.118 as permitted sender) smtp.mailfrom=xueshuai@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680945252; a=rsa-sha256; cv=none; b=lIf8uDRkQ6bG7lLi+WxI6HNb81Uqb5lbjrfGEwnTIKdVQNJeerIc9JEQvn4anQEt8ubpJh PCynUBPmzCvPs4POsqZOEHqhMB67EVVYdhNSVR9YBjZFffJt9+J0Nlc1/9EySaj2ckHN7v Nf/qbPL9i8/hidctNdACkXZSkBcFrb8= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R171e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046056;MF=xueshuai@linux.alibaba.com;NM=1;PH=DS;RN=24;SR=0;TI=SMTPD_---0VfZZJfH_1680945246; Received: from localhost.localdomain(mailfrom:xueshuai@linux.alibaba.com fp:SMTPD_---0VfZZJfH_1680945246) by smtp.aliyun-inc.com; Sat, 08 Apr 2023 17:14:07 +0800 From: Shuai Xue To: tanxiaofei@huawei.com, mawupeng1@huawei.com, tony.luck@intel.com, naoya.horiguchi@nec.com Cc: linux-acpi@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, xueshuai@linux.alibaba.com, justin.he@arm.com, akpm@linux-foundation.org, ardb@kernel.org, ashish.kalra@amd.com, baolin.wang@linux.alibaba.com, bp@alien8.de, cuibixuan@linux.alibaba.com, dave.hansen@linux.intel.com, james.morse@arm.com, jarkko@kernel.org, lenb@kernel.org, linmiaohe@huawei.com, lvying6@huawei.com, rafael@kernel.org, xiexiuqi@huawei.com, zhuo.song@linux.alibaba.com Subject: [PATCH v4 2/2] ACPI: APEI: handle synchronous exceptions in task work Date: Sat, 8 Apr 2023 17:13:59 +0800 Message-Id: <20230408091359.31554-3-xueshuai@linux.alibaba.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027042445.60108-1-xueshuai@linux.alibaba.com> References: <20221027042445.60108-1-xueshuai@linux.alibaba.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 05F1B4000B X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: 9j1tqsimqhy6eiaxhrox4rxrwexgrx8n X-HE-Tag: 1680945251-897820 X-HE-Meta: U2FsdGVkX1/lLKcWQ+ezybVo4EalCa5v7+TcVwdGhXpn6SUBrK0rUXFvdy0wi4j6t8SOHzSPrDeRSYfOniY8mGHKOR7Bu2oNwN5uMRIDaWfxHeTrLGImD7AeA6PAk07yHYnQwsuBV1WPtnYLj/bZf7KUZVJ+QN+3EwKnioAVNMfoYaXeIFn7uS49SFq4dhDSJvnDsLLrYVZwykwNRSl5eiLGi3m1jkGmqX1fJArgYpldjAk7QALleCk2THrnbmQU1R8GxZos9UDPnbq4sfinT0dc1RFnwRr9fGl9XC02SgAdcBdRvn+XHhuSxOlE1hX5DhOLcIOXKeBFkh8MeYaK2hM/ggH9h5N4U5diGZFNW1pWm+x0m1NdyD2c8PrGFom4VKA2Opbpy9c9FUjb/hsQBn5RTvRpyXChcr8GRt1Uoa7sS7FJECuCi7OjrsUaPPWSRDFX7W4e//2Fo0owx30P0rfzVJniYBuNZp1obo/tNrVVDAPUFqSOawVGRWWCCxkH14kNLkUg2ultauA/IsEPi8TeH1tQXieuj2usoBA8OSNnvZGfJg6jIBYX4iZg4nJSrvukUZbGrrAKGEWnjbJYA09e0X6gZRUimZV0UblcUUs47eUMmbCXDXFub++9qLyry4NeSsvG6gldRkbNlpZxwRIfX45fI90wbYY/0FGJifxCJbaTcbUPz/KkFKL8SBgi/H+PLvNawW+7oRWbN6IgjrTX7xbcZW8RTusCp7J716HlUqfKXbHcyZfZo9Joqdj1TgdYfpB/Eb8orXRxaRp47SXD8niOTcVRoomqdySoEdYyENyCAPpEjtIpyWG3TupTZgUU6OQ1ZSIrZLEkPFIbHpIu6zQMZh8mCBniv++vrCxdjZv4p41wgDpYC2rRsyW5m74s9Lez6fb/3lxVdFqyFEkx77jVOlIAB71VjgwbDz01tRBB2SlLdTbyEk9zT50Pluc9Qssipl+qUBeHV7I eDcWTQJN Pjd7nIJ3inBo14Fp2Dlf6ma5WpZzXUCBRnEHCtmMgT4aOb+9r2PX+jKJDSgslHClA0NnSocbA6YOWX+J+6mSPCvAVehGztRNAU6wcgrt6BuAPbBEHwOXGtJR/FhwHLthqT1Ah67foiL2zGkA= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Hardware errors could be signaled by synchronous interrupt, e.g. when an error is detected by a background scrubber, or signaled by synchronous exception, e.g. when an uncorrected error is consumed. Both synchronous and asynchronous error are queued and handled by a dedicated kthread in workqueue. commit 7f17b4a121d0 ("ACPI: APEI: Kick the memory_failure() queue for synchronous errors") keep track of whether memory_failure() work was queued, and make task_work pending to flush out the workqueue so that the work for synchronous error is processed before returning to user-space. The trick ensures that the corrupted page is unmapped and poisoned. And after returning to user-space, the task starts at current instruction which triggering a page fault in which kernel will send SIGBUS to current process due to VM_FAULT_HWPOISON. However, the memory failure recovery for hwpoison-aware mechanisms does not work as expected. For example, hwpoison-aware user-space processes like QEMU register their customized SIGBUS handler and enable early kill mode by seting PF_MCE_EARLY at initialization. Then the kernel will directy notify the process by sending a SIGBUS signal in memory failure with wrong si_code: the actual user-space process accessing the corrupt memory location, but its memory failure work is handled in a kthread context, so it will send SIGBUS with BUS_MCEERR_AO si_code to the actual user-space process instead of BUS_MCEERR_AR in kill_proc(). To this end, separate synchronous and asynchronous error handling into different paths like X86 platform does: - valid synchronous errors: queue a task_work to synchronously send SIGBUS before ret_to_user. - valid asynchronous errors: queue a work into workqueue to asynchronously handle memory failure. - abnormal branches such as invalid PA, unexpected severity, no memory failure config support, invalid GUID section, OOM, etc. Then for valid synchronous errors, the current context in memory failure is exactly belongs to the task consuming poison data and it will send SIBBUS with proper si_code. Fixes: 7f17b4a121d0 ("ACPI: APEI: Kick the memory_failure() queue for synchronous errors") Signed-off-by: Shuai Xue Tested-by: Ma Wupeng --- drivers/acpi/apei/ghes.c | 91 +++++++++++++++++++++++++++------------- include/acpi/ghes.h | 3 -- mm/memory-failure.c | 13 ------ 3 files changed, 61 insertions(+), 46 deletions(-) diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index c479b85899f5..df5574264d1b 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -452,28 +452,51 @@ static void ghes_clear_estatus(struct ghes *ghes, } /* - * Called as task_work before returning to user-space. - * Ensure any queued work has been done before we return to the context that - * triggered the notification. + * struct sync_task_work - for synchronous RAS event + * + * @twork: callback_head for task work + * @pfn: page frame number of corrupted page + * @flags: fine tune action taken + * + * Structure to pass task work to be handled before + * ret_to_user via task_work_add(). */ -static void ghes_kick_task_work(struct callback_head *head) +struct sync_task_work { + struct callback_head twork; + u64 pfn; + int flags; +}; + +static void memory_failure_cb(struct callback_head *twork) { - struct acpi_hest_generic_status *estatus; - struct ghes_estatus_node *estatus_node; - u32 node_len; + int ret; + struct sync_task_work *twcb = + container_of(twork, struct sync_task_work, twork); - estatus_node = container_of(head, struct ghes_estatus_node, task_work); - if (IS_ENABLED(CONFIG_ACPI_APEI_MEMORY_FAILURE)) - memory_failure_queue_kick(estatus_node->task_work_cpu); + ret = memory_failure(twcb->pfn, twcb->flags); + kfree(twcb); - estatus = GHES_ESTATUS_FROM_NODE(estatus_node); - node_len = GHES_ESTATUS_NODE_LEN(cper_estatus_len(estatus)); - gen_pool_free(ghes_estatus_pool, (unsigned long)estatus_node, node_len); + if (!ret) + return; + + /* + * -EHWPOISON from memory_failure() means that it already sent SIGBUS + * to the current process with the proper error info, + * -EOPNOTSUPP means hwpoison_filter() filtered the error event, + * + * In both cases, no further processing is required. + */ + if (ret == -EHWPOISON || ret == -EOPNOTSUPP) + return; + + pr_err("Memory error not recovered"); + force_sig(SIGBUS); } static bool ghes_do_memory_failure(u64 physical_addr, int flags) { unsigned long pfn; + struct sync_task_work *twcb; if (!IS_ENABLED(CONFIG_ACPI_APEI_MEMORY_FAILURE)) return false; @@ -486,6 +509,18 @@ static bool ghes_do_memory_failure(u64 physical_addr, int flags) return false; } + if (flags == MF_ACTION_REQUIRED && current->mm) { + twcb = kmalloc(sizeof(*twcb), GFP_ATOMIC); + if (!twcb) + return false; + + twcb->pfn = pfn; + twcb->flags = flags; + init_task_work(&twcb->twork, memory_failure_cb); + task_work_add(current, &twcb->twork, TWA_RESUME); + return true; + } + memory_failure_queue(pfn, flags); return true; } @@ -1000,9 +1035,8 @@ static void ghes_proc_in_irq(struct irq_work *irq_work) struct ghes_estatus_node *estatus_node; struct acpi_hest_generic *generic; struct acpi_hest_generic_status *estatus; - bool task_work_pending; + bool queued; u32 len, node_len; - int ret; llnode = llist_del_all(&ghes_estatus_llist); /* @@ -1017,25 +1051,23 @@ static void ghes_proc_in_irq(struct irq_work *irq_work) estatus = GHES_ESTATUS_FROM_NODE(estatus_node); len = cper_estatus_len(estatus); node_len = GHES_ESTATUS_NODE_LEN(len); - task_work_pending = ghes_do_proc(estatus_node->ghes, estatus); + + queued = ghes_do_proc(estatus_node->ghes, estatus); + /* + * No memory failure work is queued into work queue or task queue + * due to invalid PA, unexpected severity, OOM, etc, do a force + * kill. + */ + if (!queued && current->mm) + force_sig(SIGBUS); + if (!ghes_estatus_cached(estatus)) { generic = estatus_node->generic; if (ghes_print_estatus(NULL, generic, estatus)) ghes_estatus_cache_add(generic, estatus); } - - if (task_work_pending && current->mm) { - estatus_node->task_work.func = ghes_kick_task_work; - estatus_node->task_work_cpu = smp_processor_id(); - ret = task_work_add(current, &estatus_node->task_work, - TWA_RESUME); - if (ret) - estatus_node->task_work.func = NULL; - } - - if (!estatus_node->task_work.func) - gen_pool_free(ghes_estatus_pool, - (unsigned long)estatus_node, node_len); + gen_pool_free(ghes_estatus_pool, (unsigned long)estatus_node, + node_len); llnode = next; } @@ -1096,7 +1128,6 @@ static int ghes_in_nmi_queue_one_entry(struct ghes *ghes, estatus_node->ghes = ghes; estatus_node->generic = ghes->generic; - estatus_node->task_work.func = NULL; estatus = GHES_ESTATUS_FROM_NODE(estatus_node); if (__ghes_read_estatus(estatus, buf_paddr, fixmap_idx, len)) { diff --git a/include/acpi/ghes.h b/include/acpi/ghes.h index 3c8bba9f1114..e5e0c308d27f 100644 --- a/include/acpi/ghes.h +++ b/include/acpi/ghes.h @@ -35,9 +35,6 @@ struct ghes_estatus_node { struct llist_node llnode; struct acpi_hest_generic *generic; struct ghes *ghes; - - int task_work_cpu; - struct callback_head task_work; }; struct ghes_estatus_cache { diff --git a/mm/memory-failure.c b/mm/memory-failure.c index fae9baf3be16..6ea8c325acb3 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -2355,19 +2355,6 @@ static void memory_failure_work_func(struct work_struct *work) } } -/* - * Process memory_failure work queued on the specified CPU. - * Used to avoid return-to-userspace racing with the memory_failure workqueue. - */ -void memory_failure_queue_kick(int cpu) -{ - struct memory_failure_cpu *mf_cpu; - - mf_cpu = &per_cpu(memory_failure_cpu, cpu); - cancel_work_sync(&mf_cpu->work); - memory_failure_work_func(&mf_cpu->work); -} - static int __init memory_failure_init(void) { struct memory_failure_cpu *mf_cpu;