From nobody Sun May 10 15:45:15 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D59BC433EF for ; Fri, 29 Apr 2022 14:26:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377282AbiD2O3a (ORCPT ); Fri, 29 Apr 2022 10:29:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377276AbiD2O31 (ORCPT ); Fri, 29 Apr 2022 10:29:27 -0400 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09A67A146B for ; Fri, 29 Apr 2022 07:26:09 -0700 (PDT) Received: by mail-pl1-x631.google.com with SMTP id j8so7266546pll.11 for ; Fri, 29 Apr 2022 07:26:09 -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=Bv/fStdq6ItGSIRgfJIMLGnpap9t2FGZ2OvlOaFaeWo=; b=B9bahcbgBihTWUcGpr1y9wdTOE681iugnbfHR9qCDQA4YABUzHRuUKS27S18bX3/ok AHi/ufJYHhcOLpBWgPszCtyGT5POqSKIi23SH7fqKhKnfDw4YX5504HVLTUe3Il3kbga +Yr5187+ILwCXa9r3uOa4P7oXT7DqOmioyrLtU2ZEt6W1aTejmcK/48UJFhwVPshNcPS Uj26EpLI6dgRChSmFpizSZMaSWhrtQ6LgIiw22sJROjdcIEHk/bdbDHnOvuyJtFXA4VU ziC1PuRgCVhN4C6xJweBqxxuKQWGjDr5AXoq0jKMmuRLjMjKkz4sYHcpjcPU9Q1BxU5u JidA== 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=Bv/fStdq6ItGSIRgfJIMLGnpap9t2FGZ2OvlOaFaeWo=; b=pRF5fiV7MrvmyneQWCjrSWBgSalfcdTVexDc/qsC+98wqEXpF+d3ZoGxXfFSYwPlyh AnrXqCfA+q+Fp2Lu7HICoYUkL+uytjmJXwVSP09Mu6cAG49z0TJf3CetdbKhs3Syhd5r DVXDS76IkBgDugJxU2pF+KRuFqD4x3s8mDCAgyDnn/vSk96kuRNlGgb0Zbk8FBEA+zGp NC4vD2rR40Xyg+FIbxKJkhNPRtWVIwoMw3IJd7nUQc92ovuG7D/yCmit+T2zXiqoKi3F e/mT39FXYADWjeKKsVZfw7d6Ra2qmok5QGBpmYuDpeg4WwArUmuEnH28vAWMxrmqrGxT SWJA== X-Gm-Message-State: AOAM531jkjxFZOK9CA87g4AFikAMege99wxbHVIjeLsA0b7qUjFreTa9 TilrqCmAIil4lDVdKd++W2usOw== X-Google-Smtp-Source: ABdhPJyDytkpIn1JuFR5NC67SSAiS8dbKsZT5/R63KZRQjoACdv5mT58ogS7YGaoccx35GcYCqcZHg== X-Received: by 2002:a17:902:db0e:b0:15e:60a0:7b9 with SMTP id m14-20020a170902db0e00b0015e60a007b9mr8572959plx.55.1651242368521; Fri, 29 Apr 2022 07:26:08 -0700 (PDT) Received: from always-x1.www.tendawifi.com ([139.177.225.247]) by smtp.gmail.com with ESMTPSA id a38-20020a056a001d2600b004fae885424dsm3494734pfx.72.2022.04.29.07.26.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 07:26:07 -0700 (PDT) From: zhenwei pi To: akpm@linux-foundation.org, naoya.horiguchi@nec.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, zhenwei pi , Wu Fengguang Subject: [PATCH 1/4] mm/memory-failure.c: move clear_hwpoisoned_pages Date: Fri, 29 Apr 2022 22:22:03 +0800 Message-Id: <20220429142206.294714-2-pizhenwei@bytedance.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220429142206.294714-1-pizhenwei@bytedance.com> References: <20220429142206.294714-1-pizhenwei@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" clear_hwpoisoned_pages() clears HWPoison flag and decreases the number of poisoned pages, this actually works as part of memory failure. Move this function from sparse.c to memory-failure.c, finally there is no CONFIG_MEMORY_FAILURE in sparse.c. Cc: Wu Fengguang Signed-off-by: zhenwei pi Acked-by: Naoya Horiguchi --- mm/internal.h | 11 +++++++++++ mm/memory-failure.c | 21 +++++++++++++++++++++ mm/sparse.c | 27 --------------------------- 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index cf16280ce132..e8add8df4e0f 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -758,4 +758,15 @@ struct folio *try_grab_folio(struct page *page, int re= fs, unsigned int flags); =20 DECLARE_PER_CPU(struct per_cpu_nodestat, boot_nodestats); =20 +/* + * mm/memory-failure.c + */ +#ifdef CONFIG_MEMORY_FAILURE +void clear_hwpoisoned_pages(struct page *memmap, int nr_pages); +#else +static inline void clear_hwpoisoned_pages(struct page *memmap, int nr_page= s) +{ +} +#endif + #endif /* __MM_INTERNAL_H */ diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 27760c19bad7..46d9fb612dcc 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -2401,3 +2401,24 @@ int soft_offline_page(unsigned long pfn, int flags) =20 return ret; } + +void clear_hwpoisoned_pages(struct page *memmap, int nr_pages) +{ + int i; + + /* + * A further optimization is to have per section refcounted + * num_poisoned_pages. But that would need more space per memmap, so + * for now just do a quick global check to speed up this routine in the + * absence of bad pages. + */ + if (atomic_long_read(&num_poisoned_pages) =3D=3D 0) + return; + + for (i =3D 0; i < nr_pages; i++) { + if (PageHWPoison(&memmap[i])) { + num_poisoned_pages_dec(); + ClearPageHWPoison(&memmap[i]); + } + } +} diff --git a/mm/sparse.c b/mm/sparse.c index 952f06d8f373..e983c38fac8f 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -916,33 +916,6 @@ int __meminit sparse_add_section(int nid, unsigned lon= g start_pfn, return 0; } =20 -#ifdef CONFIG_MEMORY_FAILURE -static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages) -{ - int i; - - /* - * A further optimization is to have per section refcounted - * num_poisoned_pages. But that would need more space per memmap, so - * for now just do a quick global check to speed up this routine in the - * absence of bad pages. - */ - if (atomic_long_read(&num_poisoned_pages) =3D=3D 0) - return; - - for (i =3D 0; i < nr_pages; i++) { - if (PageHWPoison(&memmap[i])) { - num_poisoned_pages_dec(); - ClearPageHWPoison(&memmap[i]); - } - } -} -#else -static inline void clear_hwpoisoned_pages(struct page *memmap, int nr_page= s) -{ -} -#endif - void sparse_remove_section(struct mem_section *ms, unsigned long pfn, unsigned long nr_pages, unsigned long map_offset, struct vmem_altmap *altmap) --=20 2.20.1 From nobody Sun May 10 15:45:15 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3ACCC433F5 for ; Fri, 29 Apr 2022 14:26:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377290AbiD2O3e (ORCPT ); Fri, 29 Apr 2022 10:29:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377285AbiD2O3b (ORCPT ); Fri, 29 Apr 2022 10:29:31 -0400 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC9AFA204B for ; Fri, 29 Apr 2022 07:26:12 -0700 (PDT) Received: by mail-pj1-x102e.google.com with SMTP id l11-20020a17090a49cb00b001d923a9ca99so7440876pjm.1 for ; Fri, 29 Apr 2022 07:26:12 -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=JGExzK6t7dd69Krcot/v5EkylhF9Hy7HssTipfBZX74=; b=Bkz2/5SRLbrHbVzULhavc/a1oIXG99dDy7QXZHOZj5UhtxUk8y+cyNNxkJnTmy7nAj 6drqFLY5zpKQISTwcY2skEr3ddI9vvIcxAYBcRIzQVXdYQwGQqPuIKKDw4SmBcrADFjO Hsgc0vHImTWdDqW7xeb26itD5h+E3sXVm6cAolgrPFDwe/xoa/M+T3Lq22KMGvmdhm/W brBD+6isKt1TgDq68Wr4m7hq6sniSpXM0/AvdpUHlPI8wM1srSdmmgve4JElnyfkY+e2 lrXSMIsGRtlYMM1BgxG5798w0aNSqA2jtQSumpI60SFMKEcTH/H2wCXauFn9k2TNP7hx nsrw== 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=JGExzK6t7dd69Krcot/v5EkylhF9Hy7HssTipfBZX74=; b=nGlhcdKYB2mks/4JWEs/ai51yhpe8i5Sh+3bkxRtOjLGK9SogEXYzlZpagZHmAfg0Y PpJZdw/i8nPlS8TkGqcNF+hlsH1vtgNRnW3RquDTJeccYAfOJaZODDacpuYRkwgtkRob WlFMk/gP85dWf4muBfjg7iB9Gg0p1NESZFSwzq148seQXYq7c+zgRDW5bywV7bBdQFOS uBPZtsapCrUBtJM4uS0ZpcayW168fskUO/OnJwaWQc23/IzVKAXw9oHV3deO5NTE9zYm x0AMoIxcsI7rU4Fo7A+Vl2Mm3EFp54FGmeys8AiZMIl/Z5neThGyDSu0HfLuH59OhX/j YGmA== X-Gm-Message-State: AOAM530pHqhqmPLn1E7pYC+bajny+EW0q2uWmep496xqI/zebOCBvRwa MShXz9NVUGAXsAewf/RGdh5/Trs9U9So1A== X-Google-Smtp-Source: ABdhPJxP8Q5SO8edgR+USzWqy4H5Ykj0bNqW2c6nuPK6WA0RgU1MELBsfC5sVatzu38ZTdzy+BJNsg== X-Received: by 2002:a17:90b:1c87:b0:1ca:f4e:4fbe with SMTP id oo7-20020a17090b1c8700b001ca0f4e4fbemr4184643pjb.159.1651242371947; Fri, 29 Apr 2022 07:26:11 -0700 (PDT) Received: from always-x1.www.tendawifi.com ([139.177.225.247]) by smtp.gmail.com with ESMTPSA id a38-20020a056a001d2600b004fae885424dsm3494734pfx.72.2022.04.29.07.26.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 07:26:11 -0700 (PDT) From: zhenwei pi To: akpm@linux-foundation.org, naoya.horiguchi@nec.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, zhenwei pi , Wu Fengguang Subject: [PATCH 2/4] mm/memofy-failure.c:: simplify num_poisoned_pages_dec Date: Fri, 29 Apr 2022 22:22:04 +0800 Message-Id: <20220429142206.294714-3-pizhenwei@bytedance.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220429142206.294714-1-pizhenwei@bytedance.com> References: <20220429142206.294714-1-pizhenwei@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Don't descrease the number of poisoned pages in page_alloc.c, let the memory-failure.c do inc/dec poisoned pages only. Also simplify unpoison_memory(), only descrease the number of poisoned pages when: - TestClearPageHWPoison() succeed - put_page_back_buddy succeed After descreasing, print necessary log. Finally, remove clear_page_hwpoison() and unpoison_taken_off_page(). Cc: Wu Fengguang Signed-off-by: zhenwei pi Acked-by: Naoya Horiguchi --- mm/memory-failure.c | 37 +++++++++---------------------------- mm/page_alloc.c | 1 - 2 files changed, 9 insertions(+), 29 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 46d9fb612dcc..ece05858568f 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -2101,28 +2101,6 @@ core_initcall(memory_failure_init); pr_info(fmt, pfn); \ }) =20 -static inline int clear_page_hwpoison(struct ratelimit_state *rs, struct p= age *p) -{ - if (TestClearPageHWPoison(p)) { - unpoison_pr_info("Unpoison: Software-unpoisoned page %#lx\n", - page_to_pfn(p), rs); - num_poisoned_pages_dec(); - return 1; - } - return 0; -} - -static inline int unpoison_taken_off_page(struct ratelimit_state *rs, - struct page *p) -{ - if (put_page_back_buddy(p)) { - unpoison_pr_info("Unpoison: Software-unpoisoned page %#lx\n", - page_to_pfn(p), rs); - return 0; - } - return -EBUSY; -} - /** * unpoison_memory - Unpoison a previously poisoned page * @pfn: Page number of the to be unpoisoned page @@ -2140,6 +2118,7 @@ int unpoison_memory(unsigned long pfn) struct page *page; struct page *p; int ret =3D -EBUSY; + int freeit =3D 0; static DEFINE_RATELIMIT_STATE(unpoison_rs, DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RATELIMIT_BURST); =20 @@ -2180,18 +2159,15 @@ int unpoison_memory(unsigned long pfn) =20 ret =3D get_hwpoison_page(p, MF_UNPOISON); if (!ret) { - if (clear_page_hwpoison(&unpoison_rs, page)) - ret =3D 0; - else - ret =3D -EBUSY; + ret =3D TestClearPageHWPoison(page) ? 0 : -EBUSY; } else if (ret < 0) { if (ret =3D=3D -EHWPOISON) { - ret =3D unpoison_taken_off_page(&unpoison_rs, p); + ret =3D put_page_back_buddy(p) ? 0 : -EBUSY; } else unpoison_pr_info("Unpoison: failed to grab page %#lx\n", pfn, &unpoison_rs); } else { - int freeit =3D clear_page_hwpoison(&unpoison_rs, p); + freeit =3D !!TestClearPageHWPoison(p); =20 put_page(page); if (freeit && !(pfn =3D=3D my_zero_pfn(0) && page_count(p) =3D=3D 1)) { @@ -2202,6 +2178,11 @@ int unpoison_memory(unsigned long pfn) =20 unlock_mutex: mutex_unlock(&mf_mutex); + if (!ret || freeit) { + num_poisoned_pages_dec(); + unpoison_pr_info("Unpoison: Software-unpoisoned page %#lx\n", + page_to_pfn(p), &unpoison_rs); + } return ret; } EXPORT_SYMBOL(unpoison_memory); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 0e42038382c1..d710846ef653 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -9625,7 +9625,6 @@ bool put_page_back_buddy(struct page *page) ClearPageHWPoisonTakenOff(page); __free_one_page(page, pfn, zone, 0, migratetype, FPI_NONE); if (TestClearPageHWPoison(page)) { - num_poisoned_pages_dec(); ret =3D true; } } --=20 2.20.1 From nobody Sun May 10 15:45:15 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0EC3BC433F5 for ; Fri, 29 Apr 2022 14:26:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377260AbiD2O3r (ORCPT ); Fri, 29 Apr 2022 10:29:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377303AbiD2O3g (ORCPT ); Fri, 29 Apr 2022 10:29:36 -0400 Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC216A1454 for ; Fri, 29 Apr 2022 07:26:15 -0700 (PDT) Received: by mail-pg1-x52f.google.com with SMTP id 7so2779825pga.12 for ; Fri, 29 Apr 2022 07:26:15 -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=vFKncaOnZsj36cgCwXssHtw7cbUchdfW5A7RWCFJ7yM=; b=384bTYX2aM/rqOGE6WsCJQTNL79rpvqSB6FFLpieETQcCxe4bkBKp3PHUHUxNhGhBo OrC6RI3a38E7/HAdvIsG2Nx7qmS/7xcqwk7vWCA5UVqzgxMigOT6e3Q7uvtShMtOKPhZ Dfl9S51N5BM2lNMJezk08BE3w7BAmiHm4hQovg3Nfff5bgR/a1IcZKzIEZocPr6M4cWT tTwGHrEkexmAVVtXROujq+AAOYxOHFDuFGQowUZNSrbib6zdEHTwi99oa7f5rhvg0SjQ vRqAubqjuzBzIPstt3HbFWYAeZANPNmKIQt315JO5dEt5JBW/hE0iyb4eV+zoVgoO9gF V5wA== 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=vFKncaOnZsj36cgCwXssHtw7cbUchdfW5A7RWCFJ7yM=; b=SKM+C3d/SqYpI+YltrbiIhan/992Ac18CRvXT+vMCTERljvJDCaU8RBtKNmSY7FE/r RCpkQ1wpG2dSgGk8EXh3rrpjYEgYKSlKFRwRSGOTe4twJYEdBJu/BTrMmyJpm/IBU0xU d/3HtUm2jUnNKmu76DL1XHrVvSqOvtNptTNQS45IxCMUhQj3pmoj+HwJewXK8yoVWS8J /6WYxZjN78P31XU6AapGie7xZtLJJLXUXbw87mnK0LH1CFiMHLvyQMFO8g+pSRw1aHze IUkYGH6vlIvxLvWgmRyPEGewAGhaYMjy8VWt2Qj4po4iTiKN8R1FaOdDXG93VvLzSy88 x8aQ== X-Gm-Message-State: AOAM530aJ2Irrk5Q66/YWJ+cXACKGAJtecK6OrHRl9ZojmKSWQsoqHsR hYZxLEXaMW+iYa5yXo7ei/sJAQ== X-Google-Smtp-Source: ABdhPJxtVXUSLrycX5o3L/8LudOkLIuOG0tXjRQVn3FboK4JXL4Qvwb1lBd4ZuJ6uq6RVmuwiX/grw== X-Received: by 2002:a05:6a00:2391:b0:50a:3ea9:e84d with SMTP id f17-20020a056a00239100b0050a3ea9e84dmr40345445pfc.21.1651242375308; Fri, 29 Apr 2022 07:26:15 -0700 (PDT) Received: from always-x1.www.tendawifi.com ([139.177.225.247]) by smtp.gmail.com with ESMTPSA id a38-20020a056a001d2600b004fae885424dsm3494734pfx.72.2022.04.29.07.26.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 07:26:14 -0700 (PDT) From: zhenwei pi To: akpm@linux-foundation.org, naoya.horiguchi@nec.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, zhenwei pi , Wu Fengguang Subject: [PATCH 3/4] mm/memofy-failure.c: optimize hwpoison_filter Date: Fri, 29 Apr 2022 22:22:05 +0800 Message-Id: <20220429142206.294714-4-pizhenwei@bytedance.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220429142206.294714-1-pizhenwei@bytedance.com> References: <20220429142206.294714-1-pizhenwei@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In the memory failure procedure, hwpoison_filter has higher priority, if memory_filter() filters the error event, there is no need to do the further work. Cc: Wu Fengguang Signed-off-by: zhenwei pi --- mm/memory-failure.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index ece05858568f..a6a27c8b800f 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1800,6 +1800,11 @@ int memory_failure(unsigned long pfn, int flags) goto unlock_mutex; } =20 + if (hwpoison_filter(p)) { + res =3D -EOPNOTSUPP; + goto unlock_mutex; + } + try_again: res =3D try_memory_failure_hugetlb(pfn, flags, &hugetlb); if (hugetlb) @@ -1937,15 +1942,6 @@ int memory_failure(unsigned long pfn, int flags) */ page_flags =3D p->flags; =20 - if (hwpoison_filter(p)) { - if (TestClearPageHWPoison(p)) - num_poisoned_pages_dec(); - unlock_page(p); - put_page(p); - res =3D -EOPNOTSUPP; - goto unlock_mutex; - } - /* * __munlock_pagevec may clear a writeback page's LRU flag without * page_lock. We need wait writeback completion for this page or it --=20 2.20.1 From nobody Sun May 10 15:45:15 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF531C433F5 for ; Fri, 29 Apr 2022 14:26:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356954AbiD2O3u (ORCPT ); Fri, 29 Apr 2022 10:29:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377257AbiD2O3o (ORCPT ); Fri, 29 Apr 2022 10:29:44 -0400 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FA5EA1471 for ; Fri, 29 Apr 2022 07:26:19 -0700 (PDT) Received: by mail-pj1-x1036.google.com with SMTP id cx11-20020a17090afd8b00b001d9fe5965b3so8727495pjb.3 for ; Fri, 29 Apr 2022 07:26:19 -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=T+xkL3YWKNIwUvhcyT6Zc2yQzS0rBzFbHurjbmprYM8=; b=laYz416cOyIijfEQ+pVXTypoycAPoNCaBjiFp2ErDhoCqHrvU9sC6Xq1SEKRHCT5vK rchwEpxXSozP9Xnq07+2MlLlnCDZd3VqHfgrAwYi3GvcAOf/mcN/ae3HU0hC/UeTbfSW oro3O4iW0oH0MkXAFc3reyccrgWCR8LbWKWu5FIB5uRP464LJRHDEX26SVXpwgM3sUTt h3pwoOL3p/4eyF3dHBgxHbQhBGEylGN2GU4HfvD2gea+DcI3HvjuRVpEEbjvKruhbLFM j1/nBj8+dvlmBs/UvP/YCL+26jOspr/4lvcICuGTh49aCmIfAVn1eSDAhGB+pD4td6PJ 05Rg== 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=T+xkL3YWKNIwUvhcyT6Zc2yQzS0rBzFbHurjbmprYM8=; b=WQaBUfBABQTJ6UoNyEFU4KbhV1zQmyuBCylaOe884sfnpoBYk6xyNLMCHNsSlD9n/N l1kJl7m0BaMYwl17gXzTAfz6oywZuu14RJbjboPcUf9z6Ji9+JPTSJ8A0gCWMoq40Bn1 Ukox88wlTER1AkK+/4l3AKieFOrFLFFoonfhtYmXAPwurR4WyeKWC3QPR0jx2qSA5Bl/ rmRPiC21rimpcjz1lsqs2kh1xk30ByZ9B0C6C9J6ktglLJ8/4F/8QJAvwPuSUBdjX4W2 eM5Arb3sfRm9uXgXEPscF9RxFX6cO3PINhYjIdGOoTyMUNc4PdGBQHFU7EvPitz0dGTM JP6A== X-Gm-Message-State: AOAM5324R7PCT5HWD35CCkEGRfAPKakqpTQ3OjThT8UpQrayoKr8LRHq qpaCh/Wfu6um5mnzj2hozxKutA== X-Google-Smtp-Source: ABdhPJz3haJXofXKco6B7+t0Ls+9sd0gtckJfaYdpRJH2uZO9g060KFNm7+1zgYdOuEcI+B3n7xNHA== X-Received: by 2002:a17:902:f792:b0:153:1566:18 with SMTP id q18-20020a170902f79200b0015315660018mr38572615pln.115.1651242378746; Fri, 29 Apr 2022 07:26:18 -0700 (PDT) Received: from always-x1.www.tendawifi.com ([139.177.225.247]) by smtp.gmail.com with ESMTPSA id a38-20020a056a001d2600b004fae885424dsm3494734pfx.72.2022.04.29.07.26.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 07:26:18 -0700 (PDT) From: zhenwei pi To: akpm@linux-foundation.org, naoya.horiguchi@nec.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, zhenwei pi , Wu Fengguang Subject: [PATCH 4/4] mm/memofy-failure.c: add hwpoison_filter for soft offline Date: Fri, 29 Apr 2022 22:22:06 +0800 Message-Id: <20220429142206.294714-5-pizhenwei@bytedance.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220429142206.294714-1-pizhenwei@bytedance.com> References: <20220429142206.294714-1-pizhenwei@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" hwpoison_filter is missing in the soft offline path, this leads an issue: after enabling the corrupt filter, the user process still has a chance to inject hwpoison fault by madvise(addr, len, MADV_SOFT_OFFLINE) at PFN which is expected to reject. Cc: Wu Fengguang Signed-off-by: zhenwei pi --- mm/memory-failure.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index a6a27c8b800f..6564f5a34658 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -2313,7 +2313,9 @@ static void put_ref_page(struct page *page) * @pfn: pfn to soft-offline * @flags: flags. Same as memory_failure(). * - * Returns 0 on success, otherwise negated errno. + * Returns 0 on success + * -EOPNOTSUPP for memory_filter() filtered the error event + * < 0 otherwise negated errno. * * Soft offline a page, by migration or invalidation, * without killing anything. This is for the case when @@ -2350,6 +2352,11 @@ int soft_offline_page(unsigned long pfn, int flags) return -EIO; } =20 + if (hwpoison_filter(page)) { + put_ref_page(ref_page); + return -EOPNOTSUPP; + } + mutex_lock(&mf_mutex); =20 if (PageHWPoison(page)) { --=20 2.20.1