UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "mm: shrinkers: make count and scan in shrinker debugfs lockless" 

This reverts commit 20cd1892fc.

Kernel test robot reports -88.8% regression in stress-ng.ramfs.ops_per_sec
test case [1], which is caused by commit f95bdb700b ("mm: vmscan: make
global slab shrink lockless").  The root cause is that SRCU has to be
careful to not frequently check for SRCU read-side critical section exits.
Therefore, even if no one is currently in the SRCU read-side critical
section, synchronize_srcu() cannot return quickly.  That's why
unregister_shrinker() has become slower.

We will try to use the refcount+RCU method [2] proposed by Dave Chinner to
continue to re-implement the lockless slab shrink.  So revert the
shrinker_srcu related changes first.

[1]. https://lore.kernel.org/lkml/202305230837.db2c233f-yujie.liu@intel.com/
[2]. https://lore.kernel.org/lkml/ZIJhou1d55d4H1s0@dread.disaster.area/

Link: https://lkml.kernel.org/r/20230609081518.3039120-5-qi.zheng@linux.dev
Reported-by: kernel test robot <yujie.liu@intel.com>
Closes: https://lore.kernel.org/oe-lkp/202305230837.db2c233f-yujie.liu@intel.com
Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Kirill Tkhai <tkhai@ya.ru>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Qi Zheng 2023-06-09 08:15:15 +00:00 committed by Andrew Morton
parent c534f7cca6
commit 1a554ecc97
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mm/shrinker_debug.c
View File

@ -5,12 +5,10 @@
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/shrinker.h> #include <linux/shrinker.h>
#include <linux/memcontrol.h> #include <linux/memcontrol.h>
#include <linux/srcu.h>
/* defined in vmscan.c */ /* defined in vmscan.c */
extern struct rw_semaphore shrinker_rwsem; extern struct rw_semaphore shrinker_rwsem;
extern struct list_head shrinker_list; extern struct list_head shrinker_list;
extern struct srcu_struct shrinker_srcu;
static DEFINE_IDA(shrinker_debugfs_ida); static DEFINE_IDA(shrinker_debugfs_ida);
static struct dentry *shrinker_debugfs_root; static struct dentry *shrinker_debugfs_root;
@ -51,13 +49,18 @@ static int shrinker_debugfs_count_show(struct seq_file *m, void *v)
struct mem_cgroup *memcg; struct mem_cgroup *memcg;
unsigned long total; unsigned long total;
bool memcg_aware; bool memcg_aware;
int ret = 0, nid, srcu_idx; int ret, nid;
count_per_node = kcalloc(nr_node_ids, sizeof(unsigned long), GFP_KERNEL); count_per_node = kcalloc(nr_node_ids, sizeof(unsigned long), GFP_KERNEL);
if (!count_per_node) if (!count_per_node)
return -ENOMEM; return -ENOMEM;
srcu_idx = srcu_read_lock(&shrinker_srcu); 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_aware = shrinker->flags & SHRINKER_MEMCG_AWARE;
@ -88,7 +91,8 @@ static int shrinker_debugfs_count_show(struct seq_file *m, void *v)
} }
} while ((memcg = mem_cgroup_iter(NULL, memcg, NULL)) != NULL); } while ((memcg = mem_cgroup_iter(NULL, memcg, NULL)) != NULL);
srcu_read_unlock(&shrinker_srcu, srcu_idx); rcu_read_unlock();
up_read(&shrinker_rwsem);
kfree(count_per_node); kfree(count_per_node);
return ret; return ret;
@ -111,8 +115,9 @@ static ssize_t shrinker_debugfs_scan_write(struct file *file,
.gfp_mask = GFP_KERNEL, .gfp_mask = GFP_KERNEL,
}; };
struct mem_cgroup *memcg = NULL; struct mem_cgroup *memcg = NULL;
int nid, srcu_idx; int nid;
char kbuf[72]; char kbuf[72];
ssize_t ret;
read_len = size < (sizeof(kbuf) - 1) ? size : (sizeof(kbuf) - 1); read_len = size < (sizeof(kbuf) - 1) ? size : (sizeof(kbuf) - 1);
if (copy_from_user(kbuf, buf, read_len)) if (copy_from_user(kbuf, buf, read_len))
@ -141,7 +146,11 @@ static ssize_t shrinker_debugfs_scan_write(struct file *file,
return -EINVAL; return -EINVAL;
} }
srcu_idx = srcu_read_lock(&shrinker_srcu); ret = down_read_killable(&shrinker_rwsem);
if (ret) {
mem_cgroup_put(memcg);
return ret;
}
sc.nid = nid; sc.nid = nid;
sc.memcg = memcg; sc.memcg = memcg;
@ -150,7 +159,7 @@ static ssize_t shrinker_debugfs_scan_write(struct file *file,
shrinker->scan_objects(shrinker, &sc); shrinker->scan_objects(shrinker, &sc);
srcu_read_unlock(&shrinker_srcu, srcu_idx); up_read(&shrinker_rwsem);
mem_cgroup_put(memcg); mem_cgroup_put(memcg);
return size; return size;