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 11A02C433EF for ; Mon, 9 May 2022 11:01:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A12E56B007B; Mon, 9 May 2022 07:01:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 99ADD6B007D; Mon, 9 May 2022 07:01:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 777CF6B007E; Mon, 9 May 2022 07:01:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 631336B007B for ; Mon, 9 May 2022 07:01:16 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 33D0821034 for ; Mon, 9 May 2022 11:01:16 +0000 (UTC) X-FDA: 79445912952.29.70C78AB Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf26.hostedemail.com (Postfix) with ESMTP id 28929140092 for ; Mon, 9 May 2022 11:01:12 +0000 (UTC) Received: by mail-pl1-f174.google.com with SMTP id q18so556234pln.12 for ; Mon, 09 May 2022 04:01: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=t0KsZv2R4FmOpyzJ37nNuFGF3hEBVQUSZOEw7FIgU2A=; b=yjtzA8SItPH7R6S1S+OGpTA8lpujjgtHSpoSwPxtQUypZnh+LhhkrVjtjaxYiSIVAp iVo3fIPQGwplTUrHyLZm+y+PW7GyXKOyGCa/Mk5TpRRWgY8ampXvMrn3BYumiT5GRlHB BAPwL6edGJN/fGAQUqu92vb6/tAVD3lhNQBVMpBoHpI0a8/1mEJZcCGlQmMGNkMSwbsr 17l7fH1SLbbetWfYC50CRYmCDeskVHYFWSZYWmXLz1WuvE0MByPEXHTARY5dFhTICCxG mR3NVxFDYHIgork84g9o9A8HXp9wLBJY+kZqiVmveHEhPszocewvWXXDYls9OOPHvKg2 7ZLg== 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=t0KsZv2R4FmOpyzJ37nNuFGF3hEBVQUSZOEw7FIgU2A=; b=EOkFgDISZBh1bZvTcml7ui4OBslt8YwlFX/0oVZmU9RadSP3+OYb6jXVObU78AC3JP CBMoJgiVgbbEBGpJYHtTJc0qsMFc2HHQLe3y90V8hcUH0iSswOIzTy0z1Ut8RwNg9aaX 4iroK+Ti1eZ09hXlLR6yB61Dq7I/FDDiFdJRSTFjG7Jdc6P5mJcEXYDV7uWPMBhAeusg ilx8UMbYhr7mNQt7aOJGIjKurnsaafAUYcNkkPwXPfXru2bRbHYM8NfJIg+ElLpUwD9c VFIDPoyU8SYBp7Ux8G3jWbYQx14GOhluABHQU4RCqsdvaIh/Xq/GBXPbYYfSiJNpVwAR PsNw== X-Gm-Message-State: AOAM531YGqI+pMNPfAztDeKu2ZsN0dnYu3xtQ6hrW6+vWcIkPyKnU96S Nr1lrQagG2pc6VfD5TehXK2PKQ== X-Google-Smtp-Source: ABdhPJx/WzlB7PylnxnAdFCim/SskrKr0osvOo6sFRdb5OtHidyhPLSUg7ojKRvRf81iZeBPIyd+DQ== X-Received: by 2002:a17:90a:f2ce:b0:1d9:a18f:87f3 with SMTP id gt14-20020a17090af2ce00b001d9a18f87f3mr25860804pjb.213.1652094074838; Mon, 09 May 2022 04:01:14 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 04:01: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 Subject: [PATCH v2 5/5] mm/memory-failure.c: simplify num_poisoned_pages_inc/dec Date: Mon, 9 May 2022 18:56:41 +0800 Message-Id: <20220509105641.491313-6-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 X-Stat-Signature: honf6w63zome5c4oyg7giqhmyocji9qo X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 28929140092 X-Rspam-User: Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=yjtzA8SI; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf26.hostedemail.com: domain of pizhenwei@bytedance.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=pizhenwei@bytedance.com X-HE-Tag: 1652094072-347657 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: Originally, do num_poisoned_pages_inc() in memory failure routine, use num_poisoned_pages_dec() to rollback the number if filtered/ cancelled. Suggested by Naoya, do num_poisoned_pages_inc() only in action_result(), this make this clear and simple. Signed-off-by: zhenwei pi --- mm/memory-failure.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index ed280ef5473d..2d590cba412c 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1133,6 +1133,7 @@ static void action_result(unsigned long pfn, enum mf_action_page_type type, { trace_memory_failure_event(pfn, type, result); + num_poisoned_pages_inc(); pr_err("Memory failure: %#lx: recovery action for %s: %s\n", pfn, action_page_types[type], action_name[result]); } @@ -1588,8 +1589,6 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb goto out; } - num_poisoned_pages_inc(); - /* * Handling free hugepage. The possible race with hugepage allocation * or demotion can be prevented by PageHWPoison flag. @@ -1815,7 +1814,6 @@ int memory_failure(unsigned long pfn, int flags) } hpage = compound_head(p); - num_poisoned_pages_inc(); /* * We need/can do nothing about count=0 pages. @@ -1839,7 +1837,6 @@ int memory_failure(unsigned long pfn, int flags) /* We lost the race, try again */ if (retry) { ClearPageHWPoison(p); - num_poisoned_pages_dec(); retry = false; goto try_again; } @@ -1915,8 +1912,7 @@ int memory_failure(unsigned long pfn, int flags) */ if (PageCompound(p)) { if (retry) { - if (TestClearPageHWPoison(p)) - num_poisoned_pages_dec(); + ClearPageHWPoison(p); unlock_page(p); put_page(p); flags &= ~MF_COUNT_INCREASED; @@ -1938,8 +1934,7 @@ int memory_failure(unsigned long pfn, int flags) page_flags = p->flags; if (hwpoison_filter(p)) { - if (TestClearPageHWPoison(p)) - num_poisoned_pages_dec(); + TestClearPageHWPoison(p); unlock_page(p); put_page(p); res = -EOPNOTSUPP; -- 2.20.1