mirror of https://gitee.com/openkylin/linux.git
xfs: handle buffer log item IO errors directly
Currently when a buffer with attached log items has an IO error it called ->iop_error for each attched log item. These all call xfs_set_li_failed() to handle the error, but we are about to change the way log items manage buffers. hence we first need to remove the per-item dependency on buffer handling done by xfs_set_li_failed(). We already have specific buffer type IO completion routines, so move the log item error handling out of the generic error handling and into the log item specific functions so we can implement per-type error handling easily. This requires a more complex return value from the error handling code so that we can take the correct action the failure handling requires. This results in some repeated boilerplate in the functions, but that can be cleaned up later once all the changes cascade through this code. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
parent
2ef3f7f5db
commit
428947e9d5
|
@ -986,21 +986,24 @@ xfs_buf_do_callbacks_fail(
|
|||
spin_unlock(&ailp->ail_lock);
|
||||
}
|
||||
|
||||
/*
|
||||
* Decide if we're going to retry the write after a failure, and prepare
|
||||
* the buffer for retrying the write.
|
||||
*/
|
||||
static bool
|
||||
xfs_buf_iodone_callback_error(
|
||||
xfs_buf_ioerror_fail_without_retry(
|
||||
struct xfs_buf *bp)
|
||||
{
|
||||
struct xfs_mount *mp = bp->b_mount;
|
||||
static ulong lasttime;
|
||||
static xfs_buftarg_t *lasttarg;
|
||||
struct xfs_error_cfg *cfg;
|
||||
|
||||
/*
|
||||
* If we've already decided to shutdown the filesystem because of
|
||||
* I/O errors, there's no point in giving this a retry.
|
||||
*/
|
||||
if (XFS_FORCED_SHUTDOWN(mp))
|
||||
goto out_stale;
|
||||
return true;
|
||||
|
||||
if (bp->b_target != lasttarg ||
|
||||
time_after(jiffies, (lasttime + 5*HZ))) {
|
||||
|
@ -1011,91 +1014,114 @@ xfs_buf_iodone_callback_error(
|
|||
|
||||
/* synchronous writes will have callers process the error */
|
||||
if (!(bp->b_flags & XBF_ASYNC))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool
|
||||
xfs_buf_ioerror_retry(
|
||||
struct xfs_buf *bp,
|
||||
struct xfs_error_cfg *cfg)
|
||||
{
|
||||
if ((bp->b_flags & (XBF_STALE | XBF_WRITE_FAIL)) &&
|
||||
bp->b_last_error == bp->b_error)
|
||||
return false;
|
||||
|
||||
bp->b_flags |= (XBF_WRITE | XBF_DONE | XBF_WRITE_FAIL);
|
||||
bp->b_last_error = bp->b_error;
|
||||
if (cfg->retry_timeout != XFS_ERR_RETRY_FOREVER &&
|
||||
!bp->b_first_retry_time)
|
||||
bp->b_first_retry_time = jiffies;
|
||||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
* Account for this latest trip around the retry handler, and decide if
|
||||
* we've failed enough times to constitute a permanent failure.
|
||||
*/
|
||||
static bool
|
||||
xfs_buf_ioerror_permanent(
|
||||
struct xfs_buf *bp,
|
||||
struct xfs_error_cfg *cfg)
|
||||
{
|
||||
struct xfs_mount *mp = bp->b_mount;
|
||||
|
||||
if (cfg->max_retries != XFS_ERR_RETRY_FOREVER &&
|
||||
++bp->b_retries > cfg->max_retries)
|
||||
return true;
|
||||
if (cfg->retry_timeout != XFS_ERR_RETRY_FOREVER &&
|
||||
time_after(jiffies, cfg->retry_timeout + bp->b_first_retry_time))
|
||||
return true;
|
||||
|
||||
/* At unmount we may treat errors differently */
|
||||
if ((mp->m_flags & XFS_MOUNT_UNMOUNTING) && mp->m_fail_unmount)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/*
|
||||
* On a sync write or shutdown we just want to stale the buffer and let the
|
||||
* caller handle the error in bp->b_error appropriately.
|
||||
*
|
||||
* If the write was asynchronous then no one will be looking for the error. If
|
||||
* this is the first failure of this type, clear the error state and write the
|
||||
* buffer out again. This means we always retry an async write failure at least
|
||||
* once, but we also need to set the buffer up to behave correctly now for
|
||||
* repeated failures.
|
||||
*
|
||||
* If we get repeated async write failures, then we take action according to the
|
||||
* error configuration we have been set up to use.
|
||||
*
|
||||
* Multi-state return value:
|
||||
*
|
||||
* XBF_IOERROR_FINISH: clear IO error retry state and run callback completions
|
||||
* XBF_IOERROR_DONE: resubmitted immediately, do not run any completions
|
||||
* XBF_IOERROR_FAIL: transient error, run failure callback completions and then
|
||||
* release the buffer
|
||||
*/
|
||||
enum {
|
||||
XBF_IOERROR_FINISH,
|
||||
XBF_IOERROR_DONE,
|
||||
XBF_IOERROR_FAIL,
|
||||
};
|
||||
|
||||
static int
|
||||
xfs_buf_iodone_error(
|
||||
struct xfs_buf *bp)
|
||||
{
|
||||
struct xfs_mount *mp = bp->b_mount;
|
||||
struct xfs_error_cfg *cfg;
|
||||
|
||||
if (xfs_buf_ioerror_fail_without_retry(bp))
|
||||
goto out_stale;
|
||||
|
||||
trace_xfs_buf_item_iodone_async(bp, _RET_IP_);
|
||||
|
||||
cfg = xfs_error_get_cfg(mp, XFS_ERR_METADATA, bp->b_error);
|
||||
|
||||
/*
|
||||
* If the write was asynchronous then no one will be looking for the
|
||||
* error. If this is the first failure of this type, clear the error
|
||||
* state and write the buffer out again. This means we always retry an
|
||||
* async write failure at least once, but we also need to set the buffer
|
||||
* up to behave correctly now for repeated failures.
|
||||
*/
|
||||
if (!(bp->b_flags & (XBF_STALE | XBF_WRITE_FAIL)) ||
|
||||
bp->b_last_error != bp->b_error) {
|
||||
bp->b_flags |= (XBF_WRITE | XBF_DONE | XBF_WRITE_FAIL);
|
||||
bp->b_last_error = bp->b_error;
|
||||
if (cfg->retry_timeout != XFS_ERR_RETRY_FOREVER &&
|
||||
!bp->b_first_retry_time)
|
||||
bp->b_first_retry_time = jiffies;
|
||||
|
||||
if (xfs_buf_ioerror_retry(bp, cfg)) {
|
||||
xfs_buf_ioerror(bp, 0);
|
||||
xfs_buf_submit(bp);
|
||||
return true;
|
||||
return XBF_IOERROR_DONE;
|
||||
}
|
||||
|
||||
/*
|
||||
* Repeated failure on an async write. Take action according to the
|
||||
* error configuration we have been set up to use.
|
||||
*/
|
||||
|
||||
if (cfg->max_retries != XFS_ERR_RETRY_FOREVER &&
|
||||
++bp->b_retries > cfg->max_retries)
|
||||
goto permanent_error;
|
||||
if (cfg->retry_timeout != XFS_ERR_RETRY_FOREVER &&
|
||||
time_after(jiffies, cfg->retry_timeout + bp->b_first_retry_time))
|
||||
goto permanent_error;
|
||||
|
||||
/* At unmount we may treat errors differently */
|
||||
if ((mp->m_flags & XFS_MOUNT_UNMOUNTING) && mp->m_fail_unmount)
|
||||
goto permanent_error;
|
||||
|
||||
/*
|
||||
* Still a transient error, run IO completion failure callbacks and let
|
||||
* the higher layers retry the buffer.
|
||||
*/
|
||||
xfs_buf_do_callbacks_fail(bp);
|
||||
xfs_buf_ioerror(bp, 0);
|
||||
xfs_buf_relse(bp);
|
||||
return true;
|
||||
|
||||
/*
|
||||
* Permanent error - we need to trigger a shutdown if we haven't already
|
||||
* to indicate that inconsistency will result from this action.
|
||||
*/
|
||||
permanent_error:
|
||||
xfs_force_shutdown(mp, SHUTDOWN_META_IO_ERROR);
|
||||
if (xfs_buf_ioerror_permanent(bp, cfg)) {
|
||||
xfs_force_shutdown(mp, SHUTDOWN_META_IO_ERROR);
|
||||
goto out_stale;
|
||||
}
|
||||
|
||||
/* Still considered a transient error. Caller will schedule retries. */
|
||||
return XBF_IOERROR_FAIL;
|
||||
|
||||
out_stale:
|
||||
xfs_buf_stale(bp);
|
||||
bp->b_flags |= XBF_DONE;
|
||||
trace_xfs_buf_error_relse(bp, _RET_IP_);
|
||||
return false;
|
||||
}
|
||||
|
||||
static inline bool
|
||||
xfs_buf_had_callback_errors(
|
||||
struct xfs_buf *bp)
|
||||
{
|
||||
|
||||
/*
|
||||
* If there is an error, process it. Some errors require us to run
|
||||
* callbacks after failure processing is done so we detect that and take
|
||||
* appropriate action.
|
||||
*/
|
||||
if (bp->b_error && xfs_buf_iodone_callback_error(bp))
|
||||
return true;
|
||||
|
||||
/*
|
||||
* Successful IO or permanent error. Either way, we can clear the
|
||||
* retry state here in preparation for the next error that may occur.
|
||||
*/
|
||||
bp->b_last_error = 0;
|
||||
bp->b_retries = 0;
|
||||
bp->b_first_retry_time = 0;
|
||||
return false;
|
||||
return XBF_IOERROR_FINISH;
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -1122,6 +1148,15 @@ xfs_buf_item_done(
|
|||
xfs_buf_rele(bp);
|
||||
}
|
||||
|
||||
static inline void
|
||||
xfs_buf_clear_ioerror_retry_state(
|
||||
struct xfs_buf *bp)
|
||||
{
|
||||
bp->b_last_error = 0;
|
||||
bp->b_retries = 0;
|
||||
bp->b_first_retry_time = 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Inode buffer iodone callback function.
|
||||
*/
|
||||
|
@ -1129,9 +1164,22 @@ void
|
|||
xfs_buf_inode_iodone(
|
||||
struct xfs_buf *bp)
|
||||
{
|
||||
if (xfs_buf_had_callback_errors(bp))
|
||||
return;
|
||||
if (bp->b_error) {
|
||||
int ret = xfs_buf_iodone_error(bp);
|
||||
|
||||
if (ret == XBF_IOERROR_FINISH)
|
||||
goto finish_iodone;
|
||||
if (ret == XBF_IOERROR_DONE)
|
||||
return;
|
||||
ASSERT(ret == XBF_IOERROR_FAIL);
|
||||
xfs_buf_do_callbacks_fail(bp);
|
||||
xfs_buf_ioerror(bp, 0);
|
||||
xfs_buf_relse(bp);
|
||||
return;
|
||||
}
|
||||
|
||||
finish_iodone:
|
||||
xfs_buf_clear_ioerror_retry_state(bp);
|
||||
xfs_buf_item_done(bp);
|
||||
xfs_iflush_done(bp);
|
||||
xfs_buf_ioend_finish(bp);
|
||||
|
@ -1144,9 +1192,22 @@ void
|
|||
xfs_buf_dquot_iodone(
|
||||
struct xfs_buf *bp)
|
||||
{
|
||||
if (xfs_buf_had_callback_errors(bp))
|
||||
return;
|
||||
if (bp->b_error) {
|
||||
int ret = xfs_buf_iodone_error(bp);
|
||||
|
||||
if (ret == XBF_IOERROR_FINISH)
|
||||
goto finish_iodone;
|
||||
if (ret == XBF_IOERROR_DONE)
|
||||
return;
|
||||
ASSERT(ret == XBF_IOERROR_FAIL);
|
||||
xfs_buf_do_callbacks_fail(bp);
|
||||
xfs_buf_ioerror(bp, 0);
|
||||
xfs_buf_relse(bp);
|
||||
return;
|
||||
}
|
||||
|
||||
finish_iodone:
|
||||
xfs_buf_clear_ioerror_retry_state(bp);
|
||||
/* a newly allocated dquot buffer might have a log item attached */
|
||||
xfs_buf_item_done(bp);
|
||||
xfs_dquot_done(bp);
|
||||
|
@ -1163,9 +1224,22 @@ void
|
|||
xfs_buf_iodone(
|
||||
struct xfs_buf *bp)
|
||||
{
|
||||
if (xfs_buf_had_callback_errors(bp))
|
||||
return;
|
||||
if (bp->b_error) {
|
||||
int ret = xfs_buf_iodone_error(bp);
|
||||
|
||||
if (ret == XBF_IOERROR_FINISH)
|
||||
goto finish_iodone;
|
||||
if (ret == XBF_IOERROR_DONE)
|
||||
return;
|
||||
ASSERT(ret == XBF_IOERROR_FAIL);
|
||||
xfs_buf_do_callbacks_fail(bp);
|
||||
xfs_buf_ioerror(bp, 0);
|
||||
xfs_buf_relse(bp);
|
||||
return;
|
||||
}
|
||||
|
||||
finish_iodone:
|
||||
xfs_buf_clear_ioerror_retry_state(bp);
|
||||
xfs_buf_item_done(bp);
|
||||
xfs_buf_ioend_finish(bp);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue