p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfs: release bli from transaction properly on fs shutdown 

If a filesystem shutdown occurs with a buffer log item in the CIL
and a log force occurs, the ->iop_unpin() handler is generally
expected to tear down the bli properly. This entails freeing the bli
memory and releasing the associated hold on the buffer so it can be
released and the filesystem unmounted.

If this sequence occurs while ->bli_refcount is elevated (i.e.,
another transaction is open and attempting to modify the buffer),
however, ->iop_unpin() may not be responsible for releasing the bli.
Instead, the transaction may release the final ->bli_refcount
reference and thus xfs_trans_brelse() is responsible for tearing
down the bli.

While xfs_trans_brelse() does drop the reference count, it only
attempts to release the bli if it is clean (i.e., not in the
CIL/AIL). If the filesystem is shutdown and the bli is sitting dirty
in the CIL as noted above, this ends up skipping the last
opportunity to release the bli. In turn, this leaves the hold on the
buffer and causes an unmount hang. This can be reproduced by running
generic/388 in repetition.

Update xfs_trans_brelse() to handle this shutdown corner case
correctly. If the final bli reference is dropped and the filesystem
is shutdown, remove the bli from the AIL (if necessary) and release
the bli to drop the buffer hold and ensure an unmount does not hang.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Carlos Maiolino <cmaiolino@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:
Brian Foster 2017-06-14 21:35:35 -07:00 committed by Darrick J. Wong
parent 0cbe48cc58
commit 79e641ce29
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/xfs/xfs_trans_buf.c
View File

@ -356,6 +356,7 @@ xfs_trans_brelse(xfs_trans_t *tp,
xfs_buf_t *bp) xfs_buf_t *bp)
{ {
xfs_buf_log_item_t *bip; xfs_buf_log_item_t *bip;
int freed;
/* /*
* Default to a normal brelse() call if the tp is NULL. * Default to a normal brelse() call if the tp is NULL.
@ -419,16 +420,22 @@ xfs_trans_brelse(xfs_trans_t *tp,
/* /*
* Drop our reference to the buf log item. * Drop our reference to the buf log item.
*/ */
atomic_dec(&bip->bli_refcount); freed = atomic_dec_and_test(&bip->bli_refcount);
/* /*
* If the buf item is not tracking data in the log, then * If the buf item is not tracking data in the log, then we must free it
* we must free it before releasing the buffer back to the * before releasing the buffer back to the free pool.
* free pool. Before releasing the buffer to the free pool, *
* clear the transaction pointer in b_fsprivate2 to dissolve * If the fs has shutdown and we dropped the last reference, it may fall
* its relation to this transaction. * on us to release a (possibly dirty) bli if it never made it to the
* AIL (e.g., the aborted unpin already happened and didn't release it
* due to our reference). Since we're already shutdown and need xa_lock,
* just force remove from the AIL and release the bli here.
*/ */
if (!xfs_buf_item_dirty(bip)) { if (XFS_FORCED_SHUTDOWN(tp->t_mountp) && freed) {
xfs_trans_ail_remove(&bip->bli_item, SHUTDOWN_LOG_IO_ERROR);
xfs_buf_item_relse(bp);
} else if (!xfs_buf_item_dirty(bip)) {
/*** /***
ASSERT(bp->b_pincount == 0); ASSERT(bp->b_pincount == 0);
***/ ***/