Skip to content

Commit cad3f4a

Browse files
Lizhi Xujankara
authored andcommitted
inotify: Fix possible deadlock in fsnotify_destroy_mark
[Syzbot reported] WARNING: possible circular locking dependency detected 6.11.0-rc4-syzkaller-00019-gb311c1b497e5 #0 Not tainted ------------------------------------------------------ kswapd0/78 is trying to acquire lock: ffff88801b8d8930 (&group->mark_mutex){+.+.}-{3:3}, at: fsnotify_group_lock include/linux/fsnotify_backend.h:270 [inline] ffff88801b8d8930 (&group->mark_mutex){+.+.}-{3:3}, at: fsnotify_destroy_mark+0x38/0x3c0 fs/notify/mark.c:578 but task is already holding lock: ffffffff8ea2fd60 (fs_reclaim){+.+.}-{0:0}, at: balance_pgdat mm/vmscan.c:6841 [inline] ffffffff8ea2fd60 (fs_reclaim){+.+.}-{0:0}, at: kswapd+0xbb4/0x35a0 mm/vmscan.c:7223 which lock already depends on the new lock. the existing dependency chain (in reverse order) is: -> #1 (fs_reclaim){+.+.}-{0:0}: ... kmem_cache_alloc_noprof+0x3d/0x2a0 mm/slub.c:4044 inotify_new_watch fs/notify/inotify/inotify_user.c:599 [inline] inotify_update_watch fs/notify/inotify/inotify_user.c:647 [inline] __do_sys_inotify_add_watch fs/notify/inotify/inotify_user.c:786 [inline] __se_sys_inotify_add_watch+0x72e/0x1070 fs/notify/inotify/inotify_user.c:729 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f -> #0 (&group->mark_mutex){+.+.}-{3:3}: ... __mutex_lock+0x136/0xd70 kernel/locking/mutex.c:752 fsnotify_group_lock include/linux/fsnotify_backend.h:270 [inline] fsnotify_destroy_mark+0x38/0x3c0 fs/notify/mark.c:578 fsnotify_destroy_marks+0x14a/0x660 fs/notify/mark.c:934 fsnotify_inoderemove include/linux/fsnotify.h:264 [inline] dentry_unlink_inode+0x2e0/0x430 fs/dcache.c:403 __dentry_kill+0x20d/0x630 fs/dcache.c:610 shrink_kill+0xa9/0x2c0 fs/dcache.c:1055 shrink_dentry_list+0x2c0/0x5b0 fs/dcache.c:1082 prune_dcache_sb+0x10f/0x180 fs/dcache.c:1163 super_cache_scan+0x34f/0x4b0 fs/super.c:221 do_shrink_slab+0x701/0x1160 mm/shrinker.c:435 shrink_slab+0x1093/0x14d0 mm/shrinker.c:662 shrink_one+0x43b/0x850 mm/vmscan.c:4815 shrink_many mm/vmscan.c:4876 [inline] lru_gen_shrink_node mm/vmscan.c:4954 [inline] shrink_node+0x3799/0x3de0 mm/vmscan.c:5934 kswapd_shrink_node mm/vmscan.c:6762 [inline] balance_pgdat mm/vmscan.c:6954 [inline] kswapd+0x1bcd/0x35a0 mm/vmscan.c:7223 [Analysis] The problem is that inotify_new_watch() is using GFP_KERNEL to allocate new watches under group->mark_mutex, however if dentry reclaim races with unlinking of an inode, it can end up dropping the last dentry reference for an unlinked inode resulting in removal of fsnotify mark from reclaim context which wants to acquire group->mark_mutex as well. This scenario shows that all notification groups are in principle prone to this kind of a deadlock (previously, we considered only fanotify and dnotify to be problematic for other reasons) so make sure all allocations under group->mark_mutex happen with GFP_NOFS. Reported-and-tested-by: [email protected] Closes: https://syzkaller.appspot.com/bug?extid=c679f13773f295d2da53 Signed-off-by: Lizhi Xu <[email protected]> Reviewed-by: Amir Goldstein <[email protected]> Signed-off-by: Jan Kara <[email protected]> Link: https://patch.msgid.link/[email protected]
1 parent 35ceae4 commit cad3f4a

File tree

5 files changed

+6
-22
lines changed

5 files changed

+6
-22
lines changed

fs/nfsd/filecache.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,7 @@ nfsd_file_cache_init(void)
792792
}
793793

