xfs: clear ail delwri queued bufs on unmount of shutdown fs (efc3289c) · Commits · 戴 / test

In the typical unmount case, the AIL is forced out by the unmount sequence before the xfsaild task is stopped. Since AIL items are removed on writeback completion, this means that the AIL ->ail_buf_list delwri queue has been drained. This is not always true in the shutdown case, however. It's possible for buffers to sit on a delwri queue for a period of time across submission attempts if said items are locked or have been relogged and pinned since first added to the queue. If the attempt to log such an item results in a log I/O error, the error processing can shutdown the fs, remove the item from the AIL, stale the buffer (dropping the LRU reference) and clear its delwri queue state. The latter bit means the buffer will be released from a delwri queue on the next submission attempt, but this might never occur if the filesystem has shutdown and the AIL is empty. This means that such buffers are held indefinitely by the AIL delwri queue across destruction of the AIL. Aside from being a memory leak, these buffers can also hold references to in-core perag structures. The latter problem manifests as a generic/475 failure, reproducing the following asserts at unmount time: XFS: Assertion failed: atomic_read(&pag->pag_ref) == 0, file: fs/xfs/xfs_mount.c, line: 151 XFS: Assertion failed: atomic_read(&pag->pag_ref) == 0, file: fs/xfs/xfs_mount.c, line: 132 To prevent this problem, clear the AIL delwri queue as a final step before xfsaild() exit. The !empty state should never occur in the normal case, so add an assert to catch unexpected problems going forward. [dgc: add comment explaining need for xfs_buf_delwri_cancel() after calling xfs_buf_delwri_submit_nowait().] Signed-off-by:

Brian Foster <bfoster@redhat.com> Reviewed-by:

Dave Chinner <dchinner@redhat.com> Signed-off-by:

Dave Chinner <david@fromorbit.com>

fs/xfs/xfs_buf.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -2055,6 +2055,13 @@ xfs_buf_delwri_submit_buffers(
		* is only safely useable for callers that can track I/O completion by higher
		* level means, e.g. AIL pushing as the @buffer_list is consumed in this
		* function.
		*
		* Note: this function will skip buffers it would block on, and in doing so
		* leaves them on @buffer_list so they can be retried on a later pass. As such,
		* it is up to the caller to ensure that the buffer list is fully submitted or
		* cancelled appropriately when they are finished with the list. Failure to
		* cancel or resubmit the list until it is empty will result in leaked buffers
		* at unmount time.
		*/
		int
		xfs_buf_delwri_submit_nowait(

fs/xfs/xfs_trans_ail.c

+22 −6

Original line number	Diff line number	Diff line
		@@ -531,17 +531,33 @@ xfsaild(
		set_current_state(TASK_INTERRUPTIBLE);

		/*
		* Check kthread_should_stop() after we set the task state
		* to guarantee that we either see the stop bit and exit or
		* the task state is reset to runnable such that it's not
		* scheduled out indefinitely and detects the stop bit at
		* next iteration.
		*
		* Check kthread_should_stop() after we set the task state to
		* guarantee that we either see the stop bit and exit or the
		* task state is reset to runnable such that it's not scheduled
		* out indefinitely and detects the stop bit at next iteration.
		* A memory barrier is included in above task state set to
		* serialize again kthread_stop().
		*/
		if (kthread_should_stop()) {
		__set_current_state(TASK_RUNNING);

		/*
		* The caller forces out the AIL before stopping the
		* thread in the common case, which means the delwri
		* queue is drained. In the shutdown case, the queue may
		* still hold relogged buffers that haven't been
		* submitted because they were pinned since added to the
		* queue.
		*
		* Log I/O error processing stales the underlying buffer
		* and clears the delwri state, expecting the buf to be
		* removed on the next submission attempt. That won't
		* happen if we're shutting down, so this is the last
		* opportunity to release such buffers from the queue.
		*/
		ASSERT(list_empty(&ailp->ail_buf_list) \|\|
		XFS_FORCED_SHUTDOWN(ailp->ail_mount));
		xfs_buf_delwri_cancel(&ailp->ail_buf_list);
		break;
		}

Admin message