Received: by 2002:a05:6602:18e:0:0:0:0 with SMTP id m14csp2169123ioo; Mon, 23 May 2022 11:44:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZ+gF/ateXbmxSYSr1nFfod3xU5NgfCLbfiHuN4rJoF9ZtWLM/yHFnBcbYAwIEE20wdwiw X-Received: by 2002:a17:90a:43c2:b0:1df:e4da:ece7 with SMTP id r60-20020a17090a43c200b001dfe4daece7mr359959pjg.83.1653331477162; Mon, 23 May 2022 11:44:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653331477; cv=none; d=google.com; s=arc-20160816; b=pHTLcgeZx9t6fMx3g24E3WwHDR3zPReP2JVKxkd7b/MU5Zzq9OObi4cAhrRiHihQq7 qaH4mjA3eWlIk6VcEiHzD3XqageodUjqDmo36MCpeLYBO+OeZpaIG4BxR8C/coJ/XsJB SQE9G3rA3xnnf5EzxASyZCWeCXyRyVAboHkzHr+5xqg+H0rHvHt5O/Ji1oG95Zmuy8uM 2OH/DMxXwlXM1GcPpJ2Ws3A62lDI1yST5bMoBo40XlE2RbERVz2FOInq3nu8082AV2ux sG/soZ6QZCis6tdgPxu1oqhovE6Iffnaqq4XeJKkLL+9F/e+1Ryc/Ryv0wk5gQn7Kg9h hHpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:dkim-signature:date; bh=y6AuiAvuIyM/CsUH/CMnODyxFz/bShUF1rnQJYrljlE=; b=LoT34d3ID6iFvW49EHsZKwoyBadw0hOZUGoW3yH4Cemw7V49QDyUQVzIKIP10EvLsL /55fzedltpRmEovFXqFEsOenY5GqeeZYlI0RgVCnVaqo3JHxX7aEjMgRaVeIKlC7AE/v vv5md+e8lu71pEAsU09gEAxn0KJkWk4KCFf6LVX8qsD5PJrccGfZj9FFqfE2Q1JnFD3c 9jqWdnOq1dlJFUKGelVAw84UwOdQYWcG+FKjR3N8Yal7wL4lgwRpbrz30s6ijLdEkZts TXThgHPL/BQcjtnBpiDcrsapTWL/3OMLbcc4Of4JhgG4WmYhC2B7CFFxgxQGUqU3wMIl hRBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=EgEHgh8d; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id u17-20020a170902e81100b00153b640ed90si12959313plg.38.2022.05.23.11.44.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 May 2022 11:44:37 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=EgEHgh8d; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CB20B2AE7; Mon, 23 May 2022 11:44:10 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242940AbiEWSns (ORCPT + 99 others); Mon, 23 May 2022 14:43:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243598AbiEWSnH (ORCPT ); Mon, 23 May 2022 14:43:07 -0400 Received: from out1.migadu.com (out1.migadu.com [IPv6:2001:41d0:2:863f::]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BFB2C1EF9 for ; Mon, 23 May 2022 11:24:19 -0700 (PDT) Date: Mon, 23 May 2022 11:24:10 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1653330257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=y6AuiAvuIyM/CsUH/CMnODyxFz/bShUF1rnQJYrljlE=; b=EgEHgh8dujAvL0awiHz7W9jnUr9lrdkpRQI8FNd8Jw4Rb3+MzhrF3fkkdCCAW9xmT8lna2 fwkiqqnW8jcQCyIDuk5vYnVjthtO7IZwTH8T8OEP8t9ZSkABL0mBx2SoqxaMUtv3is4EnE Vo/o4XkWmZkIhnYIpYL1wJaXtgWw2QE= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Roman Gushchin To: Muchun Song Cc: Andrew Morton , linux-mm@kvack.org, Dave Chinner , linux-kernel@vger.kernel.org, Kent Overstreet , Hillf Danton , Christophe JAILLET Subject: Re: [PATCH v3 2/6] mm: shrinkers: introduce debugfs interface for memory shrinkers Message-ID: References: <20220509183820.573666-1-roman.gushchin@linux.dev> <20220509183820.573666-3-roman.gushchin@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: linux.dev X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, May 22, 2022 at 06:36:56PM +0800, Muchun Song wrote: > On Mon, May 09, 2022 at 11:38:16AM -0700, Roman Gushchin wrote: > > This commit introduces the /sys/kernel/debug/shrinker debugfs > > interface which provides an ability to observe the state of > > individual kernel memory shrinkers. > > > > Because the feature adds some memory overhead (which shouldn't be > > large unless there is a huge amount of registered shrinkers), it's > > guarded by a config option (enabled by default). > > > > This commit introduces the "count" interface for each shrinker > > registered in the system. > > > > The output is in the following format: > > Hi Roman, Hi Muchun! Thank you for taking a look! > > Shoud we print a title to show what those numbers mean? In this case, > it is more understandable. No, I don't think so: this interface is not supposed to be used by an average user and those who will be using it can refer to the provided documentation. Printing the header each time will add some overhead for no good reason. > > ... > > ... > > ... > > > > To reduce the size of output on machines with many thousands cgroups, > > if the total number of objects on all nodes is 0, the line is omitted. > > > > If the shrinker is not memcg-aware or CONFIG_MEMCG is off, 0 is > > printed as cgroup inode id. If the shrinker is not numa-aware, 0's are > > printed for all nodes except the first one. > > > > This commit gives debugfs entries simple numeric names, which are not > > very convenient. The following commit in the series will provide > > shrinkers with more meaningful names. > > > > Signed-off-by: Roman Gushchin > > --- > > include/linux/shrinker.h | 19 ++++- > > lib/Kconfig.debug | 9 +++ > > mm/Makefile | 1 + > > mm/shrinker_debug.c | 171 +++++++++++++++++++++++++++++++++++++++ > > mm/vmscan.c | 6 +- > > 5 files changed, 203 insertions(+), 3 deletions(-) > > create mode 100644 mm/shrinker_debug.c > > > > diff --git a/include/linux/shrinker.h b/include/linux/shrinker.h > > index 76fbf92b04d9..2ced8149c513 100644 > > --- a/include/linux/shrinker.h > > +++ b/include/linux/shrinker.h > > @@ -72,6 +72,10 @@ struct shrinker { > > #ifdef CONFIG_MEMCG > > /* ID in shrinker_idr */ > > int id; > > +#endif > > +#ifdef CONFIG_SHRINKER_DEBUG > > + int debugfs_id; > > + struct dentry *debugfs_entry; > > #endif > > /* objs pending delete, per node */ > > atomic_long_t *nr_deferred; > > @@ -94,4 +98,17 @@ extern int register_shrinker(struct shrinker *shrinker); > > extern void unregister_shrinker(struct shrinker *shrinker); > > extern void free_prealloced_shrinker(struct shrinker *shrinker); > > extern void synchronize_shrinkers(void); > > -#endif > > + > > +#ifdef CONFIG_SHRINKER_DEBUG > > +extern int shrinker_debugfs_add(struct shrinker *shrinker); > > +extern void shrinker_debugfs_remove(struct shrinker *shrinker); > > +#else /* CONFIG_SHRINKER_DEBUG */ > > +static inline int shrinker_debugfs_add(struct shrinker *shrinker) > > +{ > > + return 0; > > +} > > +static inline void shrinker_debugfs_remove(struct shrinker *shrinker) > > +{ > > +} > > +#endif /* CONFIG_SHRINKER_DEBUG */ > > +#endif /* _LINUX_SHRINKER_H */ > > diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug > > index 3fd7a2e9eaf1..5fa65a649798 100644 > > --- a/lib/Kconfig.debug > > +++ b/lib/Kconfig.debug > > @@ -733,6 +733,15 @@ config SLUB_STATS > > out which slabs are relevant to a particular load. > > Try running: slabinfo -DA > > > > +config SHRINKER_DEBUG > > + default y > > + bool "Enable shrinker debugging support" > > + depends on DEBUG_FS > > + help > > + Say Y to enable the shrinker debugfs interface which provides > > + visibility into the kernel memory shrinkers subsystem. > > + Disable it to avoid an extra memory footprint. > > + > > config HAVE_DEBUG_KMEMLEAK > > bool > > > > diff --git a/mm/Makefile b/mm/Makefile > > index 298c9991ab75..8083fa85a348 100644 > > --- a/mm/Makefile > > +++ b/mm/Makefile > > @@ -133,3 +133,4 @@ obj-$(CONFIG_PAGE_REPORTING) += page_reporting.o > > obj-$(CONFIG_IO_MAPPING) += io-mapping.o > > obj-$(CONFIG_HAVE_BOOTMEM_INFO_NODE) += bootmem_info.o > > obj-$(CONFIG_GENERIC_IOREMAP) += ioremap.o > > +obj-$(CONFIG_SHRINKER_DEBUG) += shrinker_debug.o > > diff --git a/mm/shrinker_debug.c b/mm/shrinker_debug.c > > new file mode 100644 > > index 000000000000..fd1f805a581a > > --- /dev/null > > +++ b/mm/shrinker_debug.c > > @@ -0,0 +1,171 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > + > > +/* defined in vmscan.c */ > > +extern struct rw_semaphore shrinker_rwsem; > > +extern struct list_head shrinker_list; > > + > > +static DEFINE_IDA(shrinker_debugfs_ida); > > +static struct dentry *shrinker_debugfs_root; > > + > > +static unsigned long shrinker_count_objects(struct shrinker *shrinker, > > + struct mem_cgroup *memcg, > > + unsigned long *count_per_node) > > +{ > > + unsigned long nr, total = 0; > > + int nid; > > + > > + for_each_node(nid) { > > + if (nid == 0 || (shrinker->flags & SHRINKER_NUMA_AWARE)) { > > + struct shrink_control sc = { > > + .gfp_mask = GFP_KERNEL, > > + .nid = nid, > > + .memcg = memcg, > > + }; > > + > > + nr = shrinker->count_objects(shrinker, &sc); > > + if (nr == SHRINK_EMPTY) > > + nr = 0; > > + } else { > > + nr = 0; > > For efficiency, we could break here, right? Not really, we need to fill count_per_node[] with zeros. > > > + } > > + > > + count_per_node[nid] = nr; > > + total += nr; > > + } > > + > > + return total; > > +} > > + > > +static int shrinker_debugfs_count_show(struct seq_file *m, void *v) > > +{ > > + struct shrinker *shrinker = (struct shrinker *)m->private; > > Maybe we cound drop the cast since m->private is a void * type. Ok. > > > + unsigned long *count_per_node = NULL; > > Do not need to be initialized, right? Right, will fix in v4. > > > + struct mem_cgroup *memcg; > > + unsigned long total; > > + bool memcg_aware; > > + int ret, nid; > > + > > + count_per_node = kcalloc(nr_node_ids, sizeof(unsigned long), GFP_KERNEL); > > + if (!count_per_node) > > + return -ENOMEM; > > + > > + ret = down_read_killable(&shrinker_rwsem); > > + if (ret) { > > + kfree(count_per_node); > > + return ret; > > + } > > + rcu_read_lock(); > > + > > + memcg_aware = shrinker->flags & SHRINKER_MEMCG_AWARE; > > + > > + memcg = mem_cgroup_iter(NULL, NULL, NULL); > > + do { > > + if (memcg && !mem_cgroup_online(memcg)) > > + continue; > > + > > + total = shrinker_count_objects(shrinker, > > + memcg_aware ? memcg : NULL, > > + count_per_node); > > + if (total) { > > + seq_printf(m, "%lu", mem_cgroup_ino(memcg)); > > + for_each_node(nid) > > + seq_printf(m, " %lu", count_per_node[nid]); > > + seq_puts(m, "\n"); > > seq_putc(m, '\n') is more efficient. Ok. > > > + } > > + > > + if (!memcg_aware) { > > + mem_cgroup_iter_break(NULL, memcg); > > + break; > > + } > > + > > + if (signal_pending(current)) { > > + mem_cgroup_iter_break(NULL, memcg); > > + ret = -EINTR; > > + break; > > + } > > + > > + cond_resched(); > > We are in rcu read lock, cannot be scheduled, right? This is a good one, thanks. Fixed. > > > + } while ((memcg = mem_cgroup_iter(NULL, memcg, NULL)) != NULL); > > + > > + rcu_read_unlock(); > > + up_read(&shrinker_rwsem); > > + > > + kfree(count_per_node); > > + return ret; > > +} > > +DEFINE_SHOW_ATTRIBUTE(shrinker_debugfs_count); > > + > > +int shrinker_debugfs_add(struct shrinker *shrinker) > > +{ > > + struct dentry *entry; > > + char buf[16]; > > + int id; > > + > > + lockdep_assert_held(&shrinker_rwsem); > > + > > + /* debugfs isn't initialized yet, add debugfs entries later. */ > > + if (!shrinker_debugfs_root) > > + return 0; > > + > > + id = ida_alloc(&shrinker_debugfs_ida, GFP_KERNEL); > > + if (id < 0) > > + return id; > > + shrinker->debugfs_id = id; > > + > > + snprintf(buf, sizeof(buf), "%d", id); > > + > > + /* create debugfs entry */ > > + entry = debugfs_create_dir(buf, shrinker_debugfs_root); > > + if (IS_ERR(entry)) { > > + ida_free(&shrinker_debugfs_ida, id); > > + return PTR_ERR(entry); > > + } > > + shrinker->debugfs_entry = entry; > > + > > + debugfs_create_file("count", 0220, entry, shrinker, > > + &shrinker_debugfs_count_fops); > > + return 0; > > +} > > + > > +void shrinker_debugfs_remove(struct shrinker *shrinker) > > +{ > > + lockdep_assert_held(&shrinker_rwsem); > > + > > + if (!shrinker->debugfs_entry) > > + return; > > + > > + debugfs_remove_recursive(shrinker->debugfs_entry); > > + ida_free(&shrinker_debugfs_ida, shrinker->debugfs_id); > > +} > > + > > +static int __init shrinker_debugfs_init(void) > > +{ > > + struct shrinker *shrinker; > > + int ret; > > + > > + if (!debugfs_initialized()) > > + return -ENODEV; > > + > > Redundant check since it is checked in debugfs_create_dir(). > So I think we could remove this. > > > + shrinker_debugfs_root = debugfs_create_dir("shrinker", NULL); > > We should use IS_ERR() to detect the error code. So the following > check is wrong. Right, will fix in the next version. > > > + if (!shrinker_debugfs_root) > > + return -ENOMEM; > > + > > + /* Create debugfs entries for shrinkers registered at boot */ > > + ret = down_write_killable(&shrinker_rwsem); > > How could we kill this process? IIUC, late_initcall() is called > from early init process, there is no way to kill this. Right? > If yes, I think we could just use down_write(). Ok, agree. Thanks!