Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfs: store an ops pointer in struct xfs_defer_pending

Browse Source 
The dfp_type field in struct xfs_defer_pending is only used to either
look up the operations associated with the pending word or in trace
points.  Replace it with a direct pointer to the operations vector,
and store a pretty name in the vector for tracing.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>
This commit is contained in:
Christoph Hellwig 2023-12-13 10:06:31 +01:00 committed by Chandan Babu R
parent 2e8f7b6f4a
commit 7f2f7531e0
8 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
fs/xfs/libxfs/xfs_defer.c
View File

@ -251,7 +251,6 @@ xfs_defer_create_done(
struct xfs_trans *tp, struct xfs_trans *tp,
struct xfs_defer_pending *dfp) struct xfs_defer_pending *dfp)
{ {
const struct xfs_defer_op_type *ops = defer_op_types[dfp->dfp_type];
struct xfs_log_item *lip; struct xfs_log_item *lip;
/* If there is no log intent item, there can be no log done item. */ /* If there is no log intent item, there can be no log done item. */
@ -266,7 +265,7 @@ xfs_defer_create_done(
* 2.) shuts down the filesystem * 2.) shuts down the filesystem
*/ */
tp->t_flags |= XFS_TRANS_DIRTY; tp->t_flags |= XFS_TRANS_DIRTY;
lip = ops->create_done(tp, dfp->dfp_intent, dfp->dfp_count); lip = dfp->dfp_ops->create_done(tp, dfp->dfp_intent, dfp->dfp_count);
if (!lip) if (!lip)
return; return;
@ -287,13 +286,13 @@ xfs_defer_create_intent(
struct xfs_defer_pending *dfp, struct xfs_defer_pending *dfp,
bool sort) bool sort)
{ {
const struct xfs_defer_op_type *ops = defer_op_types[dfp->dfp_type];
struct xfs_log_item *lip; struct xfs_log_item *lip;
if (dfp->dfp_intent) if (dfp->dfp_intent)
return 1; return 1;
lip = ops->create_intent(tp, &dfp->dfp_work, dfp->dfp_count, sort); lip = dfp->dfp_ops->create_intent(tp, &dfp->dfp_work, dfp->dfp_count,
sort);
if (!lip) if (!lip)
return 0; return 0;
if (IS_ERR(lip)) if (IS_ERR(lip))
@ -338,12 +337,10 @@ xfs_defer_pending_abort(
struct xfs_mount *mp, struct xfs_mount *mp,
struct xfs_defer_pending *dfp) struct xfs_defer_pending *dfp)
{ {
const struct xfs_defer_op_type *ops = defer_op_types[dfp->dfp_type];
trace_xfs_defer_pending_abort(mp, dfp); trace_xfs_defer_pending_abort(mp, dfp);
if (dfp->dfp_intent && !dfp->dfp_done) { if (dfp->dfp_intent && !dfp->dfp_done) {
ops->abort_intent(dfp->dfp_intent); dfp->dfp_ops->abort_intent(dfp->dfp_intent);
dfp->dfp_intent = NULL; dfp->dfp_intent = NULL;
} }
} }
@ -353,7 +350,6 @@ xfs_defer_pending_cancel_work(
struct xfs_mount *mp, struct xfs_mount *mp,
struct xfs_defer_pending *dfp) struct xfs_defer_pending *dfp)
{ {
const struct xfs_defer_op_type *ops = defer_op_types[dfp->dfp_type];
struct list_head *pwi; struct list_head *pwi;
struct list_head *n; struct list_head *n;
@ -364,7 +360,7 @@ xfs_defer_pending_cancel_work(
list_del(pwi); list_del(pwi);
dfp->dfp_count--; dfp->dfp_count--;
trace_xfs_defer_cancel_item(mp, dfp, pwi); trace_xfs_defer_cancel_item(mp, dfp, pwi);
ops->cancel_item(pwi); dfp->dfp_ops->cancel_item(pwi);
} }
ASSERT(dfp->dfp_count == 0); ASSERT(dfp->dfp_count == 0);
kmem_cache_free(xfs_defer_pending_cache, dfp); kmem_cache_free(xfs_defer_pending_cache, dfp);
@ -522,11 +518,10 @@ xfs_defer_relog_intent(
struct xfs_defer_pending *dfp) struct xfs_defer_pending *dfp)
{ {
struct xfs_log_item *lip; struct xfs_log_item *lip;
const struct xfs_defer_op_type *ops = defer_op_types[dfp->dfp_type];
xfs_defer_create_done(tp, dfp); xfs_defer_create_done(tp, dfp);
lip = ops->relog_intent(tp, dfp->dfp_intent, dfp->dfp_done); lip = dfp->dfp_ops->relog_intent(tp, dfp->dfp_intent, dfp->dfp_done);
if (lip) { if (lip) {
xfs_trans_add_item(tp, lip); xfs_trans_add_item(tp, lip);
set_bit(XFS_LI_DIRTY, &lip->li_flags); set_bit(XFS_LI_DIRTY, &lip->li_flags);
@ -593,7 +588,7 @@ xfs_defer_finish_one(
struct xfs_trans *tp, struct xfs_trans *tp,
struct xfs_defer_pending *dfp) struct xfs_defer_pending *dfp)
{ {
const struct xfs_defer_op_type *ops = defer_op_types[dfp->dfp_type]; const struct xfs_defer_op_type *ops = dfp->dfp_ops;
struct xfs_btree_cur *state = NULL; struct xfs_btree_cur *state = NULL;
struct list_head *li, *n; struct list_head *li, *n;
int error; int error;
@ -790,7 +785,6 @@ xfs_defer_cancel(
static inline struct xfs_defer_pending * static inline struct xfs_defer_pending *
xfs_defer_find_last( xfs_defer_find_last(
struct xfs_trans *tp, struct xfs_trans *tp,
enum xfs_defer_ops_type type,
const struct xfs_defer_op_type *ops) const struct xfs_defer_op_type *ops)
{ {
struct xfs_defer_pending *dfp = NULL; struct xfs_defer_pending *dfp = NULL;
@ -803,7 +797,7 @@ xfs_defer_find_last(
dfp_list); dfp_list);
/* Wrong type? */ /* Wrong type? */
if (dfp->dfp_type != type) if (dfp->dfp_ops != ops)
return NULL; return NULL;
return dfp; return dfp;
} }
@ -836,13 +830,13 @@ xfs_defer_can_append(
static inline struct xfs_defer_pending * static inline struct xfs_defer_pending *
xfs_defer_alloc( xfs_defer_alloc(
struct xfs_trans *tp, struct xfs_trans *tp,
enum xfs_defer_ops_type type) const struct xfs_defer_op_type *ops)
{ {
struct xfs_defer_pending *dfp; struct xfs_defer_pending *dfp;
dfp = kmem_cache_zalloc(xfs_defer_pending_cache, dfp = kmem_cache_zalloc(xfs_defer_pending_cache,
GFP_NOFS | __GFP_NOFAIL); GFP_NOFS | __GFP_NOFAIL);
dfp->dfp_type = type; dfp->dfp_ops = ops;
INIT_LIST_HEAD(&dfp->dfp_work); INIT_LIST_HEAD(&dfp->dfp_work);
list_add_tail(&dfp->dfp_list, &tp->t_dfops); list_add_tail(&dfp->dfp_list, &tp->t_dfops);
@ -862,9 +856,9 @@ xfs_defer_add(
ASSERT(tp->t_flags & XFS_TRANS_PERM_LOG_RES); ASSERT(tp->t_flags & XFS_TRANS_PERM_LOG_RES);
BUILD_BUG_ON(ARRAY_SIZE(defer_op_types) != XFS_DEFER_OPS_TYPE_MAX); BUILD_BUG_ON(ARRAY_SIZE(defer_op_types) != XFS_DEFER_OPS_TYPE_MAX);
dfp = xfs_defer_find_last(tp, type, ops); dfp = xfs_defer_find_last(tp, ops);
if (!dfp || !xfs_defer_can_append(dfp, ops)) if (!dfp || !xfs_defer_can_append(dfp, ops))
dfp = xfs_defer_alloc(tp, type); dfp = xfs_defer_alloc(tp, ops);
xfs_defer_add_item(dfp, li); xfs_defer_add_item(dfp, li);
trace_xfs_defer_add_item(tp->t_mountp, dfp, li); trace_xfs_defer_add_item(tp->t_mountp, dfp, li);
@ -880,17 +874,15 @@ xfs_defer_add_barrier(
struct xfs_trans *tp) struct xfs_trans *tp)
{ {
struct xfs_defer_pending *dfp; struct xfs_defer_pending *dfp;
const enum xfs_defer_ops_type type = XFS_DEFER_OPS_TYPE_BARRIER;
const struct xfs_defer_op_type *ops = defer_op_types[type];
ASSERT(tp->t_flags & XFS_TRANS_PERM_LOG_RES); ASSERT(tp->t_flags & XFS_TRANS_PERM_LOG_RES);
/* If the last defer op added was a barrier, we're done. */ /* If the last defer op added was a barrier, we're done. */
dfp = xfs_defer_find_last(tp, type, ops); dfp = xfs_defer_find_last(tp, &xfs_barrier_defer_type);
if (dfp) if (dfp)
return; return;
xfs_defer_alloc(tp, type); xfs_defer_alloc(tp, &xfs_barrier_defer_type);
trace_xfs_defer_add_item(tp->t_mountp, dfp, NULL); trace_xfs_defer_add_item(tp->t_mountp, dfp, NULL);
} }
@ -909,7 +901,7 @@ xfs_defer_start_recovery(
dfp = kmem_cache_zalloc(xfs_defer_pending_cache, dfp = kmem_cache_zalloc(xfs_defer_pending_cache,
GFP_NOFS | __GFP_NOFAIL); GFP_NOFS | __GFP_NOFAIL);
dfp->dfp_type = dfp_type; dfp->dfp_ops = defer_op_types[dfp_type];
dfp->dfp_intent = lip; dfp->dfp_intent = lip;
INIT_LIST_HEAD(&dfp->dfp_work); INIT_LIST_HEAD(&dfp->dfp_work);
list_add_tail(&dfp->dfp_list, r_dfops); list_add_tail(&dfp->dfp_list, r_dfops);
@ -935,13 +927,12 @@ xfs_defer_finish_recovery(
struct xfs_defer_pending *dfp, struct xfs_defer_pending *dfp,
struct list_head *capture_list) struct list_head *capture_list)
{ {
const struct xfs_defer_op_type *ops = defer_op_types[dfp->dfp_type];
int error; int error;
error = ops->recover_work(dfp, capture_list); error = dfp->dfp_ops->recover_work(dfp, capture_list);
if (error) if (error)
trace_xlog_intent_recovery_failed(mp, error, trace_xlog_intent_recovery_failed(mp, error,
ops->recover_work); dfp->dfp_ops->recover_work);
return error; return error;
} }

5
fs/xfs/libxfs/xfs_defer.h
View File

@ -34,9 +34,9 @@ struct xfs_defer_pending {
struct list_head dfp_work; /* work items */ struct list_head dfp_work; /* work items */
struct xfs_log_item *dfp_intent; /* log intent item */ struct xfs_log_item *dfp_intent; /* log intent item */
struct xfs_log_item *dfp_done; /* log done item */ struct xfs_log_item *dfp_done; /* log done item */
const struct xfs_defer_op_type *dfp_ops;
unsigned int dfp_count; /* # extent items */ unsigned int dfp_count; /* # extent items */
unsigned int dfp_flags; unsigned int dfp_flags;
enum xfs_defer_ops_type dfp_type;
}; };
/* /*
@ -61,6 +61,8 @@ void xfs_defer_move(struct xfs_trans *dtp, struct xfs_trans *stp);
/* Description of a deferred type. */ /* Description of a deferred type. */
struct xfs_defer_op_type { struct xfs_defer_op_type {
const char *name;
unsigned int max_items;
struct xfs_log_item *(*create_intent)(struct xfs_trans *tp, struct xfs_log_item *(*create_intent)(struct xfs_trans *tp,
struct list_head *items, unsigned int count, bool sort); struct list_head *items, unsigned int count, bool sort);
void (*abort_intent)(struct xfs_log_item *intent); void (*abort_intent)(struct xfs_log_item *intent);
@ -76,7 +78,6 @@ struct xfs_defer_op_type {
struct xfs_log_item *(*relog_intent)(struct xfs_trans *tp, struct xfs_log_item *(*relog_intent)(struct xfs_trans *tp,
struct xfs_log_item *intent, struct xfs_log_item *intent,
struct xfs_log_item *done_item); struct xfs_log_item *done_item);
unsigned int max_items;
}; };
extern const struct xfs_defer_op_type xfs_bmap_update_defer_type; extern const struct xfs_defer_op_type xfs_bmap_update_defer_type;

1
fs/xfs/xfs_attr_item.c
View File

@ -677,6 +677,7 @@ xfs_attr_create_done(
} }
const struct xfs_defer_op_type xfs_attr_defer_type = { const struct xfs_defer_op_type xfs_attr_defer_type = {
.name = "attr",
.max_items = 1, .max_items = 1,
.create_intent = xfs_attr_create_intent, .create_intent = xfs_attr_create_intent,
.abort_intent = xfs_attr_abort_intent, .abort_intent = xfs_attr_abort_intent,

1
fs/xfs/xfs_bmap_item.c
View File

@ -563,6 +563,7 @@ xfs_bmap_relog_intent(
} }
const struct xfs_defer_op_type xfs_bmap_update_defer_type = { const struct xfs_defer_op_type xfs_bmap_update_defer_type = {
.name = "bmap",
.max_items = XFS_BUI_MAX_FAST_EXTENTS, .max_items = XFS_BUI_MAX_FAST_EXTENTS,
.create_intent = xfs_bmap_update_create_intent, .create_intent = xfs_bmap_update_create_intent,
.abort_intent = xfs_bmap_update_abort_intent, .abort_intent = xfs_bmap_update_abort_intent,

2
fs/xfs/xfs_extfree_item.c
View File

@ -670,6 +670,7 @@ xfs_extent_free_relog_intent(
} }
const struct xfs_defer_op_type xfs_extent_free_defer_type = { const struct xfs_defer_op_type xfs_extent_free_defer_type = {
.name = "extent_free",
.max_items = XFS_EFI_MAX_FAST_EXTENTS, .max_items = XFS_EFI_MAX_FAST_EXTENTS,
.create_intent = xfs_extent_free_create_intent, .create_intent = xfs_extent_free_create_intent,
.abort_intent = xfs_extent_free_abort_intent, .abort_intent = xfs_extent_free_abort_intent,
@ -682,6 +683,7 @@ const struct xfs_defer_op_type xfs_extent_free_defer_type = {
/* sub-type with special handling for AGFL deferred frees */ /* sub-type with special handling for AGFL deferred frees */
const struct xfs_defer_op_type xfs_agfl_free_defer_type = { const struct xfs_defer_op_type xfs_agfl_free_defer_type = {
.name = "agfl_free",
.max_items = XFS_EFI_MAX_FAST_EXTENTS, .max_items = XFS_EFI_MAX_FAST_EXTENTS,
.create_intent = xfs_extent_free_create_intent, .create_intent = xfs_extent_free_create_intent,
.abort_intent = xfs_extent_free_abort_intent, .abort_intent = xfs_extent_free_abort_intent,

1
fs/xfs/xfs_refcount_item.c
View File

@ -523,6 +523,7 @@ xfs_refcount_relog_intent(
} }
const struct xfs_defer_op_type xfs_refcount_update_defer_type = { const struct xfs_defer_op_type xfs_refcount_update_defer_type = {
.name = "refcount",
.max_items = XFS_CUI_MAX_FAST_EXTENTS, .max_items = XFS_CUI_MAX_FAST_EXTENTS,
.create_intent = xfs_refcount_update_create_intent, .create_intent = xfs_refcount_update_create_intent,
.abort_intent = xfs_refcount_update_abort_intent, .abort_intent = xfs_refcount_update_abort_intent,

1
fs/xfs/xfs_rmap_item.c
View File

@ -576,6 +576,7 @@ xfs_rmap_relog_intent(
} }
const struct xfs_defer_op_type xfs_rmap_update_defer_type = { const struct xfs_defer_op_type xfs_rmap_update_defer_type = {
.name = "rmap",
.max_items = XFS_RUI_MAX_FAST_EXTENTS, .max_items = XFS_RUI_MAX_FAST_EXTENTS,
.create_intent = xfs_rmap_update_create_intent, .create_intent = xfs_rmap_update_create_intent,
.abort_intent = xfs_rmap_update_abort_intent, .abort_intent = xfs_rmap_update_abort_intent,

16
fs/xfs/xfs_trace.h
View File

@ -2549,7 +2549,7 @@ DECLARE_EVENT_CLASS(xfs_defer_pending_class,
TP_ARGS(mp, dfp), TP_ARGS(mp, dfp),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(dev_t, dev) __field(dev_t, dev)
__field(int, type) __string(name, dfp->dfp_ops->name)
__field(void *, intent) __field(void *, intent)
__field(unsigned int, flags) __field(unsigned int, flags)
__field(char, committed) __field(char, committed)
@ -2557,15 +2557,15 @@ DECLARE_EVENT_CLASS(xfs_defer_pending_class,
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = mp ? mp->m_super->s_dev : 0; __entry->dev = mp ? mp->m_super->s_dev : 0;
__entry->type = dfp->dfp_type; __assign_str(name, dfp->dfp_ops->name);
__entry->intent = dfp->dfp_intent; __entry->intent = dfp->dfp_intent;
__entry->flags = dfp->dfp_flags; __entry->flags = dfp->dfp_flags;
__entry->committed = dfp->dfp_done != NULL; __entry->committed = dfp->dfp_done != NULL;
__entry->nr = dfp->dfp_count; __entry->nr = dfp->dfp_count;
), ),
TP_printk("dev %d:%d optype %d intent %p flags %s committed %d nr %d", TP_printk("dev %d:%d optype %s intent %p flags %s committed %d nr %d",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->type, __get_str(name),
__entry->intent, __entry->intent,
__print_flags(__entry->flags, "|", XFS_DEFER_PENDING_STRINGS), __print_flags(__entry->flags, "|", XFS_DEFER_PENDING_STRINGS),
__entry->committed, __entry->committed,
@ -2694,7 +2694,7 @@ DECLARE_EVENT_CLASS(xfs_defer_pending_item_class,
TP_ARGS(mp, dfp, item), TP_ARGS(mp, dfp, item),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(dev_t, dev) __field(dev_t, dev)
__field(int, type) __string(name, dfp->dfp_ops->name)
__field(void *, intent) __field(void *, intent)
__field(void *, item) __field(void *, item)
__field(char, committed) __field(char, committed)
@ -2703,16 +2703,16 @@ DECLARE_EVENT_CLASS(xfs_defer_pending_item_class,
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = mp ? mp->m_super->s_dev : 0; __entry->dev = mp ? mp->m_super->s_dev : 0;
__entry->type = dfp->dfp_type; __assign_str(name, dfp->dfp_ops->name);
__entry->intent = dfp->dfp_intent; __entry->intent = dfp->dfp_intent;
__entry->item = item; __entry->item = item;
__entry->committed = dfp->dfp_done != NULL; __entry->committed = dfp->dfp_done != NULL;
__entry->flags = dfp->dfp_flags; __entry->flags = dfp->dfp_flags;
__entry->nr = dfp->dfp_count; __entry->nr = dfp->dfp_count;
), ),
TP_printk("dev %d:%d optype %d intent %p item %p flags %s committed %d nr %d", TP_printk("dev %d:%d optype %s intent %p item %p flags %s committed %d nr %d",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->type, __get_str(name),
__entry->intent, __entry->intent,
__entry->item, __entry->item,
__print_flags(__entry->flags, "|", XFS_DEFER_PENDING_STRINGS), __print_flags(__entry->flags, "|", XFS_DEFER_PENDING_STRINGS),