Commit 66824bdf authored by Amir Goldstein's avatar Amir Goldstein Committed by Greg Kroah-Hartman

xfs: fix incorrect log_flushed on fsync

commit 47c7d0b1 upstream.

When calling into _xfs_log_force{,_lsn}() with a pointer
to log_flushed variable, log_flushed will be set to 1 if:
1. xlog_sync() is called to flush the active log buffer
AND/OR
2. xlog_wait() is called to wait on a syncing log buffers

xfs_file_fsync() checks the value of log_flushed after
_xfs_log_force_lsn() call to optimize away an explicit
PREFLUSH request to the data block device after writing
out all the file's pages to disk.

This optimization is incorrect in the following sequence of events:

 Task A                    Task B
 -------------------------------------------------------
 xfs_file_fsync()
   _xfs_log_force_lsn()
     xlog_sync()
        [submit PREFLUSH]
                           xfs_file_fsync()
                             file_write_and_wait_range()
                               [submit WRITE X]
                               [endio  WRITE X]
                             _xfs_log_force_lsn()
                               xlog_wait()
        [endio  PREFLUSH]

The write X is not guarantied to be on persistent storage
when PREFLUSH request in completed, because write A was submitted
after the PREFLUSH request, but xfs_file_fsync() of task A will
be notified of log_flushed=1 and will skip explicit flush.

If the system crashes after fsync of task A, write X may not be
present on disk after reboot.

This bug was discovered and demonstrated using Josef Bacik's
dm-log-writes target, which can be used to record block io operations
and then replay a subset of these operations onto the target device.
The test goes something like this:
- Use fsx to execute ops of a file and record ops on log device
- Every now and then fsync the file, store md5 of file and mark
  the location in the log
- Then replay log onto device for each mark, mount fs and compare
  md5 of file to stored value

Cc: Christoph Hellwig <hch@lst.de>
Cc: Josef Bacik <jbacik@fb.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 31658909
...@@ -3323,8 +3323,6 @@ _xfs_log_force( ...@@ -3323,8 +3323,6 @@ _xfs_log_force(
*/ */
if (iclog->ic_state & XLOG_STATE_IOERROR) if (iclog->ic_state & XLOG_STATE_IOERROR)
return -EIO; return -EIO;
if (log_flushed)
*log_flushed = 1;
} else { } else {
no_sleep: no_sleep:
...@@ -3432,8 +3430,6 @@ _xfs_log_force_lsn( ...@@ -3432,8 +3430,6 @@ _xfs_log_force_lsn(
xlog_wait(&iclog->ic_prev->ic_write_wait, xlog_wait(&iclog->ic_prev->ic_write_wait,
&log->l_icloglock); &log->l_icloglock);
if (log_flushed)
*log_flushed = 1;
already_slept = 1; already_slept = 1;
goto try_again; goto try_again;
} }
...@@ -3467,9 +3463,6 @@ _xfs_log_force_lsn( ...@@ -3467,9 +3463,6 @@ _xfs_log_force_lsn(
*/ */
if (iclog->ic_state & XLOG_STATE_IOERROR) if (iclog->ic_state & XLOG_STATE_IOERROR)
return -EIO; return -EIO;
if (log_flushed)
*log_flushed = 1;
} else { /* just return */ } else { /* just return */
spin_unlock(&log->l_icloglock); spin_unlock(&log->l_icloglock);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment