Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-07 14:32:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xfs: convert remaining trace points to pass pag structures

Browse Source 
Convert all tracepoints that take [mp,agno] tuples to take a pag argument
instead so that decoding only happens when tracepoints are enabled and to
clean up the callers.

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:36 -08:00 committed by Darrick J. Wong
parent dc8df7e382
commit c4ae021bcb
14 changed files with 98 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/xfs/libxfs/xfs_alloc.c
View File

@ -3360,7 +3360,7 @@ xfs_read_agf(
struct xfs_mount *mp = pag->pag_mount; struct xfs_mount *mp = pag->pag_mount;
int error; int error;
trace_xfs_read_agf(pag->pag_mount, pag->pag_agno); trace_xfs_read_agf(pag);
error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp,
XFS_AG_DADDR(mp, pag->pag_agno, XFS_AGF_DADDR(mp)), XFS_AG_DADDR(mp, pag->pag_agno, XFS_AGF_DADDR(mp)),
@ -3391,7 +3391,7 @@ xfs_alloc_read_agf(
int error; int error;
int allocbt_blks; int allocbt_blks;
trace_xfs_alloc_read_agf(pag->pag_mount, pag->pag_agno); trace_xfs_alloc_read_agf(pag);
/* We don't support trylock when freeing. */ /* We don't support trylock when freeing. */
ASSERT((flags & (XFS_ALLOC_FLAG_FREEING | XFS_ALLOC_FLAG_TRYLOCK)) != ASSERT((flags & (XFS_ALLOC_FLAG_FREEING | XFS_ALLOC_FLAG_TRYLOCK)) !=

4
fs/xfs/libxfs/xfs_ialloc.c
View File

@ -2729,7 +2729,7 @@ xfs_read_agi(
struct xfs_mount *mp = pag->pag_mount; struct xfs_mount *mp = pag->pag_mount;
int error; int error;
trace_xfs_read_agi(pag->pag_mount, pag->pag_agno); trace_xfs_read_agi(pag);
error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp,
XFS_AG_DADDR(mp, pag->pag_agno, XFS_AGI_DADDR(mp)), XFS_AG_DADDR(mp, pag->pag_agno, XFS_AGI_DADDR(mp)),
@ -2760,7 +2760,7 @@ xfs_ialloc_read_agi(
struct xfs_agi *agi; struct xfs_agi *agi;
int error; int error;
trace_xfs_ialloc_read_agi(pag->pag_mount, pag->pag_agno); trace_xfs_ialloc_read_agi(pag);
error = xfs_read_agi(pag, tp, error = xfs_read_agi(pag, tp,
(flags & XFS_IALLOC_FLAG_TRYLOCK) ? XBF_TRYLOCK : 0, (flags & XFS_IALLOC_FLAG_TRYLOCK) ? XBF_TRYLOCK : 0,

4
fs/xfs/libxfs/xfs_inode_util.c
View File

@ -442,8 +442,8 @@ xfs_iunlink_update_bucket(
ASSERT(xfs_verify_agino_or_null(pag, new_agino)); ASSERT(xfs_verify_agino_or_null(pag, new_agino));
old_value = be32_to_cpu(agi->agi_unlinked[bucket_index]); old_value = be32_to_cpu(agi->agi_unlinked[bucket_index]);
trace_xfs_iunlink_update_bucket(tp->t_mountp, pag->pag_agno, bucket_index, trace_xfs_iunlink_update_bucket(pag, bucket_index, old_value,
old_value, new_agino); new_agino);
/* /*
* We should never find the head of the list already set to the value * We should never find the head of the list already set to the value

2
fs/xfs/scrub/alloc_repair.c
View File

@ -210,7 +210,7 @@ xrep_abt_stash(
if (error) if (error)
return error; return error;
trace_xrep_abt_found(sc->mp, sc->sa.pag->pag_agno, &arec); trace_xrep_abt_found(sc->sa.pag, &arec);
error = xfarray_append(ra->free_records, &arec); error = xfarray_append(ra->free_records, &arec);
if (error) if (error)

3
fs/xfs/scrub/ialloc.c
View File

@ -367,7 +367,6 @@ xchk_iallocbt_check_cluster(
struct xfs_mount *mp = bs->cur->bc_mp; struct xfs_mount *mp = bs->cur->bc_mp;
struct xfs_buf *cluster_bp; struct xfs_buf *cluster_bp;
unsigned int nr_inodes; unsigned int nr_inodes;
xfs_agnumber_t agno = bs->cur->bc_ag.pag->pag_agno;
xfs_agblock_t agbno; xfs_agblock_t agbno;
unsigned int cluster_index; unsigned int cluster_index;
uint16_t cluster_mask = 0; uint16_t cluster_mask = 0;
@ -406,7 +405,7 @@ xchk_iallocbt_check_cluster(
return 0; return 0;
} }
trace_xchk_iallocbt_check_cluster(mp, agno, irec->ir_startino, trace_xchk_iallocbt_check_cluster(bs->cur->bc_ag.pag, irec->ir_startino,
imap.im_blkno, imap.im_len, cluster_base, nr_inodes, imap.im_blkno, imap.im_len, cluster_base, nr_inodes,
cluster_mask, ir_holemask, cluster_mask, ir_holemask,
XFS_INO_TO_OFFSET(mp, irec->ir_startino + XFS_INO_TO_OFFSET(mp, irec->ir_startino +

2
fs/xfs/scrub/ialloc_repair.c
View File

@ -192,7 +192,7 @@ xrep_ibt_stash(
if (ri->rie.ir_freecount > 0) if (ri->rie.ir_freecount > 0)
ri->finobt_recs++; ri->finobt_recs++;
trace_xrep_ibt_found(ri->sc->mp, ri->sc->sa.pag->pag_agno, &ri->rie); trace_xrep_ibt_found(ri->sc->sa.pag, &ri->rie);
error = xfarray_append(ri->inode_records, &ri->rie); error = xfarray_append(ri->inode_records, &ri->rie);
if (error) if (error)

2
fs/xfs/scrub/repair.c
View File

@ -611,7 +611,7 @@ xrep_findroot_block(
else else
fab->root = NULLAGBLOCK; fab->root = NULLAGBLOCK;
trace_xrep_findroot_block(mp, ri->sc->sa.pag->pag_agno, agbno, trace_xrep_findroot_block(ri->sc->sa.pag, agbno,
be32_to_cpu(btblock->bb_magic), fab->height - 1); be32_to_cpu(btblock->bb_magic), fab->height - 1);
out: out:
xfs_trans_brelse(ri->sc->tp, bp); xfs_trans_brelse(ri->sc->tp, bp);

4
fs/xfs/scrub/rmap_repair.c
View File

@ -231,7 +231,7 @@ xrep_rmap_stash(
if (xchk_iscan_aborted(&rr->iscan)) if (xchk_iscan_aborted(&rr->iscan))
return -EFSCORRUPTED; return -EFSCORRUPTED;
trace_xrep_rmap_found(sc->mp, sc->sa.pag->pag_agno, &rmap); trace_xrep_rmap_found(sc->sa.pag, &rmap);
mutex_lock(&rr->lock); mutex_lock(&rr->lock);
mcur = xfs_rmapbt_mem_cursor(sc->sa.pag, sc->tp, &rr->rmap_btree); mcur = xfs_rmapbt_mem_cursor(sc->sa.pag, sc->tp, &rr->rmap_btree);
@ -1552,7 +1552,7 @@ xrep_rmapbt_live_update(
if (!xrep_rmapbt_want_live_update(&rr->iscan, &p->oinfo)) if (!xrep_rmapbt_want_live_update(&rr->iscan, &p->oinfo))
goto out_unlock; goto out_unlock;
trace_xrep_rmap_live_update(mp, rr->sc->sa.pag->pag_agno, action, p); trace_xrep_rmap_live_update(rr->sc->sa.pag, action, p);
error = xrep_trans_alloc_hook_dummy(mp, &txcookie, &tp); error = xrep_trans_alloc_hook_dummy(mp, &txcookie, &tp);
if (error) if (error)

61
fs/xfs/scrub/trace.h
View File

@ -772,12 +772,12 @@ TRACE_EVENT(xchk_xref_error,
); );
TRACE_EVENT(xchk_iallocbt_check_cluster, TRACE_EVENT(xchk_iallocbt_check_cluster,
TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, TP_PROTO(const struct xfs_perag *pag, xfs_agino_t startino,
xfs_agino_t startino, xfs_daddr_t map_daddr, xfs_daddr_t map_daddr, unsigned short map_len,
unsigned short map_len, unsigned int chunk_ino, unsigned int chunk_ino, unsigned int nr_inodes,
unsigned int nr_inodes, uint16_t cluster_mask, uint16_t cluster_mask, uint16_t holemask,
uint16_t holemask, unsigned int cluster_ino), unsigned int cluster_ino),
TP_ARGS(mp, agno, startino, map_daddr, map_len, chunk_ino, nr_inodes, TP_ARGS(pag, startino, map_daddr, map_len, chunk_ino, nr_inodes,
cluster_mask, holemask, cluster_ino), cluster_mask, holemask, cluster_ino),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(dev_t, dev) __field(dev_t, dev)
@ -792,8 +792,8 @@ TRACE_EVENT(xchk_iallocbt_check_cluster,
__field(uint16_t, holemask) __field(uint16_t, holemask)
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = mp->m_super->s_dev; __entry->dev = pag->pag_mount->m_super->s_dev;
__entry->agno = agno; __entry->agno = pag->pag_agno;
__entry->startino = startino; __entry->startino = startino;
__entry->map_daddr = map_daddr; __entry->map_daddr = map_daddr;
__entry->map_len = map_len; __entry->map_len = map_len;
@ -2016,9 +2016,9 @@ TRACE_EVENT(xrep_ibt_walk_rmap,
); );
TRACE_EVENT(xrep_abt_found, TRACE_EVENT(xrep_abt_found,
TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, TP_PROTO(const struct xfs_perag *pag,
const struct xfs_alloc_rec_incore *rec), const struct xfs_alloc_rec_incore *rec),
TP_ARGS(mp, agno, rec), TP_ARGS(pag, rec),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(dev_t, dev) __field(dev_t, dev)
__field(xfs_agnumber_t, agno) __field(xfs_agnumber_t, agno)
@ -2026,8 +2026,8 @@ TRACE_EVENT(xrep_abt_found,
__field(xfs_extlen_t, blockcount) __field(xfs_extlen_t, blockcount)
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = mp->m_super->s_dev; __entry->dev = pag->pag_mount->m_super->s_dev;
__entry->agno = agno; __entry->agno = pag->pag_agno;
__entry->startblock = rec->ar_startblock; __entry->startblock = rec->ar_startblock;
__entry->blockcount = rec->ar_blockcount; __entry->blockcount = rec->ar_blockcount;
), ),
@ -2039,9 +2039,9 @@ TRACE_EVENT(xrep_abt_found,
) )
TRACE_EVENT(xrep_ibt_found, TRACE_EVENT(xrep_ibt_found,
TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, TP_PROTO(const struct xfs_perag *pag,
const struct xfs_inobt_rec_incore *rec), const struct xfs_inobt_rec_incore *rec),
TP_ARGS(mp, agno, rec), TP_ARGS(pag, rec),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(dev_t, dev) __field(dev_t, dev)
__field(xfs_agnumber_t, agno) __field(xfs_agnumber_t, agno)
@ -2052,8 +2052,8 @@ TRACE_EVENT(xrep_ibt_found,
__field(uint64_t, freemask) __field(uint64_t, freemask)
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = mp->m_super->s_dev; __entry->dev = pag->pag_mount->m_super->s_dev;
__entry->agno = agno; __entry->agno = pag->pag_agno;
__entry->startino = rec->ir_startino; __entry->startino = rec->ir_startino;
__entry->holemask = rec->ir_holemask; __entry->holemask = rec->ir_holemask;
__entry->count = rec->ir_count; __entry->count = rec->ir_count;
@ -2132,9 +2132,8 @@ TRACE_EVENT(xrep_bmap_found,
); );
TRACE_EVENT(xrep_rmap_found, TRACE_EVENT(xrep_rmap_found,
TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, TP_PROTO(const struct xfs_perag *pag, const struct xfs_rmap_irec *rec),
const struct xfs_rmap_irec *rec), TP_ARGS(pag, rec),
TP_ARGS(mp, agno, rec),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(dev_t, dev) __field(dev_t, dev)
__field(xfs_agnumber_t, agno) __field(xfs_agnumber_t, agno)
@ -2145,8 +2144,8 @@ TRACE_EVENT(xrep_rmap_found,
__field(unsigned int, flags) __field(unsigned int, flags)
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = mp->m_super->s_dev; __entry->dev = pag->pag_mount->m_super->s_dev;
__entry->agno = agno; __entry->agno = pag->pag_agno;
__entry->agbno = rec->rm_startblock; __entry->agbno = rec->rm_startblock;
__entry->len = rec->rm_blockcount; __entry->len = rec->rm_blockcount;
__entry->owner = rec->rm_owner; __entry->owner = rec->rm_owner;
@ -2164,9 +2163,9 @@ TRACE_EVENT(xrep_rmap_found,
); );
TRACE_EVENT(xrep_findroot_block, TRACE_EVENT(xrep_findroot_block,
TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, xfs_agblock_t agbno, TP_PROTO(const struct xfs_perag *pag, xfs_agblock_t agbno,
uint32_t magic, uint16_t level), uint32_t magic, uint16_t level),
TP_ARGS(mp, agno, agbno, magic, level), TP_ARGS(pag, agbno, magic, level),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(dev_t, dev) __field(dev_t, dev)
__field(xfs_agnumber_t, agno) __field(xfs_agnumber_t, agno)
@ -2175,8 +2174,8 @@ TRACE_EVENT(xrep_findroot_block,
__field(uint16_t, level) __field(uint16_t, level)
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = mp->m_super->s_dev; __entry->dev = pag->pag_mount->m_super->s_dev;
__entry->agno = agno; __entry->agno = pag->pag_agno;
__entry->agbno = agbno; __entry->agbno = agbno;
__entry->magic = magic; __entry->magic = magic;
__entry->level = level; __entry->level = level;
@ -2298,8 +2297,8 @@ DECLARE_EVENT_CLASS(xrep_newbt_extent_class,
); );
#define DEFINE_NEWBT_EXTENT_EVENT(name) \ #define DEFINE_NEWBT_EXTENT_EVENT(name) \
DEFINE_EVENT(xrep_newbt_extent_class, name, \ DEFINE_EVENT(xrep_newbt_extent_class, name, \
TP_PROTO(struct xfs_perag *pag, xfs_agblock_t agbno, xfs_extlen_t len, \ TP_PROTO(const struct xfs_perag *pag, xfs_agblock_t agbno, \
int64_t owner), \ xfs_extlen_t len, int64_t owner), \
TP_ARGS(pag, agbno, len, owner)) TP_ARGS(pag, agbno, len, owner))
DEFINE_NEWBT_EXTENT_EVENT(xrep_newbt_alloc_ag_blocks); DEFINE_NEWBT_EXTENT_EVENT(xrep_newbt_alloc_ag_blocks);
DEFINE_NEWBT_EXTENT_EVENT(xrep_newbt_alloc_file_blocks); DEFINE_NEWBT_EXTENT_EVENT(xrep_newbt_alloc_file_blocks);
@ -2644,9 +2643,9 @@ DEFINE_SCRUB_NLINKS_DIFF_EVENT(xrep_nlinks_update_inode);
DEFINE_SCRUB_NLINKS_DIFF_EVENT(xrep_nlinks_unfixable_inode); DEFINE_SCRUB_NLINKS_DIFF_EVENT(xrep_nlinks_unfixable_inode);
TRACE_EVENT(xrep_rmap_live_update, TRACE_EVENT(xrep_rmap_live_update,
TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, unsigned int op, TP_PROTO(const struct xfs_perag *pag, unsigned int op,
const struct xfs_rmap_update_params *p), const struct xfs_rmap_update_params *p),
TP_ARGS(mp, agno, op, p), TP_ARGS(pag, op, p),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(dev_t, dev) __field(dev_t, dev)
__field(xfs_agnumber_t, agno) __field(xfs_agnumber_t, agno)
@ -2658,8 +2657,8 @@ TRACE_EVENT(xrep_rmap_live_update,
__field(unsigned int, flags) __field(unsigned int, flags)
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = mp->m_super->s_dev; __entry->dev = pag->pag_mount->m_super->s_dev;
__entry->agno = agno; __entry->agno = pag->pag_agno;
__entry->op = op; __entry->op = op;
__entry->agbno = p->startblock; __entry->agbno = p->startblock;
__entry->len = p->blockcount; __entry->len = p->blockcount;

11
fs/xfs/xfs_discard.c
View File

@ -117,8 +117,7 @@ xfs_discard_extents(
blk_start_plug(&plug); blk_start_plug(&plug);
list_for_each_entry(busyp, &extents->extent_list, list) { list_for_each_entry(busyp, &extents->extent_list, list) {
trace_xfs_discard_extent(mp, busyp->pag->pag_agno, busyp->bno, trace_xfs_discard_extent(busyp->pag, busyp->bno, busyp->length);
busyp->length);
error = __blkdev_issue_discard(mp->m_ddev_targp->bt_bdev, error = __blkdev_issue_discard(mp->m_ddev_targp->bt_bdev,
xfs_agbno_to_daddr(busyp->pag, busyp->bno), xfs_agbno_to_daddr(busyp->pag, busyp->bno),
@ -239,11 +238,11 @@ xfs_trim_gather_extents(
* overlapping ranges for now. * overlapping ranges for now.
*/ */
if (fbno + flen < tcur->start) { if (fbno + flen < tcur->start) {
trace_xfs_discard_exclude(mp, pag->pag_agno, fbno, flen); trace_xfs_discard_exclude(pag, fbno, flen);
goto next_extent; goto next_extent;
} }
if (fbno > tcur->end) { if (fbno > tcur->end) {
trace_xfs_discard_exclude(mp, pag->pag_agno, fbno, flen); trace_xfs_discard_exclude(pag, fbno, flen);
if (tcur->by_bno) { if (tcur->by_bno) {
tcur->count = 0; tcur->count = 0;
break; break;
@ -261,7 +260,7 @@ xfs_trim_gather_extents(
/* Too small? Give up. */ /* Too small? Give up. */
if (flen < tcur->minlen) { if (flen < tcur->minlen) {
trace_xfs_discard_toosmall(mp, pag->pag_agno, fbno, flen); trace_xfs_discard_toosmall(pag, fbno, flen);
if (tcur->by_bno) if (tcur->by_bno)
goto next_extent; goto next_extent;
tcur->count = 0; tcur->count = 0;
@ -273,7 +272,7 @@ xfs_trim_gather_extents(
* discard and try again the next time. * discard and try again the next time.
*/ */
if (xfs_extent_busy_search(pag, fbno, flen)) { if (xfs_extent_busy_search(pag, fbno, flen)) {
trace_xfs_discard_busy(mp, pag->pag_agno, fbno, flen); trace_xfs_discard_busy(pag, fbno, flen);
goto next_extent; goto next_extent;
} }

13
fs/xfs/xfs_extent_busy.c
View File

@ -41,7 +41,7 @@ xfs_extent_busy_insert_list(
new->flags = flags; new->flags = flags;
/* trace before insert to be able to see failed inserts */ /* trace before insert to be able to see failed inserts */
trace_xfs_extent_busy(pag->pag_mount, pag->pag_agno, bno, len); trace_xfs_extent_busy(pag, bno, len);
spin_lock(&pag->pagb_lock); spin_lock(&pag->pagb_lock);
rbp = &pag->pagb_tree.rb_node; rbp = &pag->pagb_tree.rb_node;
@ -278,13 +278,13 @@ xfs_extent_busy_update_extent(
ASSERT(0); ASSERT(0);
} }
trace_xfs_extent_busy_reuse(pag->pag_mount, pag->pag_agno, fbno, flen); trace_xfs_extent_busy_reuse(pag, fbno, flen);
return true; return true;
out_force_log: out_force_log:
spin_unlock(&pag->pagb_lock); spin_unlock(&pag->pagb_lock);
xfs_log_force(pag->pag_mount, XFS_LOG_SYNC); xfs_log_force(pag->pag_mount, XFS_LOG_SYNC);
trace_xfs_extent_busy_force(pag->pag_mount, pag->pag_agno, fbno, flen); trace_xfs_extent_busy_force(pag, fbno, flen);
spin_lock(&pag->pagb_lock); spin_lock(&pag->pagb_lock);
return false; return false;
} }
@ -496,8 +496,7 @@ xfs_extent_busy_trim(
out: out:
if (fbno != *bno || flen != *len) { if (fbno != *bno || flen != *len) {
trace_xfs_extent_busy_trim(args->mp, args->agno, *bno, *len, trace_xfs_extent_busy_trim(args->pag, *bno, *len, fbno, flen);
fbno, flen);
*bno = fbno; *bno = fbno;
*len = flen; *len = flen;
*busy_gen = args->pag->pagb_gen; *busy_gen = args->pag->pagb_gen;
@ -526,9 +525,7 @@ xfs_extent_busy_clear_one(
busyp->flags = XFS_EXTENT_BUSY_DISCARDED; busyp->flags = XFS_EXTENT_BUSY_DISCARDED;
return false; return false;
} }
trace_xfs_extent_busy_clear(pag->pag_mount, trace_xfs_extent_busy_clear(pag, busyp->bno, busyp->length);
busyp->pag->pag_agno, busyp->bno,
busyp->length);
rb_erase(&busyp->rb_node, &pag->pagb_tree); rb_erase(&busyp->rb_node, &pag->pagb_tree);
} }

8
fs/xfs/xfs_health.c
View File

@ -41,7 +41,7 @@ xfs_health_unmount(
for_each_perag(mp, agno, pag) { for_each_perag(mp, agno, pag) {
xfs_ag_measure_sickness(pag, &sick, &checked); xfs_ag_measure_sickness(pag, &sick, &checked);
if (sick) { if (sick) {
trace_xfs_ag_unfixed_corruption(mp, agno, sick); trace_xfs_ag_unfixed_corruption(pag, sick);
warn = true; warn = true;
} }
} }
@ -233,7 +233,7 @@ xfs_ag_mark_sick(
unsigned int mask) unsigned int mask)
{ {
ASSERT(!(mask & ~XFS_SICK_AG_ALL)); ASSERT(!(mask & ~XFS_SICK_AG_ALL));
trace_xfs_ag_mark_sick(pag->pag_mount, pag->pag_agno, mask); trace_xfs_ag_mark_sick(pag, mask);
spin_lock(&pag->pag_state_lock); spin_lock(&pag->pag_state_lock);
pag->pag_sick |= mask; pag->pag_sick |= mask;
@ -247,7 +247,7 @@ xfs_ag_mark_corrupt(
unsigned int mask) unsigned int mask)
{ {
ASSERT(!(mask & ~XFS_SICK_AG_ALL)); ASSERT(!(mask & ~XFS_SICK_AG_ALL));
trace_xfs_ag_mark_corrupt(pag->pag_mount, pag->pag_agno, mask); trace_xfs_ag_mark_corrupt(pag, mask);
spin_lock(&pag->pag_state_lock); spin_lock(&pag->pag_state_lock);
pag->pag_sick |= mask; pag->pag_sick |= mask;
@ -262,7 +262,7 @@ xfs_ag_mark_healthy(
unsigned int mask) unsigned int mask)
{ {
ASSERT(!(mask & ~XFS_SICK_AG_ALL)); ASSERT(!(mask & ~XFS_SICK_AG_ALL));
trace_xfs_ag_mark_healthy(pag->pag_mount, pag->pag_agno, mask); trace_xfs_ag_mark_healthy(pag, mask);
spin_lock(&pag->pag_state_lock); spin_lock(&pag->pag_state_lock);
pag->pag_sick &= ~mask; pag->pag_sick &= ~mask;

2
fs/xfs/xfs_iwalk.c
View File

@ -182,7 +182,7 @@ xfs_iwalk_ag_recs(
for (i = 0; i < iwag->nr_recs; i++) { for (i = 0; i < iwag->nr_recs; i++) {
struct xfs_inobt_rec_incore *irec = &iwag->recs[i]; struct xfs_inobt_rec_incore *irec = &iwag->recs[i];
trace_xfs_iwalk_ag_rec(mp, pag->pag_agno, irec); trace_xfs_iwalk_ag_rec(pag, irec);
if (xfs_pwork_want_abort(&iwag->pwork)) if (xfs_pwork_want_abort(&iwag->pwork))
return 0; return 0;

84
fs/xfs/xfs_trace.h
View File

@ -300,15 +300,15 @@ TRACE_EVENT(xfs_inodegc_shrinker_scan,
); );
DECLARE_EVENT_CLASS(xfs_ag_class, DECLARE_EVENT_CLASS(xfs_ag_class,
TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno), TP_PROTO(const struct xfs_perag *pag),
TP_ARGS(mp, agno), TP_ARGS(pag),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(dev_t, dev) __field(dev_t, dev)
__field(xfs_agnumber_t, agno) __field(xfs_agnumber_t, agno)
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = mp->m_super->s_dev; __entry->dev = pag->pag_mount->m_super->s_dev;
__entry->agno = agno; __entry->agno = pag->pag_agno;
), ),
TP_printk("dev %d:%d agno 0x%x", TP_printk("dev %d:%d agno 0x%x",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
@ -316,8 +316,8 @@ DECLARE_EVENT_CLASS(xfs_ag_class,
); );
#define DEFINE_AG_EVENT(name) \ #define DEFINE_AG_EVENT(name) \
DEFINE_EVENT(xfs_ag_class, name, \ DEFINE_EVENT(xfs_ag_class, name, \
TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno), \ TP_PROTO(const struct xfs_perag *pag), \
TP_ARGS(mp, agno)) TP_ARGS(pag))
DEFINE_AG_EVENT(xfs_read_agf); DEFINE_AG_EVENT(xfs_read_agf);
DEFINE_AG_EVENT(xfs_alloc_read_agf); DEFINE_AG_EVENT(xfs_alloc_read_agf);
@ -1636,9 +1636,9 @@ TRACE_EVENT(xfs_bunmap,
); );
DECLARE_EVENT_CLASS(xfs_extent_busy_class, DECLARE_EVENT_CLASS(xfs_extent_busy_class,
TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, TP_PROTO(const struct xfs_perag *pag, xfs_agblock_t agbno,
xfs_agblock_t agbno, xfs_extlen_t len), xfs_extlen_t len),
TP_ARGS(mp, agno, agbno, len), TP_ARGS(pag, agbno, len),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(dev_t, dev) __field(dev_t, dev)
__field(xfs_agnumber_t, agno) __field(xfs_agnumber_t, agno)
@ -1646,8 +1646,8 @@ DECLARE_EVENT_CLASS(xfs_extent_busy_class,
__field(xfs_extlen_t, len) __field(xfs_extlen_t, len)
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = mp->m_super->s_dev; __entry->dev = pag->pag_mount->m_super->s_dev;
__entry->agno = agno; __entry->agno = pag->pag_agno;
__entry->agbno = agbno; __entry->agbno = agbno;
__entry->len = len; __entry->len = len;
), ),
@ -1659,19 +1659,18 @@ DECLARE_EVENT_CLASS(xfs_extent_busy_class,
); );
#define DEFINE_BUSY_EVENT(name) \ #define DEFINE_BUSY_EVENT(name) \
DEFINE_EVENT(xfs_extent_busy_class, name, \ DEFINE_EVENT(xfs_extent_busy_class, name, \
TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, \ TP_PROTO(const struct xfs_perag *pag, xfs_agblock_t agbno, \
xfs_agblock_t agbno, xfs_extlen_t len), \ xfs_extlen_t len), \
TP_ARGS(mp, agno, agbno, len)) TP_ARGS(pag, agbno, len))
DEFINE_BUSY_EVENT(xfs_extent_busy); DEFINE_BUSY_EVENT(xfs_extent_busy);
DEFINE_BUSY_EVENT(xfs_extent_busy_force); DEFINE_BUSY_EVENT(xfs_extent_busy_force);
DEFINE_BUSY_EVENT(xfs_extent_busy_reuse); DEFINE_BUSY_EVENT(xfs_extent_busy_reuse);
DEFINE_BUSY_EVENT(xfs_extent_busy_clear); DEFINE_BUSY_EVENT(xfs_extent_busy_clear);
TRACE_EVENT(xfs_extent_busy_trim, TRACE_EVENT(xfs_extent_busy_trim,
TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, TP_PROTO(const struct xfs_perag *pag, xfs_agblock_t agbno,
xfs_agblock_t agbno, xfs_extlen_t len, xfs_extlen_t len, xfs_agblock_t tbno, xfs_extlen_t tlen),
xfs_agblock_t tbno, xfs_extlen_t tlen), TP_ARGS(pag, agbno, len, tbno, tlen),
TP_ARGS(mp, agno, agbno, len, tbno, tlen),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(dev_t, dev) __field(dev_t, dev)
__field(xfs_agnumber_t, agno) __field(xfs_agnumber_t, agno)
@ -1681,8 +1680,8 @@ TRACE_EVENT(xfs_extent_busy_trim,
__field(xfs_extlen_t, tlen) __field(xfs_extlen_t, tlen)
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = mp->m_super->s_dev; __entry->dev = pag->pag_mount->m_super->s_dev;
__entry->agno = agno; __entry->agno = pag->pag_agno;
__entry->agbno = agbno; __entry->agbno = agbno;
__entry->len = len; __entry->len = len;
__entry->tbno = tbno; __entry->tbno = tbno;
@ -2428,9 +2427,9 @@ DEFINE_LOG_RECOVER_ICREATE_ITEM(xfs_log_recover_icreate_cancel);
DEFINE_LOG_RECOVER_ICREATE_ITEM(xfs_log_recover_icreate_recover); DEFINE_LOG_RECOVER_ICREATE_ITEM(xfs_log_recover_icreate_recover);
DECLARE_EVENT_CLASS(xfs_discard_class, DECLARE_EVENT_CLASS(xfs_discard_class,
TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, TP_PROTO(const struct xfs_perag *pag, xfs_agblock_t agbno,
xfs_agblock_t agbno, xfs_extlen_t len), xfs_extlen_t len),
TP_ARGS(mp, agno, agbno, len), TP_ARGS(pag, agbno, len),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(dev_t, dev) __field(dev_t, dev)
__field(xfs_agnumber_t, agno) __field(xfs_agnumber_t, agno)
@ -2438,8 +2437,8 @@ DECLARE_EVENT_CLASS(xfs_discard_class,
__field(xfs_extlen_t, len) __field(xfs_extlen_t, len)
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = mp->m_super->s_dev; __entry->dev = pag->pag_mount->m_super->s_dev;
__entry->agno = agno; __entry->agno = pag->pag_agno;
__entry->agbno = agbno; __entry->agbno = agbno;
__entry->len = len; __entry->len = len;
), ),
@ -2452,9 +2451,9 @@ DECLARE_EVENT_CLASS(xfs_discard_class,
#define DEFINE_DISCARD_EVENT(name) \ #define DEFINE_DISCARD_EVENT(name) \
DEFINE_EVENT(xfs_discard_class, name, \ DEFINE_EVENT(xfs_discard_class, name, \
TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, \ TP_PROTO(const struct xfs_perag *pag, xfs_agblock_t agbno, \
xfs_agblock_t agbno, xfs_extlen_t len), \ xfs_extlen_t len), \
TP_ARGS(mp, agno, agbno, len)) TP_ARGS(pag, agbno, len))
DEFINE_DISCARD_EVENT(xfs_discard_extent); DEFINE_DISCARD_EVENT(xfs_discard_extent);
DEFINE_DISCARD_EVENT(xfs_discard_toosmall); DEFINE_DISCARD_EVENT(xfs_discard_toosmall);
DEFINE_DISCARD_EVENT(xfs_discard_exclude); DEFINE_DISCARD_EVENT(xfs_discard_exclude);
@ -4030,9 +4029,9 @@ DEFINE_TRANS_EVENT(xfs_trans_commit_items);
DEFINE_TRANS_EVENT(xfs_trans_free_items); DEFINE_TRANS_EVENT(xfs_trans_free_items);
TRACE_EVENT(xfs_iunlink_update_bucket, TRACE_EVENT(xfs_iunlink_update_bucket,
TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, unsigned int bucket, TP_PROTO(const struct xfs_perag *pag, unsigned int bucket,
xfs_agino_t old_ptr, xfs_agino_t new_ptr), xfs_agino_t old_ptr, xfs_agino_t new_ptr),
TP_ARGS(mp, agno, bucket, old_ptr, new_ptr), TP_ARGS(pag, bucket, old_ptr, new_ptr),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(dev_t, dev) __field(dev_t, dev)
__field(xfs_agnumber_t, agno) __field(xfs_agnumber_t, agno)
@ -4041,8 +4040,8 @@ TRACE_EVENT(xfs_iunlink_update_bucket,
__field(xfs_agino_t, new_ptr) __field(xfs_agino_t, new_ptr)
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = mp->m_super->s_dev; __entry->dev = pag->pag_mount->m_super->s_dev;
__entry->agno = agno; __entry->agno = pag->pag_agno;
__entry->bucket = bucket; __entry->bucket = bucket;
__entry->old_ptr = old_ptr; __entry->old_ptr = old_ptr;
__entry->new_ptr = new_ptr; __entry->new_ptr = new_ptr;
@ -4180,16 +4179,16 @@ DEFINE_FS_CORRUPT_EVENT(xfs_rt_mark_healthy);
DEFINE_FS_CORRUPT_EVENT(xfs_rt_unfixed_corruption); DEFINE_FS_CORRUPT_EVENT(xfs_rt_unfixed_corruption);
DECLARE_EVENT_CLASS(xfs_ag_corrupt_class, DECLARE_EVENT_CLASS(xfs_ag_corrupt_class,
TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, unsigned int flags), TP_PROTO(const struct xfs_perag *pag, unsigned int flags),
TP_ARGS(mp, agno, flags), TP_ARGS(pag, flags),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(dev_t, dev) __field(dev_t, dev)
__field(xfs_agnumber_t, agno) __field(xfs_agnumber_t, agno)
__field(unsigned int, flags) __field(unsigned int, flags)
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = mp->m_super->s_dev; __entry->dev = pag->pag_mount->m_super->s_dev;
__entry->agno = agno; __entry->agno = pag->pag_agno;
__entry->flags = flags; __entry->flags = flags;
), ),
TP_printk("dev %d:%d agno 0x%x flags 0x%x", TP_printk("dev %d:%d agno 0x%x flags 0x%x",
@ -4198,9 +4197,8 @@ DECLARE_EVENT_CLASS(xfs_ag_corrupt_class,
); );
#define DEFINE_AG_CORRUPT_EVENT(name) \ #define DEFINE_AG_CORRUPT_EVENT(name) \
DEFINE_EVENT(xfs_ag_corrupt_class, name, \ DEFINE_EVENT(xfs_ag_corrupt_class, name, \
TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, \ TP_PROTO(const struct xfs_perag *pag, unsigned int flags), \
unsigned int flags), \ TP_ARGS(pag, flags))
TP_ARGS(mp, agno, flags))
DEFINE_AG_CORRUPT_EVENT(xfs_ag_mark_sick); DEFINE_AG_CORRUPT_EVENT(xfs_ag_mark_sick);
DEFINE_AG_CORRUPT_EVENT(xfs_ag_mark_corrupt); DEFINE_AG_CORRUPT_EVENT(xfs_ag_mark_corrupt);
DEFINE_AG_CORRUPT_EVENT(xfs_ag_mark_healthy); DEFINE_AG_CORRUPT_EVENT(xfs_ag_mark_healthy);
@ -4233,9 +4231,9 @@ DEFINE_INODE_CORRUPT_EVENT(xfs_inode_mark_healthy);
DEFINE_INODE_CORRUPT_EVENT(xfs_inode_unfixed_corruption); DEFINE_INODE_CORRUPT_EVENT(xfs_inode_unfixed_corruption);
TRACE_EVENT(xfs_iwalk_ag_rec, TRACE_EVENT(xfs_iwalk_ag_rec,
TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, TP_PROTO(const struct xfs_perag *pag, \
struct xfs_inobt_rec_incore *irec), struct xfs_inobt_rec_incore *irec),
TP_ARGS(mp, agno, irec), TP_ARGS(pag, irec),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(dev_t, dev) __field(dev_t, dev)
__field(xfs_agnumber_t, agno) __field(xfs_agnumber_t, agno)
@ -4243,8 +4241,8 @@ TRACE_EVENT(xfs_iwalk_ag_rec,
__field(uint64_t, freemask) __field(uint64_t, freemask)
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = mp->m_super->s_dev; __entry->dev = pag->pag_mount->m_super->s_dev;
__entry->agno = agno; __entry->agno = pag->pag_agno;
__entry->startino = irec->ir_startino; __entry->startino = irec->ir_startino;
__entry->freemask = irec->ir_free; __entry->freemask = irec->ir_free;
), ),