Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-19 20:05:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xfs: store a generic group structure in the intents

Browse Source 
Replace the pag pointers in the extent free, bmap, rmap and refcount
intent structures with a pointer to the generic group to prepare
for adding intents for realtime groups.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
This commit is contained in:
Christoph Hellwig 2024-11-03 20:18:46 -08:00 committed by Darrick J. Wong
parent ba102a682d
commit e5e5cae05b
12 changed files with 63 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/libxfs/xfs_alloc.h
View File

@ -248,7 +248,7 @@ struct xfs_extent_free_item {
uint64_t xefi_owner; uint64_t xefi_owner;
xfs_fsblock_t xefi_startblock;/* starting fs block number */ xfs_fsblock_t xefi_startblock;/* starting fs block number */
xfs_extlen_t xefi_blockcount;/* number of blocks in extent */ xfs_extlen_t xefi_blockcount;/* number of blocks in extent */
struct xfs_perag *xefi_pag; struct xfs_group *xefi_group;
unsigned int xefi_flags; unsigned int xefi_flags;
enum xfs_ag_resv_type xefi_agresv; enum xfs_ag_resv_type xefi_agresv;
}; };

2
fs/xfs/libxfs/xfs_bmap.h
View File

@ -248,7 +248,7 @@ struct xfs_bmap_intent {
enum xfs_bmap_intent_type bi_type; enum xfs_bmap_intent_type bi_type;
int bi_whichfork; int bi_whichfork;
struct xfs_inode *bi_owner; struct xfs_inode *bi_owner;
struct xfs_perag *bi_pag; struct xfs_group *bi_group;
struct xfs_bmbt_irec bi_bmap; struct xfs_bmbt_irec bi_bmap;
}; };

9
fs/xfs/libxfs/xfs_refcount.c
View File

