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 D2501C43334 for ; Tue, 5 Jul 2022 09:21:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5BE296B0071; Tue, 5 Jul 2022 05:21:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 56EC76B0073; Tue, 5 Jul 2022 05:21:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 435806B0074; Tue, 5 Jul 2022 05:21:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 34FD26B0071 for ; Tue, 5 Jul 2022 05:21:31 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 01E9233737 for ; Tue, 5 Jul 2022 09:21:30 +0000 (UTC) X-FDA: 79652503182.15.B1993C5 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by imf28.hostedemail.com (Postfix) with ESMTP id 7266AC0056 for ; Tue, 5 Jul 2022 09:21:30 +0000 (UTC) Received: by mail-pj1-f45.google.com with SMTP id y14-20020a17090a644e00b001ef775f7118so7803460pjm.2 for ; Tue, 05 Jul 2022 02:21:30 -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=LgwF/oY7NUpKw/Y/fMnLZAeLVExnQU2R9m9v7nVaDfc=; b=QFcU4rwbVJLltnJDdJe0qNVzQqeQSyTrpb6QqV+dnZ6F/eKt9/zSvyqo9YgLi8aUlW SuB/BeRaKA1BBQcU0P4C72BEzZy2gLXEQa0SOH7g4238RuKwe7BdrFZ4fMwXnDVDNzOF AhOvTt4Z1FPlOytEFYw9q3OfPJp4O/gfdmhYkyXPLE3hPSRNIgHOpXZrUPXQihKQnnQy VG1ieRoDAEnE0dhWfCYMo4S6Z7WmDIuA37dFiw1b5xBV5OZPXSsaOsl70r2yyYXkkvcS S/OlK7zmlXNJLKWccNLomxHSNFRAnAroETwsCZNN/06LrdpVo6ej0pN3DLaq9IzvxKit rg7A== 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=LgwF/oY7NUpKw/Y/fMnLZAeLVExnQU2R9m9v7nVaDfc=; b=nUEDijPqDGMdEffF8UHphijUJ7D9HRbZy8hFW0yppDRiOXwZ/ZgLqzlI23GWq06dzr I5WSYojLb+WZlQDPvjpvH5fj10znvS4Ior80/kdjY6RgounSC4YI1jWGKIWScFWFn9r/ JXmPLdSG130wGj221NrN9BZSxSUba1ZaNNuhSbHh8e02I4qdkJNGLcwDZhHTlf/UMC1O zbVzPIh+dEcLCvbpKR9wf6Gmo2pCw2CaKDigADHLZXe8wcWjXWTvs7EQsadut1M9enX6 wvVVmbXhOKKJDlwIN+aTQYTlsIK8U2ocK1MY3lY9EwoFiLeT1PI10j6FBDzQj5C6skNR 7H3g== X-Gm-Message-State: AJIora+VvBgowWb6BKfFgGYgYDzYiohuZgt2nteNyWDDQPS5bM5hYrJw 8Us+OyCaF8FHpSGVFVum87CD0g== X-Google-Smtp-Source: AGRyM1tGo7DPRa4WK2JmH6Fn7rMd2tCaLxNf/EeSOMS0olIUAncthgFKn+tGrFH4UrwYMNKpwFDjbg== X-Received: by 2002:a17:90b:4d05:b0:1e0:b53:f4a3 with SMTP id mw5-20020a17090b4d0500b001e00b53f4a3mr42262948pjb.3.1657012889165; Tue, 05 Jul 2022 02:21:29 -0700 (PDT) Received: from C02FT5A6MD6R.bytedance.net ([61.120.150.78]) by smtp.gmail.com with ESMTPSA id n19-20020a635913000000b0040df0c9a1aasm16816025pgb.14.2022.07.05.02.21.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jul 2022 02:21:28 -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 v3] mm, hugetlb: skip irrelevant nodes in show_free_areas() Date: Tue, 5 Jul 2022 17:21:19 +0800 Message-Id: <20220705092120.2158-1-ligang.bdlg@bytedance.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1657012890; a=rsa-sha256; cv=none; b=rDgkMui0VXYRsKs8HqS2jaL4YI5Epy3Nhv8fKgqCqfKvj2Jz3kFjWLudENane3He3VtgjE GPRVGgkhe067eCt12MPYHehY8jsW1b+mFXCjOU74siv/PKWGvRRPNhAwB0rps7SJ6aHuaJ t+u8vxIHiOYIoPjs9kXCcsyoQwU6ZzI= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=QFcU4rwb; spf=pass (imf28.hostedemail.com: domain of ligang.bdlg@bytedance.com designates 209.85.216.45 as permitted sender) smtp.mailfrom=ligang.bdlg@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1657012890; 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=LgwF/oY7NUpKw/Y/fMnLZAeLVExnQU2R9m9v7nVaDfc=; b=LsB/GpLFwZMv5eEqi1MK/izA8kjBkvhqICpwUwvfZ8D31Ys/omsqeJzjmaucXW5Jpv9bGZ SjKNrE5lTZod818E5VCPwBwDNMTEEsccViGYT7Y+q+xT/a8qcNXyLqH0tflieVn5gmOQnp gil7kE8fRIReSNIIaJ77mpOzBMRpv20= X-Stat-Signature: zsg6nxhpz9bh4pmorrnmcwua6pd143w5 X-Rspamd-Queue-Id: 7266AC0056 Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=QFcU4rwb; spf=pass (imf28.hostedemail.com: domain of ligang.bdlg@bytedance.com designates 209.85.216.45 as permitted sender) smtp.mailfrom=ligang.bdlg@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1657012890-362483 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 shows 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 --- v3: move for_each_hstate() into hugetlb_show_meminfo_node(). 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 | 18 ++++++++---------- mm/page_alloc.c | 8 ++++++-- 3 files changed, 16 insertions(+), 14 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..e7f12edb120c 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -4490,22 +4490,20 @@ 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) + printk("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..93f032f32812 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,11 @@ void show_free_areas(unsigned int filter, nodemask_t *nodemask) printk(KERN_CONT "= %lukB\n", K(total)); } - hugetlb_show_meminfo(); + for_each_online_node(nid) { + 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