Skip to content

Commit 828add7

Browse files
author
Jaegeuk Kim
committed
f2fs: prepare a waiter before entering io_schedule
This is to avoid sleep() in the waiter thread. [ 20.157753] ------------[ cut here ]------------ [ 20.158393] do not call blocking ops when !TASK_RUNNING; state=2 set at [<0000000096354225>] prepare_to_wait+0xcd/0x430 [ 20.159858] WARNING: CPU: 1 PID: 1152 at kernel/sched/core.c:7142 __might_sleep+0x149/0x1a0 ... [ 20.176110] __submit_merged_write_cond+0x191/0x310 [ 20.176739] f2fs_submit_merged_write+0x18/0x20 [ 20.177323] f2fs_wait_on_all_pages+0x269/0x2d0 [ 20.177899] ? block_operations+0x980/0x980 [ 20.178441] ? __kasan_check_read+0x11/0x20 [ 20.178975] ? finish_wait+0x260/0x260 [ 20.179488] ? percpu_counter_set+0x147/0x230 [ 20.180049] do_checkpoint+0x1757/0x2a50 [ 20.180558] f2fs_write_checkpoint+0x840/0xaf0 [ 20.181126] f2fs_sync_fs+0x287/0x4a0 Reported-by: Eric Biggers <[email protected]> Reviewed-by: Chao Yu <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]>
1 parent 9feffe1 commit 828add7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

fs/f2fs/checkpoint.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1258,8 +1258,6 @@ void f2fs_wait_on_all_pages(struct f2fs_sb_info *sbi, int type)
12581258
DEFINE_WAIT(wait);
12591259

12601260
for (;;) {
1261-
prepare_to_wait(&sbi->cp_wait, &wait, TASK_UNINTERRUPTIBLE);
1262-
12631261
if (!get_pages(sbi, type))
12641262
break;
12651263

@@ -1271,6 +1269,8 @@ void f2fs_wait_on_all_pages(struct f2fs_sb_info *sbi, int type)
12711269
FS_CP_META_IO);
12721270
else if (type == F2FS_WB_CP_DATA)
12731271
f2fs_submit_merged_write(sbi, DATA);
1272+
1273+
prepare_to_wait(&sbi->cp_wait, &wait, TASK_UNINTERRUPTIBLE);
12741274
io_schedule_timeout(DEFAULT_IO_TIMEOUT);
12751275
}
12761276
finish_wait(&sbi->cp_wait, &wait);

0 commit comments

Comments
 (0)