From patchwork Tue Feb 11 06:02:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuai Xue X-Patchwork-Id: 13969436 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 64A51C0219E for ; Tue, 11 Feb 2025 06:02:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 89FB228000D; Tue, 11 Feb 2025 01:02:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 78AA7280005; Tue, 11 Feb 2025 01:02:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 62BDE28000D; Tue, 11 Feb 2025 01:02:12 -0500 (EST) 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 3A508280005 for ; Tue, 11 Feb 2025 01:02:12 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id EF1F24B3F0 for ; Tue, 11 Feb 2025 06:02:11 +0000 (UTC) X-FDA: 83106618462.10.4D37F3A Received: from out30-133.freemail.mail.aliyun.com (out30-133.freemail.mail.aliyun.com [115.124.30.133]) by imf10.hostedemail.com (Postfix) with ESMTP id DEE7DC0013 for ; Tue, 11 Feb 2025 06:02:09 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=pWuOqqTL; spf=pass (imf10.hostedemail.com: domain of xueshuai@linux.alibaba.com designates 115.124.30.133 as permitted sender) smtp.mailfrom=xueshuai@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739253730; 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:dkim-signature; bh=uL5qJeKW+ivS15GzFIfPM3QlAABBDaL6EotBeml3uRU=; b=REdfFzWsbnBzLGJXvaI4AbrxY1MlsjwdYPrGGjhUOds2Mwo19VwLL5c0NXSfbnay0f72U7 L5C3xEF1hS+ZEPaRUnh3rxijWkiSCuhXn26ixrNYhPdIrl0ak2zE2Ejog967oQC7YBT0he eFWhNEOLQBm5Mwgbl4ZXyPym9XDNNe4= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=pWuOqqTL; spf=pass (imf10.hostedemail.com: domain of xueshuai@linux.alibaba.com designates 115.124.30.133 as permitted sender) smtp.mailfrom=xueshuai@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739253730; a=rsa-sha256; cv=none; b=k+t2LT4eTwrJBmahJLDHLSBslYV7uJZ2Qea8r905K9LbmmTlJF8g0K9mhLzluq89JRKeBW 81pI8R1Kr7CIMzWC1K2rVTxG7WORCCSxkky4426xBz/CgwKK8KE/2Ja16tCG4YiWNI7gjZ H/MVNiN7a2kPfWUlrHASc9MmbJr1XcA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1739253727; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=uL5qJeKW+ivS15GzFIfPM3QlAABBDaL6EotBeml3uRU=; b=pWuOqqTLy78Zhjw0Cvkhlq60/WwPDcNap6kOvYitKOtRY5MZ43yQRmrTwKr4EKD8Yp9rAnh9DBFF4qwFxhfNHvRhbNoURCvg4ZwdxKqJcSpV5VrZ5xtaKkg/P8fwZnmuWyHj7eOt1xxM1P5i/E9Mq1E7/c/UI2FcqHPPpvmNR7g= Received: from localhost.localdomain(mailfrom:xueshuai@linux.alibaba.com fp:SMTPD_---0WPFiSIs_1739253725 cluster:ay36) by smtp.aliyun-inc.com; Tue, 11 Feb 2025 14:02:06 +0800 From: Shuai Xue To: tony.luck@intel.com, bp@alien8.de, nao.horiguchi@gmail.com Cc: tglx@linutronix.de, mingo@redhat.com, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, linmiaohe@huawei.com, akpm@linux-foundation.org, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, baolin.wang@linux.alibaba.com, tianruidong@linux.alibaba.com Subject: [PATCH v1 4/4] mm/hwpoison: Fix incorrect "not recovered" report for recovered clean pages Date: Tue, 11 Feb 2025 14:02:00 +0800 Message-ID: <20250211060200.33845-5-xueshuai@linux.alibaba.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20250211060200.33845-1-xueshuai@linux.alibaba.com> References: <20250211060200.33845-1-xueshuai@linux.alibaba.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: DEE7DC0013 X-Stat-Signature: waja63smsq55f7q44xakn3gyoy4f4p1k X-Rspamd-Server: rspam03 X-HE-Tag: 1739253729-126511 X-HE-Meta: U2FsdGVkX19lH90cY/lNgcSycBWA7Kj8czBM0dK7kmy0PmrnFAa6HylxYDDsYMDVrK1g4AmNAGhlg1iVZjVpPDIAW90II4juxf0nZuXwjS4VKX8V6tOeGTIfxfyMaJ4bsWT2YMJrgf59oVQm9fqlJs2ibHOvGccj7/e2trxQ2QmccbcNvRxDHEfNhiUCt9Lx/FWRmH0UgITc8pVqSTDDI6Gj9WBZgsur3zPbi4l5fQYIRGJVbkHaN0C1Kj9j1BryESAPRNN59/Wh5pWJRHN9HlvabOGLCo8JplxSzAesDwT2td0ONydcU/5gpvuUaqVXMwXKA4FRWedsfDmEeEdns8wOpU8B9TEkt/EvOJ+HZCHUO8Ww2vHTq5wfk6a0PFCqJJVCtebBKGh/3nqIRuw70Oq+qNDLaMLb42CHqrhZi4hIvnwzYr3JQsN34xzTY7mxAAe3v1hesRq6FXxnKsbZtgofHj5O3d8PNS1rwa+3+Ib0pMcXyRzwU68Xb8wPBkWhUQslJNJhXkSM4wQBy9LFbnhWYiKCt8irPVfyPqDOs+aemuQ42qB6m2OdtK949X5wSS8js6AQhLFx2nXusCyrB2tTClfIv8CWMe3j4vrOtoQIi5WxaK5KtEo1SqRHh6pOcbfgYc+50XC7ccDRZ3x+hmXJ2ahl6yCRSzHkurZAJUxK4FtBqk4OdyK86isYQjmaxPa6TtbzCvyBNQafemvRQxoRcQ9uRoY99JcAF4CaXL8FOe2i1EpxuiHc4hilad2xBSqwQRGs6qUnsCIblGJoJ2GN/k+pNhOW4gCRSjYw699dAU9/L3anu5Bh2IvUWhFWfzAjRMhGwfoojCBd8zPsMD3ubmL9vo/qkGRRdP0UzNSbVyKRGGKz1RwUzNHz8XqeBrlF7Q3EGNkOhfQMnOZD3q7+3cXTUl3FZXDDMd8Qz7Owykz7CGEoJSUXYr9Q16hQ17Wh+yP7/3B0P7DtZmV kmsdU9cj Ci2Rw07OsRhky/qO8S8LdkbbBgiiRGLtFb15josnsNJMxhiRtUpbduwQWBUuCJ4cm1XokcCS2bJMh9kgsZ0j7aFlo91k85V/PRxCeVmWAhJimDLY296sKr60tIxmOvkDjeDVdR1pNgfY5CnF7TN2ITHhzbTz3ZC/+ca5sUIYpRqxOcfbQSy1NIl27bQxTJ7IRlL49j0mOCh/JZp6G9IUSoODhaIQxewIWn+hTtcCKVrH+cRCUT+wVhHmjS9aLZ2WAZ1tASjOL2RYnxMek2QCnqK1q9YcOSSOTeCeFUHg4D1KFgUOxseUwiuNEf4MfCpueiWcjGUO83QWI4VhovU349Pq0Ua6yWmUcghK2 X-Bogosity: Ham, tests=bogofilter, spamicity=0.063732, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: When an uncorrected memory error is consumed there is a race between the CMCI from the memory controller reporting an uncorrected error with a UCNA signature, and the core reporting and SRAR signature machine check when the data is about to be consumed. If the CMCI wins that race, the page is marked poisoned when uc_decode_notifier() calls memory_failure(). For dirty pages, memory_failure() invokes try_to_unmap() with the TTU_HWPOISON flag, converting the PTE to a hwpoison entry. However, for clean pages, the TTU_HWPOISON flag is cleared, leaving the PTE unchanged and not converted to a hwpoison entry. Consequently, for an unmapped dirty page, the PTE is marked as a hwpoison entry allowing kill_accessing_process() to: - call walk_page_range() and return 1 - call kill_proc() to make sure a SIGBUS is sent - return -EHWPOISON to indicate that SIGBUS is already sent to the process and kill_me_maybe() doesn't have to send it again. Conversely, for clean pages where PTE entries are not marked as hwpoison, kill_accessing_process() returns -EFAULT, causing kill_me_maybe() to send a SIGBUS. Console log looks like this: Memory failure: 0x827ca68: corrupted page was clean: dropped without side effects Memory failure: 0x827ca68: recovery action for clean LRU page: Recovered Memory failure: 0x827ca68: already hardware poisoned mce: Memory error not recovered To fix it, return -EHWPOISON if no hwpoison PTE entry is found, preventing an unnecessary SIGBUS. Fixes: 046545a661af ("mm/hwpoison: fix error page recovered but reported "not recovered"") Signed-off-by: Shuai Xue --- mm/memory-failure.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 995a15eb67e2..f9a6b136a6f0 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -883,10 +883,9 @@ static int kill_accessing_process(struct task_struct *p, unsigned long pfn, (void *)&priv); if (ret == 1 && priv.tk.addr) kill_proc(&priv.tk, pfn, flags); - else - ret = 0; mmap_read_unlock(p->mm); - return ret > 0 ? -EHWPOISON : -EFAULT; + + return ret >= 0 ? -EHWPOISON : -EFAULT; } /*