@ -1358,7 +1358,7 @@ xfs_refcount_finish_one(
* If we haven't gotten a cursor or the cursor AG doesn't match * If we haven't gotten a cursor or the cursor AG doesn't match
* the startblock, get one now. * the startblock, get one now.
*/ */
if (rcur != NULL && to_perag(rcur->bc_group) != ri->ri_pag) { if (rcur != NULL && rcur->bc_group != ri->ri_group) {
nr_ops = rcur->bc_refc.nr_ops; nr_ops = rcur->bc_refc.nr_ops;
shape_changes = rcur->bc_refc.shape_changes; shape_changes = rcur->bc_refc.shape_changes;
xfs_btree_del_cursor(rcur, 0); xfs_btree_del_cursor(rcur, 0);
@ -1366,13 +1366,14 @@ xfs_refcount_finish_one(
*pcur = NULL; *pcur = NULL;
} }
if (rcur == NULL) { if (rcur == NULL) {
error = xfs_alloc_read_agf(ri->ri_pag, tp, struct xfs_perag *pag = to_perag(ri->ri_group);
error = xfs_alloc_read_agf(pag, tp,
XFS_ALLOC_FLAG_FREEING, &agbp); XFS_ALLOC_FLAG_FREEING, &agbp);
if (error) if (error)
return error; return error;
*pcur = rcur = xfs_refcountbt_init_cursor(mp, tp, agbp, *pcur = rcur = xfs_refcountbt_init_cursor(mp, tp, agbp, pag);
ri->ri_pag);
rcur->bc_refc.nr_ops = nr_ops; rcur->bc_refc.nr_ops = nr_ops;
rcur->bc_refc.shape_changes = shape_changes; rcur->bc_refc.shape_changes = shape_changes;
} }

2
fs/xfs/libxfs/xfs_refcount.h
View File

@ -56,7 +56,7 @@ enum xfs_refcount_intent_type {
struct xfs_refcount_intent { struct xfs_refcount_intent {
struct list_head ri_list; struct list_head ri_list;
struct xfs_perag *ri_pag; struct xfs_group *ri_group;
enum xfs_refcount_intent_type ri_type; enum xfs_refcount_intent_type ri_type;
xfs_extlen_t ri_blockcount; xfs_extlen_t ri_blockcount;
xfs_fsblock_t ri_startblock; xfs_fsblock_t ri_startblock;

16
fs/xfs/libxfs/xfs_rmap.c
View File

@ -2586,28 +2586,30 @@ xfs_rmap_finish_one(
* If we haven't gotten a cursor or the cursor AG doesn't match * If we haven't gotten a cursor or the cursor AG doesn't match
* the startblock, get one now. * the startblock, get one now.
*/ */
if (rcur != NULL && to_perag(rcur->bc_group) != ri->ri_pag) { if (rcur != NULL && rcur->bc_group != ri->ri_group) {
xfs_btree_del_cursor(rcur, 0); xfs_btree_del_cursor(rcur, 0);
rcur = NULL; rcur = NULL;
*pcur = NULL; *pcur = NULL;
} }
if (rcur == NULL) { if (rcur == NULL) {
struct xfs_perag *pag = to_perag(ri->ri_group);
/* /*
* Refresh the freelist before we start changing the * Refresh the freelist before we start changing the
* rmapbt, because a shape change could cause us to * rmapbt, because a shape change could cause us to
* allocate blocks. * allocate blocks.
*/ */
error = xfs_free_extent_fix_freelist(tp, ri->ri_pag, &agbp); error = xfs_free_extent_fix_freelist(tp, pag, &agbp);
if (error) { if (error) {
xfs_ag_mark_sick(ri->ri_pag, XFS_SICK_AG_AGFL); xfs_ag_mark_sick(pag, XFS_SICK_AG_AGFL);
return error; return error;
} }
if (XFS_IS_CORRUPT(tp->t_mountp, !agbp)) { if (XFS_IS_CORRUPT(tp->t_mountp, !agbp)) {
xfs_ag_mark_sick(ri->ri_pag, XFS_SICK_AG_AGFL); xfs_ag_mark_sick(pag, XFS_SICK_AG_AGFL);
return -EFSCORRUPTED; return -EFSCORRUPTED;
} }
*pcur = rcur = xfs_rmapbt_init_cursor(mp, tp, agbp, ri->ri_pag); *pcur = rcur = xfs_rmapbt_init_cursor(mp, tp, agbp, pag);
} }
xfs_rmap_ino_owner(&oinfo, ri->ri_owner, ri->ri_whichfork, xfs_rmap_ino_owner(&oinfo, ri->ri_owner, ri->ri_whichfork,
@ -2620,8 +2622,8 @@ xfs_rmap_finish_one(
if (error) if (error)
return error; return error;
xfs_rmap_update_hook(tp, pag_group(ri->ri_pag), ri->ri_type, bno, xfs_rmap_update_hook(tp, ri->ri_group, ri->ri_type, bno,
ri->ri_bmap.br_blockcount, unwritten, &oinfo); ri->ri_bmap.br_blockcount, unwritten, &oinfo);
return 0; return 0;
} }

2
fs/xfs/libxfs/xfs_rmap.h
View File

@ -173,7 +173,7 @@ struct xfs_rmap_intent {
int ri_whichfork; int ri_whichfork;
uint64_t ri_owner; uint64_t ri_owner;
struct xfs_bmbt_irec ri_bmap; struct xfs_bmbt_irec ri_bmap;
struct xfs_perag *ri_pag; struct xfs_group *ri_group;
}; };
/* functions for updating the rmapbt based on bmbt map/unmap operations */ /* functions for updating the rmapbt based on bmbt map/unmap operations */

5
fs/xfs/xfs_bmap_item.c
View File

@ -334,7 +334,8 @@ xfs_bmap_update_get_group(
* intent drops the intent count, ensuring that the intent count * intent drops the intent count, ensuring that the intent count
* remains nonzero across the transaction roll. * remains nonzero across the transaction roll.
*/ */
bi->bi_pag = xfs_perag_intent_get(mp, bi->bi_bmap.br_startblock); bi->bi_group = xfs_group_intent_get(mp, bi->bi_bmap.br_startblock,
XG_TYPE_AG);
} }
/* Add this deferred BUI to the transaction. */ /* Add this deferred BUI to the transaction. */
@ -368,7 +369,7 @@ xfs_bmap_update_put_group(
if (xfs_ifork_is_realtime(bi->bi_owner, bi->bi_whichfork)) if (xfs_ifork_is_realtime(bi->bi_owner, bi->bi_whichfork))
return; return;
xfs_perag_intent_put(bi->bi_pag); xfs_group_intent_put(bi->bi_group);
} }
/* Cancel a deferred bmap update. */ /* Cancel a deferred bmap update. */

36
fs/xfs/xfs_drain.c
View File

@ -94,39 +94,39 @@ static inline int xfs_defer_drain_wait(struct xfs_defer_drain *dr)
} }
/* /*
* Get a passive reference to the AG that contains a fsbno and declare an * Get a passive reference to the group that contains a fsbno and declare an
* intent to update its metadata. * intent to update its metadata.
* *
* Other threads that need exclusive access can decide to back off if they see * Other threads that need exclusive access can decide to back off if they see
* declared intentions. * declared intentions.
*/ */
struct xfs_perag * struct xfs_group *
xfs_perag_intent_get( xfs_group_intent_get(
struct xfs_mount *mp, struct xfs_mount *mp,
xfs_fsblock_t fsbno) xfs_fsblock_t fsbno,
enum xfs_group_type type)
{ {
struct xfs_perag *pag; struct xfs_group *xg;
pag = xfs_perag_get(mp, XFS_FSB_TO_AGNO(mp, fsbno)); xg = xfs_group_get_by_fsb(mp, fsbno, type);
if (!pag) if (!xg)
return NULL; return NULL;
trace_xfs_group_intent_hold(xg, __return_address);
trace_xfs_group_intent_hold(pag_group(pag), __return_address); xfs_defer_drain_grab(&xg->xg_intents_drain);
xfs_defer_drain_grab(pag_group(pag).xg_intents_drain); return xg;
return pag;
} }
/* /*
* Release our intent to update this AG's metadata, and then release our * Release our intent to update this groups metadata, and then release our
* passive ref to the AG. * passive ref to it.
*/ */
void void
xfs_perag_intent_put( xfs_group_intent_put(
struct xfs_perag *pag) struct xfs_group *xg)
{ {
trace_xfs_group_intent_rele(pag_group(pag), __return_address); trace_xfs_group_intent_rele(xg, __return_address);
xfs_defer_drain_rele(pag_group(pag).xg_intents_drain); xfs_defer_drain_rele(&xg->xg_intents_drain);
xfs_perag_put(pag); xfs_group_put(xg);
} }
/* /*

12
fs/xfs/xfs_drain.h
View File

@ -62,9 +62,9 @@ void xfs_drain_wait_enable(void);
* soon as the item is added to the transaction and cannot drop the counter * soon as the item is added to the transaction and cannot drop the counter
* until the item is finished or cancelled. * until the item is finished or cancelled.
*/ */
struct xfs_perag *xfs_perag_intent_get(struct xfs_mount *mp, struct xfs_group *xfs_group_intent_get(struct xfs_mount *mp,
xfs_fsblock_t fsbno); xfs_fsblock_t fsbno, enum xfs_group_type type);
void xfs_perag_intent_put(struct xfs_perag *pag); void xfs_group_intent_put(struct xfs_group *rtg);
int xfs_group_intent_drain(struct xfs_group *xg); int xfs_group_intent_drain(struct xfs_group *xg);
bool xfs_group_intent_busy(struct xfs_group *xg); bool xfs_group_intent_busy(struct xfs_group *xg);
@ -75,9 +75,9 @@ struct xfs_defer_drain { /* empty */ };
#define xfs_defer_drain_free(dr) ((void)0) #define xfs_defer_drain_free(dr) ((void)0)
#define xfs_defer_drain_init(dr) ((void)0) #define xfs_defer_drain_init(dr) ((void)0)
#define xfs_perag_intent_get(mp, fsbno) \ #define xfs_group_intent_get(_mp, _fsbno, _type) \
xfs_perag_get((mp), XFS_FSB_TO_AGNO(mp, fsbno)) xfs_group_get_by_fsb((_mp), (_fsbno), (_type))
#define xfs_perag_intent_put(pag) xfs_perag_put(pag) #define xfs_group_intent_put(xg) xfs_group_put(xg)
#endif /* CONFIG_XFS_DRAIN_INTENTS */ #endif /* CONFIG_XFS_DRAIN_INTENTS */

14
fs/xfs/xfs_extfree_item.c
View File

@ -362,7 +362,7 @@ xfs_extent_free_diff_items(
struct xfs_extent_free_item *ra = xefi_entry(a); struct xfs_extent_free_item *ra = xefi_entry(a);
struct xfs_extent_free_item *rb = xefi_entry(b); struct xfs_extent_free_item *rb = xefi_entry(b);
return pag_agno(ra->xefi_pag) - pag_agno(rb->xefi_pag); return ra->xefi_group->xg_gno - rb->xefi_group->xg_gno;
} }
/* Log a free extent to the intent item. */ /* Log a free extent to the intent item. */
@ -447,7 +447,8 @@ xfs_extent_free_defer_add(
trace_xfs_extent_free_defer(mp, xefi); trace_xfs_extent_free_defer(mp, xefi);
xefi->xefi_pag = xfs_perag_intent_get(mp, xefi->xefi_startblock); xefi->xefi_group = xfs_group_intent_get(mp, xefi->xefi_startblock,
XG_TYPE_AG);
if (xefi->xefi_agresv == XFS_AG_RESV_AGFL) if (xefi->xefi_agresv == XFS_AG_RESV_AGFL)
*dfpp = xfs_defer_add(tp, &xefi->xefi_list, *dfpp = xfs_defer_add(tp, &xefi->xefi_list,
&xfs_agfl_free_defer_type); &xfs_agfl_free_defer_type);
@ -463,7 +464,7 @@ xfs_extent_free_cancel_item(
{ {
struct xfs_extent_free_item *xefi = xefi_entry(item); struct xfs_extent_free_item *xefi = xefi_entry(item);
xfs_perag_intent_put(xefi->xefi_pag); xfs_group_intent_put(xefi->xefi_group);
kmem_cache_free(xfs_extfree_item_cache, xefi); kmem_cache_free(xfs_extfree_item_cache, xefi);
} }
@ -499,7 +500,7 @@ xfs_extent_free_finish_item(
* in this EFI to the EFD so this works correctly. * in this EFI to the EFD so this works correctly.
*/ */
if (!(xefi->xefi_flags & XFS_EFI_CANCELLED)) if (!(xefi->xefi_flags & XFS_EFI_CANCELLED))
error = __xfs_free_extent(tp, xefi->xefi_pag, agbno, error = __xfs_free_extent(tp, to_perag(xefi->xefi_group), agbno,
xefi->xefi_blockcount, &oinfo, xefi->xefi_agresv, xefi->xefi_blockcount, &oinfo, xefi->xefi_agresv,
xefi->xefi_flags & XFS_EFI_SKIP_DISCARD); xefi->xefi_flags & XFS_EFI_SKIP_DISCARD);
if (error == -EAGAIN) { if (error == -EAGAIN) {
@ -545,7 +546,7 @@ xfs_agfl_free_finish_item(
trace_xfs_agfl_free_deferred(mp, xefi); trace_xfs_agfl_free_deferred(mp, xefi);
error = xfs_alloc_read_agf(xefi->xefi_pag, tp, 0, &agbp); error = xfs_alloc_read_agf(to_perag(xefi->xefi_group), tp, 0, &agbp);
if (!error) if (!error)
error = xfs_free_ag_extent(tp, agbp, agbno, 1, &oinfo, error = xfs_free_ag_extent(tp, agbp, agbno, 1, &oinfo,
XFS_AG_RESV_AGFL); XFS_AG_RESV_AGFL);
@ -578,7 +579,8 @@ xfs_efi_recover_work(
xefi->xefi_blockcount = extp->ext_len; xefi->xefi_blockcount = extp->ext_len;
xefi->xefi_agresv = XFS_AG_RESV_NONE; xefi->xefi_agresv = XFS_AG_RESV_NONE;
xefi->xefi_owner = XFS_RMAP_OWN_UNKNOWN; xefi->xefi_owner = XFS_RMAP_OWN_UNKNOWN;
xefi->xefi_pag = xfs_perag_intent_get(mp, extp->ext_start); xefi->xefi_group = xfs_group_intent_get(mp, extp->ext_start,
XG_TYPE_AG);
xfs_defer_add_item(dfp, &xefi->xefi_list); xfs_defer_add_item(dfp, &xefi->xefi_list);
} }

9
fs/xfs/xfs_refcount_item.c
View File

@ -244,7 +244,7 @@ xfs_refcount_update_diff_items(
struct xfs_refcount_intent *ra = ci_entry(a); struct xfs_refcount_intent *ra = ci_entry(a);
struct xfs_refcount_intent *rb = ci_entry(b); struct xfs_refcount_intent *rb = ci_entry(b);
return pag_agno(ra->ri_pag) - pag_agno(rb->ri_pag); return ra->ri_group->xg_gno - rb->ri_group->xg_gno;
} }
/* Log refcount updates in the intent item. */ /* Log refcount updates in the intent item. */
@ -330,7 +330,7 @@ xfs_refcount_defer_add(
trace_xfs_refcount_defer(mp, ri); trace_xfs_refcount_defer(mp, ri);
ri->ri_pag = xfs_perag_intent_get(mp, ri->ri_startblock); ri->ri_group = xfs_group_intent_get(mp, ri->ri_startblock, XG_TYPE_AG);
xfs_defer_add(tp, &ri->ri_list, &xfs_refcount_update_defer_type); xfs_defer_add(tp, &ri->ri_list, &xfs_refcount_update_defer_type);
} }
@ -341,7 +341,7 @@ xfs_refcount_update_cancel_item(
{ {
struct xfs_refcount_intent *ri = ci_entry(item); struct xfs_refcount_intent *ri = ci_entry(item);
xfs_perag_intent_put(ri->ri_pag); xfs_group_intent_put(ri->ri_group);
kmem_cache_free(xfs_refcount_intent_cache, ri); kmem_cache_free(xfs_refcount_intent_cache, ri);
} }
@ -431,7 +431,8 @@ xfs_cui_recover_work(
ri->ri_type = pmap->pe_flags & XFS_REFCOUNT_EXTENT_TYPE_MASK; ri->ri_type = pmap->pe_flags & XFS_REFCOUNT_EXTENT_TYPE_MASK;
ri->ri_startblock = pmap->pe_startblock; ri->ri_startblock = pmap->pe_startblock;
ri->ri_blockcount = pmap->pe_len; ri->ri_blockcount = pmap->pe_len;
ri->ri_pag = xfs_perag_intent_get(mp, pmap->pe_startblock); ri->ri_group = xfs_group_intent_get(mp, pmap->pe_startblock,
XG_TYPE_AG);
xfs_defer_add_item(dfp, &ri->ri_list); xfs_defer_add_item(dfp, &ri->ri_list);
} }

9
fs/xfs/xfs_rmap_item.c
View File

@ -243,7 +243,7 @@ xfs_rmap_update_diff_items(
struct xfs_rmap_intent *ra = ri_entry(a); struct xfs_rmap_intent *ra = ri_entry(a);
struct xfs_rmap_intent *rb = ri_entry(b); struct xfs_rmap_intent *rb = ri_entry(b);
return pag_agno(ra->ri_pag) - pag_agno(rb->ri_pag); return ra->ri_group->xg_gno - rb->ri_group->xg_gno;
} }
/* Log rmap updates in the intent item. */ /* Log rmap updates in the intent item. */
@ -353,7 +353,8 @@ xfs_rmap_defer_add(
trace_xfs_rmap_defer(mp, ri); trace_xfs_rmap_defer(mp, ri);
ri->ri_pag = xfs_perag_intent_get(mp, ri->ri_bmap.br_startblock); ri->ri_group = xfs_group_intent_get(mp, ri->ri_bmap.br_startblock,
XG_TYPE_AG);
xfs_defer_add(tp, &ri->ri_list, &xfs_rmap_update_defer_type); xfs_defer_add(tp, &ri->ri_list, &xfs_rmap_update_defer_type);
} }
@ -364,7 +365,7 @@ xfs_rmap_update_cancel_item(
{ {
struct xfs_rmap_intent *ri = ri_entry(item); struct xfs_rmap_intent *ri = ri_entry(item);
xfs_perag_intent_put(ri->ri_pag); xfs_group_intent_put(ri->ri_group);
kmem_cache_free(xfs_rmap_intent_cache, ri); kmem_cache_free(xfs_rmap_intent_cache, ri);
} }
@ -494,7 +495,7 @@ xfs_rui_recover_work(
ri->ri_bmap.br_blockcount = map->me_len; ri->ri_bmap.br_blockcount = map->me_len;
ri->ri_bmap.br_state = (map->me_flags & XFS_RMAP_EXTENT_UNWRITTEN) ? ri->ri_bmap.br_state = (map->me_flags & XFS_RMAP_EXTENT_UNWRITTEN) ?
XFS_EXT_UNWRITTEN : XFS_EXT_NORM; XFS_EXT_UNWRITTEN : XFS_EXT_NORM;
ri->ri_pag = xfs_perag_intent_get(mp, map->me_startblock); ri->ri_group = xfs_group_intent_get(mp, map->me_startblock, XG_TYPE_AG);
xfs_defer_add_item(dfp, &ri->ri_list); xfs_defer_add_item(dfp, &ri->ri_list);
} }