From: Dave Chinner <david@fromorbit.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 06/12] xfs: track CIL ticket reservation in percpu structure
Date: Thu, 25 Feb 2021 14:37:19 +1100 [thread overview]
Message-ID: <20210225033725.3558450-7-david@fromorbit.com> (raw)
In-Reply-To: <20210225033725.3558450-1-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
To get it out from under the cil spinlock.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
fs/xfs/xfs_log_cil.c | 11 ++++++-----
fs/xfs/xfs_log_priv.h | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
index 68998416b388..65685889a9c3 100644
--- a/fs/xfs/xfs_log_cil.c
+++ b/fs/xfs/xfs_log_cil.c
@@ -492,6 +492,7 @@ xlog_cil_insert_items(
* based on how close we are to the hard limit.
*/
cilpcp = get_cpu_ptr(cil->xc_pcp);
+ cilpcp->space_reserved += ctx_res;
cilpcp->space_used += len;
if (space_used >= XLOG_CIL_SPACE_LIMIT(log) ||
cilpcp->space_used >
@@ -502,10 +503,6 @@ xlog_cil_insert_items(
}
put_cpu_ptr(cilpcp);
- spin_lock(&cil->xc_cil_lock);
- ctx->ticket->t_unit_res += ctx_res;
- ctx->ticket->t_curr_res += ctx_res;
-
/*
* If we've overrun the reservation, dump the tx details before we move
* the log items. Shutdown is imminent...
@@ -527,6 +524,7 @@ xlog_cil_insert_items(
* We do this here so we only need to take the CIL lock once during
* the transaction commit.
*/
+ spin_lock(&cil->xc_cil_lock);
list_for_each_entry(lip, &tp->t_items, li_trans) {
/* Skip items which aren't dirty in this transaction. */
@@ -797,10 +795,13 @@ xlog_cil_push_work(
down_write(&cil->xc_ctx_lock);
- /* Reset the CIL pcp counters */
+ /* Aggregate and reset the CIL pcp counters */
for_each_online_cpu(cpu) {
cilpcp = per_cpu_ptr(cil->xc_pcp, cpu);
+ ctx->ticket->t_curr_res += cilpcp->space_reserved;
cilpcp->space_used = 0;
+ cilpcp->space_reserved = 0;
+
}
spin_lock(&cil->xc_push_lock);
diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
index 76413315913a..ab933faacbad 100644
--- a/fs/xfs/xfs_log_priv.h
+++ b/fs/xfs/xfs_log_priv.h
@@ -236,7 +236,7 @@ struct xfs_cil_ctx {
*/
struct xlog_cil_pcp {
uint32_t space_used;
- uint32_t curr_res;
+ uint32_t space_reserved;
struct list_head busy_extents;
struct list_head log_items;
};
--
2.28.0
next prev parent reply other threads:[~2021-02-25 3:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-25 3:37 [PATCH 00/12] xfs: Improve CIL scalability Dave Chinner
2021-02-25 3:37 ` [PATCH 01/12] xfs: use the CIL space used counter for emptiness checks Dave Chinner
2021-02-25 3:37 ` [PATCH 02/12] xfs: lift init CIL reservation out of xc_cil_lock Dave Chinner
2021-02-25 3:37 ` [PATCH 03/12] xfs: rework per-iclog header CIL reservation Dave Chinner
2021-02-25 3:37 ` [PATCH 04/12] xfs: introduce per-cpu CIL tracking sructure Dave Chinner
2021-02-25 3:37 ` [PATCH 05/12] xfs: implement percpu cil space used calculation Dave Chinner
2021-02-25 3:37 ` Dave Chinner [this message]
2021-02-25 3:37 ` [PATCH 07/12] xfs: convert CIL busy extents to per-cpu Dave Chinner
2021-02-25 3:37 ` [PATCH 08/12] xfs: Add order IDs to log items in CIL Dave Chinner
2021-02-25 3:37 ` [PATCH 09/12] xfs: convert CIL to unordered per cpu lists Dave Chinner
2021-02-25 3:37 ` [PATCH 10/12] xfs: move CIL ordering to the logvec chain Dave Chinner
2021-02-25 3:37 ` [PATCH 11/12] xfs: __percpu_counter_compare() inode count debug too expensive Dave Chinner
2021-02-25 3:37 ` [PATCH 12/12] xfs: avoid cil push lock if possible Dave Chinner
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=20210225033725.3558450-7-david@fromorbit.com \
--to=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.