[42/48] xfs: create slab caches for frequently-used deferred items

Message ID	164263842354.865554.17714418783812332419.stgit@magnolia (mailing list archive)
State	Accepted
Headers	show Return-Path: <linux-xfs-owner@kernel.org> Subject: [PATCH 42/48] xfs: create slab caches for frequently-used deferred items From: "Darrick J. Wong" <djwong@kernel.org> To: sandeen@sandeen.net, djwong@kernel.org Cc: Chandan Babu R <chandan.babu@oracle.com>, linux-xfs@vger.kernel.org Date: Wed, 19 Jan 2022 16:27:03 -0800 Message-ID: <164263842354.865554.17714418783812332419.stgit@magnolia> In-Reply-To: <164263819185.865554.6000499997543946756.stgit@magnolia> References: <164263819185.865554.6000499997543946756.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk
Series	xfsprogs: sync libxfs with 5.16 \| expand [PATCHSET,00/48] xfsprogs: sync libxfs with 5.16 [01/48] xfs: formalize the process of holding onto resources across a defer roll [02/48] xfs: port the defer ops capture and continue to resource capture [03/48] xfs: fix maxlevels comparisons in the btree staging code [04/48] xfs: remove xfs_btree_cur_t typedef [05/48] xfs: check that bc_nlevels never overflows [06/48] xfs: remove the xfs_dinode_t typedef [07/48] xfs: remove the xfs_dsb_t typedef [08/48] xfs: remove the xfs_dqblk_t typedef [09/48] xfs: fold perag loop iteration logic into helper function [10/48] xfs: rename the next_agno perag iteration variable [11/48] xfs: terminate perag iteration reliably on agcount [12/48] xfs: fix perag reference leak on iteration race with growfs [13/48] xfs: remove xfs_btree_cur.bc_blocklog [14/48] xfs: reduce the size of nr_ops for refcount btree cursors [15/48] xfs: prepare xfs_btree_cur for dynamic cursor heights [16/48] xfs: rearrange xfs_btree_cur fields for better packing [17/48] xfs: refactor btree cursor allocation function [18/48] xfs: encode the max btree height in the cursor [19/48] xfs: dynamically allocate cursors based on maxlevels [20/48] xfs: rename m_ag_maxlevels to m_allocbt_maxlevels [21/48] xfs: compute maximum AG btree height for critical reservation calculation [22/48] xfs: clean up xfs_btree_{calc_size,compute_maxlevels} [23/48] xfs: compute the maximum height of the rmap btree when reflink enabled [24/48] xfs_db: fix metadump level comparisons [25/48] xfs_db: warn about suspicious finobt trees when metadumping [26/48] xfs_db: stop using XFS_BTREE_MAXLEVELS [27/48] xfs_repair: fix AG header btree level comparisons [28/48] xfs_repair: warn about suspicious btree levels in AG headers [29/48] xfs_repair: stop using XFS_BTREE_MAXLEVELS [30/48] xfs: kill XFS_BTREE_MAXLEVELS [31/48] xfs: compute absolute maximum nlevels for each btree type [32/48] xfs: use separate btree cursor cache for each btree type [33/48] xfs_db: support computing btheight for all cursor types [34/48] xfs_db: report absolute maxlevels for each btree type [35/48] libxfs: remove kmem_zone_destroy [36/48] libxfs: remove kmem_zone_init [37/48] xfs: remove kmem_zone typedef [38/48] xfs: rename _zone variables to _cache [39/48] libxfs: rename all the other _zone variables to _cache [40/48] libxfs: change zone to cache for all kmem functions [41/48] xfs: compact deferred intent item structures [42/48] xfs: create slab caches for frequently-used deferred items [43/48] xfs: rename xfs_bmap_add_free to xfs_free_extent_later [44/48] xfs: reduce the size of struct xfs_extent_free_item [45/48] xfs: remove unused parameter from refcount code [46/48] xfs: use swap() to make dabtree code cleaner [47/48] xfs: Fix the free logic of state in xfs_attr_node_hasname [48/48] libxfs: remove kernel stubs from xfs_shared.h

