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 23485C433EF for ; Wed, 22 Jun 2022 04:01:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A80FF8E007D; Wed, 22 Jun 2022 00:01:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A09F18E006E; Wed, 22 Jun 2022 00:01:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 883DE8E007D; Wed, 22 Jun 2022 00:01:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 7595B8E006E for ; Wed, 22 Jun 2022 00:01:48 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 4B209212F8 for ; Wed, 22 Jun 2022 04:01:47 +0000 (UTC) X-FDA: 79604523096.11.90F0B43 Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by imf27.hostedemail.com (Postfix) with ESMTP id F0EFB400A1 for ; Wed, 22 Jun 2022 04:01:40 +0000 (UTC) Received: by mail-pg1-f175.google.com with SMTP id h192so14984110pgc.4 for ; Tue, 21 Jun 2022 21:01:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yYa4yiJ07M3lgAUara1ddh2Fl/2EMqAxZqq+KQ/z45A=; b=2yBsnXHi0sJ5gksnfpXBlu6OIcXsiyZ8E3CKsc1rFx/zdoQHwR0GIDkgQoEpHQn5xc 3oahsnfTh5X7fL0qelOXgwPDDCtIjqL3rZl48ID7UDkxXCCHl5Hqma12n/8ce+JSHqwO UiHhuACbNgvHA1pVAfqqMdjeLUE79q9EkUb/8y3GweUvZVQamPv5UaLY0aYMxcZWcM4U 6ZxmCtIQxUpILv6F4BoFY3c6o4jERnG/u2I75R01yyYpwjFJvIIlJ/2F52EQy8+gYe6O XRe3q4aAitZCZ9JSOFc2/Hp7m3E27pGzU8xYvbkQ6pO4xuUyZ8K0Jy1+M96AF2+Nb6NA URFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yYa4yiJ07M3lgAUara1ddh2Fl/2EMqAxZqq+KQ/z45A=; b=aK640RfdH51UyHsLCv3uXKGhDPK5dFhfDgku/SjUSnaia+4rsFiQt5+ird3GoRQjB9 dxXjzYqv23lgJH3ehNy3r72g8tTryAg2NUp9GrjZkytqm9sq0WeilPrmqYRRQ1K6OViw fYmKOFZe3BUqv6R7YO959u10id8Qpf01k7NLTAnFdCoNlqmk+OTFit+oEG+gocQwrADs u20zX+6+QV8DV8tBwmie8ADOh/fUqaH2DhzEvzTi7vjlXxc9yRPEvHqU0G+mG5rkMyF9 U61w2TC9mVCr7j0YWEPwFLDrsopGR+ybFZ9t9rq4gEq5TPCe0nnLXNFlrrGW2DmTY6Gz huYg== X-Gm-Message-State: AJIora+AXbfCPLwFk1J1PDqCybecnHL59f3eM/zn2j7BEyCr/XQSj9yI ZiUwc4YKKM8mdbmCP15tbUqx8w== X-Google-Smtp-Source: AGRyM1vd6fmMfsIYhhjorbNqQH/xakz3eNiYI12x3eZPYGIlasO/NTSUnQBFu+lH5JNe2Bd3nX3K2A== X-Received: by 2002:a63:7a49:0:b0:40c:ca38:aed7 with SMTP id j9-20020a637a49000000b0040cca38aed7mr1192901pgn.11.1655870496958; Tue, 21 Jun 2022 21:01:36 -0700 (PDT) Received: from C02FT5A6MD6R.bytedance.net ([61.120.150.78]) by smtp.gmail.com with ESMTPSA id t66-20020a637845000000b004088f213f68sm12091082pgc.56.2022.06.21.21.01.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 21:01:36 -0700 (PDT) From: Gang Li To: Mike Kravetz , Muchun Song , Andrew Morton Cc: Gang Li , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v1] mm, hugetlb: skip irrelevant nodes in hugetlb_show_meminfo() Date: Wed, 22 Jun 2022 12:00:42 +0800 Message-Id: <20220622040043.25462-1-ligang.bdlg@bytedance.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=2yBsnXHi; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf27.hostedemail.com: domain of ligang.bdlg@bytedance.com designates 209.85.215.175 as permitted sender) smtp.mailfrom=ligang.bdlg@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655870504; 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:references:dkim-signature; bh=yYa4yiJ07M3lgAUara1ddh2Fl/2EMqAxZqq+KQ/z45A=; b=vquBERgWZKXnl0zsESmINryrC8MHiig2pyO7q5feZd0GHtBcOcU61vqWGMPWCf/VJyeoNa iaSifTWv3P8PPqn2mbiBlPpGKM5ZUCNWiPglfRMbWI8T/NnXjN/HRKaMoRlxRHmF4hVg/L HXi0jT8LsIF+Ojc5HwZK4ExHfwqrHkw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655870504; a=rsa-sha256; cv=none; b=Ph0/Q4pIveBbR6EAC6zaaeicudJjdOuHTfnhzPysp6WMqMWJ8h33Cs/KYQqo+yA8A/Rdv5 wWGW33tFFKZPkmWcDZs6CLtQyPejxeubJabs2s5N55mzvUZNLPlICK4t6VgqS0rp87Z2Vx RVJwcRI+Nq6z/VK6bNThr4WAxw/tu+8= X-Rspam-User: Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=2yBsnXHi; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf27.hostedemail.com: domain of ligang.bdlg@bytedance.com designates 209.85.215.175 as permitted sender) smtp.mailfrom=ligang.bdlg@bytedance.com X-Stat-Signature: 8qw9o9k354no9367w3boco781hnqkscw X-Rspamd-Queue-Id: F0EFB400A1 X-Rspamd-Server: rspam12 X-HE-Tag: 1655870500-629866 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: show_free_areas() allows to filter out node specific data which is irrelevant to the allocation request. But hugetlb_show_meminfo() still show hugetlb on all nodes, which is redundant and unnecessary. Use show_mem_node_skip() to skip irrelevant nodes in hugetlb_show_meminfo(). Signed-off-by: Gang Li --- include/linux/hugetlb.h | 4 ++-- include/linux/mm.h | 1 + mm/hugetlb.c | 7 +++++-- mm/page_alloc.c | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 642a39016f9a..1913ac6bf10a 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -155,7 +155,7 @@ void __unmap_hugepage_range_final(struct mmu_gather *tlb, struct page *ref_page, zap_flags_t zap_flags); void hugetlb_report_meminfo(struct seq_file *); int hugetlb_report_node_meminfo(char *buf, int len, int nid); -void hugetlb_show_meminfo(void); +void hugetlb_show_meminfo(unsigned int filter, nodemask_t *nodemask); unsigned long hugetlb_total_pages(void); vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long address, unsigned int flags); @@ -300,7 +300,7 @@ static inline int hugetlb_report_node_meminfo(char *buf, int len, int nid) return 0; } -static inline void hugetlb_show_meminfo(void) +static inline void hugetlb_show_meminfo(unsigned int filter, nodemask_t *nodemask) { } diff --git a/include/linux/mm.h b/include/linux/mm.h index 764dc0fdae5e..f72c1b21cde3 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1873,6 +1873,7 @@ extern void pagefault_out_of_memory(void); */ #define SHOW_MEM_FILTER_NODES (0x0001u) /* disallowed nodes */ +extern bool show_mem_node_skip(unsigned int flags, int nid, nodemask_t *nodemask); extern void show_free_areas(unsigned int flags, nodemask_t *nodemask); #ifdef CONFIG_MMU diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 98492733cc64..632826e6fea5 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -4486,7 +4486,7 @@ int hugetlb_report_node_meminfo(char *buf, int len, int nid) nid, h->surplus_huge_pages_node[nid]); } -void hugetlb_show_meminfo(void) +void hugetlb_show_meminfo(unsigned int filter, nodemask_t *nodemask) { struct hstate *h; int nid; @@ -4494,7 +4494,9 @@ void hugetlb_show_meminfo(void) if (!hugepages_supported()) return; - for_each_node_state(nid, N_MEMORY) + for_each_node_state(nid, N_MEMORY) { + if (show_mem_node_skip(filter, nid, nodemask)) + continue; for_each_hstate(h) pr_info("Node %d hugepages_total=%u hugepages_free=%u hugepages_surp=%u hugepages_size=%lukB\n", nid, @@ -4502,6 +4504,7 @@ void hugetlb_show_meminfo(void) h->free_huge_pages_node[nid], h->surplus_huge_pages_node[nid], huge_page_size(h) / SZ_1K); + } } void hugetlb_report_usage(struct seq_file *m, struct mm_struct *mm) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 84781094b478..5896b5a9101f 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5951,7 +5951,7 @@ void si_meminfo_node(struct sysinfo *val, int nid) * Determine whether the node should be displayed or not, depending on whether * SHOW_MEM_FILTER_NODES was passed to show_free_areas(). */ -static bool show_mem_node_skip(unsigned int flags, int nid, nodemask_t *nodemask) +bool show_mem_node_skip(unsigned int flags, int nid, nodemask_t *nodemask) { if (!(flags & SHOW_MEM_FILTER_NODES)) return false; @@ -6196,7 +6196,7 @@ void show_free_areas(unsigned int filter, nodemask_t *nodemask) printk(KERN_CONT "= %lukB\n", K(total)); } - hugetlb_show_meminfo(); + hugetlb_show_meminfo(filter, nodemask); printk("%ld total pagecache pages\n", global_node_page_state(NR_FILE_PAGES)); -- 2.20.1