From: Qi Zheng <zhengqi.arch@bytedance.com>
To: akpm@linux-foundation.org, david@fromorbit.com, tkhai@ya.ru,
vbabka@suse.cz, roman.gushchin@linux.dev, djwong@kernel.org,
brauner@kernel.org, paulmck@kernel.org, tytso@mit.edu,
steven.price@arm.com, cel@kernel.org, senozhatsky@chromium.org,
yujie.liu@intel.com, gregkh@linuxfoundation.org,
muchun.song@linux.dev
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org,
kvm@vger.kernel.org, xen-devel@lists.xenproject.org,
linux-erofs@lists.ozlabs.org,
linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com,
linux-nfs@vger.kernel.org, linux-mtd@lists.infradead.org,
rcu@vger.kernel.org, netdev@vger.kernel.org,
dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org,
dm-devel@redhat.com, linux-raid@vger.kernel.org,
linux-bcache@vger.kernel.org,
virtualization@lists.linux-foundation.org,
linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org,
linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org,
Qi Zheng <zhengqi.arch@bytedance.com>,
Muchun Song <songmuchun@bytedance.com>
Subject: [PATCH v3 42/49] fs: super: dynamically allocate the s_shrink
Date: Thu, 27 Jul 2023 16:04:55 +0800 [thread overview]
Message-ID: <20230727080502.77895-43-zhengqi.arch@bytedance.com> (raw)
In-Reply-To: <20230727080502.77895-1-zhengqi.arch@bytedance.com>
In preparation for implementing lockless slab shrink, use new APIs to
dynamically allocate the s_shrink, so that it can be freed asynchronously
using kfree_rcu(). Then it doesn't need to wait for RCU read-side critical
section when releasing the struct super_block.
Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com>
Reviewed-by: Muchun Song <songmuchun@bytedance.com>
---
fs/btrfs/super.c | 2 +-
fs/kernfs/mount.c | 2 +-
fs/proc/root.c | 2 +-
fs/super.c | 36 ++++++++++++++++++++----------------
include/linux/fs.h | 2 +-
5 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index cffdd6f7f8e8..4c9c878b0da4 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1519,7 +1519,7 @@ static struct dentry *btrfs_mount_root(struct file_system_type *fs_type,
error = -EBUSY;
} else {
snprintf(s->s_id, sizeof(s->s_id), "%pg", bdev);
- shrinker_debugfs_rename(&s->s_shrink, "sb-%s:%s", fs_type->name,
+ shrinker_debugfs_rename(s->s_shrink, "sb-%s:%s", fs_type->name,
s->s_id);
btrfs_sb(s)->bdev_holder = fs_type;
error = btrfs_fill_super(s, fs_devices, data);
diff --git a/fs/kernfs/mount.c b/fs/kernfs/mount.c
index d49606accb07..2657ff1181f1 100644
--- a/fs/kernfs/mount.c
+++ b/fs/kernfs/mount.c
@@ -256,7 +256,7 @@ static int kernfs_fill_super(struct super_block *sb, struct kernfs_fs_context *k
sb->s_time_gran = 1;
/* sysfs dentries and inodes don't require IO to create */
- sb->s_shrink.seeks = 0;
+ sb->s_shrink->seeks = 0;
/* get root inode, initialize and unlock it */
down_read(&kf_root->kernfs_rwsem);
diff --git a/fs/proc/root.c b/fs/proc/root.c
index a86e65a608da..22b78b28b477 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -188,7 +188,7 @@ static int proc_fill_super(struct super_block *s, struct fs_context *fc)
s->s_stack_depth = FILESYSTEM_MAX_STACK_DEPTH;
/* procfs dentries and inodes don't require IO to create */
- s->s_shrink.seeks = 0;
+ s->s_shrink->seeks = 0;
pde_get(&proc_root);
root_inode = proc_get_inode(s, &proc_root);
diff --git a/fs/super.c b/fs/super.c
index da68584815e4..68b3877af941 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -67,7 +67,7 @@ static unsigned long super_cache_scan(struct shrinker *shrink,
long dentries;
long inodes;
- sb = container_of(shrink, struct super_block, s_shrink);
+ sb = shrink->private_data;
/*
* Deadlock avoidance. We may hold various FS locks, and we don't want
@@ -120,7 +120,7 @@ static unsigned long super_cache_count(struct shrinker *shrink,
struct super_block *sb;
long total_objects = 0;
- sb = container_of(shrink, struct super_block, s_shrink);
+ sb = shrink->private_data;
/*
* We don't call trylock_super() here as it is a scalability bottleneck,
@@ -182,7 +182,7 @@ static void destroy_unused_super(struct super_block *s)
security_sb_free(s);
put_user_ns(s->s_user_ns);
kfree(s->s_subtype);
- free_prealloced_shrinker(&s->s_shrink);
+ shrinker_free(s->s_shrink);
/* no delays needed */
destroy_super_work(&s->destroy_work);
}
@@ -259,16 +259,20 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags,
s->s_time_min = TIME64_MIN;
s->s_time_max = TIME64_MAX;
- s->s_shrink.seeks = DEFAULT_SEEKS;
- s->s_shrink.scan_objects = super_cache_scan;
- s->s_shrink.count_objects = super_cache_count;
- s->s_shrink.batch = 1024;
- s->s_shrink.flags = SHRINKER_NUMA_AWARE | SHRINKER_MEMCG_AWARE;
- if (prealloc_shrinker(&s->s_shrink, "sb-%s", type->name))
+ s->s_shrink = shrinker_alloc(SHRINKER_NUMA_AWARE | SHRINKER_MEMCG_AWARE,
+ "sb-%s", type->name);
+ if (!s->s_shrink)
goto fail;
- if (list_lru_init_memcg(&s->s_dentry_lru, &s->s_shrink))
+
+ s->s_shrink->seeks = DEFAULT_SEEKS;
+ s->s_shrink->scan_objects = super_cache_scan;
+ s->s_shrink->count_objects = super_cache_count;
+ s->s_shrink->batch = 1024;
+ s->s_shrink->private_data = s;
+
+ if (list_lru_init_memcg(&s->s_dentry_lru, s->s_shrink))
goto fail;
- if (list_lru_init_memcg(&s->s_inode_lru, &s->s_shrink))
+ if (list_lru_init_memcg(&s->s_inode_lru, s->s_shrink))
goto fail;
return s;
@@ -326,7 +330,7 @@ void deactivate_locked_super(struct super_block *s)
{
struct file_system_type *fs = s->s_type;
if (atomic_dec_and_test(&s->s_active)) {
- unregister_shrinker(&s->s_shrink);
+ shrinker_free(s->s_shrink);
fs->kill_sb(s);
/*
@@ -599,7 +603,7 @@ struct super_block *sget_fc(struct fs_context *fc,
hlist_add_head(&s->s_instances, &s->s_type->fs_supers);
spin_unlock(&sb_lock);
get_filesystem(s->s_type);
- register_shrinker_prepared(&s->s_shrink);
+ shrinker_register(s->s_shrink);
return s;
share_extant_sb:
@@ -678,7 +682,7 @@ struct super_block *sget(struct file_system_type *type,
hlist_add_head(&s->s_instances, &type->fs_supers);
spin_unlock(&sb_lock);
get_filesystem(type);
- register_shrinker_prepared(&s->s_shrink);
+ shrinker_register(s->s_shrink);
return s;
}
EXPORT_SYMBOL(sget);
@@ -1312,7 +1316,7 @@ int get_tree_bdev(struct fs_context *fc,
down_write(&s->s_umount);
} else {
snprintf(s->s_id, sizeof(s->s_id), "%pg", bdev);
- shrinker_debugfs_rename(&s->s_shrink, "sb-%s:%s",
+ shrinker_debugfs_rename(s->s_shrink, "sb-%s:%s",
fc->fs_type->name, s->s_id);
sb_set_blocksize(s, block_size(bdev));
error = fill_super(s, fc);
@@ -1385,7 +1389,7 @@ struct dentry *mount_bdev(struct file_system_type *fs_type,
down_write(&s->s_umount);
} else {
snprintf(s->s_id, sizeof(s->s_id), "%pg", bdev);
- shrinker_debugfs_rename(&s->s_shrink, "sb-%s:%s",
+ shrinker_debugfs_rename(s->s_shrink, "sb-%s:%s",
fs_type->name, s->s_id);
sb_set_blocksize(s, block_size(bdev));
error = fill_super(s, data, flags & SB_SILENT ? 1 : 0);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 891cf662b26f..500238213fd9 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1232,7 +1232,7 @@ struct super_block {
const struct dentry_operations *s_d_op; /* default d_op for dentries */
- struct shrinker s_shrink; /* per-sb shrinker handle */
+ struct shrinker *s_shrink; /* per-sb shrinker handle */
/* Number of inodes with nlink == 0 but still referenced */
atomic_long_t s_remove_count;
--
2.30.2
next prev parent reply other threads:[~2023-07-27 8:14 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-27 8:04 [PATCH v3 00/49] use refcount+RCU method to implement lockless slab shrink Qi Zheng
2023-07-27 8:04 ` [PATCH v3 01/49] binder: fix memory leak in binder_init() Qi Zheng
2023-07-27 8:04 ` [PATCH v3 02/49] mm: move some shrinker-related function declarations to mm/internal.h Qi Zheng
2023-07-27 8:04 ` [PATCH v3 03/49] mm: vmscan: move shrinker-related code into a separate file Qi Zheng
2023-07-27 8:04 ` [PATCH v3 04/49] mm: shrinker: remove redundant shrinker_rwsem in debugfs operations Qi Zheng
2023-07-28 8:13 ` Simon Horman
2023-07-28 8:19 ` Qi Zheng
2023-07-27 8:04 ` [PATCH v3 05/49] mm: shrinker: add infrastructure for dynamically allocating shrinker Qi Zheng
2023-07-28 12:17 ` Simon Horman
2023-07-29 8:47 ` Qi Zheng
2023-07-27 8:04 ` [PATCH v3 06/49] kvm: mmu: dynamically allocate the x86-mmu shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 07/49] binder: dynamically allocate the android-binder shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 08/49] drm/ttm: dynamically allocate the drm-ttm_pool shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 09/49] xenbus/backend: dynamically allocate the xen-backend shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 10/49] erofs: dynamically allocate the erofs-shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 11/49] f2fs: dynamically allocate the f2fs-shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 12/49] gfs2: dynamically allocate the gfs2-glock shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 13/49] gfs2: dynamically allocate the gfs2-qd shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 14/49] NFSv4.2: dynamically allocate the nfs-xattr shrinkers Qi Zheng
2023-07-27 8:04 ` [PATCH v3 15/49] nfs: dynamically allocate the nfs-acl shrinker Qi Zheng
2023-07-27 9:06 ` Qi Zheng
2023-07-27 8:04 ` [PATCH v3 16/49] nfsd: dynamically allocate the nfsd-filecache shrinker Qi Zheng
2023-07-27 9:08 ` Qi Zheng
2023-07-27 8:04 ` [PATCH v3 17/49] quota: dynamically allocate the dquota-cache shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 18/49] ubifs: dynamically allocate the ubifs-slab shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 19/49] rcu: dynamically allocate the rcu-lazy shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 20/49] rcu: dynamically allocate the rcu-kfree shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 21/49] mm: thp: dynamically allocate the thp-related shrinkers Qi Zheng
2023-07-27 8:04 ` [PATCH v3 22/49] sunrpc: dynamically allocate the sunrpc_cred shrinker Qi Zheng
2023-07-27 9:10 ` Qi Zheng
2023-07-27 8:04 ` [PATCH v3 23/49] mm: workingset: dynamically allocate the mm-shadow shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 24/49] drm/i915: dynamically allocate the i915_gem_mm shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 25/49] drm/msm: dynamically allocate the drm-msm_gem shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 26/49] drm/panfrost: dynamically allocate the drm-panfrost shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 27/49] dm: dynamically allocate the dm-bufio shrinker Qi Zheng
2023-07-27 9:13 ` Qi Zheng
2023-07-27 8:04 ` [PATCH v3 28/49] dm zoned: dynamically allocate the dm-zoned-meta shrinker Qi Zheng
2023-07-27 8:30 ` Damien Le Moal
2023-07-27 8:55 ` Qi Zheng
2023-07-27 10:20 ` Damien Le Moal
2023-07-27 10:32 ` Qi Zheng
2023-07-27 22:59 ` Dave Chinner
2023-07-27 23:48 ` Damien Le Moal
2023-07-27 8:04 ` [PATCH v3 29/49] md/raid5: dynamically allocate the md-raid5 shrinker Qi Zheng
2023-07-27 9:15 ` Qi Zheng
2023-07-27 8:04 ` [PATCH v3 30/49] bcache: dynamically allocate the md-bcache shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 31/49] vmw_balloon: dynamically allocate the vmw-balloon shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 32/49] virtio_balloon: dynamically allocate the virtio-balloon shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 33/49] mbcache: dynamically allocate the mbcache shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 34/49] ext4: dynamically allocate the ext4-es shrinker Qi Zheng
2023-07-27 9:17 ` Qi Zheng
2023-07-27 8:04 ` [PATCH v3 35/49] jbd2,ext4: dynamically allocate the jbd2-journal shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 36/49] nfsd: dynamically allocate the nfsd-client shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 37/49] nfsd: dynamically allocate the nfsd-reply shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 38/49] xfs: dynamically allocate the xfs-buf shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 39/49] xfs: dynamically allocate the xfs-inodegc shrinker Qi Zheng
2023-07-27 8:04 ` [PATCH v3 40/49] xfs: dynamically allocate the xfs-qm shrinker Qi Zheng
2023-07-27 9:19 ` Qi Zheng
2023-07-27 8:04 ` [PATCH v3 41/49] zsmalloc: dynamically allocate the mm-zspool shrinker Qi Zheng
2023-07-27 8:04 ` Qi Zheng [this message]
2023-07-27 8:04 ` [PATCH v3 43/49] mm: shrinker: remove old APIs Qi Zheng
2023-07-27 8:04 ` [PATCH v3 44/49] drm/ttm: introduce pool_shrink_rwsem Qi Zheng
2023-07-27 8:04 ` [PATCH v3 45/49] mm: shrinker: add a secondary array for shrinker_info::{map, nr_deferred} Qi Zheng
2023-07-27 8:04 ` [PATCH v3 46/49] mm: shrinker: make global slab shrink lockless Qi Zheng
2023-07-27 8:05 ` [PATCH v3 47/49] mm: shrinker: make memcg " Qi Zheng
2023-07-27 8:05 ` [PATCH v3 48/49] mm: shrinker: hold write lock to reparent shrinker nr_deferred Qi Zheng
2023-07-27 8:05 ` [PATCH v3 49/49] mm: shrinker: convert shrinker_rwsem to mutex Qi Zheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230727080502.77895-43-zhengqi.arch@bytedance.com \
--to=zhengqi.arch@bytedance.com \
--cc=akpm@linux-foundation.org \
--cc=brauner@kernel.org \
--cc=cel@kernel.org \
--cc=cluster-devel@redhat.com \
--cc=david@fromorbit.com \
--cc=djwong@kernel.org \
--cc=dm-devel@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=kvm@vger.kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-erofs@lists.ozlabs.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=muchun.song@linux.dev \
--cc=netdev@vger.kernel.org \
--cc=paulmck@kernel.org \
--cc=rcu@vger.kernel.org \
--cc=roman.gushchin@linux.dev \
--cc=senozhatsky@chromium.org \
--cc=songmuchun@bytedance.com \
--cc=steven.price@arm.com \
--cc=tkhai@ya.ru \
--cc=tytso@mit.edu \
--cc=vbabka@suse.cz \
--cc=virtualization@lists.linux-foundation.org \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
--cc=yujie.liu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox