hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfs: convert CIL busy extents to per-cpu

Browse Source 
To get them out from under the CIL lock.

This is an unordered list, so we can simply punt it to per-cpu lists
during transaction commits and reaggregate it back into a single
list during the CIL push work.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
This commit is contained in:
Dave Chinner 2022-07-07 18:52:59 +10:00 committed by Dave Chinner
parent 1dd2a2c18e
commit df7a4a2134
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fs/xfs/xfs_log_cil.c
View File

@ -128,6 +128,11 @@ xlog_cil_push_pcp_aggregate(
ctx->ticket->t_curr_res += cilpcp->space_reserved; ctx->ticket->t_curr_res += cilpcp->space_reserved;
cilpcp->space_reserved = 0; cilpcp->space_reserved = 0;
if (!list_empty(&cilpcp->busy_extents)) {
list_splice_init(&cilpcp->busy_extents,
&ctx->busy_extents);
}
/* /*
* We're in the middle of switching cil contexts. Reset the * We're in the middle of switching cil contexts. Reset the
* counter we use to detect when the current context is nearing * counter we use to detect when the current context is nearing
@ -634,6 +639,9 @@ xlog_cil_insert_items(
} else { } else {
cilpcp->space_used += len; cilpcp->space_used += len;
} }
/* attach the transaction to the CIL if it has any busy extents */
if (!list_empty(&tp->t_busy))
list_splice_init(&tp->t_busy, &cilpcp->busy_extents);
put_cpu_ptr(cilpcp); put_cpu_ptr(cilpcp);
/* /*
@ -656,9 +664,6 @@ xlog_cil_insert_items(
list_move_tail(&lip->li_cil, &cil->xc_cil); list_move_tail(&lip->li_cil, &cil->xc_cil);
} }
/* attach the transaction to the CIL if it has any busy extents */
if (!list_empty(&tp->t_busy))
list_splice_init(&tp->t_busy, &ctx->busy_extents);
spin_unlock(&cil->xc_cil_lock); spin_unlock(&cil->xc_cil_lock);
/* /*
@ -1756,6 +1761,8 @@ xlog_cil_pcp_dead(
ctx->ticket->t_curr_res += cilpcp->space_reserved; ctx->ticket->t_curr_res += cilpcp->space_reserved;
cilpcp->space_reserved = 0; cilpcp->space_reserved = 0;
if (!list_empty(&cilpcp->busy_extents))
list_splice_init(&cilpcp->busy_extents, &ctx->busy_extents);
atomic_add(cilpcp->space_used, &ctx->space_used); atomic_add(cilpcp->space_used, &ctx->space_used);
cilpcp->space_used = 0; cilpcp->space_used = 0;
up_write(&cil->xc_ctx_lock); up_write(&cil->xc_ctx_lock);
@ -1766,10 +1773,12 @@ xlog_cil_pcp_dead(
*/ */
int int
xlog_cil_init( xlog_cil_init(
struct xlog *log) struct xlog *log)
{ {
struct xfs_cil *cil; struct xfs_cil *cil;
struct xfs_cil_ctx *ctx; struct xfs_cil_ctx *ctx;
struct xlog_cil_pcp *cilpcp;
int cpu;
cil = kmem_zalloc(sizeof(*cil), KM_MAYFAIL); cil = kmem_zalloc(sizeof(*cil), KM_MAYFAIL);
if (!cil) if (!cil)
@ -1789,6 +1798,11 @@ xlog_cil_init(
if (!cil->xc_pcp) if (!cil->xc_pcp)
goto out_destroy_wq; goto out_destroy_wq;
for_each_possible_cpu(cpu) {
cilpcp = per_cpu_ptr(cil->xc_pcp, cpu);
INIT_LIST_HEAD(&cilpcp->busy_extents);
}
INIT_LIST_HEAD(&cil->xc_cil); INIT_LIST_HEAD(&cil->xc_cil);
INIT_LIST_HEAD(&cil->xc_committing); INIT_LIST_HEAD(&cil->xc_committing);
spin_lock_init(&cil->xc_cil_lock); spin_lock_init(&cil->xc_cil_lock);