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 798C7C32771 for ; Sat, 24 Sep 2022 11:53:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CCC246B00B1; Sat, 24 Sep 2022 07:53:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C7BDB6B00B3; Sat, 24 Sep 2022 07:53:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B430C6B00B4; Sat, 24 Sep 2022 07:53:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id A26C16B00B1 for ; Sat, 24 Sep 2022 07:53:23 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 5C201A01FF for ; Sat, 24 Sep 2022 11:53:23 +0000 (UTC) X-FDA: 79946818686.15.956A007 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf11.hostedemail.com (Postfix) with ESMTP id 3DA8740021 for ; Sat, 24 Sep 2022 11:53:22 +0000 (UTC) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MZS3c0HY3zWh2Q; Sat, 24 Sep 2022 19:49:16 +0800 (CST) Received: from [10.174.151.185] (10.174.151.185) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 19:53:15 +0800 Subject: Re: [PATCH v3 2/4] mm/hwpoison: move definitions of num_poisoned_pages_* to memory-failure.c To: Naoya Horiguchi , CC: Andrew Morton , David Hildenbrand , Mike Kravetz , Yang Shi , Oscar Salvador , Muchun Song , Jane Chu , Naoya Horiguchi , References: <20220921091359.25889-1-naoya.horiguchi@linux.dev> <20220921091359.25889-3-naoya.horiguchi@linux.dev> From: Miaohe Lin Message-ID: <4b7c327a-547e-be8b-4568-745fabe74641@huawei.com> Date: Sat, 24 Sep 2022 19:53:15 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20220921091359.25889-3-naoya.horiguchi@linux.dev> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.151.185] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664020402; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ku3qZLN2EwOaKWH+jhUb6Q0wCzurKRgwrKZ+Q52SvZg=; b=BFr4Dbrztp3pDcrHfge3gL/un7TfTFxWkTZId8Ynkc25IhyOneN67lZ6MvoBrxRSYTcsXb GTq2YVwHR6UepPRCPj7ifpewbYO2y7oFLxBnVGVilnjNheBYAuBVAwgBzkRnV8M+Gx1e9G ZLI8y7cDOrr1zwKACz8TcbNl04c/3Bk= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664020402; a=rsa-sha256; cv=none; b=7w75/rnUtJA0EmJXRU5aVjNZOVHbZAS9XQ+z+vKfXu1Nej0UsRFCd9vywS75l0S86A3gLi suLGHZByQ9dPh9x5CeinZ30XSx4fH8MRWzjj12UKjPt/Lhfkp31NbnPqcIvflweabZTjRf paEK8PTGMxYg7hsmA/8z0kMb9pFQOA4= X-Rspam-User: Authentication-Results: imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 3DA8740021 X-Stat-Signature: 18s1dyassyeezirno8khmyaqqqdgimge X-HE-Tag: 1664020402-273721 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: On 2022/9/21 17:13, Naoya Horiguchi wrote: > 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 > --- > 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 Is header file "linux/swap.h" already unneeded before the code change? It seems there's no code change in that file. > -#include > +#include > > #include > #include > diff --git a/include/linux/mm.h b/include/linux/mm.h > index c2277f5aba9e..80a2d800f272 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -3279,11 +3279,16 @@ extern atomic_long_t num_poisoned_pages __read_mostly; > 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); > +extern void num_poisoned_pages_inc(void); > #else > static inline int __get_huge_page_for_hwpoison(unsigned long pfn, int flags) > { > 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 5942e1c0407e..aa6ce685b863 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; > > +static inline void num_poisoned_pages_inc(void) This function is defined as "static inline" while it's "extern void num_poisoned_pages_inc(void)" in the header file. Is this expected? Thanks, Miaohe Lin > +{ > + 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, >