[01/39] xfs: prepare rmap btree cursor tracepoints for realtime

Message ID	170404849916.1764998.16216956664784728981.stgit@frogsfrogsfrogs (mailing list archive)
State	New
Headers	show Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BB1E8BA2E for <linux-xfs@vger.kernel.org>; Sun, 31 Dec 2023 21:32:03 +0000 (UTC) Date: Sun, 31 Dec 2023 13:32:03 -0800 Subject: [PATCH 01/39] xfs: prepare rmap btree cursor tracepoints for realtime From: "Darrick J. Wong" <djwong@kernel.org> To: djwong@kernel.org Cc: linux-xfs@vger.kernel.org Message-ID: <170404849916.1764998.16216956664784728981.stgit@frogsfrogsfrogs> In-Reply-To: <170404849811.1764998.10873316890301599216.stgit@frogsfrogsfrogs> References: <170404849811.1764998.10873316890301599216.stgit@frogsfrogsfrogs> User-Agent: StGit/0.19 Precedence: bulk MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit
Series	[01/39] xfs: prepare rmap btree cursor tracepoints for realtime \| expand [01/39] xfs: prepare rmap btree cursor tracepoints for realtime [02/39] xfs: simplify the xfs_rmap_{alloc,free}_extent calling conventions [03/39] xfs: introduce realtime rmap btree definitions [04/39] xfs: define the on-disk realtime rmap btree format [05/39] xfs: realtime rmap btree transaction reservations [06/39] xfs: add realtime rmap btree operations [07/39] xfs: prepare rmap functions to deal with rtrmapbt [08/39] xfs: add a realtime flag to the rmap update log redo items [09/39] xfs: support recovering rmap intent items targetting realtime extents [10/39] xfs: add realtime rmap btree block detection to log recovery [11/39] xfs: add realtime reverse map inode to metadata directory [12/39] xfs: add metadata reservations for realtime rmap btrees [13/39] xfs: wire up a new inode fork type for the realtime rmap [14/39] xfs: allow inodes with zero extents but nonzero nblocks [15/39] xfs: use realtime EFI to free extents when realtime rmap is enabled [16/39] xfs: wire up rmap map and unmap to the realtime rmapbt [17/39] xfs: create routine to allocate and initialize a realtime rmap btree inode [18/39] xfs: rearrange xfs_fsmap.c a little bit [19/39] xfs: wire up getfsmap to the realtime reverse mapping btree [20/39] xfs: check that the rtrmapbt maxlevels doesn't increase when growing fs [21/39] xfs: add realtime rmap btree when adding rt volume [22/39] xfs: report realtime rmap btree corruption errors to the health system [23/39] xfs: fix scrub tracepoints when inode-rooted btrees are involved [24/39] xfs: allow queued realtime intents to drain before scrubbing [25/39] xfs: scrub the realtime rmapbt [26/39] xfs: cross-reference realtime bitmap to realtime rmapbt scrubber [27/39] xfs: cross-reference the realtime rmapbt [28/39] xfs: scan rt rmap when we're doing an intense rmap check of bmbt mappings [29/39] xfs: scrub the metadir path of rt rmap btree files [30/39] xfs: walk the rt reverse mapping tree when rebuilding rmap [31/39] xfs: online repair of realtime file bmaps [32/39] xfs: repair inodes that have realtime extents [33/39] xfs: repair rmap btree inodes [34/39] xfs: online repair of realtime bitmaps for a realtime group [35/39] xfs: support repairing metadata btrees rooted in metadir inodes [36/39] xfs: online repair of the realtime rmap btree [37/39] xfs: create a shadow rmap btree during realtime rmap repair [38/39] xfs: hook live realtime rmap operations during a repair operation [39/39] xfs: enable realtime rmap btree

