Skip to content

Commit 20cd189

Browse files
Qi Zhengakpm00
authored andcommitted
mm: shrinkers: make count and scan in shrinker debugfs lockless
Like global and memcg slab shrink, also use SRCU to make count and scan operations in memory shrinker debugfs lockless. Link: https://lkml.kernel.org/r/20230313112819.38938-6-zhengqi.arch@bytedance.com Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com> Acked-by: Vlastimil Babka <vbabka@suse.cz> Acked-by: Kirill Tkhai <tkhai@ya.ru> Acked-by: Roman Gushchin <roman.gushchin@linux.dev> Cc: Christian König <christian.koenig@amd.com> Cc: David Hildenbrand <david@redhat.com> Cc: Davidlohr Bueso <dave@stgolabs.net> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Michal Hocko <mhocko@kernel.org> Cc: Muchun Song <muchun.song@linux.dev> Cc: Paul E. McKenney <paulmck@kernel.org> Cc: Shakeel Butt <shakeelb@google.com> Cc: Sultan Alsawaf <sultan@kerneltoast.com> Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> Cc: Yang Shi <shy828301@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 475733d commit 20cd189

File tree

1 file changed

+8
-17
lines changed

1 file changed

+8
-17
lines changed

mm/shrinker_debug.c

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
#include <linux/seq_file.h>
66
#include <linux/shrinker.h>
77
#include <linux/memcontrol.h>
8+
#include <linux/srcu.h>
89

910
/* defined in vmscan.c */
1011
extern struct rw_semaphore shrinker_rwsem;
1112
extern struct list_head shrinker_list;
13+
extern struct srcu_struct shrinker_srcu;
1214

1315
static DEFINE_IDA(shrinker_debugfs_ida);
1416
static struct dentry *shrinker_debugfs_root;
@@ -49,18 +51,13 @@ static int shrinker_debugfs_count_show(struct seq_file *m, void *v)
4951
struct mem_cgroup *memcg;
5052
unsigned long total;
5153
bool memcg_aware;
52-
int ret, nid;
54+
int ret = 0, nid, srcu_idx;
5355

5456
count_per_node = kcalloc(nr_node_ids, sizeof(unsigned long), GFP_KERNEL);
5557
if (!count_per_node)
5658
return -ENOMEM;
5759

58-
ret = down_read_killable(&shrinker_rwsem);
59-
if (ret) {
60-
kfree(count_per_node);
61-
return ret;
62-
}
63-
rcu_read_lock();
60+
srcu_idx = srcu_read_lock(&shrinker_srcu);
6461

6562
memcg_aware = shrinker->flags & SHRINKER_MEMCG_AWARE;
6663

@@ -91,8 +88,7 @@ static int shrinker_debugfs_count_show(struct seq_file *m, void *v)
9188
}
9289
} while ((memcg = mem_cgroup_iter(NULL, memcg, NULL)) != NULL);
9390

94-
rcu_read_unlock();
95-
up_read(&shrinker_rwsem);
91+
srcu_read_unlock(&shrinker_srcu, srcu_idx);
9692

9793
kfree(count_per_node);
9894
return ret;
@@ -115,9 +111,8 @@ static ssize_t shrinker_debugfs_scan_write(struct file *file,
115111
.gfp_mask = GFP_KERNEL,
116112
};
117113
struct mem_cgroup *memcg = NULL;
118-
int nid;
114+
int nid, srcu_idx;
119115
char kbuf[72];
120-
ssize_t ret;
121116

122117
read_len = size < (sizeof(kbuf) - 1) ? size : (sizeof(kbuf) - 1);
123118
if (copy_from_user(kbuf, buf, read_len))
@@ -146,11 +141,7 @@ static ssize_t shrinker_debugfs_scan_write(struct file *file,
146141
return -EINVAL;
147142
}
148143

149-
ret = down_read_killable(&shrinker_rwsem);
150-
if (ret) {
151-
mem_cgroup_put(memcg);
152-
return ret;
153-
}
144+
srcu_idx = srcu_read_lock(&shrinker_srcu);
154145

155146
sc.nid = nid;
156147
sc.memcg = memcg;
@@ -159,7 +150,7 @@ static ssize_t shrinker_debugfs_scan_write(struct file *file,
159150

160151
shrinker->scan_objects(shrinker, &sc);
161152

162-
up_read(&shrinker_rwsem);
153+
srcu_read_unlock(&shrinker_srcu, srcu_idx);
163154
mem_cgroup_put(memcg);
164155

165156
return size;

0 commit comments

Comments
 (0)