Hi Dave, Your patch needs a minor correction. At start of xfs_iflush() either we must initialize "bp = NULL" or else xfs_imap_to_bp() when it hits an error need to set "*bpp = NULL". Otherwise with your patch we are having an uninitialized bp that corrupt_out is trying to do xfs_buf_relse(). I included the above minor change & confirmed your patch works great. So pls go ahead & formalize it. Thanks! --Shyam -----Original Message----- From: Dave Chinner [mailto:david@xxxxxxxxxxxxx] Sent: 12 April 2016 13:58 To: Shyam Kaushik Cc: xfs@xxxxxxxxxxx Subject: Re: [PATCH] xfs: Abort intent log item in xfs_iflush() upon error to get buf On Tue, Apr 12, 2016 at 12:27:30PM +0530, Shyam Kaushik wrote: > Looking at xfs_iflush(). If an IO fails, it is supposed to unlock the > inode by calling xfs_iflush_abort(), which will also remove it from > the AIL. This can also happen on reclaim of a dirty inode, and if so > we'll still reclaim the inode because reclaim assumes xfs_iflush() > cleans up properly. Which, apparently, it doesn't. > > Fix xfs_iflush() buf get failure to remove intent log item. > > Discovered-by: Dave Chinner <dchinner at redhat.com> > diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c > index 96f606d..85414a6 100644 > --- a/fs/xfs/xfs_inode.c > +++ b/fs/xfs/xfs_inode.c > @@ -3374,8 +3374,9 @@ xfs_iflush( > error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &bp, > XBF_TRYLOCK, > 0); > if (error || !bp) { > - xfs_ifunlock(ip); > - return error; > + if (!bp) > + error = -EIO; > + goto abort_out; So that will trigger a failure whenever the underlying buffer is busy (i.e. returns -EAGAIN with bp NULL), not just when an IO or corruption error occurs. The hammer is too big. ;) Great proof of concept, though, as your testing results tell us you have found the root cause of the bug. The patch I wrote earlier today takes the EAGAIN case into account - I'm currently testing it, and have attached it below. Can you run it through your error testing, please, Shyam? I'll update all the reported-by, etc attributions before I post it for proper review. Cheers, Dave. -- Dave Chinner david@xxxxxxxxxxxxx xfs: xfs_iflush_cluster fails to abort on error From: Dave Chinner <dchinner@xxxxxxxxxx> When a failure due to an inode buffer occurs, the error handling fails to abort the inode writeback correctly. This can result in the inode being reclaimed whilst still in the AIL, leading to use-after-free situations as well as filesystems that cannot be unmounted as the inode log items left in the AIL never get removed. Fix this by ensuring fatal errors from xfs_imap_to_bp() result in the inode flush being aborted correctly. Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> --- fs/xfs/xfs_inode.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 5b84bbc..e1a8020 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -3378,14 +3378,22 @@ xfs_iflush( } /* - * Get the buffer containing the on-disk inode. + * Get the buffer containing the on-disk inode. We are doing a try-lock + * operation here, so we may get an EAGAIN error. In that case, we + * simply want to return with the inode still dirty. + * + * If we get any other error, we effectively have a corruption situation + * and we cannot flush the inode, so we treat it the same as failing + * xfs_iflush_int(). */ error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &bp, XBF_TRYLOCK, 0); - if (error || !bp) { + if (error == -EAGAIN) { xfs_ifunlock(ip); return error; } + if (error) + goto corrupt_out; /* * First flush out the inode that xfs_iflush was called with. @@ -3413,7 +3421,8 @@ xfs_iflush( return 0; corrupt_out: - xfs_buf_relse(bp); + if (bp) + xfs_buf_relse(bp); xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE); cluster_corrupt_out: error = -EFSCORRUPTED; _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs
