Re: [PATCH 3/3] xfs: move the CIL workqueue to the CIL

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Jul 14, 2021 at 03:06:00PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
> 
> We only use the CIL workqueue in the CIL, so it makes no sense to
> hang it off the xfs_mount and have to walk multiple pointers back up
> to the mount when we have the CIL structures right there.
> 
> Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>

I /had/ wondered about that...
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>

--D

> ---
>  fs/xfs/xfs_log_cil.c  | 20 +++++++++++++++++---
>  fs/xfs/xfs_log_priv.h |  1 +
>  fs/xfs/xfs_mount.h    |  1 -
>  fs/xfs/xfs_super.c    | 15 +--------------
>  4 files changed, 19 insertions(+), 18 deletions(-)
> 
> diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
> index ea11d0eea9e8..99e24c75788b 100644
> --- a/fs/xfs/xfs_log_cil.c
> +++ b/fs/xfs/xfs_log_cil.c
> @@ -1134,7 +1134,7 @@ xlog_cil_push_background(
>  	spin_lock(&cil->xc_push_lock);
>  	if (cil->xc_push_seq < cil->xc_current_sequence) {
>  		cil->xc_push_seq = cil->xc_current_sequence;
> -		queue_work(log->l_mp->m_cil_workqueue, &cil->xc_ctx->push_work);
> +		queue_work(cil->xc_push_wq, &cil->xc_ctx->push_work);
>  	}
>  
>  	/*
> @@ -1200,7 +1200,7 @@ xlog_cil_push_now(
>  
>  	/* start on any pending background push to minimise wait time on it */
>  	if (!async)
> -		flush_workqueue(log->l_mp->m_cil_workqueue);
> +		flush_workqueue(cil->xc_push_wq);
>  
>  	/*
>  	 * If the CIL is empty or we've already pushed the sequence then
> @@ -1214,7 +1214,7 @@ xlog_cil_push_now(
>  
>  	cil->xc_push_seq = push_seq;
>  	cil->xc_push_commit_stable = async;
> -	queue_work(log->l_mp->m_cil_workqueue, &cil->xc_ctx->push_work);
> +	queue_work(cil->xc_push_wq, &cil->xc_ctx->push_work);
>  	spin_unlock(&cil->xc_push_lock);
>  }
>  
> @@ -1453,6 +1453,15 @@ xlog_cil_init(
>  	cil = kmem_zalloc(sizeof(*cil), KM_MAYFAIL);
>  	if (!cil)
>  		return -ENOMEM;
> +	/*
> +	 * Limit the CIL pipeline depth to 4 concurrent works to bound the
> +	 * concurrency the log spinlocks will be exposed to.
> +	 */
> +	cil->xc_push_wq = alloc_workqueue("xfs-cil/%s",
> +			XFS_WQFLAGS(WQ_FREEZABLE | WQ_MEM_RECLAIM | WQ_UNBOUND),
> +			4, log->l_mp->m_super->s_id);
> +	if (!cil->xc_push_wq)
> +		goto out_destroy_cil;
>  
>  	INIT_LIST_HEAD(&cil->xc_cil);
>  	INIT_LIST_HEAD(&cil->xc_committing);
> @@ -1469,6 +1478,10 @@ xlog_cil_init(
>  	xlog_cil_ctx_switch(cil, ctx);
>  
>  	return 0;
> +
> +out_destroy_cil:
> +	kmem_free(cil);
> +	return -ENOMEM;
>  }
>  
>  void
> @@ -1482,6 +1495,7 @@ xlog_cil_destroy(
>  	}
>  
>  	ASSERT(list_empty(&log->l_cilp->xc_cil));
> +	destroy_workqueue(log->l_cilp->xc_push_wq);
>  	kmem_free(log->l_cilp);
>  }
>  
> diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
> index 6ce3b1eda758..2389b1bc95b2 100644
> --- a/fs/xfs/xfs_log_priv.h
> +++ b/fs/xfs/xfs_log_priv.h
> @@ -264,6 +264,7 @@ struct xfs_cil {
>  	struct xlog		*xc_log;
>  	struct list_head	xc_cil;
>  	spinlock_t		xc_cil_lock;
> +	struct workqueue_struct	*xc_push_wq;
>  
>  	struct rw_semaphore	xc_ctx_lock ____cacheline_aligned_in_smp;
>  	struct xfs_cil_ctx	*xc_ctx;
> diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
> index c78b63fe779a..752cd93cf46f 100644
> --- a/fs/xfs/xfs_mount.h
> +++ b/fs/xfs/xfs_mount.h
> @@ -92,7 +92,6 @@ typedef struct xfs_mount {
>  	struct xfs_mru_cache	*m_filestream;  /* per-mount filestream data */
>  	struct workqueue_struct *m_buf_workqueue;
>  	struct workqueue_struct	*m_unwritten_workqueue;
> -	struct workqueue_struct	*m_cil_workqueue;
>  	struct workqueue_struct	*m_reclaim_workqueue;
>  	struct workqueue_struct *m_gc_workqueue;
>  	struct workqueue_struct	*m_sync_workqueue;
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index 10c1b4e43d71..8b7a9895b4a2 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
> @@ -501,21 +501,11 @@ xfs_init_mount_workqueues(
>  	if (!mp->m_unwritten_workqueue)
>  		goto out_destroy_buf;
>  
> -	/*
> -	 * Limit the CIL pipeline depth to 4 concurrent works to bound the
> -	 * concurrency the log spinlocks will be exposed to.
> -	 */
> -	mp->m_cil_workqueue = alloc_workqueue("xfs-cil/%s",
> -			XFS_WQFLAGS(WQ_FREEZABLE | WQ_MEM_RECLAIM | WQ_UNBOUND),
> -			4, mp->m_super->s_id);
> -	if (!mp->m_cil_workqueue)
> -		goto out_destroy_unwritten;
> -
>  	mp->m_reclaim_workqueue = alloc_workqueue("xfs-reclaim/%s",
>  			XFS_WQFLAGS(WQ_FREEZABLE | WQ_MEM_RECLAIM),
>  			0, mp->m_super->s_id);
>  	if (!mp->m_reclaim_workqueue)
> -		goto out_destroy_cil;
> +		goto out_destroy_unwritten;
>  
>  	mp->m_gc_workqueue = alloc_workqueue("xfs-gc/%s",
>  			WQ_SYSFS | WQ_UNBOUND | WQ_FREEZABLE | WQ_MEM_RECLAIM,
> @@ -534,8 +524,6 @@ xfs_init_mount_workqueues(
>  	destroy_workqueue(mp->m_gc_workqueue);
>  out_destroy_reclaim:
>  	destroy_workqueue(mp->m_reclaim_workqueue);
> -out_destroy_cil:
> -	destroy_workqueue(mp->m_cil_workqueue);
>  out_destroy_unwritten:
>  	destroy_workqueue(mp->m_unwritten_workqueue);
>  out_destroy_buf:
> @@ -551,7 +539,6 @@ xfs_destroy_mount_workqueues(
>  	destroy_workqueue(mp->m_sync_workqueue);
>  	destroy_workqueue(mp->m_gc_workqueue);
>  	destroy_workqueue(mp->m_reclaim_workqueue);
> -	destroy_workqueue(mp->m_cil_workqueue);
>  	destroy_workqueue(mp->m_unwritten_workqueue);
>  	destroy_workqueue(mp->m_buf_workqueue);
>  }
> -- 
> 2.31.1
> 



[Index of Archives]     [XFS Filesystem Development (older mail)]     [Linux Filesystem Development]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux RAID]     [Linux SCSI]


  Powered by Linux