Skip to content

Commit

Permalink
f2fs: avoid deadlock caused by lock order of page and lock_op
Browse files Browse the repository at this point in the history
- punch_hole
 - fill_zero
  - f2fs_lock_op
  - get_new_data_page
   - lock_page

- f2fs_write_data_pages
 - lock_page
 - do_write_data_page
  - f2fs_lock_op

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
  • Loading branch information
Jaegeuk Kim committed Jul 7, 2017
1 parent d1aa245 commit d29460e
Showing 1 changed file with 13 additions and 3 deletions.
16 changes: 13 additions & 3 deletions fs/f2fs/data.c
Original file line number Diff line number Diff line change
Expand Up @@ -1404,8 +1404,9 @@ int do_write_data_page(struct f2fs_io_info *fio)
}
}

if (fio->need_lock == LOCK_REQ)
f2fs_lock_op(fio->sbi);
/* Deadlock due to between page->lock and f2fs_lock_op */
if (fio->need_lock == LOCK_REQ && !f2fs_trylock_op(fio->sbi))
return -EAGAIN;

err = get_dnode_of_data(&dn, page->index, LOOKUP_NODE);
if (err)
Expand Down Expand Up @@ -1667,7 +1668,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping,
}

done_index = page->index;

retry_write:
lock_page(page);

if (unlikely(page->mapping != mapping)) {
Expand Down Expand Up @@ -1703,6 +1704,15 @@ static int f2fs_write_cache_pages(struct address_space *mapping,
unlock_page(page);
ret = 0;
continue;
} else if (ret == -EAGAIN) {
ret = 0;
if (wbc->sync_mode == WB_SYNC_ALL) {
cond_resched();
congestion_wait(BLK_RW_ASYNC,
HZ/50);
goto retry_write;
}
continue;
}
done_index = page->index + 1;
done = 1;
Expand Down

0 comments on commit d29460e

Please sign in to comment.