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 0C5A3ECAAA1 for ; Mon, 5 Sep 2022 06:22:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7A280801AD; Mon, 5 Sep 2022 02:22:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 778278D0050; Mon, 5 Sep 2022 02:22:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6191A801AD; Mon, 5 Sep 2022 02:22:21 -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 51AB88D0050 for ; Mon, 5 Sep 2022 02:22:21 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 2404B121869 for ; Mon, 5 Sep 2022 06:22:21 +0000 (UTC) X-FDA: 79877037282.30.18B2AF1 Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by imf23.hostedemail.com (Postfix) with ESMTP id 969D2140075 for ; Mon, 5 Sep 2022 06:22:20 +0000 (UTC) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1662358939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/BbMhqxmYuU5COA45Jj7QmdMCnLs62eTq+39BWVy6eY=; b=IjFxF5qczN8wu+FeEj3Qhjhq/1V0oaMQc25LmtpYuj1uUY4VP8dD5LVY9YyQZ9mNfHuVzH UspenGcv02ijkXrI63eUFKBY422C5EGcmiv4obWhAk/rglpi/RPOUFdvNnL6gZFRCcvtmk +PZG4ZxxnvmSjxm3py1cyS6xQ+czEPc= From: Naoya Horiguchi To: linux-mm@kvack.org Cc: Andrew Morton , Miaohe Lin , David Hildenbrand , Mike Kravetz , Yang Shi , Oscar Salvador , Muchun Song , Jane Chu , Naoya Horiguchi , linux-kernel@vger.kernel.org Subject: [PATCH v2 3/4] mm/hwpoison: pass pfn to num_poisoned_pages_*() Date: Mon, 5 Sep 2022 15:21:36 +0900 Message-Id: <20220905062137.1455537-4-naoya.horiguchi@linux.dev> In-Reply-To: <20220905062137.1455537-1-naoya.horiguchi@linux.dev> References: <20220905062137.1455537-1-naoya.horiguchi@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: linux.dev ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=IjFxF5qc; spf=pass (imf23.hostedemail.com: domain of naoya.horiguchi@linux.dev designates 188.165.223.204 as permitted sender) smtp.mailfrom=naoya.horiguchi@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662358940; a=rsa-sha256; cv=none; b=4ETUT5DejuHRNiZJ7pkevhCeF3qbJ5k0t/w+zUMrTzpUjgdOFm1r2PQInNWuHiDspSE/M9 LwR4s7lu/fSM6WuITJoXlmdAwIt52YS+FwiL81kxTaON52YOtsaC6WP5esUEHWFU99FezY q66fLudKQD0t2XSc5iqCk/Gj1AY/LOA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662358940; 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=/BbMhqxmYuU5COA45Jj7QmdMCnLs62eTq+39BWVy6eY=; b=n7cOk1RGc2DfqRSPIK7AepLZ5L45cN5RjHzfCsP2G0U/huFqM1SYGKv0y/9GmTAOGHYZd5 Ef026SRFqEO7zShr7sKKArkqRTM5RpL2dqWdVAdWDzwTO9rHNfg34+PegoLVpGCmi+DVIu LRhlhYpU2Mlxz1lwj5EPUfH2l0BgHhA= X-Rspam-User: Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=IjFxF5qc; spf=pass (imf23.hostedemail.com: domain of naoya.horiguchi@linux.dev designates 188.165.223.204 as permitted sender) smtp.mailfrom=naoya.horiguchi@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 969D2140075 X-Stat-Signature: ezbfo16dsr94kmjtfzbnmxrix56m4zxu X-HE-Tag: 1662358940-247719 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: From: Naoya Horiguchi No functional change. Signed-off-by: Naoya Horiguchi --- arch/parisc/kernel/pdt.c | 2 +- include/linux/mm.h | 2 +- mm/memory-failure.c | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/parisc/kernel/pdt.c b/arch/parisc/kernel/pdt.c index fdc880e2575a..80943a00e245 100644 --- a/arch/parisc/kernel/pdt.c +++ b/arch/parisc/kernel/pdt.c @@ -231,7 +231,7 @@ void __init pdc_pdt_init(void) /* mark memory page bad */ memblock_reserve(pdt_entry[i] & PAGE_MASK, PAGE_SIZE); - num_poisoned_pages_inc(); + num_poisoned_pages_inc(addr >> PAGE_SHIFT); } } diff --git a/include/linux/mm.h b/include/linux/mm.h index b81dd600e51a..6316973afd1d 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3203,7 +3203,7 @@ static inline int __get_huge_page_for_hwpoison(unsigned long pfn, int flags) return 0; } -static inline void num_poisoned_pages_inc() +static inline void num_poisoned_pages_inc(unsigned long pfn) { } #endif diff --git a/mm/memory-failure.c b/mm/memory-failure.c index b6236c721f54..7dd4e403e634 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -74,17 +74,17 @@ atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0); static bool hw_memory_failure __read_mostly = false; -static inline void num_poisoned_pages_inc(void) +static inline void num_poisoned_pages_inc(unsigned long pfn) { atomic_long_inc(&num_poisoned_pages); } -static inline void num_poisoned_pages_dec(void) +static inline void num_poisoned_pages_dec(unsigned long pfn) { atomic_long_dec(&num_poisoned_pages); } -static inline void num_poisoned_pages_sub(long i) +static inline void num_poisoned_pages_sub(unsigned long pfn, long i) { atomic_long_sub(i, &num_poisoned_pages); } @@ -130,7 +130,7 @@ static bool page_handle_poison(struct page *page, bool hugepage_or_freepage, boo if (release) put_page(page); page_ref_inc(page); - num_poisoned_pages_inc(); + num_poisoned_pages_inc(page_to_pfn(page)); return true; } @@ -1196,7 +1196,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(); + num_poisoned_pages_inc(pfn); pr_err("%#lx: recovery action for %s: %s\n", pfn, action_page_types[type], action_name[result]); } @@ -1743,7 +1743,7 @@ static int hugetlb_set_page_hwpoison(struct page *hpage, struct page *page) llist_add(&raw_hwp->node, head); /* the first error event will be counted in action_result(). */ if (ret) - num_poisoned_pages_inc(); + num_poisoned_pages_inc(page_to_pfn(page)); } else { /* * Failed to save raw error info. We no longer trace all @@ -2408,7 +2408,7 @@ int unpoison_memory(unsigned long pfn) unlock_mutex: mutex_unlock(&mf_mutex); if (!ret || freeit) { - num_poisoned_pages_sub(count); + num_poisoned_pages_sub(pfn, count); unpoison_pr_info("Unpoison: Software-unpoisoned page %#lx\n", page_to_pfn(p), &unpoison_rs); } @@ -2625,7 +2625,7 @@ void clear_hwpoisoned_pages(struct page *memmap, int nr_pages) for (i = 0; i < nr_pages; i++) { if (PageHWPoison(&memmap[i])) { - num_poisoned_pages_dec(); + num_poisoned_pages_dec(page_to_pfn(&memmap[i])); ClearPageHWPoison(&memmap[i]); } } -- 2.25.1