Commit 8dd71b25 authored Oct 13, 2020 by Gang He Committed by Linus Torvalds Oct 13, 2020

ocfs2: fix potential soft lockup during fstrim



When we discard unused blocks on a mounted ocfs2 filesystem, fstrim
handles each block goup with locking/unlocking global bitmap meta-file
repeatedly. we should let fstrim thread take a break(if need) between
unlock and lock, this will avoid the potential soft lockup problem,
and also gives the upper applications more IO opportunities, these
applications are not blocked for too long at writing files.

Signed-off-by: Gang He <ghe@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Jun Piao <piaojun@huawei.com>
Link: https://lkml.kernel.org/r/20200927015815.14904-1-ghe@suse.com


Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 679edeb0

fs/ocfs2/alloc.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -7654,8 +7654,10 @@ out_mutex:
		* main_bm related locks for avoiding the current IO starve, then go to
		* trim the next group
		*/
		if (ret >= 0 && group <= last_group)
		if (ret >= 0 && group <= last_group) {
		cond_resched();
		goto next_group;
		}
		out:
		range->len = trimmed * sb->s_blocksize;
		return ret;

Admin message