From: "Darrick J. Wong" <djwong@kernel.org>
To: Dave Chinner <david@fromorbit.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 8/9] xfs: pass the full grant head to accounting functions
Date: Fri, 26 Aug 2022 15:25:44 -0700 [thread overview]
Message-ID: <YwlIaCxdCht4SwUj@magnolia> (raw)
In-Reply-To: <20220809230353.3353059-9-david@fromorbit.com>
On Wed, Aug 10, 2022 at 09:03:52AM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> Because we are going to need them soon. API change only, no logic
> changes.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
Would've been nice to do the xlog_grant_space_left move as a separate
change, but as I've already squinted at both to verify that there's
nothing changing here besides the function signature, let's just leave
this as it is:
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
(ok, I lie, I actually just open the patch twice in gvim, increase the
transparency on one of the gvims, and then overlay them :P)
--D
> ---
> fs/xfs/xfs_log.c | 157 +++++++++++++++++++++---------------------
> fs/xfs/xfs_log_priv.h | 2 -
> 2 files changed, 77 insertions(+), 82 deletions(-)
>
> diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
> index 5b7c91a42edf..459c0f438c89 100644
> --- a/fs/xfs/xfs_log.c
> +++ b/fs/xfs/xfs_log.c
> @@ -136,10 +136,10 @@ xlog_prepare_iovec(
> static void
> xlog_grant_sub_space(
> struct xlog *log,
> - atomic64_t *head,
> + struct xlog_grant_head *head,
> int bytes)
> {
> - int64_t head_val = atomic64_read(head);
> + int64_t head_val = atomic64_read(&head->grant);
> int64_t new, old;
>
> do {
> @@ -155,17 +155,17 @@ xlog_grant_sub_space(
>
> old = head_val;
> new = xlog_assign_grant_head_val(cycle, space);
> - head_val = atomic64_cmpxchg(head, old, new);
> + head_val = atomic64_cmpxchg(&head->grant, old, new);
> } while (head_val != old);
> }
>
> static void
> xlog_grant_add_space(
> struct xlog *log,
> - atomic64_t *head,
> + struct xlog_grant_head *head,
> int bytes)
> {
> - int64_t head_val = atomic64_read(head);
> + int64_t head_val = atomic64_read(&head->grant);
> int64_t new, old;
>
> do {
> @@ -184,7 +184,7 @@ xlog_grant_add_space(
>
> old = head_val;
> new = xlog_assign_grant_head_val(cycle, space);
> - head_val = atomic64_cmpxchg(head, old, new);
> + head_val = atomic64_cmpxchg(&head->grant, old, new);
> } while (head_val != old);
> }
>
> @@ -197,6 +197,63 @@ xlog_grant_head_init(
> spin_lock_init(&head->lock);
> }
>
> +/*
> + * Return the space in the log between the tail and the head. The head
> + * is passed in the cycle/bytes formal parms. In the special case where
> + * the reserve head has wrapped passed the tail, this calculation is no
> + * longer valid. In this case, just return 0 which means there is no space
> + * in the log. This works for all places where this function is called
> + * with the reserve head. Of course, if the write head were to ever
> + * wrap the tail, we should blow up. Rather than catch this case here,
> + * we depend on other ASSERTions in other parts of the code. XXXmiken
> + *
> + * If reservation head is behind the tail, we have a problem. Warn about it,
> + * but then treat it as if the log is empty.
> + *
> + * If the log is shut down, the head and tail may be invalid or out of whack, so
> + * shortcut invalidity asserts in this case so that we don't trigger them
> + * falsely.
> + */
> +static int
> +xlog_grant_space_left(
> + struct xlog *log,
> + struct xlog_grant_head *head)
> +{
> + int tail_bytes;
> + int tail_cycle;
> + int head_cycle;
> + int head_bytes;
> +
> + xlog_crack_grant_head(&head->grant, &head_cycle, &head_bytes);
> + xlog_crack_atomic_lsn(&log->l_tail_lsn, &tail_cycle, &tail_bytes);
> + tail_bytes = BBTOB(tail_bytes);
> + if (tail_cycle == head_cycle && head_bytes >= tail_bytes)
> + return log->l_logsize - (head_bytes - tail_bytes);
> + if (tail_cycle + 1 < head_cycle)
> + return 0;
> +
> + /* Ignore potential inconsistency when shutdown. */
> + if (xlog_is_shutdown(log))
> + return log->l_logsize;
> +
> + if (tail_cycle < head_cycle) {
> + ASSERT(tail_cycle == (head_cycle - 1));
> + return tail_bytes - head_bytes;
> + }
> +
> + /*
> + * The reservation head is behind the tail. In this case we just want to
> + * return the size of the log as the amount of space left.
> + */
> + xfs_alert(log->l_mp, "xlog_grant_space_left: head behind tail");
> + xfs_alert(log->l_mp, " tail_cycle = %d, tail_bytes = %d",
> + tail_cycle, tail_bytes);
> + xfs_alert(log->l_mp, " GH cycle = %d, GH bytes = %d",
> + head_cycle, head_bytes);
> + ASSERT(0);
> + return log->l_logsize;
> +}
> +
> STATIC void
> xlog_grant_head_wake_all(
> struct xlog_grant_head *head)
> @@ -277,7 +334,7 @@ xlog_grant_head_wait(
> spin_lock(&head->lock);
> if (xlog_is_shutdown(log))
> goto shutdown;
> - } while (xlog_space_left(log, &head->grant) < need_bytes);
> + } while (xlog_grant_space_left(log, head) < need_bytes);
>
> list_del_init(&tic->t_queue);
> return 0;
> @@ -322,7 +379,7 @@ xlog_grant_head_check(
> * otherwise try to get some space for this transaction.
> */
> *need_bytes = xlog_ticket_reservation(log, head, tic);
> - free_bytes = xlog_space_left(log, &head->grant);
> + free_bytes = xlog_grant_space_left(log, head);
> if (!list_empty_careful(&head->waiters)) {
> spin_lock(&head->lock);
> if (!xlog_grant_head_wake(log, head, &free_bytes) ||
> @@ -396,7 +453,7 @@ xfs_log_regrant(
> if (error)
> goto out_error;
>
> - xlog_grant_add_space(log, &log->l_write_head.grant, need_bytes);
> + xlog_grant_add_space(log, &log->l_write_head, need_bytes);
> trace_xfs_log_regrant_exit(log, tic);
> xlog_verify_grant_tail(log);
> return 0;
> @@ -447,8 +504,8 @@ xfs_log_reserve(
> if (error)
> goto out_error;
>
> - xlog_grant_add_space(log, &log->l_reserve_head.grant, need_bytes);
> - xlog_grant_add_space(log, &log->l_write_head.grant, need_bytes);
> + xlog_grant_add_space(log, &log->l_reserve_head, need_bytes);
> + xlog_grant_add_space(log, &log->l_write_head, need_bytes);
> trace_xfs_log_reserve_exit(log, tic);
> xlog_verify_grant_tail(log);
> return 0;
> @@ -1114,7 +1171,7 @@ xfs_log_space_wake(
> ASSERT(!xlog_in_recovery(log));
>
> spin_lock(&log->l_write_head.lock);
> - free_bytes = xlog_space_left(log, &log->l_write_head.grant);
> + free_bytes = xlog_grant_space_left(log, &log->l_write_head);
> xlog_grant_head_wake(log, &log->l_write_head, &free_bytes);
> spin_unlock(&log->l_write_head.lock);
> }
> @@ -1123,7 +1180,7 @@ xfs_log_space_wake(
> ASSERT(!xlog_in_recovery(log));
>
> spin_lock(&log->l_reserve_head.lock);
> - free_bytes = xlog_space_left(log, &log->l_reserve_head.grant);
> + free_bytes = xlog_grant_space_left(log, &log->l_reserve_head);
> xlog_grant_head_wake(log, &log->l_reserve_head, &free_bytes);
> spin_unlock(&log->l_reserve_head.lock);
> }
> @@ -1237,64 +1294,6 @@ xfs_log_cover(
> return error;
> }
>
> -/*
> - * Return the space in the log between the tail and the head. The head
> - * is passed in the cycle/bytes formal parms. In the special case where
> - * the reserve head has wrapped passed the tail, this calculation is no
> - * longer valid. In this case, just return 0 which means there is no space
> - * in the log. This works for all places where this function is called
> - * with the reserve head. Of course, if the write head were to ever
> - * wrap the tail, we should blow up. Rather than catch this case here,
> - * we depend on other ASSERTions in other parts of the code. XXXmiken
> - *
> - * If reservation head is behind the tail, we have a problem. Warn about it,
> - * but then treat it as if the log is empty.
> - *
> - * If the log is shut down, the head and tail may be invalid or out of whack, so
> - * shortcut invalidity asserts in this case so that we don't trigger them
> - * falsely.
> - */
> -int
> -xlog_space_left(
> - struct xlog *log,
> - atomic64_t *head)
> -{
> - int tail_bytes;
> - int tail_cycle;
> - int head_cycle;
> - int head_bytes;
> -
> - xlog_crack_grant_head(head, &head_cycle, &head_bytes);
> - xlog_crack_atomic_lsn(&log->l_tail_lsn, &tail_cycle, &tail_bytes);
> - tail_bytes = BBTOB(tail_bytes);
> - if (tail_cycle == head_cycle && head_bytes >= tail_bytes)
> - return log->l_logsize - (head_bytes - tail_bytes);
> - if (tail_cycle + 1 < head_cycle)
> - return 0;
> -
> - /* Ignore potential inconsistency when shutdown. */
> - if (xlog_is_shutdown(log))
> - return log->l_logsize;
> -
> - if (tail_cycle < head_cycle) {
> - ASSERT(tail_cycle == (head_cycle - 1));
> - return tail_bytes - head_bytes;
> - }
> -
> - /*
> - * The reservation head is behind the tail. In this case we just want to
> - * return the size of the log as the amount of space left.
> - */
> - xfs_alert(log->l_mp, "xlog_space_left: head behind tail");
> - xfs_alert(log->l_mp, " tail_cycle = %d, tail_bytes = %d",
> - tail_cycle, tail_bytes);
> - xfs_alert(log->l_mp, " GH cycle = %d, GH bytes = %d",
> - head_cycle, head_bytes);
> - ASSERT(0);
> - return log->l_logsize;
> -}
> -
> -
> static void
> xlog_ioend_work(
> struct work_struct *work)
> @@ -1883,8 +1882,8 @@ xlog_sync(
> if (ticket) {
> ticket->t_curr_res -= roundoff;
> } else {
> - xlog_grant_add_space(log, &log->l_reserve_head.grant, roundoff);
> - xlog_grant_add_space(log, &log->l_write_head.grant, roundoff);
> + xlog_grant_add_space(log, &log->l_reserve_head, roundoff);
> + xlog_grant_add_space(log, &log->l_write_head, roundoff);
> }
>
> /* put cycle number in every block */
> @@ -2815,17 +2814,15 @@ xfs_log_ticket_regrant(
> if (ticket->t_cnt > 0)
> ticket->t_cnt--;
>
> - xlog_grant_sub_space(log, &log->l_reserve_head.grant,
> - ticket->t_curr_res);
> - xlog_grant_sub_space(log, &log->l_write_head.grant,
> - ticket->t_curr_res);
> + xlog_grant_sub_space(log, &log->l_reserve_head, ticket->t_curr_res);
> + xlog_grant_sub_space(log, &log->l_write_head, ticket->t_curr_res);
> ticket->t_curr_res = ticket->t_unit_res;
>
> trace_xfs_log_ticket_regrant_sub(log, ticket);
>
> /* just return if we still have some of the pre-reserved space */
> if (!ticket->t_cnt) {
> - xlog_grant_add_space(log, &log->l_reserve_head.grant,
> + xlog_grant_add_space(log, &log->l_reserve_head,
> ticket->t_unit_res);
> trace_xfs_log_ticket_regrant_exit(log, ticket);
>
> @@ -2873,8 +2870,8 @@ xfs_log_ticket_ungrant(
> bytes += ticket->t_unit_res*ticket->t_cnt;
> }
>
> - xlog_grant_sub_space(log, &log->l_reserve_head.grant, bytes);
> - xlog_grant_sub_space(log, &log->l_write_head.grant, bytes);
> + xlog_grant_sub_space(log, &log->l_reserve_head, bytes);
> + xlog_grant_sub_space(log, &log->l_write_head, bytes);
>
> trace_xfs_log_ticket_ungrant_exit(log, ticket);
>
> diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
> index 8a005cb08a02..86b5959b5ef2 100644
> --- a/fs/xfs/xfs_log_priv.h
> +++ b/fs/xfs/xfs_log_priv.h
> @@ -571,8 +571,6 @@ xlog_assign_grant_head(atomic64_t *head, int cycle, int space)
> atomic64_set(head, xlog_assign_grant_head_val(cycle, space));
> }
>
> -int xlog_space_left(struct xlog *log, atomic64_t *head);
> -
> /*
> * Committed Item List interfaces
> */
> --
> 2.36.1
>
next prev parent reply other threads:[~2022-08-26 22:25 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-09 23:03 [PATCH 0/9 v2] xfs: byte-base grant head reservation tracking Dave Chinner
2022-08-09 23:03 ` [PATCH 1/9] xfs: move and xfs_trans_committed_bulk Dave Chinner
2022-08-10 14:17 ` kernel test robot
2022-08-10 17:08 ` kernel test robot
2022-08-22 15:03 ` Darrick J. Wong
2022-09-07 13:51 ` Christoph Hellwig
2022-08-09 23:03 ` [PATCH 2/9] xfs: AIL doesn't need manual pushing Dave Chinner
2022-08-22 17:08 ` Darrick J. Wong
2022-08-23 1:51 ` Dave Chinner
2022-08-26 15:46 ` Darrick J. Wong
2022-09-07 14:01 ` Christoph Hellwig
2023-10-12 8:44 ` Christoph Hellwig
2022-08-09 23:03 ` [PATCH 3/9] xfs: background AIL push targets physical space, not grant space Dave Chinner
2022-08-22 19:00 ` Darrick J. Wong
2022-08-23 2:01 ` Dave Chinner
2022-08-26 15:47 ` Darrick J. Wong
2022-08-26 23:49 ` Darrick J. Wong
2022-09-07 14:04 ` Christoph Hellwig
2022-08-09 23:03 ` [PATCH 4/9] xfs: ensure log tail is always up to date Dave Chinner
2022-08-23 0:33 ` Darrick J. Wong
2022-08-23 2:18 ` Dave Chinner
2022-08-26 21:39 ` Darrick J. Wong
2022-08-26 23:49 ` Darrick J. Wong
2022-09-07 14:06 ` Christoph Hellwig
2022-08-09 23:03 ` [PATCH 5/9] xfs: l_last_sync_lsn is really AIL state Dave Chinner
2022-08-26 22:19 ` Darrick J. Wong
2022-09-07 14:11 ` Christoph Hellwig
2022-08-09 23:03 ` [PATCH 6/9] xfs: collapse xlog_state_set_callback in caller Dave Chinner
2022-08-26 22:20 ` Darrick J. Wong
2022-09-07 14:12 ` Christoph Hellwig
2022-08-09 23:03 ` [PATCH 7/9] xfs: track log space pinned by the AIL Dave Chinner
2022-08-26 22:39 ` Darrick J. Wong
2022-08-09 23:03 ` [PATCH 8/9] xfs: pass the full grant head to accounting functions Dave Chinner
2022-08-26 22:25 ` Darrick J. Wong [this message]
2022-08-09 23:03 ` [PATCH 9/9] xfs: grant heads track byte counts, not LSNs Dave Chinner
2022-08-26 23:45 ` Darrick J. Wong
-- strict thread matches above, loose matches on Subject: below --
2022-12-20 23:22 [PATCH 0/9 v3] xfs: byte-based grant head reservation tracking Dave Chinner
2022-12-20 23:23 ` [PATCH 8/9] xfs: pass the full grant head to accounting functions Dave Chinner
2023-09-21 1:48 [PATCH 0/9] xfs: byte-based grant head reservation tracking Dave Chinner
2023-09-21 1:48 ` [PATCH 8/9] xfs: pass the full grant head to accounting functions Dave Chinner
2023-10-12 8:50 ` Christoph Hellwig
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=YwlIaCxdCht4SwUj@magnolia \
--to=djwong@kernel.org \
--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).