Commit d3a304b6 authored by Carlos Maiolino's avatar Carlos Maiolino Committed by Darrick J. Wong
Browse files

xfs: Properly retry failed inode items in case of error during buffer writeback 



When a buffer has been failed during writeback, the inode items into it
are kept flush locked, and are never resubmitted due the flush lock, so,
if any buffer fails to be written, the items in AIL are never written to
disk and never unlocked.

This causes unmount operation to hang due these items flush locked in AIL,
but this also causes the items in AIL to never be written back, even when
the IO device comes back to normal.

I've been testing this patch with a DM-thin device, creating a
filesystem larger than the real device.

When writing enough data to fill the DM-thin device, XFS receives ENOSPC
errors from the device, and keep spinning on xfsaild (when 'retry
forever' configuration is set).

At this point, the filesystem can not be unmounted because of the flush locked
items in AIL, but worse, the items in AIL are never retried at all
(once xfs_inode_item_push() will skip the items that are flush locked),
even if the underlying DM-thin device is expanded to the proper size.

This patch fixes both cases, retrying any item that has been failed
previously, using the infra-structure provided by the previous patch.

Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Signed-off-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 0b80ae6e

fs/xfs/xfs_buf_item.c

+28 −0
Original line number Diff line number Diff line
@@ -1234,3 +1234,31 @@ xfs_buf_iodone( 
	xfs_trans_ail_delete(ailp, lip, SHUTDOWN_CORRUPT_INCORE);

	xfs_buf_item_free(BUF_ITEM(lip));

}



/*

 * Requeue a failed buffer for writeback

 *

 * Return true if the buffer has been re-queued properly, false otherwise

 */

bool

xfs_buf_resubmit_failed_buffers(

	struct xfs_buf		*bp,

	struct xfs_log_item	*lip,

	struct list_head	*buffer_list)

{

	struct xfs_log_item	*next;



	/*

	 * Clear XFS_LI_FAILED flag from all items before resubmit

	 *

	 * XFS_LI_FAILED set/clear is protected by xa_lock, caller  this

	 * function already have it acquired

	 */

	for (; lip; lip = next) {

		next = lip->li_bio_list;

		xfs_clear_li_failed(lip);

	}



	/* Add this buffer back to the delayed write list */

	return xfs_buf_delwri_queue(bp, buffer_list);

}

fs/xfs/xfs_buf_item.h

+3 −0
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ void xfs_buf_attach_iodone(struct xfs_buf *, 
			      xfs_log_item_t *);

void	xfs_buf_iodone_callbacks(struct xfs_buf *);

void	xfs_buf_iodone(struct xfs_buf *, struct xfs_log_item *);

bool	xfs_buf_resubmit_failed_buffers(struct xfs_buf *,

					struct xfs_log_item *,

					struct list_head *);



extern kmem_zone_t	*xfs_buf_item_zone;

fs/xfs/xfs_inode_item.c

+43 −4
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "xfs_error.h"

#include "xfs_trace.h"

#include "xfs_trans_priv.h"

#include "xfs_buf_item.h"

#include "xfs_log.h"
@@ -475,6 +476,23 @@ xfs_inode_item_unpin( 
		wake_up_bit(&ip->i_flags, __XFS_IPINNED_BIT);

}



/*

 * Callback used to mark a buffer with XFS_LI_FAILED when items in the buffer

 * have been failed during writeback

 *

 * This informs the AIL that the inode is already flush locked on the next push,

 * and acquires a hold on the buffer to ensure that it isn't reclaimed before

 * dirty data makes it to disk.

 */

STATIC void

xfs_inode_item_error(

	struct xfs_log_item	*lip,

	struct xfs_buf		*bp)

{

	ASSERT(xfs_isiflocked(INODE_ITEM(lip)->ili_inode));

	xfs_set_li_failed(lip, bp);

}



STATIC uint

xfs_inode_item_push(

	struct xfs_log_item	*lip,
@@ -484,13 +502,28 @@ xfs_inode_item_push( 
{

	struct xfs_inode_log_item *iip = INODE_ITEM(lip);

	struct xfs_inode	*ip = iip->ili_inode;

	struct xfs_buf		*bp = NULL;

	struct xfs_buf		*bp = lip->li_buf;

	uint			rval = XFS_ITEM_SUCCESS;

	int			error;



	if (xfs_ipincount(ip) > 0)

		return XFS_ITEM_PINNED;



	/*

	 * The buffer containing this item failed to be written back

	 * previously. Resubmit the buffer for IO.

	 */

	if (lip->li_flags & XFS_LI_FAILED) {

		if (!xfs_buf_trylock(bp))

			return XFS_ITEM_LOCKED;



		if (!xfs_buf_resubmit_failed_buffers(bp, lip, buffer_list))

			rval = XFS_ITEM_FLUSHING;



		xfs_buf_unlock(bp);

		return rval;

	}



	if (!xfs_ilock_nowait(ip, XFS_ILOCK_SHARED))

		return XFS_ITEM_LOCKED;
@@ -622,7 +655,8 @@ static const struct xfs_item_ops xfs_inode_item_ops = { 
	.iop_unlock	= xfs_inode_item_unlock,

	.iop_committed	= xfs_inode_item_committed,

	.iop_push	= xfs_inode_item_push,

	.iop_committing = xfs_inode_item_committing

	.iop_committing = xfs_inode_item_committing,

	.iop_error	= xfs_inode_item_error

};
@@ -710,7 +744,8 @@ xfs_iflush_done( 
		 * the AIL lock.

		 */

		iip = INODE_ITEM(blip);

		if (iip->ili_logged && blip->li_lsn == iip->ili_flush_lsn)

		if ((iip->ili_logged && blip->li_lsn == iip->ili_flush_lsn) ||

		    lip->li_flags & XFS_LI_FAILED)

			need_ail++;



		blip = next;
@@ -718,7 +753,8 @@ xfs_iflush_done( 


	/* make sure we capture the state of the initial inode. */

	iip = INODE_ITEM(lip);

	if (iip->ili_logged && lip->li_lsn == iip->ili_flush_lsn)

	if ((iip->ili_logged && lip->li_lsn == iip->ili_flush_lsn) ||

	    lip->li_flags & XFS_LI_FAILED)

		need_ail++;



	/*
@@ -739,6 +775,9 @@ xfs_iflush_done( 
			if (INODE_ITEM(blip)->ili_logged &&

			    blip->li_lsn == INODE_ITEM(blip)->ili_flush_lsn)

				mlip_changed |= xfs_ail_delete_one(ailp, blip);

			else {

				xfs_clear_li_failed(blip);

			}

		}



		if (mlip_changed) {

fs/xfs/xfs_trans.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ typedef struct xfs_log_item { 
	struct xfs_ail			*li_ailp;	/* ptr to AIL */

	uint				li_type;	/* item type */

	uint				li_flags;	/* misc flags */

	struct xfs_buf			*li_buf;	/* real buffer pointer */

	struct xfs_log_item		*li_bio_list;	/* buffer item list */

	void				(*li_cb)(struct xfs_buf *,

						 struct xfs_log_item *);

fs/xfs/xfs_trans_ail.c

+2 −1
Original line number Diff line number Diff line
@@ -693,6 +693,7 @@ xfs_ail_delete_one( 


	trace_xfs_ail_delete(lip, mlip->li_lsn, lip->li_lsn);

	xfs_ail_delete(ailp, lip);

	xfs_clear_li_failed(lip);

	lip->li_flags &= ~XFS_LI_IN_AIL;

	lip->li_lsn = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE