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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 172EACCA473 for ; Wed, 15 Jun 2022 09:37:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 895166B0073; Wed, 15 Jun 2022 05:37:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 81DB86B0074; Wed, 15 Jun 2022 05:37:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 697A46B0075; Wed, 15 Jun 2022 05:37:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 588256B0073 for ; Wed, 15 Jun 2022 05:37:06 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 219FE21614 for ; Wed, 15 Jun 2022 09:37:06 +0000 (UTC) X-FDA: 79579966452.21.B8F7659 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by imf11.hostedemail.com (Postfix) with ESMTP id C492C40081 for ; Wed, 15 Jun 2022 09:37:05 +0000 (UTC) Received: by mail-pj1-f45.google.com with SMTP id g16-20020a17090a7d1000b001ea9f820449so1550445pjl.5 for ; Wed, 15 Jun 2022 02:37:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zuRmpPaeBZ7RBBqgxGgYuakVG6WXJwz6SE2K0j0jSFQ=; b=UUL4/SFUMTUlunbbqmiz6/p44WMrg6Ru6WUECHtcygNpzcDAKuWBa+BjbeH5ibVwuF n5y56xYDc2Bl05iU1/7dzgdyxRVX0AK/gm+vP80Kf7N3RbjE8GXPROJWWHdvj4uJhsoP YoSEE2khu/r96vc8bxc8rgHUMdAJMzRJFLd8vJD71cP63CuO0zvma5EagqP1f7R7DRyf 5Ksv8k7IwEnClBHeZELhMUVN2BwtQGmcNIJJsiUHW8I+zEooaPyEy0McW+I9iODVHPDp jr3XjFd5eKE+JNZh2e0QrAaAKXEnG8MJ4PqznnM4oz8pJ+ScLvLz/5ezIiEGb+jSZ4oE vyKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zuRmpPaeBZ7RBBqgxGgYuakVG6WXJwz6SE2K0j0jSFQ=; b=cvwTJecCTGlDx1dkObgxQpDVOUG91Th+aJnw6Yf1ueQF7wOUtrjKUi653jc3EtmYXN UWZpveCW8L9UhI91Rx0KHnE3EIPIWPU574sqCBCn4TrjheLKYQ3HkPTo0+4tUJ0TCtlf VpdQgGqa/Xpo9pf4JgfjK7jxLlBBfsodv5jwlFIcT2ht4n16BdGAQlfCCFXREnbJwcVm 6LPp1NZGBwrJN9W4sL5G/hCMOdpDB+ajHGP+PvnrxG1+Grt3quggFmiNJ0LHa8P7TCNA zNwrWhc9wn/pTuP38+TvaXUoihKinnbrlZQjJyTdOxXvFNQ4blX8JfIEQONMzyDOTzm6 IIYA== X-Gm-Message-State: AJIora96t5o1/ss+o3Tbs8wuZZuptmkz2CwD35Ax7L47QXZRC4QLgr2H 50XToicngQ2eqfNjf7CNaQ29mA== X-Google-Smtp-Source: AGRyM1vKtdJrvtMLM/4RuIoUjWyRHYdfOw1nyGNeFOmGQrKBBM2xFQw6FTyW0zpa+Mx8uNkEAiYFJg== X-Received: by 2002:a17:90b:1e0e:b0:1ea:89a5:87d9 with SMTP id pg14-20020a17090b1e0e00b001ea89a587d9mr9253119pjb.81.1655285824779; Wed, 15 Jun 2022 02:37:04 -0700 (PDT) Received: from always-x1.bytedance.net ([61.120.150.70]) by smtp.gmail.com with ESMTPSA id jj1-20020a170903048100b00163247b64bfsm8859205plb.115.2022.06.15.02.37.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 02:37:03 -0700 (PDT) From: zhenwei pi To: pizhenwei@bytedance.com, naoya.horiguchi@nec.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, david@redhat.com, linmiaohe@huawei.com, gregkh@linuxfoundation.org, Oscar Salvador Subject: [PATCH v6 1/1] mm/memory-failure: disable unpoison once hw error happens Date: Wed, 15 Jun 2022 17:32:09 +0800 Message-Id: <20220615093209.259374-2-pizhenwei@bytedance.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220615093209.259374-1-pizhenwei@bytedance.com> References: <20220615093209.259374-1-pizhenwei@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655285825; a=rsa-sha256; cv=none; b=FRRPCUI3S7PJLGMBjmEKvsa7fh0LtSrN3u/P9ACc4tuMLPSVKSd5mbT5BdS0She+6ny2EL MekzPIWaTPADnApls8BlP53/KJNTIZhimwLlYZF5HL4sYtKZiwx+rX/NmX8fN2h7CdTSJe xIZ1X3XVIA37KiUzUp1wHD/3Lqqs3AA= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b="UUL4/SFU"; spf=pass (imf11.hostedemail.com: domain of pizhenwei@bytedance.com designates 209.85.216.45 as permitted sender) smtp.mailfrom=pizhenwei@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655285825; 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=zuRmpPaeBZ7RBBqgxGgYuakVG6WXJwz6SE2K0j0jSFQ=; b=uPpdUWVZ00128TWwwwQKa7QXKAAowY7bzBw9RlKrAEd1Nit4Af1s37RdeoS6M7z/3g0Cb5 k4TXzABNwv3afzlSQ3HoDxAWepl4P28Sw1QcXRtT95+EdbyBviIvx+xs2Bc29oABDN0Bf5 jjcUuU2aAd8uo2cFgCSmf3DSIqqgiec= X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: C492C40081 X-Stat-Signature: tjah1n9ki55pjf3mx1rb7tgho36r5m4k Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b="UUL4/SFU"; spf=pass (imf11.hostedemail.com: domain of pizhenwei@bytedance.com designates 209.85.216.45 as permitted sender) smtp.mailfrom=pizhenwei@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com X-HE-Tag: 1655285825-195939 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: Currently unpoison_memory(unsigned long pfn) is designed for soft poison(hwpoison-inject) only. Since 17fae1294ad9d, the KPTE gets cleared on a x86 platform once hardware memory corrupts. Unpoisoning a hardware corrupted page puts page back buddy only, the kernel has a chance to access the page with *NOT PRESENT* KPTE. This leads BUG during accessing on the corrupted KPTE. Suggested by David&Naoya, disable unpoison mechanism when a real HW error happens to avoid BUG like this: Unpoison: Software-unpoisoned page 0x61234 BUG: unable to handle page fault for address: ffff888061234000 #PF: supervisor write access in kernel mode #PF: error_code(0x0002) - not-present page PGD 2c01067 P4D 2c01067 PUD 107267063 PMD 10382b063 PTE 800fffff9edcb062 Oops: 0002 [#1] PREEMPT SMP NOPTI CPU: 4 PID: 26551 Comm: stress Kdump: loaded Tainted: G M OE 5.18.0.bm.1-amd64 #7 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996) ... RIP: 0010:clear_page_erms+0x7/0x10 Code: ... RSP: 0000:ffffc90001107bc8 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000000000000901 RCX: 0000000000001000 RDX: ffffea0001848d00 RSI: ffffea0001848d40 RDI: ffff888061234000 RBP: ffffea0001848d00 R08: 0000000000000901 R09: 0000000000001276 R10: 0000000000000003 R11: 0000000000000000 R12: 0000000000000001 R13: 0000000000000000 R14: 0000000000140dca R15: 0000000000000001 FS: 00007fd8b2333740(0000) GS:ffff88813fd00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffff888061234000 CR3: 00000001023d2005 CR4: 0000000000770ee0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: prep_new_page+0x151/0x170 get_page_from_freelist+0xca0/0xe20 ? sysvec_apic_timer_interrupt+0xab/0xc0 ? asm_sysvec_apic_timer_interrupt+0x1b/0x20 __alloc_pages+0x17e/0x340 __folio_alloc+0x17/0x40 vma_alloc_folio+0x84/0x280 __handle_mm_fault+0x8d4/0xeb0 handle_mm_fault+0xd5/0x2a0 do_user_addr_fault+0x1d0/0x680 ? kvm_read_and_reset_apf_flags+0x3b/0x50 exc_page_fault+0x78/0x170 asm_exc_page_fault+0x27/0x30 Fixes: 847ce401df392 ("HWPOISON: Add unpoisoning support") Fixes: 17fae1294ad9d ("x86/{mce,mm}: Unmap the entire page if the whole page is affected and poisoned") Cc: Naoya Horiguchi Cc: David Hildenbrand Cc: Oscar Salvador Cc: Greg Kroah-Hartman Acked-by: David Hildenbrand Signed-off-by: zhenwei pi --- Documentation/vm/hwpoison.rst | 3 ++- drivers/base/memory.c | 2 +- include/linux/mm.h | 1 + mm/hwpoison-inject.c | 2 +- mm/madvise.c | 2 +- mm/memory-failure.c | 12 ++++++++++++ 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Documentation/vm/hwpoison.rst b/Documentation/vm/hwpoison.rst index c742de1769d1..b9d5253c1305 100644 --- a/Documentation/vm/hwpoison.rst +++ b/Documentation/vm/hwpoison.rst @@ -120,7 +120,8 @@ Testing unpoison-pfn Software-unpoison page at PFN echoed into this file. This way a page can be reused again. This only works for Linux - injected failures, not for real memory failures. + injected failures, not for real memory failures. Once any hardware + memory failure happens, this feature is disabled. Note these injection interfaces are not stable and might change between kernel versions diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 084d67fd55cc..bc60c9cd3230 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -558,7 +558,7 @@ static ssize_t hard_offline_page_store(struct device *dev, if (kstrtoull(buf, 0, &pfn) < 0) return -EINVAL; pfn >>= PAGE_SHIFT; - ret = memory_failure(pfn, 0); + ret = memory_failure(pfn, MF_SW_SIMULATED); if (ret == -EOPNOTSUPP) ret = 0; return ret ? ret : count; diff --git a/include/linux/mm.h b/include/linux/mm.h index bc8f326be0ce..4346e51484ba 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3232,6 +3232,7 @@ enum mf_flags { MF_MUST_KILL = 1 << 2, MF_SOFT_OFFLINE = 1 << 3, MF_UNPOISON = 1 << 4, + MF_SW_SIMULATED = 1 << 5, }; extern int memory_failure(unsigned long pfn, int flags); extern void memory_failure_queue(unsigned long pfn, int flags); diff --git a/mm/hwpoison-inject.c b/mm/hwpoison-inject.c index 5c0cddd81505..65e242b5a432 100644 --- a/mm/hwpoison-inject.c +++ b/mm/hwpoison-inject.c @@ -48,7 +48,7 @@ static int hwpoison_inject(void *data, u64 val) inject: pr_info("Injecting memory failure at pfn %#lx\n", pfn); - err = memory_failure(pfn, 0); + err = memory_failure(pfn, MF_SW_SIMULATED); return (err == -EOPNOTSUPP) ? 0 : err; } diff --git a/mm/madvise.c b/mm/madvise.c index d7b4f2602949..0316bbc6441b 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -1112,7 +1112,7 @@ static int madvise_inject_error(int behavior, } else { pr_info("Injecting memory failure for pfn %#lx at process virtual address %#lx\n", pfn, start); - ret = memory_failure(pfn, MF_COUNT_INCREASED); + ret = memory_failure(pfn, MF_COUNT_INCREASED | MF_SW_SIMULATED); if (ret == -EOPNOTSUPP) ret = 0; } diff --git a/mm/memory-failure.c b/mm/memory-failure.c index b85661cbdc4a..da39ec8afca8 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -69,6 +69,8 @@ int sysctl_memory_failure_recovery __read_mostly = 1; atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0); +static bool hw_memory_failure __read_mostly = false; + static bool __page_handle_poison(struct page *page) { int ret; @@ -1768,6 +1770,9 @@ int memory_failure(unsigned long pfn, int flags) mutex_lock(&mf_mutex); + if (!(flags & MF_SW_SIMULATED)) + hw_memory_failure = true; + p = pfn_to_online_page(pfn); if (!p) { res = arch_memory_failure(pfn, flags); @@ -2103,6 +2108,13 @@ int unpoison_memory(unsigned long pfn) mutex_lock(&mf_mutex); + if (hw_memory_failure) { + unpoison_pr_info("Unpoison: Disabled after HW memory failure %#lx\n", + pfn, &unpoison_rs); + ret = -EOPNOTSUPP; + goto unlock_mutex; + } + if (!PageHWPoison(p)) { unpoison_pr_info("Unpoison: Page was already unpoisoned %#lx\n", pfn, &unpoison_rs); -- 2.20.1