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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 019F2C7EE23 for ; Mon, 29 May 2023 14:24:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230100AbjE2OY0 (ORCPT ); Mon, 29 May 2023 10:24:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229667AbjE2OYX (ORCPT ); Mon, 29 May 2023 10:24:23 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 749BAA0 for ; Mon, 29 May 2023 07:24:21 -0700 (PDT) Received: from dggpemm500001.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4QVHmh030kzLmPC; Mon, 29 May 2023 22:22:44 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 29 May 2023 22:24:17 +0800 From: Kefeng Wang To: Andrew Morton , , CC: Kefeng Wang , Baoquan He Subject: [PATCH -next] mm: page_alloc: simplify has_managed_dma() Date: Mon, 29 May 2023 22:40:22 +0800 Message-ID: <20230529144022.42927-1-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The ZONE_DMA should only exists on Node 0, only check NODE_DATA(0) is enough, so simplify has_managed_dma() and make it inline. Cc: Baoquan He Signed-off-by: Kefeng Wang --- include/linux/mmzone.h | 21 +++++++++++---------- mm/page_alloc.c | 15 --------------- 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 5a7ada0413da..48e9fd8eccb4 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1503,16 +1503,6 @@ static inline int is_highmem(struct zone *zone) return is_highmem_idx(zone_idx(zone)); } -#ifdef CONFIG_ZONE_DMA -bool has_managed_dma(void); -#else -static inline bool has_managed_dma(void) -{ - return false; -} -#endif - - #ifndef CONFIG_NUMA extern struct pglist_data contig_page_data; @@ -1527,6 +1517,17 @@ static inline struct pglist_data *NODE_DATA(int nid) #endif /* !CONFIG_NUMA */ +static inline bool has_managed_dma(void) +{ +#ifdef CONFIG_ZONE_DMA + struct zone *zone = NODE_DATA(0)->node_zones + ZONE_DMA; + + if (managed_zone(zone)) + return true; +#endif + return false; +} + extern struct pglist_data *first_online_pgdat(void); extern struct pglist_data *next_online_pgdat(struct pglist_data *pgdat); extern struct zone *next_zone(struct zone *zone); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index e671c747892f..e847b39939b8 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6613,18 +6613,3 @@ bool put_page_back_buddy(struct page *page) return ret; } #endif - -#ifdef CONFIG_ZONE_DMA -bool has_managed_dma(void) -{ - struct pglist_data *pgdat; - - for_each_online_pgdat(pgdat) { - struct zone *zone = &pgdat->node_zones[ZONE_DMA]; - - if (managed_zone(zone)) - return true; - } - return false; -} -#endif /* CONFIG_ZONE_DMA */ -- 2.35.3