Skip to content

Commit ea5ddbc

Browse files
konisgregkh
authored andcommitted
nilfs2: fix hang in nilfs_lookup_dirty_data_buffers()
commit 38296af upstream. 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]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 2e14805 commit ea5ddbc

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
@@ -105,7 +105,13 @@ static vm_fault_t nilfs_page_mkwrite(struct vm_fault *vmf)
105105
nilfs_transaction_commit(inode->i_sb);
106106

107107
mapped:
108-
wait_for_stable_page(page);
108+
/*
109+
* Since checksumming including data blocks is performed to determine
110+
* the validity of the log to be written and used for recovery, it is
111+
* necessary to wait for writeback to finish here, regardless of the
112+
* stable write requirement of the backing device.
113+
*/
114+
wait_on_page_writeback(page);
109115
out:
110116
sb_end_pagefault(inode->i_sb);
111117
return vmf_fs_error(ret);

0 commit comments

Comments
 (0)