Re: [PATCH v3 2/9] fs: tracepoints around multigrain timestamp events

[Jeff Layton]

On Fri, 2024-07-05 at 14:07 -0400, Steven Rostedt wrote:
> On Fri, 05 Jul 2024 13:02:36 -0400
> Jeff Layton <jlayton@xxxxxxxxxx> wrote:
> 
> > diff --git a/include/trace/events/timestamp.h
> > b/include/trace/events/timestamp.h
> > new file mode 100644
> > index 000000000000..a004e5572673
> > --- /dev/null
> > +++ b/include/trace/events/timestamp.h
> > @@ -0,0 +1,109 @@
> > +/* SPDX-License-Identifier: GPL-2.0 */
> > +#undef TRACE_SYSTEM
> > +#define TRACE_SYSTEM timestamp
> > +
> > +#if !defined(_TRACE_TIMESTAMP_H) ||
> > defined(TRACE_HEADER_MULTI_READ)
> > +#define _TRACE_TIMESTAMP_H
> > +
> > +#include <linux/tracepoint.h>
> > +#include <linux/fs.h>
> > +
> > +TRACE_EVENT(inode_set_ctime_to_ts,
> > +	TP_PROTO(struct inode *inode,
> > +		 struct timespec64 *ctime),
> > +
> > +	TP_ARGS(inode, ctime),
> > +
> > +	TP_STRUCT__entry(
> > +		__field(dev_t,			dev)
> > +		__field(ino_t,			ino)
> > +		__field(u32,			gen)
> 
> It's best to keep the above 4 byte word below 8 byte words,
> otherwise,
> it will likely create a 4 byte hole in between.
> 

Thanks, I'll fix up both!

> > +		__field(time64_t,		ctime_s)
> > +		__field(u32,			ctime_ns)
> > +	),
> > +
> > +	TP_fast_assign(
> > +		__entry->dev		= inode->i_sb->s_dev;
> > +		__entry->ino		= inode->i_ino;
> > +		__entry->gen		= inode->i_generation;
> > +		__entry->ctime_s	= ctime->tv_sec;
> > +		__entry->ctime_ns	= ctime->tv_nsec;
> > +	),
> > +
> > +	TP_printk("ino=%d:%d:%ld:%u ctime=%lld.%u",
> > +		MAJOR(__entry->dev), MINOR(__entry->dev), __entry-
> > >ino, __entry->gen,
> > +		__entry->ctime_s, __entry->ctime_ns
> > +	)
> > +);
> > +
> > +TRACE_EVENT(ctime_ns_xchg,
> > +	TP_PROTO(struct inode *inode,
> > +		 u32 old,
> > +		 u32 new,
> > +		 u32 cur),
> > +
> > +	TP_ARGS(inode, old, new, cur),
> > +
> > +	TP_STRUCT__entry(
> > +		__field(dev_t,				dev)
> > +		__field(ino_t,				ino)
> > +		__field(u32,				gen)
> > +		__field(u32,				old)
> > +		__field(u32,				new)
> > +		__field(u32,				cur)
> > +	),
> > +
> > +	TP_fast_assign(
> > +		__entry->dev		= inode->i_sb->s_dev;
> > +		__entry->ino		= inode->i_ino;
> > +		__entry->gen		= inode->i_generation;
> > +		__entry->old		= old;
> > +		__entry->new		= new;
> > +		__entry->cur		= cur;
> > +	),
> > +
> > +	TP_printk("ino=%d:%d:%ld:%u old=%u:%c new=%u cur=%u:%c",
> > +		MAJOR(__entry->dev), MINOR(__entry->dev), __entry-
> > >ino, __entry->gen,
> > +		__entry->old & ~I_CTIME_QUERIED, __entry->old &
> > I_CTIME_QUERIED ? 'Q' : '-',
> > +		__entry->new,
> > +		__entry->cur & ~I_CTIME_QUERIED, __entry->cur &
> > I_CTIME_QUERIED ? 'Q' : '-'
> > +	)
> > +);
> > +
> > +TRACE_EVENT(fill_mg_cmtime,
> > +	TP_PROTO(struct inode *inode,
> > +		 struct timespec64 *ctime,
> > +		 struct timespec64 *mtime),
> > +
> > +	TP_ARGS(inode, ctime, mtime),
> > +
> > +	TP_STRUCT__entry(
> > +		__field(dev_t,			dev)
> > +		__field(ino_t,			ino)
> > +		__field(u32,			gen)
> 
> Same here.
> 
> -- Steve
> 
> > +		__field(time64_t,		ctime_s)
> > +		__field(time64_t,		mtime_s)
> > +		__field(u32,			ctime_ns)
> > +		__field(u32,			mtime_ns)
> > +	),
> > +
> > +	TP_fast_assign(
> > +		__entry->dev		= inode->i_sb->s_dev;
> > +		__entry->ino		= inode->i_ino;
> > +		__entry->gen		= inode->i_generation;
> > +		__entry->ctime_s	= ctime->tv_sec;
> > +		__entry->mtime_s	= mtime->tv_sec;
> > +		__entry->ctime_ns	= ctime->tv_nsec;
> > +		__entry->mtime_ns	= mtime->tv_nsec;
> > +	),
> > +
> > +	TP_printk("ino=%d:%d:%ld:%u ctime=%lld.%u mtime=%lld.%u",
> > +		MAJOR(__entry->dev), MINOR(__entry->dev), __entry-
> > >ino, __entry->gen,
> > +		__entry->ctime_s, __entry->ctime_ns,
> > +		__entry->mtime_s, __entry->mtime_ns
> > +	)
> > +);
> > +#endif /* _TRACE_TIMESTAMP_H */
> > +
> > +/* This part must be outside protection */
> > +#include <trace/define_trace.h>
> > 
> 

-- 
Jeff Layton <jlayton@xxxxxxxxxx>