1 files changed, 79 insertions, 8 deletions
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 6363193a3418..b50a54736242 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -23,7 +23,7 @@ TRACE_EVENT(ext4_free_inode,
        TP_STRUCT__entry(
                __field(        dev_t,  dev                     )
                __field(        ino_t,  ino                     )
-                __field(        umode_t, mode                   )
+                __field(        __u16, mode                     )
                __field(        uid_t,  uid                     )
                __field(        gid_t,  gid                     )
                __field(        __u64, blocks                   )
@@ -52,7 +52,7 @@ TRACE_EVENT(ext4_request_inode,
        TP_STRUCT__entry(
                __field(        dev_t,  dev                     )
                __field(        ino_t,  dir                     )
-                __field(        umode_t, mode                   )
+                __field(        __u16, mode                     )
        ),
        TP_fast_assign(
@@ -75,7 +75,7 @@ TRACE_EVENT(ext4_allocate_inode,
                __field(        dev_t,  dev                     )
                __field(        ino_t,  ino                     )
                __field(        ino_t,  dir                     )
-                __field(        umode_t, mode                   )
+                __field(        __u16,  mode                    )
        ),
        TP_fast_assign(
@@ -725,7 +725,7 @@ TRACE_EVENT(ext4_free_blocks,
        TP_STRUCT__entry(
                __field(        dev_t,  dev                     )
                __field(        ino_t,  ino                     )
-                __field(        umode_t, mode                   )
+                __field(        __u16,  mode                    )
                __field(        __u64,  block                   )
                __field(        unsigned long,  count           )
                __field(        int,    flags                   )
@@ -1012,7 +1012,7 @@ TRACE_EVENT(ext4_forget,
        TP_STRUCT__entry(
                __field(        dev_t,  dev                     )
                __field(        ino_t,  ino                     )
-                __field(        umode_t, mode                   )
+                __field(        __u16,  mode                    )
                __field(        int,    is_metadata             )
                __field(        __u64,  block                   )
        ),
@@ -1039,7 +1039,7 @@ TRACE_EVENT(ext4_da_update_reserve_space,
        TP_STRUCT__entry(
                __field(        dev_t,  dev                     )
                __field(        ino_t,  ino                     )
-                __field(        umode_t, mode                   )
+                __field(        __u16,  mode                    )
                __field(        __u64,  i_blocks                )
                __field(        int,    used_blocks             )
                __field(        int,    reserved_data_blocks    )
@@ -1076,7 +1076,7 @@ TRACE_EVENT(ext4_da_reserve_space,
        TP_STRUCT__entry(
                __field(        dev_t,  dev                     )
                __field(        ino_t,  ino                     )
-                __field(        umode_t, mode                   )
+                __field(        __u16,  mode                    )
                __field(        __u64,  i_blocks                )
                __field(        int,    md_needed               )
                __field(        int,    reserved_data_blocks    )
@@ -1110,7 +1110,7 @@ TRACE_EVENT(ext4_da_release_space,
        TP_STRUCT__entry(
                __field(        dev_t,  dev                     )
                __field(        ino_t,  ino                     )
-                __field(        umode_t, mode                   )
+                __field(        __u16,  mode                    )
                __field(        __u64,  i_blocks                )
                __field(        int,    freed_blocks            )
                __field(        int,    reserved_data_blocks    )
@@ -1518,6 +1518,77 @@ TRACE_EVENT(ext4_load_inode,
                  (unsigned long) __entry->ino)
 );
+TRACE_EVENT(ext4_journal_start,
+        TP_PROTO(struct super_block *sb, int nblocks, unsigned long IP),
+        TP_ARGS(sb, nblocks, IP),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(          int,  nblocks                 )
+                __field(unsigned long,  ip                      )
+        ),
+        TP_fast_assign(
+                __entry->dev     = sb->s_dev;
+                __entry->nblocks = nblocks;
+                __entry->ip      = IP;
+        ),
+        TP_printk("dev %d,%d nblocks %d caller %pF",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->nblocks, (void *)__entry->ip)
+);
+DECLARE_EVENT_CLASS(ext4__trim,
+        TP_PROTO(struct super_block *sb,
+                 ext4_group_t group,
+                 ext4_grpblk_t start,
+                 ext4_grpblk_t len),
+        TP_ARGS(sb, group, start, len),
+        TP_STRUCT__entry(
+                __field(        int,    dev_major               )
+                __field(        int,    dev_minor               )
+                __field(        __u32,  group                   )
+                __field(        int,    start                   )
+                __field(        int,    len                     )
+        ),
+        TP_fast_assign(
+                __entry->dev_major      = MAJOR(sb->s_dev);
+                __entry->dev_minor      = MINOR(sb->s_dev);
+                __entry->group          = group;
+                __entry->start          = start;
+                __entry->len            = len;
+        ),
+        TP_printk("dev %d,%d group %u, start %d, len %d",
+                  __entry->dev_major, __entry->dev_minor,
+                  __entry->group, __entry->start, __entry->len)
+);
+DEFINE_EVENT(ext4__trim, ext4_trim_extent,
+        TP_PROTO(struct super_block *sb,
+                 ext4_group_t group,
+                 ext4_grpblk_t start,
+                 ext4_grpblk_t len),
+        TP_ARGS(sb, group, start, len)
+);
+DEFINE_EVENT(ext4__trim, ext4_trim_all_free,
+        TP_PROTO(struct super_block *sb,
+                 ext4_group_t group,
+                 ext4_grpblk_t start,
+                 ext4_grpblk_t len),
+        TP_ARGS(sb, group, start, len)
+);
 #endif /* _TRACE_EXT4_H */
 /* This part must be outside protection */

diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h index 6363193a3418..b50a54736242 100644 --- a/include/trace/events/ext4.h +++ b/include/trace/events/ext4.h
@@ -23,7 +23,7 @@ TRACE_EVENT(ext4_free_inode,
23	TP_STRUCT__entry(	23	TP_STRUCT__entry(
24	__field( dev_t, dev )	24	__field( dev_t, dev )
25	__field( ino_t, ino )	25	__field( ino_t, ino )
26	__field( umode_t, mode )	26	__field( __u16, mode )
27	__field( uid_t, uid )	27	__field( uid_t, uid )
28	__field( gid_t, gid )	28	__field( gid_t, gid )
29	__field( __u64, blocks )	29	__field( __u64, blocks )
@@ -52,7 +52,7 @@ TRACE_EVENT(ext4_request_inode,
52	TP_STRUCT__entry(	52	TP_STRUCT__entry(
53	__field( dev_t, dev )	53	__field( dev_t, dev )
54	__field( ino_t, dir )	54	__field( ino_t, dir )
55	__field( umode_t, mode )	55	__field( __u16, mode )
56	),	56	),
57		57
58	TP_fast_assign(	58	TP_fast_assign(
@@ -75,7 +75,7 @@ TRACE_EVENT(ext4_allocate_inode,
75	__field( dev_t, dev )	75	__field( dev_t, dev )
76	__field( ino_t, ino )	76	__field( ino_t, ino )
77	__field( ino_t, dir )	77	__field( ino_t, dir )
78	__field( umode_t, mode )	78	__field( __u16, mode )
79	),	79	),
80		80
81	TP_fast_assign(	81	TP_fast_assign(
@@ -725,7 +725,7 @@ TRACE_EVENT(ext4_free_blocks,
725	TP_STRUCT__entry(	725	TP_STRUCT__entry(
726	__field( dev_t, dev )	726	__field( dev_t, dev )
727	__field( ino_t, ino )	727	__field( ino_t, ino )
728	__field( umode_t, mode )	728	__field( __u16, mode )
729	__field( __u64, block )	729	__field( __u64, block )
730	__field( unsigned long, count )	730	__field( unsigned long, count )
731	__field( int, flags )	731	__field( int, flags )
@@ -1012,7 +1012,7 @@ TRACE_EVENT(ext4_forget,
1012	TP_STRUCT__entry(	1012	TP_STRUCT__entry(
1013	__field( dev_t, dev )	1013	__field( dev_t, dev )
1014	__field( ino_t, ino )	1014	__field( ino_t, ino )
1015	__field( umode_t, mode )	1015	__field( __u16, mode )
1016	__field( int, is_metadata )	1016	__field( int, is_metadata )
1017	__field( __u64, block )	1017	__field( __u64, block )
1018	),	1018	),
@@ -1039,7 +1039,7 @@ TRACE_EVENT(ext4_da_update_reserve_space,
1039	TP_STRUCT__entry(	1039	TP_STRUCT__entry(
1040	__field( dev_t, dev )	1040	__field( dev_t, dev )
1041	__field( ino_t, ino )	1041	__field( ino_t, ino )
1042	__field( umode_t, mode )	1042	__field( __u16, mode )
1043	__field( __u64, i_blocks )	1043	__field( __u64, i_blocks )
1044	__field( int, used_blocks )	1044	__field( int, used_blocks )
1045	__field( int, reserved_data_blocks )	1045	__field( int, reserved_data_blocks )
@@ -1076,7 +1076,7 @@ TRACE_EVENT(ext4_da_reserve_space,
1076	TP_STRUCT__entry(	1076	TP_STRUCT__entry(
1077	__field( dev_t, dev )	1077	__field( dev_t, dev )
1078	__field( ino_t, ino )	1078	__field( ino_t, ino )
1079	__field( umode_t, mode )	1079	__field( __u16, mode )
1080	__field( __u64, i_blocks )	1080	__field( __u64, i_blocks )
1081	__field( int, md_needed )	1081	__field( int, md_needed )
1082	__field( int, reserved_data_blocks )	1082	__field( int, reserved_data_blocks )
@@ -1110,7 +1110,7 @@ TRACE_EVENT(ext4_da_release_space,
1110	TP_STRUCT__entry(	1110	TP_STRUCT__entry(
1111	__field( dev_t, dev )	1111	__field( dev_t, dev )
1112	__field( ino_t, ino )	1112	__field( ino_t, ino )
1113	__field( umode_t, mode )	1113	__field( __u16, mode )
1114	__field( __u64, i_blocks )	1114	__field( __u64, i_blocks )
1115	__field( int, freed_blocks )	1115	__field( int, freed_blocks )
1116	__field( int, reserved_data_blocks )	1116	__field( int, reserved_data_blocks )
@@ -1518,6 +1518,77 @@ TRACE_EVENT(ext4_load_inode,
1518	(unsigned long) __entry->ino)	1518	(unsigned long) __entry->ino)
1519	);	1519	);
1520		1520
		1521	TRACE_EVENT(ext4_journal_start,
		1522	TP_PROTO(struct super_block *sb, int nblocks, unsigned long IP),
		1523
		1524	TP_ARGS(sb, nblocks, IP),
		1525
		1526	TP_STRUCT__entry(
		1527	__field( dev_t, dev )
		1528	__field( int, nblocks )
		1529	__field(unsigned long, ip )
		1530	),
		1531
		1532	TP_fast_assign(
		1533	__entry->dev = sb->s_dev;
		1534	__entry->nblocks = nblocks;
		1535	__entry->ip = IP;
		1536	),
		1537
		1538	TP_printk("dev %d,%d nblocks %d caller %pF",
		1539	MAJOR(__entry->dev), MINOR(__entry->dev),
		1540	__entry->nblocks, (void *)__entry->ip)
		1541	);
		1542
		1543	DECLARE_EVENT_CLASS(ext4__trim,
		1544	TP_PROTO(struct super_block *sb,
		1545	ext4_group_t group,
		1546	ext4_grpblk_t start,
		1547	ext4_grpblk_t len),
		1548
		1549	TP_ARGS(sb, group, start, len),
		1550
		1551	TP_STRUCT__entry(
		1552	__field( int, dev_major )
		1553	__field( int, dev_minor )
		1554	__field( __u32, group )
		1555	__field( int, start )
		1556	__field( int, len )
		1557	),
		1558
		1559	TP_fast_assign(
		1560	__entry->dev_major = MAJOR(sb->s_dev);
		1561	__entry->dev_minor = MINOR(sb->s_dev);
		1562	__entry->group = group;
		1563	__entry->start = start;
		1564	__entry->len = len;
		1565	),
		1566
		1567	TP_printk("dev %d,%d group %u, start %d, len %d",
		1568	__entry->dev_major, __entry->dev_minor,
		1569	__entry->group, __entry->start, __entry->len)
		1570	);
		1571
		1572	DEFINE_EVENT(ext4__trim, ext4_trim_extent,
		1573
		1574	TP_PROTO(struct super_block *sb,
		1575	ext4_group_t group,
		1576	ext4_grpblk_t start,
		1577	ext4_grpblk_t len),
		1578
		1579	TP_ARGS(sb, group, start, len)
		1580	);
		1581
		1582	DEFINE_EVENT(ext4__trim, ext4_trim_all_free,
		1583
		1584	TP_PROTO(struct super_block *sb,
		1585	ext4_group_t group,
		1586	ext4_grpblk_t start,
		1587	ext4_grpblk_t len),
		1588
		1589	TP_ARGS(sb, group, start, len)
		1590	);
		1591
1521	#endif /* _TRACE_EXT4_H */	1592	#endif /* _TRACE_EXT4_H */
1522		1593
1523	/* This part must be outside protection */	1594	/* This part must be outside protection */