ocfs2: fix potential soft lockup during fstrim
PATCH 1/1 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.
--- fs/ocfs2/alloc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/ocfs2/alloc.c +3 -1
@@ -7654,8 +7654,10 @@ int ocfs2_trim_mainbm(struct super_block *sb, struct fstrim_range *range)* 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;
Signature · 1 line
2.21.0
Quoted 8 lines · Gang He
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 <[email protected]>
It makes sense.
Quoted 21 lines
--- fs/ocfs2/alloc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)fs/ocfs2/alloc.c +3
-1@@ -7654,8 +7654,10 @@ int ocfs2_trim_mainbm(struct super_block *sb, struct fstrim_range *range)* 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;