From patchwork Mon Sep 5 06:21:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naoya Horiguchi X-Patchwork-Id: 12965476 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 015F0ECAAD5 for ; Mon, 5 Sep 2022 06:22:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 94F9D801AC; Mon, 5 Sep 2022 02:22:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8FED68D0050; Mon, 5 Sep 2022 02:22:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7C6E5801AC; Mon, 5 Sep 2022 02:22:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 6BC6F8D0050 for ; Mon, 5 Sep 2022 02:22:17 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 3C839140177 for ; Mon, 5 Sep 2022 06:22:17 +0000 (UTC) X-FDA: 79877037114.19.C93875A Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by imf19.hostedemail.com (Postfix) with ESMTP id C0FD81A0052 for ; Mon, 5 Sep 2022 06:22:16 +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=1662358935; 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=KJKmQBcrfqjRJ7vJe0VgHKDJG/ZTJxuNlianmOytPC4=; b=GqjZ2HY6ixn3Q6PsBSb1oIPpXpTKNnhcPJ+LjiO6VJRmjy3qgnpcVjTqKzisan0dnC7an0 dRzhW9LH3rrXfBUpKvST7f/WeZiCwGcoeqr8heKUJFQvtmLc+gWnP/0xKbbZ0GIxmgywpb tw5sxGPxHjKhNTRggiM5Mpdcbdi/7cU= 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 2/4] mm/hwpoison: move definitions of num_poisoned_pages_* to memory-failure.c Date: Mon, 5 Sep 2022 15:21:35 +0900 Message-Id: <20220905062137.1455537-3-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 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: linux.dev ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=GqjZ2HY6; spf=pass (imf19.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=1662358936; a=rsa-sha256; cv=none; b=ukOX67/GyP8PPrYJllN4tzVT15MTQJ19tLOfJJSVaytx/rTc3Qd4gn0uCnqmz/1ennFQgv hEgnnalYZ8HgxFIGRyMRaqi8whm3gNGEGB0OYfw8zutYWi4Wh88mliKFnXxkKmAtF7KtCf n9i+7TZNQL4F64w5ovnT3D4wwKqtu5w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662358936; 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=KJKmQBcrfqjRJ7vJe0VgHKDJG/ZTJxuNlianmOytPC4=; b=2zNpLhkepdpdfjH0ao0fD0FgvXE/di6b9jCVcE3YxB/BNa9AKgTrFLzJAqGTdyDSG7fcuY s8vxNfU6jo4TZgeqqwM9+MbuXfZbLqqe4P7E5g2Jn9/tpHVOUlQ80sgLRZO00K2JREsvNe 1SOHgoqjjcHAxzHECyX7I/PbuSY4lCY= X-Stat-Signature: unsnjdwocjrod6p3dmiwzohgpf946uta X-Rspamd-Queue-Id: C0FD81A0052 X-Rspam-User: Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=GqjZ2HY6; spf=pass (imf19.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: rspam07 X-HE-Tag: 1662358936-509186 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 These interfaces will be used by drivers/base/core.c by later patch, so as a preparatory work move them to more common header file visible to the file. Signed-off-by: Naoya Horiguchi --- arch/parisc/kernel/pdt.c | 3 +-- include/linux/mm.h | 4 ++++ include/linux/swapops.h | 25 ------------------------- mm/memory-failure.c | 15 +++++++++++++++ 4 files changed, 20 insertions(+), 27 deletions(-) diff --git a/arch/parisc/kernel/pdt.c b/arch/parisc/kernel/pdt.c index e391b175f5ec..fdc880e2575a 100644 --- a/arch/parisc/kernel/pdt.c +++ b/arch/parisc/kernel/pdt.c @@ -18,8 +18,7 @@ #include #include #include -#include -#include +#include #include #include diff --git a/include/linux/mm.h b/include/linux/mm.h index 21f8b27bd9fd..b81dd600e51a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3202,6 +3202,10 @@ static inline int __get_huge_page_for_hwpoison(unsigned long pfn, int flags) { return 0; } + +static inline void num_poisoned_pages_inc() +{ +} #endif #ifndef arch_memory_failure diff --git a/include/linux/swapops.h b/include/linux/swapops.h index ddc98f96ad2c..55afc2aaba6b 100644 --- a/include/linux/swapops.h +++ b/include/linux/swapops.h @@ -459,8 +459,6 @@ static inline int is_pmd_migration_entry(pmd_t pmd) #ifdef CONFIG_MEMORY_FAILURE -extern atomic_long_t num_poisoned_pages __read_mostly; - /* * Support for hardware poisoned pages */ @@ -488,21 +486,6 @@ static inline struct page *hwpoison_entry_to_page(swp_entry_t entry) return p; } -static inline void num_poisoned_pages_inc(void) -{ - atomic_long_inc(&num_poisoned_pages); -} - -static inline void num_poisoned_pages_dec(void) -{ - atomic_long_dec(&num_poisoned_pages); -} - -static inline void num_poisoned_pages_sub(long i) -{ - atomic_long_sub(i, &num_poisoned_pages); -} - #else static inline swp_entry_t make_hwpoison_entry(struct page *page) @@ -519,14 +502,6 @@ static inline struct page *hwpoison_entry_to_page(swp_entry_t entry) { return NULL; } - -static inline void num_poisoned_pages_inc(void) -{ -} - -static inline void num_poisoned_pages_sub(long i) -{ -} #endif static inline int non_swap_entry(swp_entry_t entry) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 7b077da568ff..b6236c721f54 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -74,6 +74,21 @@ 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) +{ + atomic_long_inc(&num_poisoned_pages); +} + +static inline void num_poisoned_pages_dec(void) +{ + atomic_long_dec(&num_poisoned_pages); +} + +static inline void num_poisoned_pages_sub(long i) +{ + atomic_long_sub(i, &num_poisoned_pages); +} + /* * Return values: * 1: the page is dissolved (if needed) and taken off from buddy,