794794
nfsd_file_fsnotify_group = fsnotify_alloc_group(&nfsd_file_fsnotify_ops,
795-
FSNOTIFY_GROUP_NOFS);
795+
0);
796796
if (IS_ERR(nfsd_file_fsnotify_group)) {
797797
pr_err("nfsd: unable to create fsnotify group: %ld\n",
798798
PTR_ERR(nfsd_file_fsnotify_group));

fs/notify/dnotify/dnotify.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,8 +406,7 @@ static int __init dnotify_init(void)
406406
SLAB_PANIC|SLAB_ACCOUNT);
407407
dnotify_mark_cache = KMEM_CACHE(dnotify_mark, SLAB_PANIC|SLAB_ACCOUNT);
408408

409-
dnotify_group = fsnotify_alloc_group(&dnotify_fsnotify_ops,
410-
FSNOTIFY_GROUP_NOFS);
409+
dnotify_group = fsnotify_alloc_group(&dnotify_fsnotify_ops, 0);
411410
if (IS_ERR(dnotify_group))
412411
panic("unable to allocate fsnotify group for dnotify\n");
413412
dnotify_sysctl_init();

fs/notify/fanotify/fanotify_user.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1480,7 +1480,7 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags)
14801480

14811481
/* fsnotify_alloc_group takes a ref. Dropped in fanotify_release */
14821482
group = fsnotify_alloc_group(&fanotify_fsnotify_ops,
1483-
FSNOTIFY_GROUP_USER | FSNOTIFY_GROUP_NOFS);
1483+
FSNOTIFY_GROUP_USER);
14841484
if (IS_ERR(group)) {
14851485
return PTR_ERR(group);
14861486
}

fs/notify/group.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ static struct fsnotify_group *__fsnotify_alloc_group(
115115
const struct fsnotify_ops *ops,
116116
int flags, gfp_t gfp)
117117
{
118-
static struct lock_class_key nofs_marks_lock;
119118
struct fsnotify_group *group;
120119

121120
group = kzalloc(sizeof(struct fsnotify_group), gfp);
@@ -136,16 +135,6 @@ static struct fsnotify_group *__fsnotify_alloc_group(
136135

137136
group->ops = ops;
138137
group->flags = flags;
139-
/*
140-
* For most backends, eviction of inode with a mark is not expected,
141-
* because marks hold a refcount on the inode against eviction.
142-
*
143-
* Use a different lockdep class for groups that support evictable
144-
* inode marks, because with evictable marks, mark_mutex is NOT
145-
* fs-reclaim safe - the mutex is taken when evicting inodes.
146-
*/
147-
if (flags & FSNOTIFY_GROUP_NOFS)
148-
lockdep_set_class(&group->mark_mutex, &nofs_marks_lock);
149138

150139
return group;
151140
}

include/linux/fsnotify_backend.h

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ struct fsnotify_group {
217217

218218
#define FSNOTIFY_GROUP_USER 0x01 /* user allocated group */
219219
#define FSNOTIFY_GROUP_DUPS 0x02 /* allow multiple marks per object */
220-
#define FSNOTIFY_GROUP_NOFS 0x04 /* group lock is not direct reclaim safe */
221220
int flags;
222221
unsigned int owner_flags; /* stored flags of mark_mutex owner */
223222

@@ -268,22 +267,19 @@ struct fsnotify_group {
268267
static inline void fsnotify_group_lock(struct fsnotify_group *group)
269268
{
270269
mutex_lock(&group->mark_mutex);
271-
if (group->flags & FSNOTIFY_GROUP_NOFS)
272-
group->owner_flags = memalloc_nofs_save();
270+
group->owner_flags = memalloc_nofs_save();
273271
}
274272

275273
static inline void fsnotify_group_unlock(struct fsnotify_group *group)
276274
{
277-
if (group->flags & FSNOTIFY_GROUP_NOFS)
278-
memalloc_nofs_restore(group->owner_flags);
275+
memalloc_nofs_restore(group->owner_flags);
279276
mutex_unlock(&group->mark_mutex);
280277
}
281278

282279
static inline void fsnotify_group_assert_locked(struct fsnotify_group *group)
283280
{
284281
WARN_ON_ONCE(!mutex_is_locked(&group->mark_mutex));
285-
if (group->flags & FSNOTIFY_GROUP_NOFS)
286-
WARN_ON_ONCE(!(current->flags & PF_MEMALLOC_NOFS));
282+
WARN_ON_ONCE(!(current->flags & PF_MEMALLOC_NOFS));
287283
}
288284

289285
/* When calling fsnotify tell it if the data is a path or inode */

0 commit comments

Comments
 (0)