Unverified Commit 5a3d5928 authored by Jeff Layton's avatar Jeff Layton Committed by Christian Brauner
Browse files

vfs: widen trace event i_ino fields to u64 



Update VFS-layer trace event definitions to use u64 instead of
ino_t/unsigned long for inode number fields. Update TP_printk format
strings to use %llu/%llx to match the widened field type. Remove
now-unnecessary (unsigned long) casts since __entry->ino is already
u64.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Link: https://patch.msgid.link/20260304-iino-u64-v3-4-2257ad83d372@kernel.org


Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 0fe27e59

fs/iomap/trace.h

+4 −4
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ TRACE_EVENT(iomap_dio_rw_begin, 
	TP_ARGS(iocb, iter, dio_flags, done_before),

	TP_STRUCT__entry(

		__field(dev_t,	dev)

		__field(ino_t,	ino)

		__field(u64,	ino)

		__field(loff_t, isize)

		__field(loff_t, pos)

		__field(size_t,	count)
@@ -277,7 +277,7 @@ TRACE_EVENT(iomap_dio_rw_begin, 
		__entry->dio_flags = dio_flags;

		__entry->aio = !is_sync_kiocb(iocb);

	),

	TP_printk("dev %d:%d ino 0x%lx size 0x%llx offset 0x%llx length 0x%zx done_before 0x%zx flags %s dio_flags %s aio %d",

	TP_printk("dev %d:%d ino 0x%llx size 0x%llx offset 0x%llx length 0x%zx done_before 0x%zx flags %s dio_flags %s aio %d",

		  MAJOR(__entry->dev), MINOR(__entry->dev),

		  __entry->ino,

		  __entry->isize,
@@ -294,7 +294,7 @@ TRACE_EVENT(iomap_dio_complete, 
	TP_ARGS(iocb, error, ret),

	TP_STRUCT__entry(

		__field(dev_t,	dev)

		__field(ino_t,	ino)

		__field(u64,	ino)

		__field(loff_t, isize)

		__field(loff_t, pos)

		__field(int,	ki_flags)
@@ -312,7 +312,7 @@ TRACE_EVENT(iomap_dio_complete, 
		__entry->error = error;

		__entry->ret = ret;

	),

	TP_printk("dev %d:%d ino 0x%lx size 0x%llx offset 0x%llx flags %s aio %d error %d ret %zd",

	TP_printk("dev %d:%d ino 0x%llx size 0x%llx offset 0x%llx flags %s aio %d error %d ret %zd",

		  MAJOR(__entry->dev), MINOR(__entry->dev),

		  __entry->ino,

		  __entry->isize,

include/trace/events/filelock.h

+17 −17
Original line number Diff line number Diff line
@@ -42,10 +42,10 @@ TRACE_EVENT(locks_get_lock_context, 
	TP_ARGS(inode, type, ctx),



	TP_STRUCT__entry(

		__field(unsigned long, i_ino)

		__field(u64, i_ino)

		__field(struct file_lock_context *, ctx)

		__field(dev_t, s_dev)

		__field(unsigned char, type)

		__field(struct file_lock_context *, ctx)

	),



	TP_fast_assign(
@@ -55,7 +55,7 @@ TRACE_EVENT(locks_get_lock_context, 
		__entry->ctx = ctx;

	),



	TP_printk("dev=0x%x:0x%x ino=0x%lx type=%s ctx=%p",

	TP_printk("dev=0x%x:0x%x ino=0x%llx type=%s ctx=%p",

		  MAJOR(__entry->s_dev), MINOR(__entry->s_dev),

		  __entry->i_ino, show_fl_type(__entry->type), __entry->ctx)

);
@@ -66,16 +66,16 @@ DECLARE_EVENT_CLASS(filelock_lock, 
	TP_ARGS(inode, fl, ret),



	TP_STRUCT__entry(

		__field(u64, i_ino)

		__field(loff_t, fl_start)

		__field(loff_t, fl_end)

		__field(struct file_lock *, fl)

		__field(unsigned long, i_ino)

		__field(dev_t, s_dev)

		__field(struct file_lock_core *, blocker)

		__field(fl_owner_t, owner)

		__field(dev_t, s_dev)

		__field(unsigned int, pid)

		__field(unsigned int, flags)

		__field(unsigned char, type)

		__field(loff_t, fl_start)

		__field(loff_t, fl_end)

		__field(int, ret)

	),
@@ -93,7 +93,7 @@ DECLARE_EVENT_CLASS(filelock_lock, 
		__entry->ret = ret;

	),



	TP_printk("fl=%p dev=0x%x:0x%x ino=0x%lx fl_blocker=%p fl_owner=%p fl_pid=%u fl_flags=%s fl_type=%s fl_start=%lld fl_end=%lld ret=%d",

	TP_printk("fl=%p dev=0x%x:0x%x ino=0x%llx fl_blocker=%p fl_owner=%p fl_pid=%u fl_flags=%s fl_type=%s fl_start=%lld fl_end=%lld ret=%d",

		__entry->fl, MAJOR(__entry->s_dev), MINOR(__entry->s_dev),

		__entry->i_ino, __entry->blocker, __entry->owner,

		__entry->pid, show_fl_flags(__entry->flags),
@@ -123,15 +123,15 @@ DECLARE_EVENT_CLASS(filelock_lease, 
	TP_ARGS(inode, fl),



	TP_STRUCT__entry(

		__field(u64, i_ino)

		__field(struct file_lease *, fl)

		__field(unsigned long, i_ino)

		__field(dev_t, s_dev)

		__field(struct file_lock_core *, blocker)

		__field(fl_owner_t, owner)

		__field(unsigned int, flags)

		__field(unsigned char, type)

		__field(unsigned long, break_time)

		__field(unsigned long, downgrade_time)

		__field(dev_t, s_dev)

		__field(unsigned int, flags)

		__field(unsigned char, type)

	),



	TP_fast_assign(
@@ -146,7 +146,7 @@ DECLARE_EVENT_CLASS(filelock_lease, 
		__entry->downgrade_time = fl ? fl->fl_downgrade_time : 0;

	),



	TP_printk("fl=%p dev=0x%x:0x%x ino=0x%lx fl_blocker=%p fl_owner=%p fl_flags=%s fl_type=%s fl_break_time=%lu fl_downgrade_time=%lu",

	TP_printk("fl=%p dev=0x%x:0x%x ino=0x%llx fl_blocker=%p fl_owner=%p fl_flags=%s fl_type=%s fl_break_time=%lu fl_downgrade_time=%lu",

		__entry->fl, MAJOR(__entry->s_dev), MINOR(__entry->s_dev),

		__entry->i_ino, __entry->blocker, __entry->owner,

		show_fl_flags(__entry->flags),
@@ -175,12 +175,12 @@ TRACE_EVENT(generic_add_lease, 
	TP_ARGS(inode, fl),



	TP_STRUCT__entry(

		__field(unsigned long, i_ino)

		__field(u64, i_ino)

		__field(fl_owner_t, owner)

		__field(dev_t, s_dev)

		__field(int, wcount)

		__field(int, rcount)

		__field(int, icount)

		__field(dev_t, s_dev)

		__field(fl_owner_t, owner)

		__field(unsigned int, flags)

		__field(unsigned char, type)

	),
@@ -196,7 +196,7 @@ TRACE_EVENT(generic_add_lease, 
		__entry->type = fl->c.flc_type;

	),



	TP_printk("dev=0x%x:0x%x ino=0x%lx wcount=%d rcount=%d icount=%d fl_owner=%p fl_flags=%s fl_type=%s",

	TP_printk("dev=0x%x:0x%x ino=0x%llx wcount=%d rcount=%d icount=%d fl_owner=%p fl_flags=%s fl_type=%s",

		MAJOR(__entry->s_dev), MINOR(__entry->s_dev),

		__entry->i_ino, __entry->wcount, __entry->rcount,

		__entry->icount, __entry->owner,

include/trace/events/filemap.h

+10 −10
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ DECLARE_EVENT_CLASS(mm_filemap_op_page_cache, 
	TP_ARGS(folio),



	TP_STRUCT__entry(

		__field(u64, i_ino)

		__field(unsigned long, pfn)

		__field(unsigned long, i_ino)

		__field(unsigned long, index)

		__field(dev_t, s_dev)

		__field(unsigned char, order)
@@ -38,7 +38,7 @@ DECLARE_EVENT_CLASS(mm_filemap_op_page_cache, 
		__entry->order = folio_order(folio);

	),



	TP_printk("dev %d:%d ino %lx pfn=0x%lx ofs=%lu order=%u",

	TP_printk("dev %d:%d ino %llx pfn=0x%lx ofs=%lu order=%u",

		MAJOR(__entry->s_dev), MINOR(__entry->s_dev),

		__entry->i_ino,

		__entry->pfn,
@@ -67,7 +67,7 @@ DECLARE_EVENT_CLASS(mm_filemap_op_page_cache_range, 
	TP_ARGS(mapping, index, last_index),



	TP_STRUCT__entry(

		__field(unsigned long, i_ino)

		__field(u64, i_ino)

		__field(dev_t, s_dev)

		__field(unsigned long, index)

		__field(unsigned long, last_index)
@@ -85,7 +85,7 @@ DECLARE_EVENT_CLASS(mm_filemap_op_page_cache_range, 
	),



	TP_printk(

		"dev=%d:%d ino=%lx ofs=%lld-%lld",

		"dev=%d:%d ino=%llx ofs=%lld-%lld",

		MAJOR(__entry->s_dev),

		MINOR(__entry->s_dev), __entry->i_ino,

		((loff_t)__entry->index) << PAGE_SHIFT,
@@ -117,7 +117,7 @@ TRACE_EVENT(mm_filemap_fault, 
	TP_ARGS(mapping, index),



	TP_STRUCT__entry(

		__field(unsigned long, i_ino)

		__field(u64, i_ino)

		__field(dev_t, s_dev)

		__field(unsigned long, index)

	),
@@ -133,7 +133,7 @@ TRACE_EVENT(mm_filemap_fault, 
	),



	TP_printk(

		"dev=%d:%d ino=%lx ofs=%lld",

		"dev=%d:%d ino=%llx ofs=%lld",

		MAJOR(__entry->s_dev),

		MINOR(__entry->s_dev), __entry->i_ino,

		((loff_t)__entry->index) << PAGE_SHIFT
@@ -146,7 +146,7 @@ TRACE_EVENT(filemap_set_wb_err, 
		TP_ARGS(mapping, eseq),



		TP_STRUCT__entry(

			__field(unsigned long, i_ino)

			__field(u64, i_ino)

			__field(dev_t, s_dev)

			__field(errseq_t, errseq)

		),
@@ -160,7 +160,7 @@ TRACE_EVENT(filemap_set_wb_err, 
				__entry->s_dev = mapping->host->i_rdev;

		),



		TP_printk("dev=%d:%d ino=0x%lx errseq=0x%x",

		TP_printk("dev=%d:%d ino=0x%llx errseq=0x%x",

			MAJOR(__entry->s_dev), MINOR(__entry->s_dev),

			__entry->i_ino, __entry->errseq)

);
@@ -171,8 +171,8 @@ TRACE_EVENT(file_check_and_advance_wb_err, 
		TP_ARGS(file, old),



		TP_STRUCT__entry(

			__field(u64, i_ino)

			__field(struct file *, file)

			__field(unsigned long, i_ino)

			__field(dev_t, s_dev)

			__field(errseq_t, old)

			__field(errseq_t, new)
@@ -191,7 +191,7 @@ TRACE_EVENT(file_check_and_advance_wb_err, 
			__entry->new = file->f_wb_err;

		),



		TP_printk("file=%p dev=%d:%d ino=0x%lx old=0x%x new=0x%x",

		TP_printk("file=%p dev=%d:%d ino=0x%llx old=0x%x new=0x%x",

			__entry->file, MAJOR(__entry->s_dev),

			MINOR(__entry->s_dev), __entry->i_ino, __entry->old,

			__entry->new)

include/trace/events/fs_dax.h

+10 −10
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ DECLARE_EVENT_CLASS(dax_pmd_fault_class, 
		pgoff_t max_pgoff, int result),

	TP_ARGS(inode, vmf, max_pgoff, result),

	TP_STRUCT__entry(

		__field(unsigned long, ino)

		__field(u64, ino)

		__field(unsigned long, vm_start)

		__field(unsigned long, vm_end)

		__field(vm_flags_t, vm_flags)
@@ -35,7 +35,7 @@ DECLARE_EVENT_CLASS(dax_pmd_fault_class, 
		__entry->max_pgoff = max_pgoff;

		__entry->result = result;

	),

	TP_printk("dev %d:%d ino %#lx %s %s address %#lx vm_start "

	TP_printk("dev %d:%d ino %#llx %s %s address %#lx vm_start "

			"%#lx vm_end %#lx pgoff %#lx max_pgoff %#lx %s",

		MAJOR(__entry->dev),

		MINOR(__entry->dev),
@@ -66,7 +66,7 @@ DECLARE_EVENT_CLASS(dax_pmd_load_hole_class, 
		void *radix_entry),

	TP_ARGS(inode, vmf, zero_folio, radix_entry),

	TP_STRUCT__entry(

		__field(unsigned long, ino)

		__field(u64, ino)

		__field(vm_flags_t, vm_flags)

		__field(unsigned long, address)

		__field(struct folio *, zero_folio)
@@ -81,7 +81,7 @@ DECLARE_EVENT_CLASS(dax_pmd_load_hole_class, 
		__entry->zero_folio = zero_folio;

		__entry->radix_entry = radix_entry;

	),

	TP_printk("dev %d:%d ino %#lx %s address %#lx zero_folio %p "

	TP_printk("dev %d:%d ino %#llx %s address %#lx zero_folio %p "

			"radix_entry %#lx",

		MAJOR(__entry->dev),

		MINOR(__entry->dev),
@@ -106,7 +106,7 @@ DECLARE_EVENT_CLASS(dax_pte_fault_class, 
	TP_PROTO(struct inode *inode, struct vm_fault *vmf, int result),

	TP_ARGS(inode, vmf, result),

	TP_STRUCT__entry(

		__field(unsigned long, ino)

		__field(u64, ino)

		__field(vm_flags_t, vm_flags)

		__field(unsigned long, address)

		__field(pgoff_t, pgoff)
@@ -123,7 +123,7 @@ DECLARE_EVENT_CLASS(dax_pte_fault_class, 
		__entry->pgoff = vmf->pgoff;

		__entry->result = result;

	),

	TP_printk("dev %d:%d ino %#lx %s %s address %#lx pgoff %#lx %s",

	TP_printk("dev %d:%d ino %#llx %s %s address %#lx pgoff %#lx %s",

		MAJOR(__entry->dev),

		MINOR(__entry->dev),

		__entry->ino,
@@ -150,7 +150,7 @@ DECLARE_EVENT_CLASS(dax_writeback_range_class, 
	TP_PROTO(struct inode *inode, pgoff_t start_index, pgoff_t end_index),

	TP_ARGS(inode, start_index, end_index),

	TP_STRUCT__entry(

		__field(unsigned long, ino)

		__field(u64, ino)

		__field(pgoff_t, start_index)

		__field(pgoff_t, end_index)

		__field(dev_t, dev)
@@ -161,7 +161,7 @@ DECLARE_EVENT_CLASS(dax_writeback_range_class, 
		__entry->start_index = start_index;

		__entry->end_index = end_index;

	),

	TP_printk("dev %d:%d ino %#lx pgoff %#lx-%#lx",

	TP_printk("dev %d:%d ino %#llx pgoff %#lx-%#lx",

		MAJOR(__entry->dev),

		MINOR(__entry->dev),

		__entry->ino,
@@ -182,7 +182,7 @@ TRACE_EVENT(dax_writeback_one, 
	TP_PROTO(struct inode *inode, pgoff_t pgoff, pgoff_t pglen),

	TP_ARGS(inode, pgoff, pglen),

	TP_STRUCT__entry(

		__field(unsigned long, ino)

		__field(u64, ino)

		__field(pgoff_t, pgoff)

		__field(pgoff_t, pglen)

		__field(dev_t, dev)
@@ -193,7 +193,7 @@ TRACE_EVENT(dax_writeback_one, 
		__entry->pgoff = pgoff;

		__entry->pglen = pglen;

	),

	TP_printk("dev %d:%d ino %#lx pgoff %#lx pglen %#lx",

	TP_printk("dev %d:%d ino %#llx pgoff %#lx pglen %#lx",

		MAJOR(__entry->dev),

		MINOR(__entry->dev),

		__entry->ino,

include/trace/events/fsverity.h

+15 −15
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ TRACE_EVENT(fsverity_enable, 
		 const struct merkle_tree_params *params),

	TP_ARGS(inode, params),

	TP_STRUCT__entry(

		__field(ino_t, ino)

		__field(u64, ino)

		__field(u64, data_size)

		__field(u64, tree_size)

		__field(unsigned int, merkle_block)
@@ -29,8 +29,8 @@ TRACE_EVENT(fsverity_enable, 
		__entry->merkle_block = params->block_size;

		__entry->num_levels = params->num_levels;

	),

	TP_printk("ino %lu data_size %llu tree_size %llu merkle_block %u levels %u",

		(unsigned long) __entry->ino,

	TP_printk("ino %llu data_size %llu tree_size %llu merkle_block %u levels %u",

		__entry->ino,

		__entry->data_size,

		__entry->tree_size,

		__entry->merkle_block,
@@ -42,7 +42,7 @@ TRACE_EVENT(fsverity_tree_done, 
		 const struct merkle_tree_params *params),

	TP_ARGS(inode, vi, params),

	TP_STRUCT__entry(

		__field(ino_t, ino)

		__field(u64, ino)

		__field(u64, data_size)

		__field(u64, tree_size)

		__field(unsigned int, merkle_block)
@@ -59,8 +59,8 @@ TRACE_EVENT(fsverity_tree_done, 
		memcpy(__get_dynamic_array(root_hash), vi->root_hash, __get_dynamic_array_len(root_hash));

		memcpy(__get_dynamic_array(file_digest), vi->file_digest, __get_dynamic_array_len(file_digest));

	),

	TP_printk("ino %lu data_size %llu tree_size %lld merkle_block %u levels %u root_hash %s digest %s",

		(unsigned long) __entry->ino,

	TP_printk("ino %llu data_size %llu tree_size %lld merkle_block %u levels %u root_hash %s digest %s",

		__entry->ino,

		__entry->data_size,

		__entry->tree_size,

		__entry->merkle_block,
@@ -75,7 +75,7 @@ TRACE_EVENT(fsverity_verify_data_block, 
		 u64 data_pos),

	TP_ARGS(inode, params, data_pos),

	TP_STRUCT__entry(

		__field(ino_t, ino)

		__field(u64, ino)

		__field(u64, data_pos)

		__field(unsigned int, merkle_block)

	),
@@ -84,8 +84,8 @@ TRACE_EVENT(fsverity_verify_data_block, 
		__entry->data_pos = data_pos;

		__entry->merkle_block = params->block_size;

	),

	TP_printk("ino %lu data_pos %llu merkle_block %u",

		(unsigned long) __entry->ino,

	TP_printk("ino %llu data_pos %llu merkle_block %u",

		__entry->ino,

		__entry->data_pos,

		__entry->merkle_block)

);
@@ -96,7 +96,7 @@ TRACE_EVENT(fsverity_merkle_hit, 
		 unsigned int hidx),

	TP_ARGS(inode, data_pos, hblock_idx, level, hidx),

	TP_STRUCT__entry(

		__field(ino_t, ino)

		__field(u64, ino)

		__field(u64, data_pos)

		__field(unsigned long, hblock_idx)

		__field(unsigned int, level)
@@ -109,8 +109,8 @@ TRACE_EVENT(fsverity_merkle_hit, 
		__entry->level = level;

		__entry->hidx = hidx;

	),

	TP_printk("ino %lu data_pos %llu hblock_idx %lu level %u hidx %u",

		(unsigned long) __entry->ino,

	TP_printk("ino %llu data_pos %llu hblock_idx %lu level %u hidx %u",

		__entry->ino,

		__entry->data_pos,

		__entry->hblock_idx,

		__entry->level,
@@ -122,7 +122,7 @@ TRACE_EVENT(fsverity_verify_merkle_block, 
		 unsigned int level, unsigned int hidx),

	TP_ARGS(inode, hblock_idx, level, hidx),

	TP_STRUCT__entry(

		__field(ino_t, ino)

		__field(u64, ino)

		__field(unsigned long, hblock_idx)

		__field(unsigned int, level)

		__field(unsigned int, hidx)
@@ -133,8 +133,8 @@ TRACE_EVENT(fsverity_verify_merkle_block, 
		__entry->level = level;

		__entry->hidx = hidx;

	),

	TP_printk("ino %lu hblock_idx %lu level %u hidx %u",

		(unsigned long) __entry->ino,

	TP_printk("ino %llu hblock_idx %lu level %u hidx %u",

		__entry->ino,

		__entry->hblock_idx,

		__entry->level,

		__entry->hidx)