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 BA44BC433FE for ; Mon, 9 May 2022 11:01:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 35B6A6B0074; Mon, 9 May 2022 07:01:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2E5D56B0075; Mon, 9 May 2022 07:01:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 137076B0078; Mon, 9 May 2022 07:01:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 0039C6B0074 for ; Mon, 9 May 2022 07:01:06 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id CBB8E20EC5 for ; Mon, 9 May 2022 11:01:06 +0000 (UTC) X-FDA: 79445912532.17.61E04FD Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by imf28.hostedemail.com (Postfix) with ESMTP id E43C9C0090 for ; Mon, 9 May 2022 11:00:47 +0000 (UTC) Received: by mail-pj1-f47.google.com with SMTP id cu23-20020a17090afa9700b001d98d8e53b7so12266148pjb.0 for ; Mon, 09 May 2022 04:01: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=Dwecl2Kr1urUIZir4QecyhUGT2o+Jo6GQteEXIEdnc4=; b=bYuFJNt6ZEGQO5O5z5nIFxsS6dk83OgKxaii7XuPjAdM2s4k3cG/HlVgCLphAahc+o 2Mpv157r4aX42F2I6pzx/WdVj+6wRp+FU6wrRNZPt2cnEjVPmCVzBBrYwvq8JgeqI/iS ztXJfWYwkpBFJ+QgSUjs9bIUtesCdKcOdR061A/gxIWqFcvFqGxVyX/YNxVsR62MNC26 ePn2L11yNJ2Ax3SGGXklYIJRaaNwCGpqGwmQEveG2X7CnRg5SYtCM87bgCnMdIQmwMuD Zbm1EZ+YkoycHRb3kC7CWaPWFbirQPR+3S2O52B58bJOpC5uqfnq6AaydXWS5JU0cXZb LUbw== 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=Dwecl2Kr1urUIZir4QecyhUGT2o+Jo6GQteEXIEdnc4=; b=UifyH/DXAtfuqRjkk/ZJQkbB39rPzXa9xvGeDrxfLiNf7KVcEIfFGQ9zV0W74QoAFr bsLjeV9ydZXEY46RdgeeYJZ/yZ/DF0hEstl100x80wufOP0rozHkEgMbpnOUcb+ET63I Aa4L00YQZVoSipmbvBqCO3f5wpryYyLk2WQJKKLCB7hjheIYFuqkaQlY2LYsLBUTjXgn ds9CjKZFVOxWTzNdWuxh6Cy7IS1lfal/52iTni4lSPF8fQRazif8FvWimnLC7R4VjWJ+ zw+OuwrEfFhnfE9jq2RZiieie+b1LKGFsF/GkM5elS+XjlhWeM7qySD2esNjKV9Y7ilD UREg== X-Gm-Message-State: AOAM530MXYp2WyphSvM/AHqKQhPU7Q5g9Jg2o6y6sW7AlXyHaPDWANnz /b2xdR3BYfgi1nZusKdoLsEHzl6fQLKR/w== X-Google-Smtp-Source: ABdhPJy1uR5B7Z3hoJSkWWt6S8aIJC8MM9+evsRCGhS7NW+twaifPSICrJjYgfX9wH3uhyeq/gCA1g== X-Received: by 2002:a17:903:22cf:b0:15e:cf4e:79c9 with SMTP id y15-20020a17090322cf00b0015ecf4e79c9mr15891618plg.54.1652094065144; Mon, 09 May 2022 04:01:05 -0700 (PDT) Received: from always-x1.www.tendawifi.com ([139.177.225.239]) by smtp.gmail.com with ESMTPSA id n12-20020a170902968c00b0015e8d4eb244sm6813303plp.142.2022.05.09.04.01.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 04:01:04 -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 Subject: [PATCH v2 2/5] mm/memory-failure.c: simplify num_poisoned_pages_dec Date: Mon, 9 May 2022 18:56:38 +0800 Message-Id: <20220509105641.491313-3-pizhenwei@bytedance.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220509105641.491313-1-pizhenwei@bytedance.com> References: <20220509105641.491313-1-pizhenwei@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=bYuFJNt6; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf28.hostedemail.com: domain of pizhenwei@bytedance.com designates 209.85.216.47 as permitted sender) smtp.mailfrom=pizhenwei@bytedance.com X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: E43C9C0090 X-Rspam-User: X-Stat-Signature: khnxiyfm89g5g1fn9mti9swz4sqhxc9p X-HE-Tag: 1652094047-321798 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 decrease 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 decrease the number of poisoned pages when: - TestClearPageHWPoison() succeed - put_page_back_buddy succeed After decreasing, print necessary log. Finally, remove clear_page_hwpoison() and unpoison_taken_off_page(). Acked-by: Naoya Horiguchi 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