From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: david@fromorbit.com, darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 09/41] xfs: add scrub tracepoints
Date: Fri, 04 Nov 2016 17:20:03 -0700 [thread overview]
Message-ID: <147830520307.2155.17458796827205767963.stgit@birch.djwong.org> (raw)
In-Reply-To: <147830514302.2155.3920703176812208304.stgit@birch.djwong.org>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
fs/xfs/libxfs/xfs_types.h | 5 +
fs/xfs/xfs_trace.h | 352 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 357 insertions(+)
diff --git a/fs/xfs/libxfs/xfs_types.h b/fs/xfs/libxfs/xfs_types.h
index cf044c0..442b223 100644
--- a/fs/xfs/libxfs/xfs_types.h
+++ b/fs/xfs/libxfs/xfs_types.h
@@ -95,6 +95,11 @@ typedef __int64_t xfs_sfiloff_t; /* signed block number in a file */
#define XFS_ATTR_FORK 1
#define XFS_COW_FORK 2
+#define XFS_FORK_DESC \
+ { XFS_DATA_FORK, "data" }, \
+ { XFS_ATTR_FORK, "attr" }, \
+ { XFS_COW_FORK, "CoW" }
+
/*
* Min numbers of data/attr fork btree root pointers.
*/
diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index 71778d0..ba61ca6 100644
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -3460,6 +3460,358 @@ DEFINE_GETFSMAP_EVENT(xfs_getfsmap_low_key);
DEFINE_GETFSMAP_EVENT(xfs_getfsmap_high_key);
DEFINE_GETFSMAP_EVENT(xfs_getfsmap_mapping);
+/* scrub */
+#define XFS_SCRUB_TYPE_DESC \
+ { 0, NULL }
+DECLARE_EVENT_CLASS(xfs_scrub_class,
+ TP_PROTO(struct xfs_inode *ip, int type, xfs_agnumber_t agno,
+ xfs_ino_t inum, unsigned int gen, unsigned int flags,
+ int error),
+ TP_ARGS(ip, type, agno, inum, gen, flags, error),
+ TP_STRUCT__entry(
+ __field(dev_t, dev)
+ __field(xfs_ino_t, ino)
+ __field(int, type)
+ __field(xfs_agnumber_t, agno)
+ __field(xfs_ino_t, inum)
+ __field(unsigned int, gen)
+ __field(unsigned int, flags)
+ __field(int, error)
+ ),
+ TP_fast_assign(
+ __entry->dev = ip->i_mount->m_super->s_dev;
+ __entry->ino = ip->i_ino;
+ __entry->type = type;
+ __entry->agno = agno;
+ __entry->inum = inum;
+ __entry->gen = gen;
+ __entry->flags = flags;
+ __entry->error = error;
+ ),
+ TP_printk("dev %d:%d ino %llu type %s agno %u inum %llu gen %u flags 0x%x error %d\n",
+ MAJOR(__entry->dev), MINOR(__entry->dev),
+ __entry->ino,
+ __print_symbolic(__entry->type, XFS_SCRUB_TYPE_DESC),
+ __entry->agno,
+ __entry->inum,
+ __entry->gen,
+ __entry->flags,
+ __entry->error)
+)
+#define DEFINE_SCRUB_EVENT(name) \
+DEFINE_EVENT(xfs_scrub_class, name, \
+ TP_PROTO(struct xfs_inode *ip, int type, xfs_agnumber_t agno, \
+ xfs_ino_t inum, unsigned int gen, unsigned int flags, \
+ int error), \
+ TP_ARGS(ip, type, agno, inum, gen, flags, error))
+
+DECLARE_EVENT_CLASS(xfs_scrub_sbtree_class,
+ TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, xfs_agblock_t bno,
+ xfs_btnum_t btnum, int level, int nlevels, int ptr),
+ TP_ARGS(mp, agno, bno, btnum, level, nlevels, ptr),
+ TP_STRUCT__entry(
+ __field(dev_t, dev)
+ __field(xfs_btnum_t, btnum)
+ __field(xfs_agnumber_t, agno)
+ __field(xfs_agblock_t, bno)
+ __field(int, level)
+ __field(int, nlevels)
+ __field(int, ptr)
+ ),
+ TP_fast_assign(
+ __entry->dev = mp->m_super->s_dev;
+ __entry->agno = agno;
+ __entry->btnum = btnum;
+ __entry->bno = bno;
+ __entry->level = level;
+ __entry->nlevels = nlevels;
+ __entry->ptr = ptr;
+ ),
+ TP_printk("dev %d:%d agno %u agbno %u btnum %d level %d nlevels %d ptr %d\n",
+ MAJOR(__entry->dev), MINOR(__entry->dev),
+ __entry->agno,
+ __entry->bno,
+ __entry->btnum,
+ __entry->level,
+ __entry->nlevels,
+ __entry->ptr)
+)
+#define DEFINE_SCRUB_SBTREE_EVENT(name) \
+DEFINE_EVENT(xfs_scrub_sbtree_class, name, \
+ TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, xfs_agblock_t bno, \
+ xfs_btnum_t btnum, int level, int nlevels, int ptr), \
+ TP_ARGS(mp, agno, bno, btnum, level, nlevels, ptr))
+
+DEFINE_SCRUB_EVENT(xfs_scrub);
+DEFINE_SCRUB_EVENT(xfs_scrub_done);
+DEFINE_SCRUB_SBTREE_EVENT(xfs_scrub_btree_rec);
+DEFINE_SCRUB_SBTREE_EVENT(xfs_scrub_btree_key);
+
+TRACE_EVENT(xfs_scrub_op_error,
+ TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, xfs_agblock_t bno,
+ const char *type, int error, const char *func,
+ int line),
+ TP_ARGS(mp, agno, bno, type, error, func, line),
+ TP_STRUCT__entry(
+ __field(dev_t, dev)
+ __field(xfs_agnumber_t, agno)
+ __field(xfs_agblock_t, bno)
+ __string(type, type)
+ __field(int, error)
+ __string(func, func)
+ __field(int, line)
+ ),
+ TP_fast_assign(
+ __entry->dev = mp->m_super->s_dev;
+ __entry->agno = agno;
+ __entry->bno = bno;
+ __assign_str(type, type);
+ __entry->error = error;
+ __assign_str(func, func);
+ __entry->line = line;
+ ),
+ TP_printk("dev %d:%d agno %u agbno %u type '%s' error %d fn %s:%d\n",
+ MAJOR(__entry->dev), MINOR(__entry->dev),
+ __entry->agno,
+ __entry->bno,
+ __get_str(type),
+ __entry->error,
+ __get_str(func),
+ __entry->line)
+);
+
+TRACE_EVENT(xfs_scrub_file_op_error,
+ TP_PROTO(struct xfs_inode *ip, int whichfork, xfs_fileoff_t offset,
+ const char *type, int error, const char *func,
+ int line),
+ TP_ARGS(ip, whichfork, offset, type, error, func, line),
+ TP_STRUCT__entry(
+ __field(dev_t, dev)
+ __field(xfs_ino_t, ino)
+ __field(int, whichfork)
+ __field(xfs_fileoff_t, offset)
+ __string(type, type)
+ __field(int, error)
+ __string(func, func)
+ __field(int, line)
+ ),
+ TP_fast_assign(
+ __entry->dev = ip->i_mount->m_super->s_dev;
+ __entry->ino = ip->i_ino;
+ __entry->whichfork = whichfork;
+ __entry->offset = offset;
+ __assign_str(type, type);
+ __entry->error = error;
+ __assign_str(func, func);
+ __entry->line = line;
+ ),
+ TP_printk("dev %d:%d ino %llu %s offset %llu type '%s' error %d fn %s:%d\n",
+ MAJOR(__entry->dev), MINOR(__entry->dev),
+ __entry->ino,
+ __print_symbolic(__entry->whichfork, XFS_FORK_DESC),
+ __entry->offset,
+ __get_str(type),
+ __entry->error,
+ __get_str(func),
+ __entry->line)
+);
+
+TRACE_EVENT(xfs_scrub_block_error,
+ TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, xfs_agblock_t bno,
+ const char *type, const char *check, const char *func,
+ int line),
+ TP_ARGS(mp, agno, bno, type, check, func, line),
+ TP_STRUCT__entry(
+ __field(dev_t, dev)
+ __field(xfs_agnumber_t, agno)
+ __field(xfs_agblock_t, bno)
+ __string(type, type)
+ __string(check, check)
+ __string(func, func)
+ __field(int, line)
+ ),
+ TP_fast_assign(
+ __entry->dev = mp->m_super->s_dev;
+ __entry->agno = agno;
+ __entry->bno = bno;
+ __assign_str(type, type);
+ __assign_str(check, check);
+ __assign_str(func, func);
+ __entry->line = line;
+ ),
+ TP_printk("dev %d:%d agno %u agbno %u type '%s' check '%s' fn %s:%d\n",
+ MAJOR(__entry->dev), MINOR(__entry->dev),
+ __entry->agno,
+ __entry->bno,
+ __get_str(type),
+ __get_str(check),
+ __get_str(func),
+ __entry->line)
+);
+
+TRACE_EVENT(xfs_scrub_ino_error,
+ TP_PROTO(struct xfs_inode *ip, xfs_agnumber_t agno, xfs_agblock_t bno,
+ const char *type, const char *check, const char *func,
+ int line),
+ TP_ARGS(ip, agno, bno, type, check, func, line),
+ TP_STRUCT__entry(
+ __field(dev_t, dev)
+ __field(xfs_ino_t, ino)
+ __field(xfs_agnumber_t, agno)
+ __field(xfs_agblock_t, bno)
+ __string(type, type)
+ __string(check, check)
+ __string(func, func)
+ __field(int, line)
+ ),
+ TP_fast_assign(
+ __entry->dev = ip->i_mount->m_super->s_dev;
+ __entry->ino = ip->i_ino;
+ __entry->agno = agno;
+ __entry->bno = bno;
+ __assign_str(type, type);
+ __assign_str(check, check);
+ __assign_str(func, func);
+ __entry->line = line;
+ ),
+ TP_printk("dev %d:%d ino %llu agno %u agbno %u type '%s' check '%s' fn %s:%d\n",
+ MAJOR(__entry->dev), MINOR(__entry->dev),
+ __entry->ino,
+ __entry->agno,
+ __entry->bno,
+ __get_str(type),
+ __get_str(check),
+ __get_str(func),
+ __entry->line)
+);
+
+TRACE_EVENT(xfs_scrub_data_error,
+ TP_PROTO(struct xfs_inode *ip, int whichfork, xfs_fileoff_t offset,
+ const char *type, const char *check, const char *func,
+ int line),
+ TP_ARGS(ip, whichfork, offset, type, check, func, line),
+ TP_STRUCT__entry(
+ __field(dev_t, dev)
+ __field(xfs_ino_t, ino)
+ __field(int, whichfork)
+ __field(xfs_fileoff_t, offset)
+ __string(type, type)
+ __string(check, check)
+ __string(func, func)
+ __field(int, line)
+ ),
+ TP_fast_assign(
+ __entry->dev = ip->i_mount->m_super->s_dev;
+ __entry->ino = ip->i_ino;
+ __entry->whichfork = whichfork;
+ __entry->offset = offset;
+ __assign_str(type, type);
+ __assign_str(check, check);
+ __assign_str(func, func);
+ __entry->line = line;
+ ),
+ TP_printk("dev %d:%d ino %llu %s fork offset %llu type '%s' check '%s' fn %s:%d\n",
+ MAJOR(__entry->dev), MINOR(__entry->dev),
+ __entry->ino,
+ __print_symbolic(__entry->whichfork, XFS_FORK_DESC),
+ __entry->offset,
+ __get_str(type),
+ __get_str(check),
+ __get_str(func),
+ __entry->line)
+);
+
+TRACE_EVENT(xfs_scrub_xref_error,
+ TP_PROTO(struct xfs_mount *mp, const char *type, int error,
+ const char *func, int line),
+ TP_ARGS(mp, type, error, func, line),
+ TP_STRUCT__entry(
+ __field(dev_t, dev)
+ __string(type, type)
+ __field(int, error)
+ __string(func, func)
+ __field(int, line)
+ ),
+ TP_fast_assign(
+ __entry->dev = mp->m_super->s_dev;
+ __assign_str(type, type);
+ __entry->error = error;
+ __assign_str(func, func);
+ __entry->line = line;
+ ),
+ TP_printk("dev %d:%d btree %s xref error %d fn %s:%d\n",
+ MAJOR(__entry->dev), MINOR(__entry->dev),
+ __get_str(type),
+ __entry->error,
+ __get_str(func),
+ __entry->line)
+);
+
+TRACE_EVENT(xfs_scrub_btree_error,
+ TP_PROTO(struct xfs_mount *mp, const char *bt_type, const char *bt_ptr,
+ xfs_agnumber_t agno, xfs_agblock_t bno, const char *check,
+ const char *func, int line),
+ TP_ARGS(mp, bt_type, bt_ptr, agno, bno, check, func, line),
+ TP_STRUCT__entry(
+ __field(dev_t, dev)
+ __string(bt_type, bt_type)
+ __string(bt_ptr, bt_ptr)
+ __field(xfs_agnumber_t, agno)
+ __field(xfs_agblock_t, bno)
+ __string(check, check)
+ __string(func, func)
+ __field(int, line)
+ ),
+ TP_fast_assign(
+ __entry->dev = mp->m_super->s_dev;
+ __assign_str(bt_type, bt_type);
+ __assign_str(bt_ptr, bt_ptr);
+ __entry->agno = agno;
+ __entry->bno = bno;
+ __assign_str(check, check);
+ __assign_str(func, func);
+ __entry->line = line;
+ ),
+ TP_printk("dev %d:%d %s %s agno %u agbno %u check '%s' fn %s:%d\n",
+ MAJOR(__entry->dev), MINOR(__entry->dev),
+ __get_str(bt_type),
+ __get_str(bt_ptr),
+ __entry->agno,
+ __entry->bno,
+ __get_str(check),
+ __get_str(func),
+ __entry->line)
+);
+
+DECLARE_EVENT_CLASS(xfs_scrub_ag_lock_class,
+ TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t max_ag,
+ xfs_agnumber_t agno),
+ TP_ARGS(mp, max_ag, agno),
+ TP_STRUCT__entry(
+ __field(dev_t, dev)
+ __field(xfs_agnumber_t, max_ag)
+ __field(xfs_agnumber_t, agno)
+ ),
+ TP_fast_assign(
+ __entry->dev = mp->m_super->s_dev;
+ __entry->max_ag = max_ag;
+ __entry->agno = agno;
+ ),
+ TP_printk("dev %d:%d max_ag %u agno %u\n",
+ MAJOR(__entry->dev), MINOR(__entry->dev),
+ __entry->max_ag,
+ __entry->agno)
+)
+#define DEFINE_SCRUB_AG_LOCK_EVENT(name) \
+DEFINE_EVENT(xfs_scrub_ag_lock_class, name, \
+ TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t max_ag, \
+ xfs_agnumber_t agno), \
+ TP_ARGS(mp, max_ag, agno))
+
+DEFINE_SCRUB_AG_LOCK_EVENT(xfs_scrub_ag_can_lock);
+DEFINE_SCRUB_AG_LOCK_EVENT(xfs_scrub_ag_may_deadlock);
+DEFINE_SCRUB_AG_LOCK_EVENT(xfs_scrub_ag_lock_all);
+
#endif /* _TRACE_XFS_H */
#undef TRACE_INCLUDE_PATH
next prev parent reply other threads:[~2016-11-05 0:20 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-05 0:19 [PATCH v2 00/41] xfs: online scrub/repair support Darrick J. Wong
2016-11-05 0:19 ` [PATCH 01/41] xfs: plumb in needed functions for range querying of the freespace btrees Darrick J. Wong
2016-11-05 0:19 ` [PATCH 02/41] xfs: provide a query_range function for " Darrick J. Wong
2016-11-05 0:19 ` [PATCH 03/41] xfs: create a function to query all records in a btree Darrick J. Wong
2016-11-05 0:19 ` [PATCH 04/41] xfs: introduce the XFS_IOC_GETFSMAP ioctl Darrick J. Wong
2016-11-05 0:19 ` [PATCH 05/41] xfs: report shared extents in getfsmapx Darrick J. Wong
2016-11-05 0:19 ` [PATCH 06/41] xfs: have getfsmap fall back to the freesp btrees when rmap is not present Darrick J. Wong
2016-11-05 0:19 ` [PATCH 07/41] xfs: getfsmap should fall back to rtbitmap when rtrmapbt " Darrick J. Wong
2016-11-05 0:19 ` [PATCH 08/41] xfs: use GPF_NOFS when allocating btree cursors Darrick J. Wong
2016-11-05 0:20 ` Darrick J. Wong [this message]
2016-11-05 0:20 ` [PATCH 10/41] xfs: create an ioctl to scrub AG metadata Darrick J. Wong
2016-11-05 0:20 ` [PATCH 11/41] xfs: generic functions to scrub metadata and btrees Darrick J. Wong
2016-11-05 0:20 ` [PATCH 12/41] xfs: scrub the backup superblocks Darrick J. Wong
2016-11-05 0:20 ` [PATCH 13/41] xfs: scrub AGF and AGFL Darrick J. Wong
2016-11-05 0:20 ` [PATCH 14/41] xfs: scrub the AGI Darrick J. Wong
2016-11-05 0:20 ` [PATCH 15/41] xfs: support scrubbing free space btrees Darrick J. Wong
2016-11-05 0:20 ` [PATCH 16/41] xfs: support scrubbing inode btrees Darrick J. Wong
2016-11-05 0:20 ` [PATCH 17/41] xfs: support scrubbing rmap btree Darrick J. Wong
2016-11-05 0:20 ` [PATCH 18/41] xfs: support scrubbing refcount btree Darrick J. Wong
2016-11-05 0:21 ` [PATCH 19/41] xfs: scrub inodes Darrick J. Wong
2016-11-05 0:21 ` [PATCH 20/41] xfs: scrub inode block mappings Darrick J. Wong
2016-11-05 0:21 ` [PATCH 21/41] xfs: scrub directory/attribute btrees Darrick J. Wong
2016-11-05 0:21 ` [PATCH 22/41] xfs: scrub directory metadata Darrick J. Wong
2016-11-05 0:21 ` [PATCH 23/41] xfs: scrub extended attributes Darrick J. Wong
2016-11-05 0:21 ` [PATCH 24/41] xfs: scrub symbolic links Darrick J. Wong
2016-11-05 0:21 ` [PATCH 25/41] xfs: scrub realtime bitmap/summary Darrick J. Wong
2016-11-05 0:21 ` [PATCH 26/41] xfs: scrub should cross-reference with the bnobt Darrick J. Wong
2016-11-05 0:21 ` [PATCH 27/41] xfs: cross-reference bnobt records with cntbt Darrick J. Wong
2016-11-05 0:22 ` [PATCH 28/41] xfs: cross-reference extents with AG header Darrick J. Wong
2016-11-05 0:22 ` [PATCH 29/41] xfs: cross-reference inode btrees during scrub Darrick J. Wong
2016-11-05 0:22 ` [PATCH 30/41] xfs: cross-reference reverse-mapping btree Darrick J. Wong
2016-11-05 0:22 ` [PATCH 31/41] xfs: cross-reference refcount btree during scrub Darrick J. Wong
2016-11-05 0:22 ` [PATCH 32/41] xfs: scrub should cross-reference the realtime bitmap Darrick J. Wong
2016-11-05 0:22 ` [PATCH 33/41] xfs: implement the metadata repair ioctl flag Darrick J. Wong
2016-11-05 0:22 ` [PATCH 34/41] xfs: add helper routines for the repair code Darrick J. Wong
2016-11-05 0:22 ` [PATCH 35/41] xfs: repair free space btrees Darrick J. Wong
2016-11-05 0:22 ` [PATCH 36/41] xfs: repair inode btrees Darrick J. Wong
2016-11-05 0:23 ` [PATCH 37/41] xfs: rebuild the rmapbt Darrick J. Wong
2016-11-05 0:23 ` [PATCH 38/41] xfs: repair refcount btrees Darrick J. Wong
2016-11-05 0:23 ` [PATCH 39/41] xfs: online repair of inodes Darrick J. Wong
2016-11-05 0:23 ` [PATCH 40/41] xfs: repair inode block maps Darrick J. Wong
2016-11-05 0:23 ` [PATCH 41/41] xfs: query the per-AG reservation counters Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=147830520307.2155.17458796827205767963.stgit@birch.djwong.org \
--to=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).