From: Dave Chinner <dchinner@xxxxxxxxxx>
To get it out from under the cil spinlock.
Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
fs/xfs/xfs_log_cil.c | 20 +++++++++++++++-----
fs/xfs/xfs_log_priv.h | 1 +
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
index ddc8d262d9f9..74717bdd992b 100644
--- a/fs/xfs/xfs_log_cil.c
+++ b/fs/xfs/xfs_log_cil.c
@@ -91,6 +91,10 @@ xlog_cil_pcp_aggregate(
for_each_online_cpu(cpu) {
cilpcp = per_cpu_ptr(cil->xc_pcp, cpu);
+ ctx->ticket->t_curr_res += cilpcp->space_reserved;
+ ctx->ticket->t_unit_res += cilpcp->space_reserved;
+ cilpcp->space_reserved = 0;
+
/*
* We're in the middle of switching cil contexts. Reset the
* counter we use to detect when the current context is nearing
@@ -524,6 +528,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 >
@@ -534,10 +539,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...
@@ -559,6 +560,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. */
@@ -1600,9 +1602,17 @@ xlog_cil_pcp_dead(
{
struct xfs_cil *cil = log->l_cilp;
struct xlog_cil_pcp *cilpcp = per_cpu_ptr(cil->xc_pcp, cpu);
+ struct xfs_cil_ctx *ctx;
down_write(&cil->xc_ctx_lock);
- atomic_add(cilpcp->space_used, &cil->xc_ctx->space_used);
+ ctx = cil->xc_ctx;
+ if (ctx->ticket) {
+ ctx->ticket->t_curr_res += cilpcp->space_reserved;
+ ctx->ticket->t_unit_res += cilpcp->space_reserved;
+ }
+ cilpcp->space_reserved = 0;
+
+ atomic_add(cilpcp->space_used, &ctx->space_used);
cilpcp->space_used = 0;
up_write(&cil->xc_ctx_lock);
}
diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
index b9c96609705b..5150b4a7d086 100644
--- a/fs/xfs/xfs_log_priv.h
+++ b/fs/xfs/xfs_log_priv.h
@@ -236,6 +236,7 @@ struct xfs_cil_ctx {
*/
struct xlog_cil_pcp {
uint32_t space_used;
+ uint32_t space_reserved;
struct list_head busy_extents;
struct list_head log_items;
};
--
2.33.0
