From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D2B4C433DB for ; Wed, 17 Mar 2021 07:49:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CA5FA64F8B for ; Wed, 17 Mar 2021 07:48:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230099AbhCQHs0 convert rfc822-to-8bit (ORCPT ); Wed, 17 Mar 2021 03:48:26 -0400 Received: from mail.kingsoft.com ([114.255.44.145]:15481 "EHLO mail.kingsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229944AbhCQHsR (ORCPT ); Wed, 17 Mar 2021 03:48:17 -0400 X-AuditID: 0a580157-463ff70000021a79-27-6051ad662f1b Received: from mail.kingsoft.com (localhost [10.88.1.32]) (using TLS with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mail.kingsoft.com (SMG-1-NODE-87) with SMTP id 2C.D1.06777.66DA1506; Wed, 17 Mar 2021 15:19:02 +0800 (HKT) Received: from alex-virtual-machine (172.16.253.254) by KSBJMAIL2.kingsoft.cn (10.88.1.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 17 Mar 2021 15:48:13 +0800 Date: Wed, 17 Mar 2021 15:48:12 +0800 From: Aili Yao To: "HORIGUCHI =?UTF-8?B?TkFPWUE=?=(=?UTF-8?B?5aCA5Y+j44CA55u05Lmf?=)" , "Luck, Tony" , "akpm@linux-foundation.org" CC: Oscar Salvador , "david@redhat.com" , "bp@alien8.de" , "tglx@linutronix.de" , "mingo@redhat.com" , "hpa@zytor.com" , "x86@kernel.org" , "linux-edac@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-mm@kvack.org" , "yangfeng1@kingsoft.com" , , Subject: Re: [PATCH] mm,hwpoison: return -EBUSY when page already poisoned Message-ID: <20210317154812.4173f423@alex-virtual-machine> In-Reply-To: <20210311085529.GA22268@hori.linux.bs1.fc.nec.co.jp> References: <20210303115710.2e9f8e23@alex-virtual-machine> <20210303163912.3d508e0f@alex-virtual-machine> <1a78e9abdc134e35a5efcbf6b2fd2263@intel.com> <20210304101653.546a9da1@alex-virtual-machine> <20210304121941.667047c3@alex-virtual-machine> <20210304144524.795872d7@alex-virtual-machine> <20210304235720.GA215567@agluck-desk2.amr.corp.intel.com> <20210305093016.40c87375@alex-virtual-machine> <20210310141042.4db9ea29@alex-virtual-machine> <20210311085529.GA22268@hori.linux.bs1.fc.nec.co.jp> Organization: kingsoft X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 8BIT X-Originating-IP: [172.16.253.254] X-ClientProxiedBy: KSBJMAIL1.kingsoft.cn (10.88.1.31) To KSBJMAIL2.kingsoft.cn (10.88.1.32) X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFIsWRmVeSWpSXmKPExsXCFcGooJu2NjDB4N5yVYs569ewWXze8I/N 4uv6X8wW0zaKW1w41cBkcXnXHDaLe2v+s1pcOrCAyeJi4wFGizPTiiw2b5rKbPHmwj0Wix8b HrM68Hp8b+1j8Vi85yWTx6ZVnWwemz5NYvd4d+4cu8eJGb9ZPF5c3cji8X7fVTaPzaerPT5v kvM40fKFNYA7issmJTUnsyy1SN8ugStjztSnTAXf3SqePvrB3sB4wbKLkZNDQsBEYt/16Sxd jFwcQgLTmSRmLJsB5bxilPjy/DdTFyMHB4uAqsSVSX4gDWxA5q57s1hBbBGBg4wSa68ygdQz C8xgkTi57CMjSEJYwEviy/21jCC9vAJWEq/264KYnAKOEnvma0CM38giceLOGbA5/AJiEr1X /jNBHGQv0bZlEdgYXgFBiZMzn7CA2MwCOhInVh1jhrC1JZYtfA1mCwkoShxe8osdoldJ4kj3 DDYIO1Zi2bxXrBMYhWchGTULyahZSEYtYGRexchSnJtuuIkREn3hOxjnNX3UO8TIxMF4iFGC g1lJhNc0LyBBiDclsbIqtSg/vqg0J7X4EKM0B4uSOK9IFFBKID2xJDU7NbUgtQgmy8TBKdXA 1P/DJ/x0UuzHVFm+2NSyjayrZ0l78H1YFhLzPrlKen19jMSZXxcKfrvGflSb7X3kvez2Cjfv /27XwnYKu5/pmLX2VPxF599fa3b4XfWQPP/0tyXfgiSGSyv6lXI1y+51OL5b2MP8VzlF7G7n twd9D5dEtAsZnX05RXKJ1Wp/4+UqbQf/333wPMY36KedddKaiYIG8VECM/WMDj/IkHvHtHSm 24XXM7s18hi/NifJ6/ZkF3Qt858VtumT1CeW+dezPVw3NHwNemcU+9Unzqkhr6+2Ptx7cVeA EVPoDpudXD79n++ZNgfs5v/pvmrRtMTo75775+m/Xqfd9dKu8a1HqPr6PUy7U7QemMr5pOQp sRRnJBpqMRcVJwIA9czwZi0DAAA= Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org > > Returning true means you stop walking when you find the first entry pointing > to a given pfn. But there could be multiple such entries, so if MCE SRAR is > triggered by memory access to the larger address in hwpoisoned entries, the > returned virtual address might be wrong. > I can't find the way to fix this, maybe the virtual address is contained in related register, but this is really beyong my knowledge. This is a v2 RFC patch, add support for thp and 1G huge page errors. Thanks Aili Yao >From 31b685609610b3b06c8fd98d866913dbfeb7e159 Mon Sep 17 00:00:00 2001 From: Aili Yao Date: Wed, 17 Mar 2021 15:34:15 +0800 Subject: [PATCH] fix invalid SIGBUS address for recovery fail Walk the current process pages and compare with the pfn, then get the user address and related page_shift. For thp pages, we can only split anonoums thp page, so I think there may be no race condition for walking and searching the thp error page for such case; For non anonymous thp, the page flag and pte will not be change. so when code goes into this place, it may be race condition for non-anonoums thp page or from a recovery fail for anonoums thp, the page status will not change, i am not so sure about this; For the case we don't find the related virtual address, Maybe sending one BUS_MCEERR_AR signal with invalid address NULL is a better option, but i am not sure. And this may get the wrong virtual address if process have multiple entry for a same page, I don't find a way to get it correct. Maybe other issues is not recognized. --- arch/x86/kernel/cpu/mce/core.c | 16 ++--- include/linux/mm.h | 1 + mm/memory-failure.c | 145 ++++++++++++++++++++++++++++++++++++++++- 3 files changed, 152 insertions(+), 10 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index db4afc5..1bf21cc 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -28,8 +28,12 @@ #include #include #include +#include +#include +#include #include #include +#include #include #include #include @@ -1246,7 +1250,7 @@ static void kill_me_maybe(struct callback_head *cb) struct task_struct *p = container_of(cb, struct task_struct, mce_kill_me); int flags = MF_ACTION_REQUIRED; - pr_err("Uncorrected hardware memory error in user-access at %llx", p->mce_addr); + pr_err("Uncorrected hardware memory error in user-access at %llx, %llx", p->mce_addr, p->mce_vaddr); if (!p->mce_ripv) flags |= MF_MUST_KILL; @@ -1258,14 +1262,8 @@ static void kill_me_maybe(struct callback_head *cb) return; } - if (p->mce_vaddr != (void __user *)-1l) { - pr_err("Memory error may not recovered: %#lx: Sending SIGBUS to %s:%d due to hardware memory corruption\n", - p->mce_addr >> PAGE_SHIFT, p->comm, p->pid); - force_sig_mceerr(BUS_MCEERR_AR, p->mce_vaddr, PAGE_SHIFT); - } else { - pr_err("Memory error not recovered"); - kill_me_now(cb); - } + memory_failure_error(current, p->mce_addr >> PAGE_SHIFT); + } static void queue_task_work(struct mce *m, int kill_current_task) diff --git a/include/linux/mm.h b/include/linux/mm.h index ecdf8a8..cff2f02 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3046,6 +3046,7 @@ enum mf_flags { MF_SOFT_OFFLINE = 1 << 3, }; extern int memory_failure(unsigned long pfn, int flags); +extern void memory_failure_error(struct task_struct *p, unsigned long pfn); extern void memory_failure_queue(unsigned long pfn, int flags); extern void memory_failure_queue_kick(int cpu); extern int unpoison_memory(unsigned long pfn); diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 06f0061..aaf99a7 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -56,8 +56,10 @@ #include #include #include +#include #include "internal.h" #include "ras/ras_event.h" +#include int sysctl_memory_failure_early_kill __read_mostly = 0; @@ -240,7 +242,7 @@ static int kill_proc(struct to_kill *tk, unsigned long pfn, int flags) int ret = 0; pr_err("Memory failure: %#lx: Sending SIGBUS to %s:%d due to hardware memory corruption\n", - pfn, t->comm, t->pid); + tk->addr, t->comm, t->pid); if (flags & MF_ACTION_REQUIRED) { WARN_ON_ONCE(t != current); @@ -1417,6 +1419,7 @@ int memory_failure(unsigned long pfn, int flags) try_again: if (PageHuge(p)) return memory_failure_hugetlb(pfn, flags); + if (TestSetPageHWPoison(p)) { pr_err("Memory failure: %#lx: already hardware poisoned\n", pfn); @@ -1553,6 +1556,146 @@ int memory_failure(unsigned long pfn, int flags) } EXPORT_SYMBOL_GPL(memory_failure); +static int pte_range(pte_t *ptep, unsigned long addr, unsigned long next, struct mm_walk *walk) +{ + u64 *buff = (u64 *)walk->private; + u64 pfn = buff[0]; + pte_t pte = *ptep; + + if (!pte_none(pte) && !pte_present(pte)) { + swp_entry_t swp_temp = pte_to_swp_entry(pte); + + printk("%s, %d \n", __FUNCTION__, __LINE__); + if (is_hwpoison_entry(swp_temp) && swp_offset(swp_temp) == pfn) { + printk("%s, %d \n", __FUNCTION__, __LINE__); + goto find; + } + } else if (pte_pfn(pte) == pfn) { + printk("%s, %d \n", __FUNCTION__, __LINE__); + goto find; + } + + return 0; + +find: + buff[0] = addr; + buff[1] = PAGE_SHIFT; + return true; +} + +static int pmd_range(pmd_t *pmdp, unsigned long addr, unsigned long end, + struct mm_walk *walk) +{ + u64 *buff = (u64 *)walk->private; + struct page *page = (struct page *)buff[0]; + u64 pfn = buff[1]; + pmd_t pmd = *pmdp; + + if (likely(!pmd_trans_huge(pmd))) + return 0; + + if (pmd_none(pmd) || !pmd_present(pmd)) + return 0; + + if (pmd_page(pmd) != page) + return 0; + + for (; addr != end; page++, addr += PAGE_SIZE) { + if (page_to_pfn(page) == pfn) { + printk("%s, %d \n", __FUNCTION__, __LINE__); + buff[0] = addr; + buff[1] = PAGE_SHIFT; + return true; + } + } + + return 0; +} + +static int hugetlb_range(pte_t *ptep, unsigned long hmask, + unsigned long addr, unsigned long end, + struct mm_walk *walk) +{ + u64 *buff = (u64 *)walk->private; + u64 pfn = buff[0]; + pte_t pte = huge_ptep_get(ptep); + struct page *page = pfn_to_page(pfn); + + if (!huge_pte_none(pte) && !pte_present(pte)) { + swp_entry_t swp_temp = pte_to_swp_entry(pte); + printk("%s, %d \n", __FUNCTION__, __LINE__); + if (is_hwpoison_entry(swp_temp) && swp_offset(swp_temp) == pfn) { + printk("%s, %d \n", __FUNCTION__, __LINE__); + goto find; + } + } + if (pte_pfn(pte) == pfn) { + printk("%s, %d \n", __FUNCTION__, __LINE__); + goto find; + } + return 0; + +find: + buff[0] = addr; + buff[1] = (huge_page_size(page_hstate(page)) > PMD_SIZE) ? PUD_SHIFT : PMD_SHIFT; + return true; +} + +void memory_failure_error(struct task_struct *p, unsigned long pfn) +{ + u64 buff[2] = {0}; + struct page *page; + int ret = -1; + struct mm_walk_ops walk = {0}; + + if (p->mce_vaddr != (void __user *)-1l && p->mce_vaddr != (void __user *)0) { + printk("%s, %d \n", __FUNCTION__, __LINE__); + force_sig_mceerr(BUS_MCEERR_AR, p->mce_vaddr, PAGE_SHIFT); + return; + } + + page = pfn_to_page(pfn); + if (!page) + goto force_sigbus; + + if (is_zone_device_page(page)) + goto force_sigbus; + + page = compound_head(page); + + if (PageHuge(page)) { + printk("%s, %d \n", __FUNCTION__, __LINE__); + walk.hugetlb_entry = hugetlb_range; + buff[0] = page_to_pfn(page); + } else if (PageTransHuge(page)) { + printk("%s, %d \n", __FUNCTION__, __LINE__); + walk.pmd_entry = pmd_range; + buff[0] = (u64)page; + buff[1] = pfn; + } else { + printk("%s, %d \n", __FUNCTION__, __LINE__); + walk.pte_entry = pte_range; + buff[0] = pfn; + } + msleep(1000); + mmap_read_lock(p->mm); + ret = walk_page_range(p->mm, 0, TASK_SIZE_MAX, &walk, (void *)buff); + mmap_read_unlock(p->mm); + + pr_err("Memory error may not recovered: %#lx: Sending SIGBUS to %s:%d due to hardware memory corruption\n", + pfn, p->comm, p->pid); + + if (ret) { + printk("%s, %d \n", __FUNCTION__, __LINE__); + force_sig_mceerr(BUS_MCEERR_AR, (void __user *)buff[0], buff[1]); + } else { +force_sigbus: + printk("%s, %d \n", __FUNCTION__, __LINE__); + force_sig_mceerr(BUS_MCEERR_AR, (void __user *)0, PAGE_SHIFT); + } +} +EXPORT_SYMBOL_GPL(memory_failure_error); + #define MEMORY_FAILURE_FIFO_ORDER 4 #define MEMORY_FAILURE_FIFO_SIZE (1 << MEMORY_FAILURE_FIFO_ORDER) -- 1.8.3.1