From patchwork Mon Oct 24 06:20:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naoya Horiguchi X-Patchwork-Id: 8171 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp280652wru; Sun, 23 Oct 2022 23:23:24 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6B+BwGE30mq7QgbjtujwxTdYnSeznnvn9YdEOxdPt9RceSGgzexvhU/G+oOkLq9hlmM/lt X-Received: by 2002:a05:6402:f1e:b0:461:cfd3:48c2 with SMTP id i30-20020a0564020f1e00b00461cfd348c2mr2345025eda.294.1666592604336; Sun, 23 Oct 2022 23:23:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666592604; cv=none; d=google.com; s=arc-20160816; b=RQLgqDoJoDiwJczAhGDAPT7LREaK0iuea33lyUp5Qd2FtoyoYP6DZ41MRBAtZIdzJo pXJ0edtLyTsrdV0TTcE0FeXqga8u8LQq7YnIU+l7L5hddS5xujakYmo+3eIeCxkmAeRR 17R10bzHbAqUXH7XOW6AHEolOcLIhVUUwgyubIKCzvAO6T7cVtRv2Dh/z9TafuNhSj/q fjobzHUqgClcBhwuEEZNCdAYUqNrnM5R8H5WYi5mjLriD6+WBto+/GWc0/FmWuFLS4/G YPZpzNoyl3cxpKkVcG7Umhs+EK3O7oITBqXrUg6NR5j4j0+JcCYyunmIl9fi2Zbk4126 jiLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Jyy+TtDTebM2ULRn5gfgfaG/rShZnN8sUyQZqnKLbrQ=; b=AlWMYEdQusu2CWxCXbdkX1+ygsDDaOdtzBonubur58DVNmwq+yGZHqD8yCqSLWNgNg 4OWQqGwjwvOLz4euptuTejBOrUKLIC8W9LNb0mewLwgk0rMEhAH52+V9SvMTcnLAoWFn oCUSznibtnE3kyhGcJz+eM72fvp+Uri2KwOSJT4QfadxEX/vRRWk6TWmSqJExu5Dckvf 7ugb61uvvKBt+7p5V+3oI89PXlepLzTV3oixI0RKV11hi6ZC0c9rcqK7VMaUNo0ZoWVS 2JIdSysPFvvwm+QCleEs31yRhl+MzCSzuRk3SuDbAp/koBnz91qQ7Bgz/OAsjp1yKlC/ L92Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=tHXsEaUy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z14-20020a05640240ce00b00461b8e2c7f4si3118035edb.548.2022.10.23.23.23.00; Sun, 23 Oct 2022 23:23:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=tHXsEaUy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230262AbiJXGUo (ORCPT + 99 others); Mon, 24 Oct 2022 02:20:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230209AbiJXGUj (ORCPT ); Mon, 24 Oct 2022 02:20:39 -0400 Received: from out0.migadu.com (out0.migadu.com [94.23.1.103]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CEE5446634 for ; Sun, 23 Oct 2022 23:20:36 -0700 (PDT) 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=1666592434; 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=Jyy+TtDTebM2ULRn5gfgfaG/rShZnN8sUyQZqnKLbrQ=; b=tHXsEaUyTrQt+zgOBwT4prd/SfcMMeDbA7Qj+zM6EmkyEdN5SviEjUVNzFbLeGIeqcP9id RwiDKW0U/eF7fHi33f19lx+tic+gi3DLOlL/K++AW9m/W+GAU2Lg4t2bt1tBW5dt1Ik3Ia ylbhwZ4b8AHTL398aXbGSvd7Q9YRssQ= 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 v7 2/4] mm/hwpoison: move definitions of num_poisoned_pages_* to memory-failure.c Date: Mon, 24 Oct 2022 15:20:10 +0900 Message-Id: <20221024062012.1520887-3-naoya.horiguchi@linux.dev> In-Reply-To: <20221024062012.1520887-1-naoya.horiguchi@linux.dev> References: <20221024062012.1520887-1-naoya.horiguchi@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747549006622595628?= X-GMAIL-MSGID: =?utf-8?q?1747549006622595628?= From: Naoya Horiguchi These interfaces will be used by drivers/base/memory.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 Reviewed-by: Miaohe Lin --- ChangeLog v3 -> v6: - remove static in definition of num_poisoned_pages_inc() to fix build error. ChangeLog v2 -> v3: - added declaration of num_poisoned_pages_inc() in #ifdef CONFIG_MEMORY_FAILURE --- arch/parisc/kernel/pdt.c | 3 +-- include/linux/mm.h | 5 +++++ include/linux/swapops.h | 24 ++---------------------- mm/memory-failure.c | 10 ++++++++++ 4 files changed, 18 insertions(+), 24 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 3da6283c9d30..80d7c2987c3b 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3248,12 +3248,17 @@ extern int soft_offline_page(unsigned long pfn, int flags); #ifdef CONFIG_MEMORY_FAILURE extern int __get_huge_page_for_hwpoison(unsigned long pfn, int flags, bool *migratable_cleared); +extern void num_poisoned_pages_inc(void); #else static inline int __get_huge_page_for_hwpoison(unsigned long pfn, int flags, bool *migratable_cleared) { return 0; } + +static inline void num_poisoned_pages_inc(void) +{ +} #endif #ifndef arch_memory_failure diff --git a/include/linux/swapops.h b/include/linux/swapops.h index a91dd08e107b..3e58a812399a 100644 --- a/include/linux/swapops.h +++ b/include/linux/swapops.h @@ -581,8 +581,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 */ @@ -610,17 +608,7 @@ 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_sub(long i) -{ - atomic_long_sub(i, &num_poisoned_pages); -} - -#else /* CONFIG_MEMORY_FAILURE */ +#else static inline swp_entry_t make_hwpoison_entry(struct page *page) { @@ -636,15 +624,7 @@ 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 /* CONFIG_MEMORY_FAILURE */ +#endif static inline int non_swap_entry(swp_entry_t entry) { diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 31589f2f5f07..3e0e20cac211 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -74,6 +74,16 @@ atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0); static bool hw_memory_failure __read_mostly = false; +inline void num_poisoned_pages_inc(void) +{ + atomic_long_inc(&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,