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 420DDC04A95 for ; Wed, 28 Sep 2022 07:56:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A5D028E0130; Wed, 28 Sep 2022 03:56:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9E4768E0120; Wed, 28 Sep 2022 03:56:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 85F3D8E0130; Wed, 28 Sep 2022 03:56:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 73EDC8E0120 for ; Wed, 28 Sep 2022 03:56:39 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 43DDE12114D for ; Wed, 28 Sep 2022 07:56:39 +0000 (UTC) X-FDA: 79960737318.28.BAB6FF3 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by imf16.hostedemail.com (Postfix) with ESMTP id E7F0E18000A for ; Wed, 28 Sep 2022 07:56:36 +0000 (UTC) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4McpcH4fRlz1P6mv; Wed, 28 Sep 2022 15:52:15 +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; Wed, 28 Sep 2022 15:56:31 +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> <4b7c327a-547e-be8b-4568-745fabe74641@huawei.com> <20220928020511.GB597297@u2004.lan> From: Miaohe Lin Message-ID: Date: Wed, 28 Sep 2022 15:56:30 +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: <20220928020511.GB597297@u2004.lan> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.151.185] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664351798; a=rsa-sha256; cv=none; b=YE1W2waOQ374uYnbfvFLEh9IrKA9ibcCVIaRsb25bm/WTOG80F9kJqM2acaFXbMKMZLfUf CX0zsrFe49DkoqPMhrtx3AT2zq7FpjyfbfxqZWpAYOQ/pQ7f+0QaYJbLAsQPTtuxBJPC7F 9iY6TzSZn3wckQuHrC1UF9WFVtTl2G0= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664351798; 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=/DDUzLSa0sjyRsZJGPJjM4IEHP3GujjyAxVjENDGhA0=; b=7KroUU+3LN+HnaxU/UHOmA01S7gMPfKLE5sh0J/R+5tN0htRQ4omMLH5alWZMXLpntB1zG sPavfh1T7IRHwadU1Z1rrd3x5W2eoHOm+PqEh7fXNx/x0SvBQSxzKOF49Msxi8NDr32oQi 7H8fbsFi1EAlyRgcyMSb8gyI++Ue0d8= X-Rspamd-Queue-Id: E7F0E18000A X-Rspam-User: Authentication-Results: imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com X-Rspamd-Server: rspam06 X-Stat-Signature: kzsg7ikoy7rrm89ejfxou73u9psn5t5m X-HE-Tag: 1664351796-532160 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/28 10:05, Naoya Horiguchi wrote: > On Sat, Sep 24, 2022 at 07:53:15PM +0800, Miaohe Lin wrote: >> 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. > > Maybe yes. I updated this line too because it's introduced together > swapops.h by the following commit. > > commit 0e5a7ff6e36ad58933d076ddcac36ff14d014692 > Author: Helge Deller > Date: Fri Jul 24 19:17:52 2020 +0200 > > parisc: Report bad pages as HardwareCorrupted > I see. Many thanks for your explanation. >> >>> -#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? > > No. 4/4 effectively fixes it, but I should've done this in this patch. > Thank you, > - Naoya Horiguchi Then this patch looks good to me. Thanks. Reviewed-by: Miaohe Lin Thanks, Miaohe Lin