1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
From a0a3563affbbebd9c7385586e1d6031de82c2a83 Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan at linux.intel.com>
Date: Fri, 26 Nov 2010 12:18:03 -0800
Subject: [PATCH] vfs: Add a trace point in the mark_inode_dirty function
PowerTOP would like to be able to show who is keeping the disk
busy by dirtying data. The most logical spot for this is in the vfs
in the mark_inode_dirty() function, doing this on the block level
is not possible because by the time the IO hits the block layer the
guilty party can no longer be found ("kjournald" and "pdflush" are not
useful answers to "who caused this file to be dirty).
The trace point follows the same logic/style as the block_dump code
and pretty much dumps the same data, just not to dmesg (and thus to
/var/log/messages) but via the trace events streams.
Eventually we should be able to phase out the block dump code, but that's
for later on after a transition time.
---
fs/fs-writeback.c | 3 +++
include/linux/fs.h | 12 ++++++++++++
include/trace/events/writeback.h | 28 ++++++++++++++++++++++++++++
3 files changed, 43 insertions(+)
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 54f5786..981ec8c 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -1072,6 +1072,9 @@ void __mark_inode_dirty(struct inode *inode, int flags)
if ((inode->i_state & flags) == flags)
return;
+ if (flags & (I_DIRTY_SYNC | I_DIRTY_DATASYNC | I_DIRTY_PAGES))
+ trace_writeback_inode_dirty(inode, flags);
+
if (unlikely(block_dump))
block_dump___mark_inode_dirty(inode);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 43d36b7..a3e46ee 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1759,6 +1759,18 @@ struct super_operations {
#define I_DIRTY (I_DIRTY_SYNC | I_DIRTY_DATASYNC | I_DIRTY_PAGES)
+#define INODE_DIRTY_FLAGS \
+ { I_DIRTY_SYNC, "DIRTY-SYNC" }, \
+ { I_DIRTY_DATASYNC, "DIRTY-DATASYNC" }, \
+ { I_DIRTY_PAGES, "DIRTY-PAGES" }, \
+ { I_NEW, "NEW" }, \
+ { I_WILL_FREE, "WILL-FREE" }, \
+ { I_FREEING, "FREEING" }, \
+ { I_CLEAR, "CLEAR" }, \
+ { I_SYNC, "SYNC" }, \
+ { I_REFERENCED, "REFERENCED" }
+
+
extern void __mark_inode_dirty(struct inode *, int);
static inline void mark_inode_dirty(struct inode *inode)
{
diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h
index 1f48f14..8053e75 100644
--- a/include/trace/events/writeback.h
+++ b/include/trace/events/writeback.h
@@ -400,6 +400,34 @@ DEFINE_EVENT(writeback_congest_waited_template, writeback_wait_iff_congested,
TP_ARGS(usec_timeout, usec_delayed)
);
+/*
+ * Tracepoint for dirtying an inode; used by PowerTOP
+ */
+TRACE_EVENT(writeback_inode_dirty,
+
+ TP_PROTO(struct inode *inode, int flags),
+
+ TP_ARGS(inode, flags),
+
+ TP_STRUCT__entry(
+ __field( __kernel_dev_t, dev )
+ __field( ino_t, ino )
+ __field( u32, flags )
+ ),
+
+ TP_fast_assign(
+ __entry->dev = inode->i_sb->s_dev;
+ __entry->ino = inode->i_ino;
+ __entry->flags = flags;
+ ),
+
+ TP_printk("dev %d:%d ino %lu flags %d %s", MAJOR(__entry->dev), MINOR(__entry->dev),
+ (unsigned long) __entry->ino,
+ __entry->flags,
+ __print_flags(__entry->flags, "|", INODE_DIRTY_FLAGS)
+ )
+);
+
DECLARE_EVENT_CLASS(writeback_single_inode_template,
TP_PROTO(struct inode *inode,
--
1.7.10
|