diff --git a/fs/xfs/xfs_trace.c b/fs/xfs/xfs_trace.c index 8a990a2fa132f..f35927ebe2450 100644 --- a/fs/xfs/xfs_trace.c +++ b/fs/xfs/xfs_trace.c @@ -47,6 +47,24 @@ #include "xfs_rtgroup.h" #include "xfs_rmap.h" +static inline void +xfs_rmapbt_crack_agno_opdev( + struct xfs_btree_cur *cur, + xfs_agnumber_t *agno, + dev_t *opdev) +{ + if (cur->bc_flags & XFS_BTREE_IN_XFILE) { + *agno = 0; + *opdev = xfbtree_target(cur->bc_mem.xfbtree)->bt_dev; + } else if (cur->bc_flags & XFS_BTREE_ROOT_IN_INODE) { + *agno = cur->bc_ino.rtg->rtg_rgno; + *opdev = cur->bc_mp->m_rtdev_targp->bt_dev; + } else { + *agno = cur->bc_ag.pag->pag_agno; + *opdev = cur->bc_mp->m_super->s_dev; + } +} + /* * We include this last to have the helpers above available for the trace * event implementations. diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h index 9290a02bac99e..43ecf98f86558 100644 --- a/fs/xfs/xfs_trace.h +++ b/fs/xfs/xfs_trace.h @@ -14,11 +14,15 @@ * ino: filesystem inode number * * agbno: per-AG block number in fs blocks + * rgbno: per-rtgroup block number in fs blocks * startblock: physical block number for file mappings. This is either a * segmented fsblock for data device mappings, or a rfsblock * for realtime device mappings * fsbcount: number of blocks in an extent, in fs blocks * + * rmapbno: physical block number for a reverse mapping. This is an agbno for + * per-AG rmap btrees or a rgbno for realtime rmap btrees. + * * daddr: physical block number in 512b blocks * bbcount: number of blocks in a physical extent, in 512b blocks * @@ -2840,13 +2844,14 @@ DEFINE_DEFER_PENDING_ITEM_EVENT(xfs_defer_finish_item); /* rmap tracepoints */ DECLARE_EVENT_CLASS(xfs_rmap_class, TP_PROTO(struct xfs_btree_cur *cur, - xfs_agblock_t agbno, xfs_extlen_t len, bool unwritten, + xfs_agblock_t rmapbno, xfs_extlen_t len, bool unwritten, const struct xfs_owner_info *oinfo), - TP_ARGS(cur, agbno, len, unwritten, oinfo), + TP_ARGS(cur, rmapbno, len, unwritten, oinfo), TP_STRUCT__entry( __field(dev_t, dev) + __field(dev_t, opdev) __field(xfs_agnumber_t, agno) - __field(xfs_agblock_t, agbno) + __field(xfs_agblock_t, rmapbno) __field(xfs_extlen_t, len) __field(uint64_t, owner) __field(uint64_t, offset) @@ -2854,8 +2859,8 @@ DECLARE_EVENT_CLASS(xfs_rmap_class, ), TP_fast_assign( __entry->dev = cur->bc_mp->m_super->s_dev; - __entry->agno = cur->bc_ag.pag->pag_agno; - __entry->agbno = agbno; + xfs_rmapbt_crack_agno_opdev(cur, &__entry->agno, &__entry->opdev); + __entry->rmapbno = rmapbno; __entry->len = len; __entry->owner = oinfo->oi_owner; __entry->offset = oinfo->oi_offset; @@ -2863,10 +2868,11 @@ DECLARE_EVENT_CLASS(xfs_rmap_class, if (unwritten) __entry->flags |= XFS_RMAP_UNWRITTEN; ), - TP_printk("dev %d:%d agno 0x%x agbno 0x%x fsbcount 0x%x owner 0x%llx fileoff 0x%llx flags 0x%lx", + TP_printk("dev %d:%d opdev %d:%d agno 0x%x rmapbno 0x%x fsbcount 0x%x owner 0x%llx fileoff 0x%llx flags 0x%lx", MAJOR(__entry->dev), MINOR(__entry->dev), + MAJOR(__entry->opdev), MINOR(__entry->opdev), __entry->agno, - __entry->agbno, + __entry->rmapbno, __entry->len, __entry->owner, __entry->offset, @@ -2875,9 +2881,9 @@ DECLARE_EVENT_CLASS(xfs_rmap_class, #define DEFINE_RMAP_EVENT(name) \ DEFINE_EVENT(xfs_rmap_class, name, \ TP_PROTO(struct xfs_btree_cur *cur, \ - xfs_agblock_t agbno, xfs_extlen_t len, bool unwritten, \ + xfs_agblock_t rmapbno, xfs_extlen_t len, bool unwritten, \ const struct xfs_owner_info *oinfo), \ - TP_ARGS(cur, agbno, len, unwritten, oinfo)) + TP_ARGS(cur, rmapbno, len, unwritten, oinfo)) /* btree cursor error/%ip tracepoint class */ DECLARE_EVENT_CLASS(xfs_btree_error_class, @@ -2936,40 +2942,35 @@ TRACE_EVENT(xfs_rmap_convert_state, TP_ARGS(cur, state, caller_ip), TP_STRUCT__entry( __field(dev_t, dev) + __field(dev_t, opdev) __field(xfs_agnumber_t, agno) - __field(xfs_ino_t, ino) __field(int, state) __field(unsigned long, caller_ip) ), TP_fast_assign( __entry->dev = cur->bc_mp->m_super->s_dev; - if (cur->bc_flags & XFS_BTREE_ROOT_IN_INODE) { - __entry->agno = 0; - __entry->ino = cur->bc_ino.ip->i_ino; - } else { - __entry->agno = cur->bc_ag.pag->pag_agno; - __entry->ino = 0; - } + xfs_rmapbt_crack_agno_opdev(cur, &__entry->agno, &__entry->opdev); __entry->state = state; __entry->caller_ip = caller_ip; ), - TP_printk("dev %d:%d agno 0x%x ino 0x%llx state %d caller %pS", + TP_printk("dev %d:%d opdev %d:%d agno 0x%x state %d caller %pS", MAJOR(__entry->dev), MINOR(__entry->dev), + MAJOR(__entry->opdev), MINOR(__entry->opdev), __entry->agno, - __entry->ino, __entry->state, (char *)__entry->caller_ip) ); DECLARE_EVENT_CLASS(xfs_rmapbt_class, TP_PROTO(struct xfs_btree_cur *cur, - xfs_agblock_t agbno, xfs_extlen_t len, + xfs_agblock_t rmapbno, xfs_extlen_t len, uint64_t owner, uint64_t offset, unsigned int flags), - TP_ARGS(cur, agbno, len, owner, offset, flags), + TP_ARGS(cur, rmapbno, len, owner, offset, flags), TP_STRUCT__entry( __field(dev_t, dev) + __field(dev_t, opdev) __field(xfs_agnumber_t, agno) - __field(xfs_agblock_t, agbno) + __field(xfs_agblock_t, rmapbno) __field(xfs_extlen_t, len) __field(uint64_t, owner) __field(uint64_t, offset) @@ -2977,17 +2978,18 @@ DECLARE_EVENT_CLASS(xfs_rmapbt_class, ), TP_fast_assign( __entry->dev = cur->bc_mp->m_super->s_dev; - __entry->agno = cur->bc_ag.pag->pag_agno; - __entry->agbno = agbno; + xfs_rmapbt_crack_agno_opdev(cur, &__entry->agno, &__entry->opdev); + __entry->rmapbno = rmapbno; __entry->len = len; __entry->owner = owner; __entry->offset = offset; __entry->flags = flags; ), - TP_printk("dev %d:%d agno 0x%x agbno 0x%x fsbcount 0x%x owner 0x%llx fileoff 0x%llx flags 0x%x", + TP_printk("dev %d:%d opdev %d:%d agno 0x%x rmapbno 0x%x fsbcount 0x%x owner 0x%llx fileoff 0x%llx flags 0x%x", MAJOR(__entry->dev), MINOR(__entry->dev), + MAJOR(__entry->opdev), MINOR(__entry->opdev), __entry->agno, - __entry->agbno, + __entry->rmapbno, __entry->len, __entry->owner, __entry->offset, @@ -2996,9 +2998,9 @@ DECLARE_EVENT_CLASS(xfs_rmapbt_class, #define DEFINE_RMAPBT_EVENT(name) \ DEFINE_EVENT(xfs_rmapbt_class, name, \ TP_PROTO(struct xfs_btree_cur *cur, \ - xfs_agblock_t agbno, xfs_extlen_t len, \ + xfs_agblock_t rmapbno, xfs_extlen_t len, \ uint64_t owner, uint64_t offset, unsigned int flags), \ - TP_ARGS(cur, agbno, len, owner, offset, flags)) + TP_ARGS(cur, rmapbno, len, owner, offset, flags)) TRACE_DEFINE_ENUM(XFS_RMAP_MAP); TRACE_DEFINE_ENUM(XFS_RMAP_MAP_SHARED);

[01/39] xfs: prepare rmap btree cursor tracepoints for realtime

Commit Message

Patch