nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

mm: shrinkers: fix deadlock in shrinker debugfs

Browse source 
The debugfs_remove_recursive() is invoked by unregister_shrinker(), which
is holding the write lock of shrinker_rwsem.  It will waits for the
handler of debugfs file complete.  The handler also needs to hold the read
lock of shrinker_rwsem to do something.  So it may cause the following
deadlock:

 	CPU0				CPU1

debugfs_file_get()
shrinker_debugfs_count_show()/shrinker_debugfs_scan_write()

     				unregister_shrinker()
				--> down_write(&shrinker_rwsem);
				    debugfs_remove_recursive()
					// wait for (A)
				    --> wait_for_completion();

    // wait for (B)
--> down_read_killable(&shrinker_rwsem)
debugfs_file_put() -- (A)

				    up_write() -- (B)

The down_read_killable() can be killed, so that the above deadlock can be
recovered.  But it still requires an extra kill action, otherwise it will
block all subsequent shrinker-related operations, so it's better to fix
it.

[akpm@linux-foundation.org: fix CONFIG_SHRINKER_DEBUG=n stub]
Link: https://lkml.kernel.org/r/20230202105612.64641-1-zhengqi.arch@bytedance.com
Fixes: 5035ebc644 ("mm: shrinkers: introduce debugfs interface for memory shrinkers")
Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com>
Reviewed-by: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Kent Overstreet <kent.overstreet@gmail.com>
Cc: Muchun Song <songmuchun@bytedance.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Qi Zheng 2023-02-02 18:56:12 +08:00 committed by Andrew Morton
parent 6b970599e8
commit badc28d492
3 changed files with 16 additions and 8 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

5
include/linux/shrinker.h
View file

@ -107,7 +107,7 @@ extern void synchronize_shrinkers(void);
#ifdef CONFIG_SHRINKER_DEBUG #ifdef CONFIG_SHRINKER_DEBUG
extern int shrinker_debugfs_add(struct shrinker *shrinker); extern int shrinker_debugfs_add(struct shrinker *shrinker);
extern void shrinker_debugfs_remove(struct shrinker *shrinker); extern struct dentry *shrinker_debugfs_remove(struct shrinker *shrinker);
extern int __printf(2, 3) shrinker_debugfs_rename(struct shrinker *shrinker, extern int __printf(2, 3) shrinker_debugfs_rename(struct shrinker *shrinker,
const char *fmt, ...); const char *fmt, ...);
#else /* CONFIG_SHRINKER_DEBUG */ #else /* CONFIG_SHRINKER_DEBUG */
@ -115,8 +115,9 @@ static inline int shrinker_debugfs_add(struct shrinker *shrinker)
{ {
return 0; return 0;
} }
static inline void shrinker_debugfs_remove(struct shrinker *shrinker) static inline struct dentry *shrinker_debugfs_remove(struct shrinker *shrinker)
{ {
return NULL;
} }
static inline __printf(2, 3) static inline __printf(2, 3)
int shrinker_debugfs_rename(struct shrinker *shrinker, const char *fmt, ...) int shrinker_debugfs_rename(struct shrinker *shrinker, const char *fmt, ...)

13
mm/shrinker_debug.c
View file

@ -246,18 +246,21 @@ int shrinker_debugfs_rename(struct shrinker *shrinker, const char *fmt, ...)
} }
EXPORT_SYMBOL(shrinker_debugfs_rename); EXPORT_SYMBOL(shrinker_debugfs_rename);
void shrinker_debugfs_remove(struct shrinker *shrinker) struct dentry *shrinker_debugfs_remove(struct shrinker *shrinker)
{ {
struct dentry *entry = shrinker->debugfs_entry;
lockdep_assert_held(&shrinker_rwsem); lockdep_assert_held(&shrinker_rwsem);
kfree_const(shrinker->name); kfree_const(shrinker->name);
shrinker->name = NULL; shrinker->name = NULL;
if (!shrinker->debugfs_entry) if (entry) {
return;
debugfs_remove_recursive(shrinker->debugfs_entry);
ida_free(&shrinker_debugfs_ida, shrinker->debugfs_id); ida_free(&shrinker_debugfs_ida, shrinker->debugfs_id);
shrinker->debugfs_entry = NULL;
}
return entry;
} }
static int __init shrinker_debugfs_init(void) static int __init shrinker_debugfs_init(void)

6
mm/vmscan.c
View file

@ -741,6 +741,8 @@ EXPORT_SYMBOL(register_shrinker);
*/ */
void unregister_shrinker(struct shrinker *shrinker) void unregister_shrinker(struct shrinker *shrinker)
{ {
struct dentry *debugfs_entry;
if (!(shrinker->flags & SHRINKER_REGISTERED)) if (!(shrinker->flags & SHRINKER_REGISTERED))
return; return;
@ -749,9 +751,11 @@ void unregister_shrinker(struct shrinker *shrinker)
shrinker->flags &= ~SHRINKER_REGISTERED; shrinker->flags &= ~SHRINKER_REGISTERED;
if (shrinker->flags & SHRINKER_MEMCG_AWARE) if (shrinker->flags & SHRINKER_MEMCG_AWARE)
unregister_memcg_shrinker(shrinker); unregister_memcg_shrinker(shrinker);
shrinker_debugfs_remove(shrinker); debugfs_entry = shrinker_debugfs_remove(shrinker);
up_write(&shrinker_rwsem); up_write(&shrinker_rwsem);
debugfs_remove_recursive(debugfs_entry);
kfree(shrinker->nr_deferred); kfree(shrinker->nr_deferred);
shrinker->nr_deferred = NULL; shrinker->nr_deferred = NULL;
} }