Commit f3c799c2 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: create slab caches for frequently-used deferred items 



Create slab caches for the high-level structures that coordinate
deferred intent items, since they're used fairly heavily.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChandan Babu R <chandan.babu@oracle.com>
parent 9e253954

fs/xfs/libxfs/xfs_bmap.c

+19 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include "xfs_icache.h"

#include "xfs_iomap.h"





struct kmem_cache		*xfs_bmap_intent_cache;

struct kmem_cache		*xfs_bmap_free_item_cache;



/*
@@ -6190,7 +6190,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;
@@ -6301,3 +6301,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;

}

fs/xfs/libxfs/xfs_bmap.h

+5 −0
Original line number Diff line number Diff line
@@ -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__ */

fs/xfs/libxfs/xfs_defer.c

+61 −4
Original line number Diff line number Diff line
@@ -18,6 +18,11 @@ 
#include "xfs_trace.h"

#include "xfs_icache.h"

#include "xfs_log.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
@@ -365,7 +370,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);

	}

}
@@ -462,7 +467,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);
@@ -596,8 +601,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;
@@ -809,3 +814,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();

}

fs/xfs/libxfs/xfs_defer.h

+3 −0
Original line number Diff line number Diff line
@@ -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__ */

fs/xfs/libxfs/xfs_refcount.c

+21 −2
Original line number Diff line number Diff line
@@ -24,6 +24,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,
@@ -1235,8 +1237,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;
@@ -1782,3 +1784,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;

}