Skip to content

Commit 38296af

Browse files
konisakpm00
authored andcommitted
nilfs2: fix hang in nilfs_lookup_dirty_data_buffers()
Syzbot reported a hang issue in migrate_pages_batch() called by mbind() and nilfs_lookup_dirty_data_buffers() called in the log writer of nilfs2. While migrate_pages_batch() locks a folio and waits for the writeback to complete, the log writer thread that should bring the writeback to completion picks up the folio being written back in nilfs_lookup_dirty_data_buffers() that it calls for subsequent log creation and was trying to lock the folio. Thus causing a deadlock. In the first place, it is unexpected that folios/pages in the middle of writeback will be updated and become dirty. Nilfs2 adds a checksum to verify the validity of the log being written and uses it for recovery at mount, so data changes during writeback are suppressed. Since this is broken, an unclean shutdown could potentially cause recovery to fail. Investigation revealed that the root cause is that the wait for writeback completion in nilfs_page_mkwrite() is conditional, and if the backing device does not require stable writes, data may be modified without waiting. Fix these issues by making nilfs_page_mkwrite() wait for writeback to finish regardless of the stable write requirement of the backing device. Link: https://lkml.kernel.org/r/[email protected] Fixes: 1d1d1a7 ("mm: only enforce stable page writes if the backing device requires it") Signed-off-by: Ryusuke Konishi <[email protected]> Reported-by: [email protected] Closes: https://lkml.kernel.org/r/[email protected] Tested-by: Ryusuke Konishi <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 6f1f15a commit 38296af

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

fs/nilfs2/file.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,13 @@ static vm_fault_t nilfs_page_mkwrite(struct vm_fault *vmf)
107107
nilfs_transaction_commit(inode->i_sb);
108108

109109
mapped:
110-
folio_wait_stable(folio);
110+
/*
111+
* Since checksumming including data blocks is performed to determine
112+
* the validity of the log to be written and used for recovery, it is
113+
* necessary to wait for writeback to finish here, regardless of the
114+
* stable write requirement of the backing device.
115+
*/
116+
folio_wait_writeback(folio);
111117
out:
112118
sb_end_pagefault(inode->i_sb);
113119
return vmf_fs_error(ret);

0 commit comments

Comments
 (0)