On Wed, Aug 10, 2022 at 09:03:45AM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
>
> Ever since the CIL and delayed logging was introduced,
> xfs_trans_committed_bulk() has been a purely CIL checkpoint
> completion function and not a transaction commit completion
> function. Now that we are adding log specific updates to this
> function, it really does not have anything to do with the
> transaction subsystem - it is really log and log item level
> functionality.
>
> This should be part of the CIL code as it is the callback
> that moves log items from the CIL checkpoint to the AIL. Move it
> and rename it to xlog_cil_ail_insert().
>
> Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
/me has been wondering why these two functions weren't lumped into the
rest of the cil code for quite sometime, so thx for clarifying. :)
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
--D
> ---
> fs/xfs/xfs_log_cil.c | 132 +++++++++++++++++++++++++++++++++++++++-
> fs/xfs/xfs_trans.c | 129 ---------------------------------------
> fs/xfs/xfs_trans_priv.h | 3 -
> 3 files changed, 131 insertions(+), 133 deletions(-)
>
> diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
> index eccbfb99e894..475a18493c37 100644
> --- a/fs/xfs/xfs_log_cil.c
> +++ b/fs/xfs/xfs_log_cil.c
> @@ -683,6 +683,136 @@ xlog_cil_insert_items(
> }
> }
>
> +static inline void
> +xlog_cil_ail_insert_batch(
> + struct xfs_ail *ailp,
> + struct xfs_ail_cursor *cur,
> + struct xfs_log_item **log_items,
> + int nr_items,
> + xfs_lsn_t commit_lsn)
> +{
> + int i;
> +
> + spin_lock(&ailp->ail_lock);
> + /* xfs_trans_ail_update_bulk drops ailp->ail_lock */
> + xfs_trans_ail_update_bulk(ailp, cur, log_items, nr_items, commit_lsn);
> +
> + for (i = 0; i < nr_items; i++) {
> + struct xfs_log_item *lip = log_items[i];
> +
> + if (lip->li_ops->iop_unpin)
> + lip->li_ops->iop_unpin(lip, 0);
> + }
> +}
> +
> +/*
> + * Take the checkpoint's log vector chain of items and insert the attached log
> + * items into the the AIL. This uses bulk insertion techniques to minimise AIL
> + * lock traffic.
> + *
> + * If we are called with the aborted flag set, it is because a log write during
> + * a CIL checkpoint commit has failed. In this case, all the items in the
> + * checkpoint have already gone through iop_committed and iop_committing, which
> + * means that checkpoint commit abort handling is treated exactly the same as an
> + * iclog write error even though we haven't started any IO yet. Hence in this
> + * case all we need to do is iop_committed processing, followed by an
> + * iop_unpin(aborted) call.
> + *
> + * The AIL cursor is used to optimise the insert process. If commit_lsn is not
> + * at the end of the AIL, the insert cursor avoids the need to walk the AIL to
> + * find the insertion point on every xfs_log_item_batch_insert() call. This
> + * saves a lot of needless list walking and is a net win, even though it
> + * slightly increases that amount of AIL lock traffic to set it up and tear it
> + * down.
> + */
> +void
> +xlog_cil_ail_insert(
> + struct xlog *log,
> + struct list_head *lv_chain,
> + xfs_lsn_t commit_lsn,
> + bool aborted)
> +{
> +#define LOG_ITEM_BATCH_SIZE 32
> + struct xfs_ail *ailp = log->l_ailp;
> + struct xfs_log_item *log_items[LOG_ITEM_BATCH_SIZE];
> + struct xfs_log_vec *lv;
> + struct xfs_ail_cursor cur;
> + int i = 0;
> +
> + spin_lock(&ailp->ail_lock);
> + xfs_trans_ail_cursor_last(ailp, &cur, commit_lsn);
> + spin_unlock(&ailp->ail_lock);
> +
> + /* unpin all the log items */
> + list_for_each_entry(lv, lv_chain, lv_list) {
> + struct xfs_log_item *lip = lv->lv_item;
> + xfs_lsn_t item_lsn;
> +
> + if (aborted)
> + set_bit(XFS_LI_ABORTED, &lip->li_flags);
> +
> + if (lip->li_ops->flags & XFS_ITEM_RELEASE_WHEN_COMMITTED) {
> + lip->li_ops->iop_release(lip);
> + continue;
> + }
> +
> + if (lip->li_ops->iop_committed)
> + item_lsn = lip->li_ops->iop_committed(lip, commit_lsn);
> + else
> + item_lsn = commit_lsn;
> +
> + /* item_lsn of -1 means the item needs no further processing */
> + if (XFS_LSN_CMP(item_lsn, (xfs_lsn_t)-1) == 0)
> + continue;
> +
> + /*
> + * if we are aborting the operation, no point in inserting the
> + * object into the AIL as we are in a shutdown situation.
> + */
> + if (aborted) {
> + ASSERT(xlog_is_shutdown(ailp->ail_log));
> + if (lip->li_ops->iop_unpin)
> + lip->li_ops->iop_unpin(lip, 1);
> + continue;
> + }
> +
> + if (item_lsn != commit_lsn) {
> +
> + /*
> + * Not a bulk update option due to unusual item_lsn.
> + * Push into AIL immediately, rechecking the lsn once
> + * we have the ail lock. Then unpin the item. This does
> + * not affect the AIL cursor the bulk insert path is
> + * using.
> + */
> + spin_lock(&ailp->ail_lock);
> + if (XFS_LSN_CMP(item_lsn, lip->li_lsn) > 0)
> + xfs_trans_ail_update(ailp, lip, item_lsn);
> + else
> + spin_unlock(&ailp->ail_lock);
> + if (lip->li_ops->iop_unpin)
> + lip->li_ops->iop_unpin(lip, 0);
> + continue;
> + }
> +
> + /* Item is a candidate for bulk AIL insert. */
> + log_items[i++] = lv->lv_item;
> + if (i >= LOG_ITEM_BATCH_SIZE) {
> + xlog_cil_ail_insert_batch(ailp, &cur, log_items,
> + LOG_ITEM_BATCH_SIZE, commit_lsn);
> + i = 0;
> + }
> + }
> +
> + /* make sure we insert the remainder! */
> + if (i)
> + xlog_cil_ail_insert_batch(ailp, &cur, log_items, i, commit_lsn);
> +
> + spin_lock(&ailp->ail_lock);
> + xfs_trans_ail_cursor_done(&cur);
> + spin_unlock(&ailp->ail_lock);
> +}
> +
> static void
> xlog_cil_free_logvec(
> struct list_head *lv_chain)
> @@ -792,7 +922,7 @@ xlog_cil_committed(
> spin_unlock(&ctx->cil->xc_push_lock);
> }
>
> - xfs_trans_committed_bulk(ctx->cil->xc_log->l_ailp, &ctx->lv_chain,
> + xlog_cil_ail_insert(ctx->cil->xc_log, &ctx->lv_chain,
> ctx->start_lsn, abort);
>
> xfs_extent_busy_sort(&ctx->busy_extents);
> diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
> index 7bd16fbff534..58c4e875eb12 100644
> --- a/fs/xfs/xfs_trans.c
> +++ b/fs/xfs/xfs_trans.c
> @@ -715,135 +715,6 @@ xfs_trans_free_items(
> }
> }
>
> -static inline void
> -xfs_log_item_batch_insert(
> - struct xfs_ail *ailp,
> - struct xfs_ail_cursor *cur,
> - struct xfs_log_item **log_items,
> - int nr_items,
> - xfs_lsn_t commit_lsn)
> -{
> - int i;
> -
> - spin_lock(&ailp->ail_lock);
> - /* xfs_trans_ail_update_bulk drops ailp->ail_lock */
> - xfs_trans_ail_update_bulk(ailp, cur, log_items, nr_items, commit_lsn);
> -
> - for (i = 0; i < nr_items; i++) {
> - struct xfs_log_item *lip = log_items[i];
> -
> - if (lip->li_ops->iop_unpin)
> - lip->li_ops->iop_unpin(lip, 0);
> - }
> -}
> -
> -/*
> - * Bulk operation version of xfs_trans_committed that takes a log vector of
> - * items to insert into the AIL. This uses bulk AIL insertion techniques to
> - * minimise lock traffic.
> - *
> - * If we are called with the aborted flag set, it is because a log write during
> - * a CIL checkpoint commit has failed. In this case, all the items in the
> - * checkpoint have already gone through iop_committed and iop_committing, which
> - * means that checkpoint commit abort handling is treated exactly the same
> - * as an iclog write error even though we haven't started any IO yet. Hence in
> - * this case all we need to do is iop_committed processing, followed by an
> - * iop_unpin(aborted) call.
> - *
> - * The AIL cursor is used to optimise the insert process. If commit_lsn is not
> - * at the end of the AIL, the insert cursor avoids the need to walk
> - * the AIL to find the insertion point on every xfs_log_item_batch_insert()
> - * call. This saves a lot of needless list walking and is a net win, even
> - * though it slightly increases that amount of AIL lock traffic to set it up
> - * and tear it down.
> - */
> -void
> -xfs_trans_committed_bulk(
> - struct xfs_ail *ailp,
> - struct list_head *lv_chain,
> - xfs_lsn_t commit_lsn,
> - bool aborted)
> -{
> -#define LOG_ITEM_BATCH_SIZE 32
> - struct xfs_log_item *log_items[LOG_ITEM_BATCH_SIZE];
> - struct xfs_log_vec *lv;
> - struct xfs_ail_cursor cur;
> - int i = 0;
> -
> - spin_lock(&ailp->ail_lock);
> - xfs_trans_ail_cursor_last(ailp, &cur, commit_lsn);
> - spin_unlock(&ailp->ail_lock);
> -
> - /* unpin all the log items */
> - list_for_each_entry(lv, lv_chain, lv_list) {
> - struct xfs_log_item *lip = lv->lv_item;
> - xfs_lsn_t item_lsn;
> -
> - if (aborted)
> - set_bit(XFS_LI_ABORTED, &lip->li_flags);
> -
> - if (lip->li_ops->flags & XFS_ITEM_RELEASE_WHEN_COMMITTED) {
> - lip->li_ops->iop_release(lip);
> - continue;
> - }
> -
> - if (lip->li_ops->iop_committed)
> - item_lsn = lip->li_ops->iop_committed(lip, commit_lsn);
> - else
> - item_lsn = commit_lsn;
> -
> - /* item_lsn of -1 means the item needs no further processing */
> - if (XFS_LSN_CMP(item_lsn, (xfs_lsn_t)-1) == 0)
> - continue;
> -
> - /*
> - * if we are aborting the operation, no point in inserting the
> - * object into the AIL as we are in a shutdown situation.
> - */
> - if (aborted) {
> - ASSERT(xlog_is_shutdown(ailp->ail_log));
> - if (lip->li_ops->iop_unpin)
> - lip->li_ops->iop_unpin(lip, 1);
> - continue;
> - }
> -
> - if (item_lsn != commit_lsn) {
> -
> - /*
> - * Not a bulk update option due to unusual item_lsn.
> - * Push into AIL immediately, rechecking the lsn once
> - * we have the ail lock. Then unpin the item. This does
> - * not affect the AIL cursor the bulk insert path is
> - * using.
> - */
> - spin_lock(&ailp->ail_lock);
> - if (XFS_LSN_CMP(item_lsn, lip->li_lsn) > 0)
> - xfs_trans_ail_update(ailp, lip, item_lsn);
> - else
> - spin_unlock(&ailp->ail_lock);
> - if (lip->li_ops->iop_unpin)
> - lip->li_ops->iop_unpin(lip, 0);
> - continue;
> - }
> -
> - /* Item is a candidate for bulk AIL insert. */
> - log_items[i++] = lv->lv_item;
> - if (i >= LOG_ITEM_BATCH_SIZE) {
> - xfs_log_item_batch_insert(ailp, &cur, log_items,
> - LOG_ITEM_BATCH_SIZE, commit_lsn);
> - i = 0;
> - }
> - }
> -
> - /* make sure we insert the remainder! */
> - if (i)
> - xfs_log_item_batch_insert(ailp, &cur, log_items, i, commit_lsn);
> -
> - spin_lock(&ailp->ail_lock);
> - xfs_trans_ail_cursor_done(&cur);
> - spin_unlock(&ailp->ail_lock);
> -}
> -
> /*
> * Sort transaction items prior to running precommit operations. This will
> * attempt to order the items such that they will always be locked in the same
> diff --git a/fs/xfs/xfs_trans_priv.h b/fs/xfs/xfs_trans_priv.h
> index d5400150358e..52a45f0a5ef1 100644
> --- a/fs/xfs/xfs_trans_priv.h
> +++ b/fs/xfs/xfs_trans_priv.h
> @@ -19,9 +19,6 @@ void xfs_trans_add_item(struct xfs_trans *, struct xfs_log_item *);
> void xfs_trans_del_item(struct xfs_log_item *);
> void xfs_trans_unreserve_and_mod_sb(struct xfs_trans *tp);
>
> -void xfs_trans_committed_bulk(struct xfs_ail *ailp,
> - struct list_head *lv_chain,
> - xfs_lsn_t commit_lsn, bool aborted);
> /*
> * AIL traversal cursor.
> *
> --
> 2.36.1
>
