diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2019-12-06 10:54:23 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-12 12:17:20 +0100 |
| commit | 77de8ee6b09f5c73a92c0434e8a08b4e614fbcba (patch) | |
| tree | a3ec4a9e11fe0ec01ec0a973307e29b9a3b7d437 /fs/inode.c | |
| parent | 50360686bf73ad844c1970702d2a1c70e3bf4766 (diff) | |
| download | linux-stable-77de8ee6b09f5c73a92c0434e8a08b4e614fbcba.tar.gz linux-stable-77de8ee6b09f5c73a92c0434e8a08b4e614fbcba.tar.bz2 linux-stable-77de8ee6b09f5c73a92c0434e8a08b4e614fbcba.zip | |
fs: avoid softlockups in s_inodes iterators
[ Upstream commit 04646aebd30b99f2cfa0182435a2ec252fcb16d0 ]
Anything that walks all inodes on sb->s_inodes list without rescheduling
risks softlockups.
Previous efforts were made in 2 functions, see:
c27d82f fs/drop_caches.c: avoid softlockups in drop_pagecache_sb()
ac05fbb inode: don't softlockup when evicting inodes
but there hasn't been an audit of all walkers, so do that now. This
also consistently moves the cond_resched() calls to the bottom of each
loop in cases where it already exists.
One loop remains: remove_dquot_ref(), because I'm not quite sure how
to deal with that one w/o taking the i_lock.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs/inode.c')
| -rw-r--r-- | fs/inode.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/inode.c b/fs/inode.c index 5c63693326bb..9c50521c9fe4 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -660,6 +660,7 @@ int invalidate_inodes(struct super_block *sb, bool kill_dirty) struct inode *inode, *next; LIST_HEAD(dispose); +again: spin_lock(&sb->s_inode_list_lock); list_for_each_entry_safe(inode, next, &sb->s_inodes, i_sb_list) { spin_lock(&inode->i_lock); @@ -682,6 +683,12 @@ int invalidate_inodes(struct super_block *sb, bool kill_dirty) inode_lru_list_del(inode); spin_unlock(&inode->i_lock); list_add(&inode->i_lru, &dispose); + if (need_resched()) { + spin_unlock(&sb->s_inode_list_lock); + cond_resched(); + dispose_list(&dispose); + goto again; + } } spin_unlock(&sb->s_inode_list_lock); |