diff --git a/libxfs/defer_item.c b/libxfs/defer_item.c index b18182e9..1277469f 100644 --- a/libxfs/defer_item.c +++ b/libxfs/defer_item.c @@ -82,7 +82,7 @@ xfs_extent_free_finish_item( error = xfs_free_extent(tp, free->xefi_startblock, free->xefi_blockcount, &free->xefi_oinfo, XFS_AG_RESV_NONE); - kmem_free(free); + kmem_cache_free(xfs_bmap_free_item_cache, free); return error; } @@ -101,7 +101,7 @@ xfs_extent_free_cancel_item( struct xfs_extent_free_item *free; free = container_of(item, struct xfs_extent_free_item, xefi_list); - kmem_free(free); + kmem_cache_free(xfs_bmap_free_item_cache, free); } const struct xfs_defer_op_type xfs_extent_free_defer_type = { @@ -139,7 +139,7 @@ xfs_agfl_free_finish_item( if (!error) error = xfs_free_agfl_block(tp, agno, agbno, agbp, &free->xefi_oinfo); - kmem_free(free); + kmem_cache_free(xfs_bmap_free_item_cache, free); return error; } @@ -216,7 +216,7 @@ xfs_rmap_update_finish_item( rmap->ri_bmap.br_blockcount, rmap->ri_bmap.br_state, state); - kmem_free(rmap); + kmem_cache_free(xfs_rmap_intent_cache, rmap); return error; } @@ -235,7 +235,7 @@ xfs_rmap_update_cancel_item( struct xfs_rmap_intent *rmap; rmap = container_of(item, struct xfs_rmap_intent, ri_list); - kmem_free(rmap); + kmem_cache_free(xfs_rmap_intent_cache, rmap); } const struct xfs_defer_op_type xfs_rmap_update_defer_type = { @@ -319,7 +319,7 @@ xfs_refcount_update_finish_item( refc->ri_blockcount = new_aglen; return -EAGAIN; } - kmem_free(refc); + kmem_cache_free(xfs_refcount_intent_cache, refc); return error; } @@ -338,7 +338,7 @@ xfs_refcount_update_cancel_item( struct xfs_refcount_intent *refc; refc = container_of(item, struct xfs_refcount_intent, ri_list); - kmem_free(refc); + kmem_cache_free(xfs_refcount_intent_cache, refc); } const struct xfs_defer_op_type xfs_refcount_update_defer_type = { @@ -418,7 +418,7 @@ xfs_bmap_update_finish_item( bmap->bi_bmap.br_blockcount = count; return -EAGAIN; } - kmem_free(bmap); + kmem_cache_free(xfs_bmap_intent_cache, bmap); return error; } @@ -437,7 +437,7 @@ xfs_bmap_update_cancel_item( struct xfs_bmap_intent *bmap; bmap = container_of(item, struct xfs_bmap_intent, bi_list); - kmem_free(bmap); + kmem_cache_free(xfs_bmap_intent_cache, bmap); } const struct xfs_defer_op_type xfs_bmap_update_defer_type = { diff --git a/libxfs/init.c b/libxfs/init.c index b0be28e3..f6863f4c 100644 --- a/libxfs/init.c +++ b/libxfs/init.c @@ -253,6 +253,12 @@ init_caches(void) abort(); } + error = xfs_defer_init_item_caches(); + if (error) { + fprintf(stderr, "Could not allocate defer work item caches.\n"); + abort(); + } + xfs_bmap_free_item_cache = kmem_cache_create("xfs_bmap_free_item", sizeof(struct xfs_extent_free_item), 0, 0, NULL); xfs_trans_cache = kmem_cache_create("xfs_trans", @@ -268,6 +274,7 @@ destroy_kmem_caches(void) kmem_cache_destroy(xfs_ifork_cache); kmem_cache_destroy(xfs_buf_item_cache); kmem_cache_destroy(xfs_da_state_cache); + xfs_defer_destroy_item_caches(); xfs_btree_destroy_cur_caches(); kmem_cache_destroy(xfs_bmap_free_item_cache); kmem_cache_destroy(xfs_trans_cache); diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c index 0514d6e5..c261d119 100644 --- a/libxfs/xfs_bmap.c +++ b/libxfs/xfs_bmap.c @@ -30,7 +30,7 @@ #include "xfs_ag_resv.h" #include "xfs_refcount.h" - +struct kmem_cache *xfs_bmap_intent_cache; struct kmem_cache *xfs_bmap_free_item_cache; /* @@ -6183,7 +6183,7 @@ __xfs_bmap_add( bmap->br_blockcount, bmap->br_state); - bi = kmem_alloc(sizeof(struct xfs_bmap_intent), KM_NOFS); + bi = kmem_cache_alloc(xfs_bmap_intent_cache, GFP_NOFS | __GFP_NOFAIL); INIT_LIST_HEAD(&bi->bi_list); bi->bi_type = type; bi->bi_owner = ip; @@ -6294,3 +6294,20 @@ xfs_bmap_validate_extent( return __this_address; return NULL; } + +int __init +xfs_bmap_intent_init_cache(void) +{ + xfs_bmap_intent_cache = kmem_cache_create("xfs_bmap_intent", + sizeof(struct xfs_bmap_intent), + 0, 0, NULL); + + return xfs_bmap_intent_cache != NULL ? 0 : -ENOMEM; +} + +void +xfs_bmap_intent_destroy_cache(void) +{ + kmem_cache_destroy(xfs_bmap_intent_cache); + xfs_bmap_intent_cache = NULL; +} diff --git a/libxfs/xfs_bmap.h b/libxfs/xfs_bmap.h index db01fe83..fa73a568 100644 --- a/libxfs/xfs_bmap.h +++ b/libxfs/xfs_bmap.h @@ -290,4 +290,9 @@ int xfs_bmapi_remap(struct xfs_trans *tp, struct xfs_inode *ip, xfs_fileoff_t bno, xfs_filblks_t len, xfs_fsblock_t startblock, int flags); +extern struct kmem_cache *xfs_bmap_intent_cache; + +int __init xfs_bmap_intent_init_cache(void); +void xfs_bmap_intent_destroy_cache(void); + #endif /* __XFS_BMAP_H__ */ diff --git a/libxfs/xfs_defer.c b/libxfs/xfs_defer.c index 40d49abc..f71bb055 100644 --- a/libxfs/xfs_defer.c +++ b/libxfs/xfs_defer.c @@ -14,6 +14,11 @@ #include "xfs_trans.h" #include "xfs_inode.h" #include "xfs_trace.h" +#include "xfs_rmap.h" +#include "xfs_refcount.h" +#include "xfs_bmap.h" + +static struct kmem_cache *xfs_defer_pending_cache; /* * Deferred Operations in XFS @@ -361,7 +366,7 @@ xfs_defer_cancel_list( ops->cancel_item(pwi); } ASSERT(dfp->dfp_count == 0); - kmem_free(dfp); + kmem_cache_free(xfs_defer_pending_cache, dfp); } } @@ -458,7 +463,7 @@ xfs_defer_finish_one( /* Done with the dfp, free it. */ list_del(&dfp->dfp_list); - kmem_free(dfp); + kmem_cache_free(xfs_defer_pending_cache, dfp); out: if (ops->finish_cleanup) ops->finish_cleanup(tp, state, error); @@ -592,8 +597,8 @@ xfs_defer_add( dfp = NULL; } if (!dfp) { - dfp = kmem_alloc(sizeof(struct xfs_defer_pending), - KM_NOFS); + dfp = kmem_cache_zalloc(xfs_defer_pending_cache, + GFP_NOFS | __GFP_NOFAIL); dfp->dfp_type = type; dfp->dfp_intent = NULL; dfp->dfp_done = NULL; @@ -805,3 +810,55 @@ xfs_defer_resources_rele( dres->dr_bufs = 0; dres->dr_ordered = 0; } + +static inline int __init +xfs_defer_init_cache(void) +{ + xfs_defer_pending_cache = kmem_cache_create("xfs_defer_pending", + sizeof(struct xfs_defer_pending), + 0, 0, NULL); + + return xfs_defer_pending_cache != NULL ? 0 : -ENOMEM; +} + +static inline void +xfs_defer_destroy_cache(void) +{ + kmem_cache_destroy(xfs_defer_pending_cache); + xfs_defer_pending_cache = NULL; +} + +/* Set up caches for deferred work items. */ +int __init +xfs_defer_init_item_caches(void) +{ + int error; + + error = xfs_defer_init_cache(); + if (error) + return error; + error = xfs_rmap_intent_init_cache(); + if (error) + goto err; + error = xfs_refcount_intent_init_cache(); + if (error) + goto err; + error = xfs_bmap_intent_init_cache(); + if (error) + goto err; + + return 0; +err: + xfs_defer_destroy_item_caches(); + return error; +} + +/* Destroy all the deferred work item caches, if they've been allocated. */ +void +xfs_defer_destroy_item_caches(void) +{ + xfs_bmap_intent_destroy_cache(); + xfs_refcount_intent_destroy_cache(); + xfs_rmap_intent_destroy_cache(); + xfs_defer_destroy_cache(); +} diff --git a/libxfs/xfs_defer.h b/libxfs/xfs_defer.h index 7952695c..7bb8a31a 100644 --- a/libxfs/xfs_defer.h +++ b/libxfs/xfs_defer.h @@ -122,4 +122,7 @@ void xfs_defer_ops_capture_free(struct xfs_mount *mp, struct xfs_defer_capture *d); void xfs_defer_resources_rele(struct xfs_defer_resources *dres); +int __init xfs_defer_init_item_caches(void); +void xfs_defer_destroy_item_caches(void); + #endif /* __XFS_DEFER_H__ */ diff --git a/libxfs/xfs_refcount.c b/libxfs/xfs_refcount.c index 2aa64d3e..da3cd7d5 100644 --- a/libxfs/xfs_refcount.c +++ b/libxfs/xfs_refcount.c @@ -23,6 +23,8 @@ #include "xfs_rmap.h" #include "xfs_ag.h" +struct kmem_cache *xfs_refcount_intent_cache; + /* Allowable refcount adjustment amounts. */ enum xfs_refc_adjust_op { XFS_REFCOUNT_ADJUST_INCREASE = 1, @@ -1234,8 +1236,8 @@ __xfs_refcount_add( type, XFS_FSB_TO_AGBNO(tp->t_mountp, startblock), blockcount); - ri = kmem_alloc(sizeof(struct xfs_refcount_intent), - KM_NOFS); + ri = kmem_cache_alloc(xfs_refcount_intent_cache, + GFP_NOFS | __GFP_NOFAIL); INIT_LIST_HEAD(&ri->ri_list); ri->ri_type = type; ri->ri_startblock = startblock; @@ -1781,3 +1783,20 @@ xfs_refcount_has_record( return xfs_btree_has_record(cur, &low, &high, exists); } + +int __init +xfs_refcount_intent_init_cache(void) +{ + xfs_refcount_intent_cache = kmem_cache_create("xfs_refc_intent", + sizeof(struct xfs_refcount_intent), + 0, 0, NULL); + + return xfs_refcount_intent_cache != NULL ? 0 : -ENOMEM; +} + +void +xfs_refcount_intent_destroy_cache(void) +{ + kmem_cache_destroy(xfs_refcount_intent_cache); + xfs_refcount_intent_cache = NULL; +} diff --git a/libxfs/xfs_refcount.h b/libxfs/xfs_refcount.h index 89404596..9eb01edb 100644 --- a/libxfs/xfs_refcount.h +++ b/libxfs/xfs_refcount.h @@ -83,4 +83,9 @@ extern void xfs_refcount_btrec_to_irec(const union xfs_btree_rec *rec, extern int xfs_refcount_insert(struct xfs_btree_cur *cur, struct xfs_refcount_irec *irec, int *stat); +extern struct kmem_cache *xfs_refcount_intent_cache; + +int __init xfs_refcount_intent_init_cache(void); +void xfs_refcount_intent_destroy_cache(void); + #endif /* __XFS_REFCOUNT_H__ */ diff --git a/libxfs/xfs_rmap.c b/libxfs/xfs_rmap.c index e93010ff..d6601a65 100644 --- a/libxfs/xfs_rmap.c +++ b/libxfs/xfs_rmap.c @@ -23,6 +23,8 @@ #include "xfs_inode.h" #include "xfs_ag.h" +struct kmem_cache *xfs_rmap_intent_cache; + /* * Lookup the first record less than or equal to [bno, len, owner, offset] * in the btree given by cur. @@ -2484,7 +2486,7 @@ __xfs_rmap_add( bmap->br_blockcount, bmap->br_state); - ri = kmem_alloc(sizeof(struct xfs_rmap_intent), KM_NOFS); + ri = kmem_cache_alloc(xfs_rmap_intent_cache, GFP_NOFS | __GFP_NOFAIL); INIT_LIST_HEAD(&ri->ri_list); ri->ri_type = type; ri->ri_owner = owner; @@ -2778,3 +2780,20 @@ const struct xfs_owner_info XFS_RMAP_OINFO_REFC = { const struct xfs_owner_info XFS_RMAP_OINFO_COW = { .oi_owner = XFS_RMAP_OWN_COW, }; + +int __init +xfs_rmap_intent_init_cache(void) +{ + xfs_rmap_intent_cache = kmem_cache_create("xfs_rmap_intent", + sizeof(struct xfs_rmap_intent), + 0, 0, NULL); + + return xfs_rmap_intent_cache != NULL ? 0 : -ENOMEM; +} + +void +xfs_rmap_intent_destroy_cache(void) +{ + kmem_cache_destroy(xfs_rmap_intent_cache); + xfs_rmap_intent_cache = NULL; +} diff --git a/libxfs/xfs_rmap.h b/libxfs/xfs_rmap.h index 85dd98ac..b718ebed 100644 --- a/libxfs/xfs_rmap.h +++ b/libxfs/xfs_rmap.h @@ -215,4 +215,9 @@ extern const struct xfs_owner_info XFS_RMAP_OINFO_INODES; extern const struct xfs_owner_info XFS_RMAP_OINFO_REFC; extern const struct xfs_owner_info XFS_RMAP_OINFO_COW; +extern struct kmem_cache *xfs_rmap_intent_cache; + +int __init xfs_rmap_intent_init_cache(void); +void xfs_rmap_intent_destroy_cache(void); + #endif /* __XFS_RMAP_H__ */

[42/48] xfs: create slab caches for frequently-used deferred items

Commit Message

Patch