Skip to content

Commit 343ee18

Browse files
committed
fs: tracepoints around multigrain timestamp events
JIRA: https://issues.redhat.com/browse/RHEL-121527 Add some tracepoints around various multigrain timestamp events. Reviewed-by: Josef Bacik <josef@toxicpanda.com> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Jan Kara <jack@suse.cz> Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org> Tested-by: Randy Dunlap <rdunlap@infradead.org> # documentation bits Signed-off-by: Jeff Layton <jlayton@kernel.org> Link: https://lore.kernel.org/r/20241002-mgtime-v10-6-d1c4717f5284@kernel.org Signed-off-by: Christian Brauner <brauner@kernel.org> (cherry picked from commit c86e3c4) Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
1 parent c5e63bb commit 343ee18

File tree

3 files changed

+135
-1
lines changed

3 files changed

+135
-1
lines changed

fs/inode.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
#include <linux/iversion.h>
2323
#include <linux/rw_hint.h>
2424
#include <trace/events/writeback.h>
25+
#define CREATE_TRACE_POINTS
26+
#include <trace/events/timestamp.h>
27+
2528
#include "internal.h"
2629

2730
/*
@@ -2640,6 +2643,7 @@ EXPORT_SYMBOL(inode_nohighmem);
26402643

26412644
struct timespec64 inode_set_ctime_to_ts(struct inode *inode, struct timespec64 ts)
26422645
{
2646+
trace_inode_set_ctime_to_ts(inode, &ts);
26432647
set_normalized_timespec64(&ts, ts.tv_sec, ts.tv_nsec);
26442648
inode->i_ctime_sec = ts.tv_sec;
26452649
inode->i_ctime_nsec = ts.tv_nsec;
@@ -2726,14 +2730,17 @@ struct timespec64 inode_set_ctime_current(struct inode *inode)
27262730
}
27272731

27282732
/* No need to cmpxchg if it's exactly the same */
2729-
if (cns == now.tv_nsec && inode->i_ctime_sec == now.tv_sec)
2733+
if (cns == now.tv_nsec && inode->i_ctime_sec == now.tv_sec) {
2734+
trace_ctime_xchg_skip(inode, &now);
27302735
goto out;
2736+
}
27312737
cur = cns;
27322738
retry:
27332739
/* Try to swap the nsec value into place. */
27342740
if (try_cmpxchg(&inode->i_ctime_nsec, &cur, now.tv_nsec)) {
27352741
/* If swap occurred, then we're (mostly) done */
27362742
inode->i_ctime_sec = now.tv_sec;
2743+
trace_ctime_ns_xchg(inode, cns, now.tv_nsec, cur);
27372744
} else {
27382745
/*
27392746
* Was the change due to someone marking the old ctime QUERIED?

fs/stat.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
#include <linux/uaccess.h>
2424
#include <asm/unistd.h>
2525

26+
#include <trace/events/timestamp.h>
27+
2628
#include "internal.h"
2729
#include "mount.h"
2830

@@ -56,6 +58,7 @@ void fill_mg_cmtime(struct kstat *stat, u32 request_mask, struct inode *inode)
5658
if (!(stat->ctime.tv_nsec & I_CTIME_QUERIED))
5759
stat->ctime.tv_nsec = ((u32)atomic_fetch_or(I_CTIME_QUERIED, pcn));
5860
stat->ctime.tv_nsec &= ~I_CTIME_QUERIED;
61+
trace_fill_mg_cmtime(inode, &stat->ctime, &stat->mtime);
5962
}
6063
EXPORT_SYMBOL(fill_mg_cmtime);
6164

include/trace/events/timestamp.h

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
2+
#undef TRACE_SYSTEM
3+
#define TRACE_SYSTEM timestamp
4+
5+
#if !defined(_TRACE_TIMESTAMP_H) || defined(TRACE_HEADER_MULTI_READ)
6+
#define _TRACE_TIMESTAMP_H
7+
8+
#include <linux/tracepoint.h>
9+
#include <linux/fs.h>
10+
11+
#define CTIME_QUERIED_FLAGS \
12+
{ I_CTIME_QUERIED, "Q" }
13+
14+
DECLARE_EVENT_CLASS(ctime,
15+
TP_PROTO(struct inode *inode,
16+
struct timespec64 *ctime),
17+
18+
TP_ARGS(inode, ctime),
19+
20+
TP_STRUCT__entry(
21+
__field(dev_t, dev)
22+
__field(ino_t, ino)
23+
__field(time64_t, ctime_s)
24+
__field(u32, ctime_ns)
25+
__field(u32, gen)
26+
),
27+
28+
TP_fast_assign(
29+
__entry->dev = inode->i_sb->s_dev;
30+
__entry->ino = inode->i_ino;
31+
__entry->gen = inode->i_generation;
32+
__entry->ctime_s = ctime->tv_sec;
33+
__entry->ctime_ns = ctime->tv_nsec;
34+
),
35+
36+
TP_printk("ino=%d:%d:%ld:%u ctime=%lld.%u",
37+
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->ino, __entry->gen,
38+
__entry->ctime_s, __entry->ctime_ns
39+
)
40+
);
41+
42+
DEFINE_EVENT(ctime, inode_set_ctime_to_ts,
43+
TP_PROTO(struct inode *inode,
44+
struct timespec64 *ctime),
45+
TP_ARGS(inode, ctime));
46+
47+
DEFINE_EVENT(ctime, ctime_xchg_skip,
48+
TP_PROTO(struct inode *inode,
49+
struct timespec64 *ctime),
50+
TP_ARGS(inode, ctime));
51+
52+
TRACE_EVENT(ctime_ns_xchg,
53+
TP_PROTO(struct inode *inode,
54+
u32 old,
55+
u32 new,
56+
u32 cur),
57+
58+
TP_ARGS(inode, old, new, cur),
59+
60+
TP_STRUCT__entry(
61+
__field(dev_t, dev)
62+
__field(ino_t, ino)
63+
__field(u32, gen)
64+
__field(u32, old)
65+
__field(u32, new)
66+
__field(u32, cur)
67+
),
68+
69+
TP_fast_assign(
70+
__entry->dev = inode->i_sb->s_dev;
71+
__entry->ino = inode->i_ino;
72+
__entry->gen = inode->i_generation;
73+
__entry->old = old;
74+
__entry->new = new;
75+
__entry->cur = cur;
76+
),
77+
78+
TP_printk("ino=%d:%d:%ld:%u old=%u:%s new=%u cur=%u:%s",
79+
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->ino, __entry->gen,
80+
__entry->old & ~I_CTIME_QUERIED,
81+
__print_flags(__entry->old & I_CTIME_QUERIED, "|", CTIME_QUERIED_FLAGS),
82+
__entry->new,
83+
__entry->cur & ~I_CTIME_QUERIED,
84+
__print_flags(__entry->cur & I_CTIME_QUERIED, "|", CTIME_QUERIED_FLAGS)
85+
)
86+
);
87+
88+
TRACE_EVENT(fill_mg_cmtime,
89+
TP_PROTO(struct inode *inode,
90+
struct timespec64 *ctime,
91+
struct timespec64 *mtime),
92+
93+
TP_ARGS(inode, ctime, mtime),
94+
95+
TP_STRUCT__entry(
96+
__field(dev_t, dev)
97+
__field(ino_t, ino)
98+
__field(time64_t, ctime_s)
99+
__field(time64_t, mtime_s)
100+
__field(u32, ctime_ns)
101+
__field(u32, mtime_ns)
102+
__field(u32, gen)
103+
),
104+
105+
TP_fast_assign(
106+
__entry->dev = inode->i_sb->s_dev;
107+
__entry->ino = inode->i_ino;
108+
__entry->gen = inode->i_generation;
109+
__entry->ctime_s = ctime->tv_sec;
110+
__entry->mtime_s = mtime->tv_sec;
111+
__entry->ctime_ns = ctime->tv_nsec;
112+
__entry->mtime_ns = mtime->tv_nsec;
113+
),
114+
115+
TP_printk("ino=%d:%d:%ld:%u ctime=%lld.%u mtime=%lld.%u",
116+
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->ino, __entry->gen,
117+
__entry->ctime_s, __entry->ctime_ns,
118+
__entry->mtime_s, __entry->mtime_ns
119+
)
120+
);
121+
#endif /* _TRACE_TIMESTAMP_H */
122+
123+
/* This part must be outside protection */
124+
#include <trace/define_trace.h>

0 commit comments

Comments
 (0)