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 E1F9EC43334 for ; Tue, 5 Jul 2022 03:49:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 280A76B0071; Mon, 4 Jul 2022 23:49:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 230C36B0073; Mon, 4 Jul 2022 23:49:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0D23A6B0074; Mon, 4 Jul 2022 23:49:13 -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 EEDA16B0071 for ; Mon, 4 Jul 2022 23:49:12 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 9E14E3547F for ; Tue, 5 Jul 2022 03:49:12 +0000 (UTC) X-FDA: 79651665744.24.0D3C450 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by imf08.hostedemail.com (Postfix) with ESMTP id 3D0A0160039 for ; Tue, 5 Jul 2022 03:49:11 +0000 (UTC) Received: by mail-pg1-f176.google.com with SMTP id 68so10316574pgb.10 for ; Mon, 04 Jul 2022 20:49:10 -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=v8W5VXSsMR9SIWfIFdd/+qIMKQzpXYNtEC9shhUXWyA=; b=yTwRafuNQfMiOZKlJUe3g3ODrRNEvzMm28lOhNj1X0MgwQODD9lPwqJ5LYMSEnuVwD K8bV07NN4UeyNpGqBlKha/cGRnSuFHQU0g4Wu0Iackun2GyW5x7h1KvMO4dQzhQif9fS ZBsrWVnb4EMtA+LecCu7h0U0AuR0WQIX9ywup/Sb8UXLwuA8A3HPibNgriXtYKqRiwAc xxfl291CLwWlJIFmy6V+dnHkf6wW2iJ6sIou6jyo/m8Vtt6ueqFrlJHpey2yfGn1xXqw AYQDPvPoL/5yl/t8aBv6lpWeF0oLjTps0AYVCqrHL58Ce6pUj1ZltI6MpdyvVJttCqeE 446Q== 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=v8W5VXSsMR9SIWfIFdd/+qIMKQzpXYNtEC9shhUXWyA=; b=L/fj2kHi+Ws6/yDWpDqmZCPHg6XRFhh/MvHZZiunTOXzSr+F5O3qbEXrxCaKWmRHTh WkZel0unx66ByxoDKDPvhrZdY1ji6iIeY4haksou0/8nEegF0jurj4D2/WqADEkyWf1h Fn6y8JSnQr3uM2QBiHyz9R7R+s/Kvvw0wWlxEsGuUWba8zW/u4ZEUQU5FsXnl4VLWwXL QUbuNIkeIe0G8WNvHkFMp+hpqM4JfqkWhbcpLNIgOsHPXyEd3GO/S0ayd4eGD8AcFVxq swPXRzYJIbCF/Z4iqVdy59Mcg+A/+GEW6NMRHt0gwU0oWYw0MvKPZtvx/zhsKJ/H7ouk ARCA== X-Gm-Message-State: AJIora9Ic6fHh2SshRV1QT1FJlhBBmI+OEgqKaCrdL1c3GHvC6etcJIt Reg8D94kUMZnlvwDowq0ZOrzeQ== X-Google-Smtp-Source: AGRyM1uKg1CAEOtf50oeywo6H4iwYYQyg4ajAsUic6maJyQPqlo+e65AJ5ML4Y2oBCkIVlDDQwz3hw== X-Received: by 2002:a63:64c1:0:b0:411:e736:a790 with SMTP id y184-20020a6364c1000000b00411e736a790mr16838370pgb.45.1656992949862; Mon, 04 Jul 2022 20:49:09 -0700 (PDT) Received: from C02FT5A6MD6R.bytedance.net ([61.120.150.78]) by smtp.gmail.com with ESMTPSA id p5-20020aa78605000000b0052527ca27b2sm22484842pfn.143.2022.07.04.20.49.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Jul 2022 20:49:09 -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 v2] mm, hugetlb: skip irrelevant nodes in show_free_areas() Date: Tue, 5 Jul 2022 11:48:40 +0800 Message-Id: <20220705034841.40931-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; imf08.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=yTwRafuN; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf08.hostedemail.com: domain of ligang.bdlg@bytedance.com designates 209.85.215.176 as permitted sender) smtp.mailfrom=ligang.bdlg@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1656992952; a=rsa-sha256; cv=none; b=lvgfgTjSGpEI9huxdjvzSm8on4N8wgZZW6+6tPYgcOYVSGQ7aFINJzUpEBM/hfxsoLNnJ1 sVxqdzi3knmiaLKq2vzBEMuhWrkxLvYbDyaxjUj6MqsZ4BZnA4lWaXqgqCVFfNOQHbc+f8 lJQk3H8orQlSPjfH3G+lA8k87mjG+8g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1656992952; 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=v8W5VXSsMR9SIWfIFdd/+qIMKQzpXYNtEC9shhUXWyA=; b=VRmhyw9Rnx/6wiSZBp2j3y8OCRgnsr1m2CxWRrfgZREdjcSVoKFEZdQALdMtQQnTJ+QUNB 0a4/k2Y+5jZRV5Gh1PCgocwa0oe51XHAew55rHWT1AXS4L/BQoFDcNgSxFBiVWlaW3h8hV FmC6xulmr8bdRwtL/FHRx56iMBZlYXM= Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=yTwRafuN; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf08.hostedemail.com: domain of ligang.bdlg@bytedance.com designates 209.85.215.176 as permitted sender) smtp.mailfrom=ligang.bdlg@bytedance.com X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: 4kr7eze9m9urcnzcgp7o8bgnwfd47ntr X-Rspamd-Queue-Id: 3D0A0160039 X-HE-Tag: 1656992951-771883 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. And replace hugetlb_show_meminfo() with hugetlb_show_meminfo_node(nid). Signed-off-by: Gang Li --- v2: replace hugetlb_show_meminfo() with hugetlb_show_meminfo_node(nid) to avoid exporting show_mem_node_skip. --- include/linux/hugetlb.h | 4 ++-- mm/hugetlb.c | 21 ++++++++------------- mm/page_alloc.c | 10 ++++++++-- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 29c4d0883d36..21795e62398b 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_node(int nid); 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); @@ -301,7 +301,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_node(int nid) { } diff --git a/mm/hugetlb.c b/mm/hugetlb.c index ca081078e814..c87049c4126e 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -4490,22 +4490,17 @@ 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_node(int nid) { struct hstate *h; - int nid; - if (!hugepages_supported()) - return; - - for_each_node_state(nid, N_MEMORY) - for_each_hstate(h) - pr_info("Node %d hugepages_total=%u hugepages_free=%u hugepages_surp=%u hugepages_size=%lukB\n", - nid, - h->nr_huge_pages_node[nid], - h->free_huge_pages_node[nid], - h->surplus_huge_pages_node[nid], - huge_page_size(h) / SZ_1K); + for_each_hstate(h) + pr_info("Node %d hugepages_total=%u hugepages_free=%u hugepages_surp=%u hugepages_size=%lukB\n", + nid, + h->nr_huge_pages_node[nid], + 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 2eb6ad5a650a..684c2e410923 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6014,7 +6014,7 @@ static void show_migration_types(unsigned char type) void show_free_areas(unsigned int filter, nodemask_t *nodemask) { unsigned long free_pcp = 0; - int cpu; + int cpu, nid; struct zone *zone; pg_data_t *pgdat; @@ -6202,7 +6202,13 @@ void show_free_areas(unsigned int filter, nodemask_t *nodemask) printk(KERN_CONT "= %lukB\n", K(total)); } - hugetlb_show_meminfo(); + if (hugepages_supported()) { + for_each_node_state(nid, N_MEMORY) { + if (show_mem_node_skip(filter, nid, nodemask)) + continue; + hugetlb_show_meminfo_node(nid); + } + } printk("%ld total pagecache pages\n", global_node_page_state(NR_FILE_PAGES)); -- 2.20.1