From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Dave Chinner <david@fromorbit.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 23/24] xfs: factor xfs_iflush_done
Date: Fri, 22 May 2020 17:20:59 -0700 (PDT) [thread overview]
Message-ID: <20200523002059.GB8230@magnolia> (raw)
In-Reply-To: <20200522035029.3022405-24-david@fromorbit.com>
On Fri, May 22, 2020 at 01:50:28PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> xfs_iflush_done() does 3 distinct operations to the inodes attached
> to the buffer. Separate these operations out into functions so that
> it is easier to modify these operations independently in future.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
Seems like a fairly simple refactoring,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/xfs_inode_item.c | 156 +++++++++++++++++++++-------------------
> 1 file changed, 82 insertions(+), 74 deletions(-)
>
> diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
> index af4764f97a339..4dd4f45dcc46e 100644
> --- a/fs/xfs/xfs_inode_item.c
> +++ b/fs/xfs/xfs_inode_item.c
> @@ -662,104 +662,67 @@ xfs_inode_item_destroy(
>
>
> /*
> - * This is the inode flushing I/O completion routine. It is called
> - * from interrupt level when the buffer containing the inode is
> - * flushed to disk. It is responsible for removing the inode item
> - * from the AIL if it has not been re-logged, and unlocking the inode's
> - * flush lock.
> - *
> - * To reduce AIL lock traffic as much as possible, we scan the buffer log item
> - * list for other inodes that will run this function. We remove them from the
> - * buffer list so we can process all the inode IO completions in one AIL lock
> - * traversal.
> - *
> - * Note: Now that we attach the log item to the buffer when we first log the
> - * inode in memory, we can have unflushed inodes on the buffer list here. These
> - * inodes will have a zero ili_last_fields, so skip over them here.
> + * We only want to pull the item from the AIL if it is actually there
> + * and its location in the log has not changed since we started the
> + * flush. Thus, we only bother if the inode's lsn has not changed.
> */
> void
> -xfs_iflush_done(
> - struct xfs_buf *bp)
> +xfs_iflush_ail_updates(
> + struct xfs_ail *ailp,
> + struct list_head *list)
> {
> - struct xfs_inode_log_item *iip;
> - struct xfs_log_item *lip, *n;
> - struct xfs_ail *ailp = bp->b_mount->m_ail;
> - int need_ail = 0;
> - LIST_HEAD(tmp);
> + struct xfs_log_item *lip;
> + xfs_lsn_t tail_lsn = 0;
>
> - /*
> - * Pull the attached inodes from the buffer one at a time and take the
> - * appropriate action on them.
> - */
> - list_for_each_entry_safe(lip, n, &bp->b_li_list, li_bio_list) {
> - iip = INODE_ITEM(lip);
> - if (!iip->ili_last_fields)
> - continue;
> + /* this is an opencoded batch version of xfs_trans_ail_delete */
> + spin_lock(&ailp->ail_lock);
> + list_for_each_entry(lip, list, li_bio_list) {
> + struct xfs_inode_log_item *iip = INODE_ITEM(lip);
> + xfs_lsn_t lsn;
>
> - if (xfs_iflags_test(iip->ili_inode, XFS_ISTALE)) {
> - xfs_iflush_abort(iip->ili_inode);
> + if (iip->ili_flush_lsn != lip->li_lsn) {
> + xfs_clear_li_failed(lip);
> continue;
> }
>
> - list_move_tail(&lip->li_bio_list, &tmp);
> -
> - /* Do an unlocked check for needing the AIL lock. */
> - if (iip->ili_flush_lsn == lip->li_lsn ||
> - test_bit(XFS_LI_FAILED, &lip->li_flags))
> - need_ail++;
> + lsn = xfs_ail_delete_one(ailp, lip);
> + if (!tail_lsn && lsn)
> + tail_lsn = lsn;
> }
> + xfs_ail_update_finish(ailp, tail_lsn);
> +}
>
> - /*
> - * We only want to pull the item from the AIL if it is actually there
> - * and its location in the log has not changed since we started the
> - * flush. Thus, we only bother if the inode's lsn has not changed.
> - */
> - if (need_ail) {
> - xfs_lsn_t tail_lsn = 0;
> -
> - /* this is an opencoded batch version of xfs_trans_ail_delete */
> - spin_lock(&ailp->ail_lock);
> - list_for_each_entry(lip, &tmp, li_bio_list) {
> - iip = INODE_ITEM(lip);
> - if (iip->ili_flush_lsn == lip->li_lsn) {
> - xfs_lsn_t lsn = xfs_ail_delete_one(ailp, lip);
> - if (!tail_lsn && lsn)
> - tail_lsn = lsn;
> - } else {
> - xfs_clear_li_failed(lip);
> - }
> - }
> - xfs_ail_update_finish(ailp, tail_lsn);
> - }
> +/*
> + * Walk the list of inodes that have completed their IOs. If they are clean
> + * remove them from the list and dissociate them from the buffer. Buffers that
> + * are still dirty remain linked to the buffer and on the list. Caller must
> + * handle them appropriately.
> + */
> +void
> +xfs_iflush_finish(
> + struct xfs_buf *bp,
> + struct list_head *list)
> +{
> + struct xfs_log_item *lip, *n;
>
> - /*
> - * Clean up and unlock the flush lock now we are done. We can clear the
> - * ili_last_fields bits now that we know that the data corresponding to
> - * them is safely on disk.
> - */
> - list_for_each_entry_safe(lip, n, &tmp, li_bio_list) {
> + list_for_each_entry_safe(lip, n, list, li_bio_list) {
> + struct xfs_inode_log_item *iip = INODE_ITEM(lip);
> bool drop_buffer = false;
>
> - list_del_init(&lip->li_bio_list);
> - iip = INODE_ITEM(lip);
> -
> spin_lock(&iip->ili_lock);
> iip->ili_last_fields = 0;
> iip->ili_flush_lsn = 0;
>
> /*
> * Remove the reference to the cluster buffer if the inode is
> - * clean in memory. Drop the buffer reference once we've dropped
> - * the locks we hold. If the inode is dirty in memory, we need
> - * to put the inode item back on the buffer list for another
> - * pass through the flush machinery.
> + * clean in memory and drop the buffer reference once we've
> + * dropped the locks we hold.
> */
> ASSERT(iip->ili_item.li_buf == bp);
> if (!iip->ili_fields) {
> iip->ili_item.li_buf = NULL;
> + list_del_init(&lip->li_bio_list);
> drop_buffer = true;
> - } else {
> - list_add(&lip->li_bio_list, &bp->b_li_list);
> }
> spin_unlock(&iip->ili_lock);
> xfs_ifunlock(iip->ili_inode);
> @@ -768,6 +731,51 @@ xfs_iflush_done(
> }
> }
>
> +/*
> + * Inode buffer IO completion routine. It is responsible for removing inodes
> + * attached to the buffer from the AIL if they have not been re-logged, as well
> + * as completing the flush and unlocking the inode.
> + */
> +void
> +xfs_iflush_done(
> + struct xfs_buf *bp)
> +{
> + struct xfs_log_item *lip, *n;
> + LIST_HEAD(flushed_inodes);
> + LIST_HEAD(ail_updates);
> +
> + /*
> + * Pull the attached inodes from the buffer one at a time and take the
> + * appropriate action on them.
> + */
> + list_for_each_entry_safe(lip, n, &bp->b_li_list, li_bio_list) {
> + struct xfs_inode_log_item *iip = INODE_ITEM(lip);
> + if (!iip->ili_last_fields)
> + continue;
> +
> + if (xfs_iflags_test(iip->ili_inode, XFS_ISTALE)) {
> + xfs_iflush_abort(iip->ili_inode);
> + continue;
> + }
> +
> + /* Do an unlocked check for needing the AIL lock. */
> + if (iip->ili_flush_lsn == lip->li_lsn ||
> + test_bit(XFS_LI_FAILED, &lip->li_flags))
> + list_move_tail(&lip->li_bio_list, &ail_updates);
> + else
> + list_move_tail(&lip->li_bio_list, &flushed_inodes);
> + }
> +
> + if (!list_empty(&ail_updates)) {
> + xfs_iflush_ail_updates(bp->b_mount->m_ail, &ail_updates);
> + list_splice_tail(&ail_updates, &flushed_inodes);
> + }
> +
> + xfs_iflush_finish(bp, &flushed_inodes);
> + if (!list_empty(&flushed_inodes))
> + list_splice_tail(&flushed_inodes, &bp->b_li_list);
> +}
> +
> /*
> * This is the inode flushing abort routine. It is called from xfs_iflush when
> * the filesystem is shutting down to clean up the inode state. It is
> --
> 2.26.2.761.g0e0b3e54be
>
next prev parent reply other threads:[~2020-05-23 0:23 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-22 3:50 [PATCH 00/24] xfs: rework inode flushing to make inode reclaim fully asynchronous Dave Chinner
2020-05-22 3:50 ` [PATCH 01/24] xfs: remove logged flag from inode log item Dave Chinner
2020-05-22 7:25 ` Christoph Hellwig
2020-05-22 21:13 ` Darrick J. Wong
2020-05-22 3:50 ` [PATCH 02/24] xfs: add an inode item lock Dave Chinner
2020-05-22 6:45 ` Amir Goldstein
2020-05-22 21:24 ` Darrick J. Wong
2020-05-23 8:45 ` Christoph Hellwig
2020-05-22 3:50 ` [PATCH 03/24] xfs: mark inode buffers in cache Dave Chinner
2020-05-22 7:45 ` Amir Goldstein
2020-05-22 21:35 ` Darrick J. Wong
2020-05-24 23:41 ` Dave Chinner
2020-05-23 8:48 ` Christoph Hellwig
2020-05-25 0:06 ` Dave Chinner
2020-05-22 3:50 ` [PATCH 04/24] xfs: mark dquot " Dave Chinner
2020-05-22 7:46 ` Amir Goldstein
2020-05-22 21:38 ` Darrick J. Wong
2020-05-22 3:50 ` [PATCH 05/24] xfs: mark log recovery buffers for completion Dave Chinner
2020-05-22 7:41 ` Amir Goldstein
2020-05-24 23:54 ` Dave Chinner
2020-05-22 21:41 ` Darrick J. Wong
2020-05-22 3:50 ` [PATCH 06/24] xfs: call xfs_buf_iodone directly Dave Chinner
2020-05-22 7:56 ` Amir Goldstein
2020-05-22 21:53 ` Darrick J. Wong
2020-05-22 3:50 ` [PATCH 07/24] xfs: clean up whacky buffer log item list reinit Dave Chinner
2020-05-22 22:01 ` Darrick J. Wong
2020-05-23 8:50 ` Christoph Hellwig
2020-05-22 3:50 ` [PATCH 08/24] xfs: fold xfs_istale_done into xfs_iflush_done Dave Chinner
2020-05-22 22:10 ` Darrick J. Wong
2020-05-23 9:12 ` Christoph Hellwig
2020-05-22 3:50 ` [PATCH 09/24] xfs: use direct calls for dquot IO completion Dave Chinner
2020-05-22 22:13 ` Darrick J. Wong
2020-05-23 9:16 ` Christoph Hellwig
2020-05-22 3:50 ` [PATCH 10/24] xfs: clean up the buffer iodone callback functions Dave Chinner
2020-05-22 22:26 ` Darrick J. Wong
2020-05-25 0:37 ` Dave Chinner
2020-05-23 9:19 ` Christoph Hellwig
2020-05-22 3:50 ` [PATCH 11/24] xfs: get rid of log item callbacks Dave Chinner
2020-05-22 22:27 ` Darrick J. Wong
2020-05-23 9:19 ` Christoph Hellwig
2020-05-22 3:50 ` [PATCH 12/24] xfs: pin inode backing buffer to the inode log item Dave Chinner
2020-05-22 22:39 ` Darrick J. Wong
2020-05-23 9:34 ` Christoph Hellwig
2020-05-23 21:43 ` Dave Chinner
2020-05-24 5:31 ` Christoph Hellwig
2020-05-24 23:13 ` Dave Chinner
2020-05-22 3:50 ` [PATCH 13/24] xfs: make inode reclaim almost non-blocking Dave Chinner
2020-05-22 12:19 ` Amir Goldstein
2020-05-22 22:48 ` Darrick J. Wong
2020-05-23 22:29 ` Dave Chinner
2020-05-22 3:50 ` [PATCH 14/24] xfs: remove IO submission from xfs_reclaim_inode() Dave Chinner
2020-05-22 23:06 ` Darrick J. Wong
2020-05-25 3:49 ` Dave Chinner
2020-05-23 9:40 ` Christoph Hellwig
2020-05-23 22:35 ` Dave Chinner
2020-05-22 3:50 ` [PATCH 15/24] xfs: allow multiple reclaimers per AG Dave Chinner
2020-05-22 23:10 ` Darrick J. Wong
2020-05-23 22:35 ` Dave Chinner
2020-05-22 3:50 ` [PATCH 16/24] xfs: don't block inode reclaim on the ILOCK Dave Chinner
2020-05-22 23:11 ` Darrick J. Wong
2020-05-22 3:50 ` [PATCH 17/24] xfs: remove SYNC_TRYLOCK from inode reclaim Dave Chinner
2020-05-22 23:14 ` Darrick J. Wong
2020-05-23 22:42 ` Dave Chinner
2020-05-22 3:50 ` [PATCH 18/24] xfs: clean up inode reclaim comments Dave Chinner
2020-05-22 23:17 ` Darrick J. Wong
2020-05-22 3:50 ` [PATCH 19/24] xfs: attach inodes to the cluster buffer when dirtied Dave Chinner
2020-05-22 23:48 ` Darrick J. Wong
2020-05-23 22:59 ` Dave Chinner
2020-05-22 3:50 ` [PATCH 20/24] xfs: xfs_iflush() is no longer necessary Dave Chinner
2020-05-22 23:54 ` Darrick J. Wong
2020-05-22 3:50 ` [PATCH 21/24] xfs: rename xfs_iflush_int() Dave Chinner
2020-05-22 12:33 ` Amir Goldstein
2020-05-22 23:57 ` Darrick J. Wong
2020-05-22 3:50 ` [PATCH 22/24] xfs: rework xfs_iflush_cluster() dirty inode iteration Dave Chinner
2020-05-23 0:13 ` Darrick J. Wong
2020-05-23 23:14 ` Dave Chinner
2020-05-23 11:31 ` Christoph Hellwig
2020-05-23 23:23 ` Dave Chinner
2020-05-24 5:32 ` Christoph Hellwig
2020-05-23 11:39 ` Christoph Hellwig
2020-05-22 3:50 ` [PATCH 23/24] xfs: factor xfs_iflush_done Dave Chinner
2020-05-23 0:20 ` Darrick J. Wong [this message]
2020-05-23 11:35 ` Christoph Hellwig
2020-05-22 3:50 ` [PATCH 24/24] xfs: remove xfs_inobp_check() Dave Chinner
2020-05-23 0:16 ` Darrick J. Wong
2020-05-23 11:36 ` Christoph Hellwig
2020-05-22 4:04 ` [PATCH 00/24] xfs: rework inode flushing to make inode reclaim fully asynchronous Dave Chinner
2020-05-23 16:18 ` Darrick J. Wong
2020-05-23 21:22 ` Dave Chinner
2020-05-22 6:18 ` Amir Goldstein
2020-05-22 12:01 ` Amir Goldstein
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200523002059.GB8230@magnolia \
--to=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).