xfs: clear ail delwri queued bufs on unmount of shutdown fs
PATCH 1/1 xfs: clear ail delwri queued bufs on unmount of shutdown fs
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.
---
Hi all,
This is a minor issue I ran into via generic/475. That test still occasionally fails for me with this patch in place, but the failure appears to be unrelated.
Brian
fs/xfs/xfs_trans_ail.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-)
fs/xfs/xfs_trans_ail.c +22 -6
@@ -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 ; }
Signature · 1 line
2.17.1
Quoted 9 lines · Brian Foster
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.
Can you add this as a comment to xfs_buf_delwri_submit_nowait() to document that callers either need to check that everything was submitted and/or cancel the delwri list before they tear it down?
Quoted 14 lines
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:
Quoted 4 lines
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
Yup, I saw that once a couple of weeks ago, but was not able to reproduce it to track it down.
Quoted 4 lines
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.
*nod*.
Apart from needing to document how to usexfs_buf_delwri_submit_nowait(), this looks fine.
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]
Quoted 7 lines · Dave Chinner
Quoted 6 lines · Brian Foster
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.
Quoted 7 lines
Quoted 3 lines
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.
Can you add this as a comment to
xfs_buf_delwri_submit_nowait()to document that callers either need to check that everything was submitted and/or cancel the delwri list before they tear it down?
I added this comment to the patch when I pulled it in:
fs/xfs/xfs_buf.c +7 -0
@@ -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(
Does that look reasonable?
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]
Quoted 35 lines · Dave Chinner
Quoted 7 lines · Dave Chinner
Quoted 6 lines · Brian Foster
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.
Quoted 7 lines
Quoted 3 lines
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.
Can you add this as a comment to
xfs_buf_delwri_submit_nowait()to document that callers either need to check that everything was submitted and/or cancel the delwri list before they tear it down?I added this comment to the patch when I pulled it in:
fs/xfs/xfs_buf.c +7
-0@@ -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(
Quoted 2 lines
Does that look reasonable?
Looks fine to me, thanks!
Brian
Quoted 6 lines
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]