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 23869C433FE for ; Fri, 29 Apr 2022 14:26:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B21EB6B0074; Fri, 29 Apr 2022 10:26:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AAA3D6B0075; Fri, 29 Apr 2022 10:26:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 925286B0078; Fri, 29 Apr 2022 10:26:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.26]) by kanga.kvack.org (Postfix) with ESMTP id 80AB16B0074 for ; Fri, 29 Apr 2022 10:26:13 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay11.hostedemail.com (Postfix) with ESMTP id 49C978071A for ; Fri, 29 Apr 2022 14:26:13 +0000 (UTC) X-FDA: 79410141426.05.C8EF53B Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by imf08.hostedemail.com (Postfix) with ESMTP id BAA0C160068 for ; Fri, 29 Apr 2022 14:26:05 +0000 (UTC) Received: by mail-pj1-f49.google.com with SMTP id z5-20020a17090a468500b001d2bc2743c4so7465624pjf.0 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=Tb5mXMsONHG/wRc4OA2HpG0OfyOn6dM8FatsaqBxxUj8UW7K9soK95+TCsllzrVZWc 8Cl0dhpRX2ijIIBzyXf5SijcD7m2kboTT+wJ/6Isd/ag7qpDPCl2D9JwWPxz1TkAYABp O1MmRbLDkr+RGnInEFlD76g2e8J0HH54fW1gVdB6r2/24N5L3pcVB37IPeJ004dC/OUQ 6HRAcXZBqi/FHmConAbTJM4HL12Nx+ZrI1oeiG4W+7IVWHyVwES6tq52ru8QLXh4YRtZ 2/QROxzB52WnosIzTlcmxyZAGiFLhmPDL6r1zGJvXKvyNGl+xOzOoxNcBxR/xfT6xyx0 dUzw== X-Gm-Message-State: AOAM530rQ8+BlkFDESBC9AQlh60c2tAj+rdIkZHLkJhp+LafU4rjeRBe bpNdmidZR0/N12t381l5uI+kcA== 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: 8bit X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: BAA0C160068 X-Stat-Signature: pzk7zhgwbfqhzs1pmbk7rxx3h1qy3rax Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b="Bkz2/5SR"; spf=pass (imf08.hostedemail.com: domain of pizhenwei@bytedance.com designates 209.85.216.49 as permitted sender) smtp.mailfrom=pizhenwei@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com X-HE-Tag: 1651242365-468900 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: 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 --- 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); \ }) -static inline int clear_page_hwpoison(struct ratelimit_state *rs, struct page *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 = -EBUSY; + int freeit = 0; static DEFINE_RATELIMIT_STATE(unpoison_rs, DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RATELIMIT_BURST); @@ -2180,18 +2159,15 @@ int unpoison_memory(unsigned long pfn) ret = get_hwpoison_page(p, MF_UNPOISON); if (!ret) { - if (clear_page_hwpoison(&unpoison_rs, page)) - ret = 0; - else - ret = -EBUSY; + ret = TestClearPageHWPoison(page) ? 0 : -EBUSY; } else if (ret < 0) { if (ret == -EHWPOISON) { - ret = unpoison_taken_off_page(&unpoison_rs, p); + ret = put_page_back_buddy(p) ? 0 : -EBUSY; } else unpoison_pr_info("Unpoison: failed to grab page %#lx\n", pfn, &unpoison_rs); } else { - int freeit = clear_page_hwpoison(&unpoison_rs, p); + freeit = !!TestClearPageHWPoison(p); put_page(page); if (freeit && !(pfn == my_zero_pfn(0) && page_count(p) == 1)) { @@ -2202,6 +2178,11 @@ int unpoison_memory(unsigned long pfn) 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 = true; } } -- 2.20.1