Attachment 644557 Details for Bug 941305

[patch] [PATCH v3] xfs: Extend tracing of rename operations

xfs-13.2-tracing.diff (text/plain), 6.50 KB, created by Jan Kara on 2015-08-21 08:28:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kara

Created: 2015-08-21 08:28:21 UTC

Size: 6.50 KB

patch

obsolete

>From: Jan Kara <jack@suse.com>
>Subject: xfs: Expand tracing
>Patch-mainline: Never
>
>Signed-off-by: Jan Kara <jack@suse.com>
>
>diff -rupX /crypted/home/jack/.kerndiffexclude linux-3.16-openSUSE-13.2/fs/xfs/xfs_da_format.c linux-3.16-openSUSE-13.2-1-xfs_corruption/fs/xfs/xfs_da_format.c
>--- linux-3.16-openSUSE-13.2/fs/xfs/xfs_da_format.c	2014-08-04 00:25:02.000000000 +0200
>+++ linux-3.16-openSUSE-13.2-1-xfs_corruption/fs/xfs/xfs_da_format.c	2015-08-20 19:45:02.430160962 +0200
>@@ -256,7 +256,7 @@ xfs_dir2_data_get_ftype(
> 	return XFS_DIR3_FT_UNKNOWN;
> }
> 
>-static void
>+void
> xfs_dir2_data_put_ftype(
> 	struct xfs_dir2_data_entry *dep,
> 	__uint8_t		ftype)
>@@ -276,7 +276,7 @@ xfs_dir3_data_get_ftype(
> 	return ftype;
> }
> 
>-static void
>+void
> xfs_dir3_data_put_ftype(
> 	struct xfs_dir2_data_entry *dep,
> 	__uint8_t		type)
>diff -rupX /crypted/home/jack/.kerndiffexclude linux-3.16-openSUSE-13.2/fs/xfs/xfs_dir2_node.c linux-3.16-openSUSE-13.2-1-xfs_corruption/fs/xfs/xfs_dir2_node.c
>--- linux-3.16-openSUSE-13.2/fs/xfs/xfs_dir2_node.c	2014-08-04 00:25:02.000000000 +0200
>+++ linux-3.16-openSUSE-13.2-1-xfs_corruption/fs/xfs/xfs_dir2_node.c	2015-08-21 10:03:17.229309167 +0200
>@@ -2171,6 +2171,9 @@ xfs_dir2_node_replace(
> 	 */
> 	if (rval == EEXIST) {
> 		struct xfs_dir2_leaf_entry *ents;
>+		xfs_ino_t oldinum;
>+		int old_ftype, new_ftype;
>+
> 		/*
> 		 * Find the leaf entry.
> 		 */
>@@ -2194,9 +2197,13 @@ xfs_dir2_node_replace(
> 		/*
> 		 * Fill in the new inode number and log the entry.
> 		 */
>+		oldinum = be64_to_cpu(dep->inumber);
>+		old_ftype = args->dp->d_ops->data_get_ftype(dep);
> 		dep->inumber = cpu_to_be64(inum);
> 		args->dp->d_ops->data_put_ftype(dep, args->filetype);
> 		xfs_dir2_data_log_entry(args, state->extrablk.bp, dep);
>+		new_ftype = args->dp->d_ops->data_get_ftype(dep);
>+		trace_xfs_dir2_node_replace_done(args, oldinum, inum, old_ftype, new_ftype);
> 		rval = 0;
> 	}
> 	/*
>diff -rupX /crypted/home/jack/.kerndiffexclude linux-3.16-openSUSE-13.2/fs/xfs/xfs_trace.c linux-3.16-openSUSE-13.2-1-xfs_corruption/fs/xfs/xfs_trace.c
>--- linux-3.16-openSUSE-13.2/fs/xfs/xfs_trace.c	2014-08-04 00:25:02.000000000 +0200
>+++ linux-3.16-openSUSE-13.2-1-xfs_corruption/fs/xfs/xfs_trace.c	2015-08-20 19:59:00.318089568 +0200
>@@ -47,6 +47,7 @@
> #include "xfs_inode_item.h"
> #include "xfs_bmap_btree.h"
> #include "xfs_filestream.h"
>+#include "xfs_dir2.h"
> 
> /*
>  * We include this last to have the helpers above available for the trace
>diff -rupX /crypted/home/jack/.kerndiffexclude linux-3.16-openSUSE-13.2/fs/xfs/xfs_trace.h linux-3.16-openSUSE-13.2-1-xfs_corruption/fs/xfs/xfs_trace.h
>--- linux-3.16-openSUSE-13.2/fs/xfs/xfs_trace.h	2014-08-04 00:25:02.000000000 +0200
>+++ linux-3.16-openSUSE-13.2-1-xfs_corruption/fs/xfs/xfs_trace.h	2015-08-21 10:19:10.947893567 +0200
>@@ -785,6 +785,8 @@ TRACE_EVENT(xfs_rename,
> 		__field(xfs_ino_t, target_dp_ino)
> 		__field(int, src_namelen)
> 		__field(int, target_namelen)
>+		__field(int, src_type)
>+		__field(int, target_type)
> 		__dynamic_array(char, src_name, src_name->len)
> 		__dynamic_array(char, target_name, target_name->len)
> 	),
>@@ -794,15 +796,19 @@ TRACE_EVENT(xfs_rename,
> 		__entry->target_dp_ino = target_dp->i_ino;
> 		__entry->src_namelen = src_name->len;
> 		__entry->target_namelen = target_name->len;
>+		__entry->src_type = src_name->type;
>+		__entry->target_type = target_name->type;
> 		memcpy(__get_str(src_name), src_name->name, src_name->len);
> 		memcpy(__get_str(target_name), target_name->name,
> 			target_name->len);
> 	),
> 	TP_printk("dev %d:%d src dp ino 0x%llx target dp ino 0x%llx"
>-		  " src name %.*s target name %.*s",
>+		  " src type %d target type %d src name %.*s target name %.*s",
> 		  MAJOR(__entry->dev), MINOR(__entry->dev),
> 		  __entry->src_dp_ino,
> 		  __entry->target_dp_ino,
>+		  __entry->src_type,
>+		  __entry->target_type,
> 		  __entry->src_namelen,
> 		  __get_str(src_name),
> 		  __entry->target_namelen,
>@@ -1616,6 +1622,13 @@ DEFINE_ALLOC_EVENT(xfs_alloc_vextent_noa
> DEFINE_ALLOC_EVENT(xfs_alloc_vextent_loopfailed);
> DEFINE_ALLOC_EVENT(xfs_alloc_vextent_allfailed);
> 
>+struct xfs_dir2_data_entry;
>+
>+void
>+xfs_dir3_data_put_ftype(
>+	struct xfs_dir2_data_entry *dep,
>+	__uint8_t		ftype);
>+
> DECLARE_EVENT_CLASS(xfs_da_class,
> 	TP_PROTO(struct xfs_da_args *args),
> 	TP_ARGS(args),
>@@ -1627,6 +1640,8 @@ DECLARE_EVENT_CLASS(xfs_da_class,
> 		__field(xfs_dahash_t, hashval)
> 		__field(xfs_ino_t, inumber)
> 		__field(int, op_flags)
>+		__field(int, type)
>+		__field(int, dir3_op)
> 	),
> 	TP_fast_assign(
> 		__entry->dev = VFS_I(args->dp)->i_sb->s_dev;
>@@ -1637,9 +1652,11 @@ DECLARE_EVENT_CLASS(xfs_da_class,
> 		__entry->hashval = args->hashval;
> 		__entry->inumber = args->inumber;
> 		__entry->op_flags = args->op_flags;
>+		__entry->type = args->filetype;
>+		__entry->dir3_op = (args->dp->d_ops->data_put_ftype == xfs_dir3_data_put_ftype);
> 	),
> 	TP_printk("dev %d:%d ino 0x%llx name %.*s namelen %d hashval 0x%x "
>-		  "inumber 0x%llx op_flags %s",
>+		  "inumber 0x%llx op_flags %s ftype %d dir3_op %d",
> 		  MAJOR(__entry->dev), MINOR(__entry->dev),
> 		  __entry->ino,
> 		  __entry->namelen,
>@@ -1647,7 +1664,8 @@ DECLARE_EVENT_CLASS(xfs_da_class,
> 		  __entry->namelen,
> 		  __entry->hashval,
> 		  __entry->inumber,
>-		  __print_flags(__entry->op_flags, "|", XFS_DA_OP_FLAGS))
>+		  __print_flags(__entry->op_flags, "|", XFS_DA_OP_FLAGS),
>+		  __entry->type, __entry->dir3_op)
> )
> 
> #define DEFINE_DIR2_EVENT(name) \
>@@ -1680,6 +1698,35 @@ DEFINE_DIR2_EVENT(xfs_dir2_node_replace)
> DEFINE_DIR2_EVENT(xfs_dir2_node_removename);
> DEFINE_DIR2_EVENT(xfs_dir2_node_to_leaf);
> 
>+TRACE_EVENT(xfs_dir2_node_replace_done,
>+	TP_PROTO(struct xfs_da_args *args, xfs_ino_t oldino, xfs_ino_t newino, int oldftype, int newftype),
>+	TP_ARGS(args, oldino, newino, oldftype, newftype),
>+	TP_STRUCT__entry(
>+		__field(dev_t, dev)
>+		__field(xfs_ino_t, ino)
>+		__field(xfs_ino_t, oldino)
>+		__field(xfs_ino_t, newino)
>+		__field(int, oldftype)
>+		__field(int, newftype)
>+		__field(int, dir3_op)
>+	),
>+	TP_fast_assign(
>+		__entry->dev = VFS_I(args->dp)->i_sb->s_dev;
>+		__entry->ino = args->dp->i_ino;
>+		__entry->oldino = oldino;
>+		__entry->newino = newino;
>+		__entry->oldftype = oldftype;
>+		__entry->newftype = newftype;
>+		__entry->dir3_op = (args->dp->d_ops->data_put_ftype == xfs_dir3_data_put_ftype);
>+	),
>+	TP_printk("dev %d:%d ino 0x%llx oldino 0x%llx newino 0x%llx "
>+		  "oldftype %d newftype %d dir3_op %d",
>+		  MAJOR(__entry->dev), MINOR(__entry->dev),
>+		  __entry->ino,
>+		  __entry->oldino, __entry->newino,
>+		  __entry->oldftype, __entry->newftype, __entry->dir3_op)
>+);
>+
> DECLARE_EVENT_CLASS(xfs_attr_class,
> 	TP_PROTO(struct xfs_da_args *args),
> 	TP_ARGS(args),

Actions: View | Diff

Attachments on bug 941305: 643793 | 643916 | 643953 | 644505 | 644506 | 644524 | 644557 | 644605 | 644636