Revert "ext4: use ext4_write_inode() when fsyncing w/o a journal"
Theodore Ts'o
maintainerPATCH 1/1 Revert "ext4: use ext4_write_inode() when fsyncing w/o a journal"
This reverts commit ad211f3e94b314a910d4af03178a0b52a7d1ee0a.
As Jan Kara pointed out, this change was unsafe since it means we lose the call to sync_mapping_buffers() in the nojournal case. The original point of the commit was avoid taking the inode mutex (since it causes a lockdep warning in generic/113); but we need the mutex in order to call sync_mapping_buffers().
The real fix to this problem was discussed here:
https://lore.kernel.org/lkml/[email protected]
The proposed patch was to fix a syzbot complaint, but the problem can also demonstrated via "kvm-xfstests -c nojournal generic/113". Multiple solutions were discused in the e-mail thread, but none have landed in the kernel as of this writing. Anyway, commit ad211f3e94b314 is absolutely the wrong way to suppress the lockdep, so revert it.
Reported: Jan Kara <[email protected]>
--- fs/ext4/fsync.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
fs/ext4/fsync.c +4 -9
@@ -116,16 +116,8 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync) goto out; } - ret =file_write_and_wait_range (file, start, end); -if (ret) -return ret; -if (!journal) { -struct writeback_control wbc = { - .sync_mode =WB_SYNC_ALL - }; - - ret =ext4_write_inode (inode, &wbc); + ret =__generic_file_fsync (file, start, end, datasync);if (!ret) ret =ext4_sync_parent (inode);if (test_opt (inode->i_sb,BARRIER ))
@@ -133,6 +125,9 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync) goto out; } + ret =file_write_and_wait_range (file, start, end); +if (ret) +return ret;/* * data=writeback,ordered: * The caller's filemap_fdatawrite()/wait will sync the data.
Signature · 1 line
2.19.1
Quoted 7 lines · Theodore Ts'o
This reverts commit
ad211f3e94b314a910d4af03178a0b52a7d1ee0a.As Jan Kara pointed out, this change was unsafe since it means we lose the call to
sync_mapping_buffers()in the nojournal case. The original point of the commit was avoid taking the inode mutex (since it causes a lockdep warning in generic/113); but we need the mutex in order to callsync_mapping_buffers().
Actually, I don't think sync_mapping_buffers() needs inode mutex (i_rwsem these days). It uses blkdev_mapping->private_lock for synchronization of operations on the list of buffers and fsync_buffers_list() seems to be pretty careful about races with mark_buffer_dirty_inode(). So why do you think we need i_rwsem?
Quoted 11 lines
The real fix to this problem was discussed here:
https://lore.kernel.org/lkml/[email protected]
The proposed patch was to fix a syzbot complaint, but the problem can also demonstrated via "kvm-xfstests -c nojournal generic/113". Multiple solutions were discused in the e-mail thread, but none have landed in the kernel as of this writing. Anyway, commit
ad211f3e94b314is absolutely the wrong way to suppress the lockdep, so revert it.
Quoted 3 lines
Fixes ad211f3e94b314a910d4af03178a0b52a7d1ee0a ("ext4: use ext4_write_inode() when fsyncing w/o a journal")Signed-off-by Theodore Ts'o <[email protected]>Reported: Jan Kara <[email protected]>
So if you decide to go via a safe way of reverting the change, I'm fine with that so feel free to add:
Honza
Quoted 39 lines
--- fs/ext4/fsync.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)fs/ext4/fsync.c +4
-9@@ -116,16 +116,8 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync) goto out; } - ret =file_write_and_wait_range (file, start, end); -if (ret) -return ret; -if (!journal) { -struct writeback_control wbc = { - .sync_mode =WB_SYNC_ALL - }; - - ret =ext4_write_inode (inode, &wbc); + ret =__generic_file_fsync (file, start, end, datasync);if (!ret) ret =ext4_sync_parent (inode);if (test_opt (inode->i_sb,BARRIER ))@@ -133,6 +125,9 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync) goto out; } + ret =file_write_and_wait_range (file, start, end); +if (ret) +return ret;/* * data=writeback,ordered: * The caller's filemap_fdatawrite()/wait will sync the data. Signature · 1 line
2.19.1
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Theodore Y. Ts'o
maintainerQuoted 9 lines · Jan Kara
Quoted 7 lines · Theodore Ts'o
This reverts commit
ad211f3e94b314a910d4af03178a0b52a7d1ee0a.As Jan Kara pointed out, this change was unsafe since it means we lose the call to
sync_mapping_buffers()in the nojournal case. The original point of the commit was avoid taking the inode mutex (since it causes a lockdep warning in generic/113); but we need the mutex in order to callsync_mapping_buffers().
Quoted 5 lines
Actually, I don't think
sync_mapping_buffers()needs inode mutex (i_rwsemthese days). It usesblkdev_mapping->private_lockfor synchronization of operations on the list of buffers andfsync_buffers_list()seems to be pretty careful about races withmark_buffer_dirty_inode(). So why do you think we needi_rwsem?
Hmm, I think you're right. I wonder if we can therefore remove theinode_lock() in __generic_file_fsync() then... What do you think?
- Ted
Jan Kara
reviewerQuoted 10 lines · Theodore Y. Ts'o
Quoted 9 lines · Jan Kara
Quoted 7 lines · Theodore Ts'o
This reverts commit
ad211f3e94b314a910d4af03178a0b52a7d1ee0a.As Jan Kara pointed out, this change was unsafe since it means we lose the call to
sync_mapping_buffers()in the nojournal case. The original point of the commit was avoid taking the inode mutex (since it causes a lockdep warning in generic/113); but we need the mutex in order to callsync_mapping_buffers().
Quoted 8 lines
Quoted 5 lines
Actually, I don't think
sync_mapping_buffers()needs inode mutex (i_rwsemthese days). It usesblkdev_mapping->private_lockfor synchronization of operations on the list of buffers andfsync_buffers_list()seems to be pretty careful about races withmark_buffer_dirty_inode(). So why do you think we needi_rwsem?Hmm, I think you're right. I wonder if we can therefore remove the
inode_lock()in__generic_file_fsync()then... What do you think?
That's actually a good question. I was thinking about why we have inode_lock() in __generic_file_fsync(). The only reason I could come up with is that when fsync(2) races with write(2) or truncate(2), with inode_lock() in __generic_file_fsync() you will either get old or new metadata state on disk. Without inode_lock() you could get some intermediate metadata state and thus after a crash may not be able to see even the old data. We are here on the thin ice of how good data consistency do we provide after a crash for non-journalling filesystems. It is never going to be perfect but this change would seem like a noticeable regression to me. What do you think?
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR