Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Jeff Layton <jlayton@kernel.org>
Link: https://patch.msgid.link/20260304-iino-u64-v3-4-2257ad83d372@kernel.org
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>
authored by
Jeff Layton
and committed by
Christian Brauner
5a3d5928
0fe27e59
+158
-158
+4
-4
fs/iomap/trace.h
+4
-4
fs/iomap/trace.h
···
257
257
TP_ARGS(iocb, iter, dio_flags, done_before),
258
258
TP_STRUCT__entry(
259
259
__field(dev_t, dev)
260
-
__field(ino_t, ino)
260
+
__field(u64, ino)
261
261
__field(loff_t, isize)
262
262
__field(loff_t, pos)
263
263
__field(size_t, count)
···
277
277
__entry->dio_flags = dio_flags;
278
278
__entry->aio = !is_sync_kiocb(iocb);
279
279
),
280
-
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",
280
+
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",
281
281
MAJOR(__entry->dev), MINOR(__entry->dev),
282
282
__entry->ino,
283
283
__entry->isize,
···
294
294
TP_ARGS(iocb, error, ret),
295
295
TP_STRUCT__entry(
296
296
__field(dev_t, dev)
297
-
__field(ino_t, ino)
297
+
__field(u64, ino)
298
298
__field(loff_t, isize)
299
299
__field(loff_t, pos)
300
300
__field(int, ki_flags)
···
312
312
__entry->error = error;
313
313
__entry->ret = ret;
314
314
),
315
-
TP_printk("dev %d:%d ino 0x%lx size 0x%llx offset 0x%llx flags %s aio %d error %d ret %zd",
315
+
TP_printk("dev %d:%d ino 0x%llx size 0x%llx offset 0x%llx flags %s aio %d error %d ret %zd",
316
316
MAJOR(__entry->dev), MINOR(__entry->dev),
317
317
__entry->ino,
318
318
__entry->isize,
+17
-17
include/trace/events/filelock.h
+17
-17
include/trace/events/filelock.h
···
42
42
TP_ARGS(inode, type, ctx),
43
43
44
44
TP_STRUCT__entry(
45
-
__field(unsigned long, i_ino)
45
+
__field(u64, i_ino)
46
+
__field(struct file_lock_context *, ctx)
46
47
__field(dev_t, s_dev)
47
48
__field(unsigned char, type)
48
-
__field(struct file_lock_context *, ctx)
49
49
),
50
50
51
51
TP_fast_assign(
···
55
55
__entry->ctx = ctx;
56
56
),
57
57
58
-
TP_printk("dev=0x%x:0x%x ino=0x%lx type=%s ctx=%p",
58
+
TP_printk("dev=0x%x:0x%x ino=0x%llx type=%s ctx=%p",
59
59
MAJOR(__entry->s_dev), MINOR(__entry->s_dev),
60
60
__entry->i_ino, show_fl_type(__entry->type), __entry->ctx)
61
61
);
···
66
66
TP_ARGS(inode, fl, ret),
67
67
68
68
TP_STRUCT__entry(
69
+
__field(u64, i_ino)
70
+
__field(loff_t, fl_start)
71
+
__field(loff_t, fl_end)
69
72
__field(struct file_lock *, fl)
70
-
__field(unsigned long, i_ino)
71
-
__field(dev_t, s_dev)
72
73
__field(struct file_lock_core *, blocker)
73
74
__field(fl_owner_t, owner)
75
+
__field(dev_t, s_dev)
74
76
__field(unsigned int, pid)
75
77
__field(unsigned int, flags)
76
78
__field(unsigned char, type)
77
-
__field(loff_t, fl_start)
78
-
__field(loff_t, fl_end)
79
79
__field(int, ret)
80
80
),
81
81
···
93
93
__entry->ret = ret;
94
94
),
95
95
96
-
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",
96
+
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",
97
97
__entry->fl, MAJOR(__entry->s_dev), MINOR(__entry->s_dev),
98
98
__entry->i_ino, __entry->blocker, __entry->owner,
99
99
__entry->pid, show_fl_flags(__entry->flags),
···
123
123
TP_ARGS(inode, fl),
124
124
125
125
TP_STRUCT__entry(
126
+
__field(u64, i_ino)
126
127
__field(struct file_lease *, fl)
127
-
__field(unsigned long, i_ino)
128
-
__field(dev_t, s_dev)
129
128
__field(struct file_lock_core *, blocker)
130
129
__field(fl_owner_t, owner)
131
-
__field(unsigned int, flags)
132
-
__field(unsigned char, type)
133
130
__field(unsigned long, break_time)
134
131
__field(unsigned long, downgrade_time)
132
+
__field(dev_t, s_dev)
133
+
__field(unsigned int, flags)
134
+
__field(unsigned char, type)
135
135
),
136
136
137
137
TP_fast_assign(
···
146
146
__entry->downgrade_time = fl ? fl->fl_downgrade_time : 0;
147
147
),
148
148
149
-
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",
149
+
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",
150
150
__entry->fl, MAJOR(__entry->s_dev), MINOR(__entry->s_dev),
151
151
__entry->i_ino, __entry->blocker, __entry->owner,
152
152
show_fl_flags(__entry->flags),
···
175
175
TP_ARGS(inode, fl),
176
176
177
177
TP_STRUCT__entry(
178
-
__field(unsigned long, i_ino)
178
+
__field(u64, i_ino)
179
+
__field(fl_owner_t, owner)
180
+
__field(dev_t, s_dev)
179
181
__field(int, wcount)
180
182
__field(int, rcount)
181
183
__field(int, icount)
182
-
__field(dev_t, s_dev)
183
-
__field(fl_owner_t, owner)
184
184
__field(unsigned int, flags)
185
185
__field(unsigned char, type)
186
186
),
···
196
196
__entry->type = fl->c.flc_type;
197
197
),
198
198
199
-
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",
199
+
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",
200
200
MAJOR(__entry->s_dev), MINOR(__entry->s_dev),
201
201
__entry->i_ino, __entry->wcount, __entry->rcount,
202
202
__entry->icount, __entry->owner,
+10
-10
include/trace/events/filemap.h
+10
-10
include/trace/events/filemap.h
···
20
20
TP_ARGS(folio),
21
21
22
22
TP_STRUCT__entry(
23
+
__field(u64, i_ino)
23
24
__field(unsigned long, pfn)
24
-
__field(unsigned long, i_ino)
25
25
__field(unsigned long, index)
26
26
__field(dev_t, s_dev)
27
27
__field(unsigned char, order)
···
38
38
__entry->order = folio_order(folio);
39
39
),
40
40
41
-
TP_printk("dev %d:%d ino %lx pfn=0x%lx ofs=%lu order=%u",
41
+
TP_printk("dev %d:%d ino %llx pfn=0x%lx ofs=%lu order=%u",
42
42
MAJOR(__entry->s_dev), MINOR(__entry->s_dev),
43
43
__entry->i_ino,
44
44
__entry->pfn,
···
67
67
TP_ARGS(mapping, index, last_index),
68
68
69
69
TP_STRUCT__entry(
70
-
__field(unsigned long, i_ino)
70
+
__field(u64, i_ino)
71
71
__field(dev_t, s_dev)
72
72
__field(unsigned long, index)
73
73
__field(unsigned long, last_index)
···
85
85
),
86
86
87
87
TP_printk(
88
-
"dev=%d:%d ino=%lx ofs=%lld-%lld",
88
+
"dev=%d:%d ino=%llx ofs=%lld-%lld",
89
89
MAJOR(__entry->s_dev),
90
90
MINOR(__entry->s_dev), __entry->i_ino,
91
91
((loff_t)__entry->index) << PAGE_SHIFT,
···
117
117
TP_ARGS(mapping, index),
118
118
119
119
TP_STRUCT__entry(
120
-
__field(unsigned long, i_ino)
120
+
__field(u64, i_ino)
121
121
__field(dev_t, s_dev)
122
122
__field(unsigned long, index)
123
123
),
···
133
133
),
134
134
135
135
TP_printk(
136
-
"dev=%d:%d ino=%lx ofs=%lld",
136
+
"dev=%d:%d ino=%llx ofs=%lld",
137
137
MAJOR(__entry->s_dev),
138
138
MINOR(__entry->s_dev), __entry->i_ino,
139
139
((loff_t)__entry->index) << PAGE_SHIFT
···
146
146
TP_ARGS(mapping, eseq),
147
147
148
148
TP_STRUCT__entry(
149
-
__field(unsigned long, i_ino)
149
+
__field(u64, i_ino)
150
150
__field(dev_t, s_dev)
151
151
__field(errseq_t, errseq)
152
152
),
···
160
160
__entry->s_dev = mapping->host->i_rdev;
161
161
),
162
162
163
-
TP_printk("dev=%d:%d ino=0x%lx errseq=0x%x",
163
+
TP_printk("dev=%d:%d ino=0x%llx errseq=0x%x",
164
164
MAJOR(__entry->s_dev), MINOR(__entry->s_dev),
165
165
__entry->i_ino, __entry->errseq)
166
166
);
···
171
171
TP_ARGS(file, old),
172
172
173
173
TP_STRUCT__entry(
174
+
__field(u64, i_ino)
174
175
__field(struct file *, file)
175
-
__field(unsigned long, i_ino)
176
176
__field(dev_t, s_dev)
177
177
__field(errseq_t, old)
178
178
__field(errseq_t, new)
···
191
191
__entry->new = file->f_wb_err;
192
192
),
193
193
194
-
TP_printk("file=%p dev=%d:%d ino=0x%lx old=0x%x new=0x%x",
194
+
TP_printk("file=%p dev=%d:%d ino=0x%llx old=0x%x new=0x%x",
195
195
__entry->file, MAJOR(__entry->s_dev),
196
196
MINOR(__entry->s_dev), __entry->i_ino, __entry->old,
197
197
__entry->new)
+10
-10
include/trace/events/fs_dax.h
+10
-10
include/trace/events/fs_dax.h
···
12
12
pgoff_t max_pgoff, int result),
13
13
TP_ARGS(inode, vmf, max_pgoff, result),
14
14
TP_STRUCT__entry(
15
-
__field(unsigned long, ino)
15
+
__field(u64, ino)
16
16
__field(unsigned long, vm_start)
17
17
__field(unsigned long, vm_end)
18
18
__field(vm_flags_t, vm_flags)
···
35
35
__entry->max_pgoff = max_pgoff;
36
36
__entry->result = result;
37
37
),
38
-
TP_printk("dev %d:%d ino %#lx %s %s address %#lx vm_start "
38
+
TP_printk("dev %d:%d ino %#llx %s %s address %#lx vm_start "
39
39
"%#lx vm_end %#lx pgoff %#lx max_pgoff %#lx %s",
40
40
MAJOR(__entry->dev),
41
41
MINOR(__entry->dev),
···
66
66
void *radix_entry),
67
67
TP_ARGS(inode, vmf, zero_folio, radix_entry),
68
68
TP_STRUCT__entry(
69
-
__field(unsigned long, ino)
69
+
__field(u64, ino)
70
70
__field(vm_flags_t, vm_flags)
71
71
__field(unsigned long, address)
72
72
__field(struct folio *, zero_folio)
···
81
81
__entry->zero_folio = zero_folio;
82
82
__entry->radix_entry = radix_entry;
83
83
),
84
-
TP_printk("dev %d:%d ino %#lx %s address %#lx zero_folio %p "
84
+
TP_printk("dev %d:%d ino %#llx %s address %#lx zero_folio %p "
85
85
"radix_entry %#lx",
86
86
MAJOR(__entry->dev),
87
87
MINOR(__entry->dev),
···
106
106
TP_PROTO(struct inode *inode, struct vm_fault *vmf, int result),
107
107
TP_ARGS(inode, vmf, result),
108
108
TP_STRUCT__entry(
109
-
__field(unsigned long, ino)
109
+
__field(u64, ino)
110
110
__field(vm_flags_t, vm_flags)
111
111
__field(unsigned long, address)
112
112
__field(pgoff_t, pgoff)
···
123
123
__entry->pgoff = vmf->pgoff;
124
124
__entry->result = result;
125
125
),
126
-
TP_printk("dev %d:%d ino %#lx %s %s address %#lx pgoff %#lx %s",
126
+
TP_printk("dev %d:%d ino %#llx %s %s address %#lx pgoff %#lx %s",
127
127
MAJOR(__entry->dev),
128
128
MINOR(__entry->dev),
129
129
__entry->ino,
···
150
150
TP_PROTO(struct inode *inode, pgoff_t start_index, pgoff_t end_index),
151
151
TP_ARGS(inode, start_index, end_index),
152
152
TP_STRUCT__entry(
153
-
__field(unsigned long, ino)
153
+
__field(u64, ino)
154
154
__field(pgoff_t, start_index)
155
155
__field(pgoff_t, end_index)
156
156
__field(dev_t, dev)
···
161
161
__entry->start_index = start_index;
162
162
__entry->end_index = end_index;
163
163
),
164
-
TP_printk("dev %d:%d ino %#lx pgoff %#lx-%#lx",
164
+
TP_printk("dev %d:%d ino %#llx pgoff %#lx-%#lx",
165
165
MAJOR(__entry->dev),
166
166
MINOR(__entry->dev),
167
167
__entry->ino,
···
182
182
TP_PROTO(struct inode *inode, pgoff_t pgoff, pgoff_t pglen),
183
183
TP_ARGS(inode, pgoff, pglen),
184
184
TP_STRUCT__entry(
185
-
__field(unsigned long, ino)
185
+
__field(u64, ino)
186
186
__field(pgoff_t, pgoff)
187
187
__field(pgoff_t, pglen)
188
188
__field(dev_t, dev)
···
193
193
__entry->pgoff = pgoff;
194
194
__entry->pglen = pglen;
195
195
),
196
-
TP_printk("dev %d:%d ino %#lx pgoff %#lx pglen %#lx",
196
+
TP_printk("dev %d:%d ino %#llx pgoff %#lx pglen %#lx",
197
197
MAJOR(__entry->dev),
198
198
MINOR(__entry->dev),
199
199
__entry->ino,
+15
-15
include/trace/events/fsverity.h
+15
-15
include/trace/events/fsverity.h
···
16
16
const struct merkle_tree_params *params),
17
17
TP_ARGS(inode, params),
18
18
TP_STRUCT__entry(
19
-
__field(ino_t, ino)
19
+
__field(u64, ino)
20
20
__field(u64, data_size)
21
21
__field(u64, tree_size)
22
22
__field(unsigned int, merkle_block)
···
29
29
__entry->merkle_block = params->block_size;
30
30
__entry->num_levels = params->num_levels;
31
31
),
32
-
TP_printk("ino %lu data_size %llu tree_size %llu merkle_block %u levels %u",
33
-
(unsigned long) __entry->ino,
32
+
TP_printk("ino %llu data_size %llu tree_size %llu merkle_block %u levels %u",
33
+
__entry->ino,
34
34
__entry->data_size,
35
35
__entry->tree_size,
36
36
__entry->merkle_block,
···
42
42
const struct merkle_tree_params *params),
43
43
TP_ARGS(inode, vi, params),
44
44
TP_STRUCT__entry(
45
-
__field(ino_t, ino)
45
+
__field(u64, ino)
46
46
__field(u64, data_size)
47
47
__field(u64, tree_size)
48
48
__field(unsigned int, merkle_block)
···
59
59
memcpy(__get_dynamic_array(root_hash), vi->root_hash, __get_dynamic_array_len(root_hash));
60
60
memcpy(__get_dynamic_array(file_digest), vi->file_digest, __get_dynamic_array_len(file_digest));
61
61
),
62
-
TP_printk("ino %lu data_size %llu tree_size %lld merkle_block %u levels %u root_hash %s digest %s",
63
-
(unsigned long) __entry->ino,
62
+
TP_printk("ino %llu data_size %llu tree_size %lld merkle_block %u levels %u root_hash %s digest %s",
63
+
__entry->ino,
64
64
__entry->data_size,
65
65
__entry->tree_size,
66
66
__entry->merkle_block,
···
75
75
u64 data_pos),
76
76
TP_ARGS(inode, params, data_pos),
77
77
TP_STRUCT__entry(
78
-
__field(ino_t, ino)
78
+
__field(u64, ino)
79
79
__field(u64, data_pos)
80
80
__field(unsigned int, merkle_block)
81
81
),
···
84
84
__entry->data_pos = data_pos;
85
85
__entry->merkle_block = params->block_size;
86
86
),
87
-
TP_printk("ino %lu data_pos %llu merkle_block %u",
88
-
(unsigned long) __entry->ino,
87
+
TP_printk("ino %llu data_pos %llu merkle_block %u",
88
+
__entry->ino,
89
89
__entry->data_pos,
90
90
__entry->merkle_block)
91
91
);
···
96
96
unsigned int hidx),
97
97
TP_ARGS(inode, data_pos, hblock_idx, level, hidx),
98
98
TP_STRUCT__entry(
99
-
__field(ino_t, ino)
99
+
__field(u64, ino)
100
100
__field(u64, data_pos)
101
101
__field(unsigned long, hblock_idx)
102
102
__field(unsigned int, level)
···
109
109
__entry->level = level;
110
110
__entry->hidx = hidx;
111
111
),
112
-
TP_printk("ino %lu data_pos %llu hblock_idx %lu level %u hidx %u",
113
-
(unsigned long) __entry->ino,
112
+
TP_printk("ino %llu data_pos %llu hblock_idx %lu level %u hidx %u",
113
+
__entry->ino,
114
114
__entry->data_pos,
115
115
__entry->hblock_idx,
116
116
__entry->level,
···
122
122
unsigned int level, unsigned int hidx),
123
123
TP_ARGS(inode, hblock_idx, level, hidx),
124
124
TP_STRUCT__entry(
125
-
__field(ino_t, ino)
125
+
__field(u64, ino)
126
126
__field(unsigned long, hblock_idx)
127
127
__field(unsigned int, level)
128
128
__field(unsigned int, hidx)
···
133
133
__entry->level = level;
134
134
__entry->hidx = hidx;
135
135
),
136
-
TP_printk("ino %lu hblock_idx %lu level %u hidx %u",
137
-
(unsigned long) __entry->ino,
136
+
TP_printk("ino %llu hblock_idx %lu level %u hidx %u",
137
+
__entry->ino,
138
138
__entry->hblock_idx,
139
139
__entry->level,
140
140
__entry->hidx)
+4
-4
include/trace/events/netfs.h
+4
-4
include/trace/events/netfs.h
···
298
298
__field(loff_t, start)
299
299
__field(size_t, len)
300
300
__field(enum netfs_read_trace, what)
301
-
__field(unsigned int, netfs_inode)
301
+
__field(u64, netfs_inode)
302
302
),
303
303
304
304
TP_fast_assign(
···
311
311
__entry->netfs_inode = rreq->inode->i_ino;
312
312
),
313
313
314
-
TP_printk("R=%08x %s c=%08x ni=%x s=%llx l=%zx sz=%llx",
314
+
TP_printk("R=%08x %s c=%08x ni=%llx s=%llx l=%zx sz=%llx",
315
315
__entry->rreq,
316
316
__print_symbolic(__entry->what, netfs_read_traces),
317
317
__entry->cookie,
···
484
484
TP_ARGS(folio, why),
485
485
486
486
TP_STRUCT__entry(
487
-
__field(ino_t, ino)
487
+
__field(u64, ino)
488
488
__field(pgoff_t, index)
489
489
__field(unsigned int, nr)
490
490
__field(enum netfs_folio_trace, why)
···
498
498
__entry->nr = folio_nr_pages(folio);
499
499
),
500
500
501
-
TP_printk("i=%05lx ix=%05lx-%05lx %s",
501
+
TP_printk("i=%05llx ix=%05lx-%05lx %s",
502
502
__entry->ino, __entry->index, __entry->index + __entry->nr - 1,
503
503
__print_symbolic(__entry->why, netfs_folio_traces))
504
504
);
+9
-9
include/trace/events/readahead.h
+9
-9
include/trace/events/readahead.h
···
18
18
TP_ARGS(inode, index, nr_to_read, lookahead_size),
19
19
20
20
TP_STRUCT__entry(
21
-
__field(unsigned long, i_ino)
21
+
__field(u64, i_ino)
22
22
__field(dev_t, s_dev)
23
23
__field(pgoff_t, index)
24
24
__field(unsigned long, nr_to_read)
···
34
34
),
35
35
36
36
TP_printk(
37
-
"dev=%d:%d ino=%lx index=%lu nr_to_read=%lu lookahead_size=%lu",
37
+
"dev=%d:%d ino=%llx index=%lu nr_to_read=%lu lookahead_size=%lu",
38
38
MAJOR(__entry->s_dev), MINOR(__entry->s_dev), __entry->i_ino,
39
39
__entry->index, __entry->nr_to_read, __entry->lookahead_size
40
40
)
···
46
46
TP_ARGS(inode, index, ra),
47
47
48
48
TP_STRUCT__entry(
49
-
__field(unsigned long, i_ino)
49
+
__field(u64, i_ino)
50
50
__field(dev_t, s_dev)
51
51
__field(pgoff_t, index)
52
52
__field(unsigned int, order)
···
66
66
),
67
67
68
68
TP_printk(
69
-
"dev=%d:%d ino=%lx index=%lu order=%u size=%u async_size=%u ra_pages=%u",
69
+
"dev=%d:%d ino=%llx index=%lu order=%u size=%u async_size=%u ra_pages=%u",
70
70
MAJOR(__entry->s_dev), MINOR(__entry->s_dev), __entry->i_ino,
71
71
__entry->index, __entry->order, __entry->size,
72
72
__entry->async_size, __entry->ra_pages
···
80
80
TP_ARGS(inode, index, ra, req_count),
81
81
82
82
TP_STRUCT__entry(
83
-
__field(unsigned long, i_ino)
84
-
__field(dev_t, s_dev)
83
+
__field(u64, i_ino)
84
+
__field(loff_t, prev_pos)
85
85
__field(pgoff_t, index)
86
+
__field(unsigned long, req_count)
87
+
__field(dev_t, s_dev)
86
88
__field(unsigned int, order)
87
89
__field(unsigned int, size)
88
90
__field(unsigned int, async_size)
89
91
__field(unsigned int, ra_pages)
90
92
__field(unsigned int, mmap_miss)
91
-
__field(loff_t, prev_pos)
92
-
__field(unsigned long, req_count)
93
93
),
94
94
95
95
TP_fast_assign(
···
106
106
),
107
107
108
108
TP_printk(
109
-
"dev=%d:%d ino=%lx index=%lu req_count=%lu order=%u size=%u async_size=%u ra_pages=%u mmap_miss=%u prev_pos=%lld",
109
+
"dev=%d:%d ino=%llx index=%lu req_count=%lu order=%u size=%u async_size=%u ra_pages=%u mmap_miss=%u prev_pos=%lld",
110
110
MAJOR(__entry->s_dev), MINOR(__entry->s_dev), __entry->i_ino,
111
111
__entry->index, __entry->req_count, __entry->order,
112
112
__entry->size, __entry->async_size, __entry->ra_pages,
+8
-8
include/trace/events/timestamp.h
+8
-8
include/trace/events/timestamp.h
···
18
18
TP_ARGS(inode, ctime),
19
19
20
20
TP_STRUCT__entry(
21
-
__field(dev_t, dev)
22
-
__field(ino_t, ino)
21
+
__field(u64, ino)
23
22
__field(time64_t, ctime_s)
23
+
__field(dev_t, dev)
24
24
__field(u32, ctime_ns)
25
25
__field(u32, gen)
26
26
),
···
33
33
__entry->ctime_ns = ctime->tv_nsec;
34
34
),
35
35
36
-
TP_printk("ino=%d:%d:%ld:%u ctime=%lld.%u",
36
+
TP_printk("ino=%d:%d:%llu:%u ctime=%lld.%u",
37
37
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->ino, __entry->gen,
38
38
__entry->ctime_s, __entry->ctime_ns
39
39
)
···
58
58
TP_ARGS(inode, old, new, cur),
59
59
60
60
TP_STRUCT__entry(
61
+
__field(u64, ino)
61
62
__field(dev_t, dev)
62
-
__field(ino_t, ino)
63
63
__field(u32, gen)
64
64
__field(u32, old)
65
65
__field(u32, new)
···
75
75
__entry->cur = cur;
76
76
),
77
77
78
-
TP_printk("ino=%d:%d:%ld:%u old=%u:%s new=%u cur=%u:%s",
78
+
TP_printk("ino=%d:%d:%llu:%u old=%u:%s new=%u cur=%u:%s",
79
79
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->ino, __entry->gen,
80
80
__entry->old & ~I_CTIME_QUERIED,
81
81
__print_flags(__entry->old & I_CTIME_QUERIED, "|", CTIME_QUERIED_FLAGS),
···
93
93
TP_ARGS(inode, ctime, mtime),
94
94
95
95
TP_STRUCT__entry(
96
-
__field(dev_t, dev)
97
-
__field(ino_t, ino)
96
+
__field(u64, ino)
98
97
__field(time64_t, ctime_s)
99
98
__field(time64_t, mtime_s)
99
+
__field(dev_t, dev)
100
100
__field(u32, ctime_ns)
101
101
__field(u32, mtime_ns)
102
102
__field(u32, gen)
···
112
112
__entry->mtime_ns = mtime->tv_nsec;
113
113
),
114
114
115
-
TP_printk("ino=%d:%d:%ld:%u ctime=%lld.%u mtime=%lld.%u",
115
+
TP_printk("ino=%d:%d:%llu:%u ctime=%lld.%u mtime=%lld.%u",
116
116
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->ino, __entry->gen,
117
117
__entry->ctime_s, __entry->ctime_ns,
118
118
__entry->mtime_s, __entry->mtime_ns
+81
-81
include/trace/events/writeback.h
+81
-81
include/trace/events/writeback.h
···
67
67
68
68
TP_STRUCT__entry (
69
69
__array(char, name, 32)
70
-
__field(ino_t, ino)
70
+
__field(u64, ino)
71
71
__field(pgoff_t, index)
72
72
),
73
73
···
79
79
__entry->index = folio->index;
80
80
),
81
81
82
-
TP_printk("bdi %s: ino=%lu index=%lu",
82
+
TP_printk("bdi %s: ino=%llu index=%lu",
83
83
__entry->name,
84
-
(unsigned long)__entry->ino,
84
+
__entry->ino,
85
85
__entry->index
86
86
)
87
87
);
···
108
108
109
109
TP_STRUCT__entry (
110
110
__array(char, name, 32)
111
-
__field(ino_t, ino)
111
+
__field(u64, ino)
112
112
__field(unsigned long, state)
113
113
__field(unsigned long, flags)
114
114
),
···
123
123
__entry->flags = flags;
124
124
),
125
125
126
-
TP_printk("bdi %s: ino=%lu state=%s flags=%s",
126
+
TP_printk("bdi %s: ino=%llu state=%s flags=%s",
127
127
__entry->name,
128
-
(unsigned long)__entry->ino,
128
+
__entry->ino,
129
129
show_inode_state(__entry->state),
130
130
show_inode_state(__entry->flags)
131
131
)
···
155
155
#ifdef CREATE_TRACE_POINTS
156
156
#ifdef CONFIG_CGROUP_WRITEBACK
157
157
158
-
static inline ino_t __trace_wb_assign_cgroup(struct bdi_writeback *wb)
158
+
static inline u64 __trace_wb_assign_cgroup(struct bdi_writeback *wb)
159
159
{
160
160
return cgroup_ino(wb->memcg_css->cgroup);
161
161
}
162
162
163
-
static inline ino_t __trace_wbc_assign_cgroup(struct writeback_control *wbc)
163
+
static inline u64 __trace_wbc_assign_cgroup(struct writeback_control *wbc)
164
164
{
165
165
if (wbc->wb)
166
166
return __trace_wb_assign_cgroup(wbc->wb);
···
169
169
}
170
170
#else /* CONFIG_CGROUP_WRITEBACK */
171
171
172
-
static inline ino_t __trace_wb_assign_cgroup(struct bdi_writeback *wb)
172
+
static inline u64 __trace_wb_assign_cgroup(struct bdi_writeback *wb)
173
173
{
174
174
return 1;
175
175
}
176
176
177
-
static inline ino_t __trace_wbc_assign_cgroup(struct writeback_control *wbc)
177
+
static inline u64 __trace_wbc_assign_cgroup(struct writeback_control *wbc)
178
178
{
179
179
return 1;
180
180
}
···
192
192
193
193
TP_STRUCT__entry(
194
194
__array(char, name, 32)
195
-
__field(ino_t, ino)
196
-
__field(ino_t, cgroup_ino)
195
+
__field(u64, ino)
196
+
__field(u64, cgroup_ino)
197
197
__field(unsigned int, history)
198
198
),
199
199
···
204
204
__entry->history = history;
205
205
),
206
206
207
-
TP_printk("bdi %s: ino=%lu cgroup_ino=%lu history=0x%x",
207
+
TP_printk("bdi %s: ino=%llu cgroup_ino=%llu history=0x%x",
208
208
__entry->name,
209
-
(unsigned long)__entry->ino,
210
-
(unsigned long)__entry->cgroup_ino,
209
+
__entry->ino,
210
+
__entry->cgroup_ino,
211
211
__entry->history
212
212
)
213
213
);
···
221
221
222
222
TP_STRUCT__entry(
223
223
__array(char, name, 32)
224
-
__field(ino_t, old_cgroup_ino)
225
-
__field(ino_t, new_cgroup_ino)
224
+
__field(u64, old_cgroup_ino)
225
+
__field(u64, new_cgroup_ino)
226
226
__field(unsigned int, count)
227
227
),
228
228
···
233
233
__entry->count = count;
234
234
),
235
235
236
-
TP_printk("bdi %s: old_cgroup_ino=%lu new_cgroup_ino=%lu count=%u",
236
+
TP_printk("bdi %s: old_cgroup_ino=%llu new_cgroup_ino=%llu count=%u",
237
237
__entry->name,
238
-
(unsigned long)__entry->old_cgroup_ino,
239
-
(unsigned long)__entry->new_cgroup_ino,
238
+
__entry->old_cgroup_ino,
239
+
__entry->new_cgroup_ino,
240
240
__entry->count
241
241
)
242
242
);
···
250
250
251
251
TP_STRUCT__entry(
252
252
__array(char, name, 32)
253
-
__field(ino_t, ino)
254
-
__field(ino_t, old_cgroup_ino)
255
-
__field(ino_t, new_cgroup_ino)
253
+
__field(u64, ino)
254
+
__field(u64, old_cgroup_ino)
255
+
__field(u64, new_cgroup_ino)
256
256
),
257
257
258
258
TP_fast_assign(
···
262
262
__entry->new_cgroup_ino = __trace_wb_assign_cgroup(new_wb);
263
263
),
264
264
265
-
TP_printk("bdi %s: ino=%lu old_cgroup_ino=%lu new_cgroup_ino=%lu",
265
+
TP_printk("bdi %s: ino=%llu old_cgroup_ino=%llu new_cgroup_ino=%llu",
266
266
__entry->name,
267
-
(unsigned long)__entry->ino,
268
-
(unsigned long)__entry->old_cgroup_ino,
269
-
(unsigned long)__entry->new_cgroup_ino
267
+
__entry->ino,
268
+
__entry->old_cgroup_ino,
269
+
__entry->new_cgroup_ino
270
270
)
271
271
);
272
272
···
279
279
TP_STRUCT__entry(
280
280
__array(char, name, 32)
281
281
__field(u64, bdi_id)
282
-
__field(ino_t, ino)
282
+
__field(u64, ino)
283
+
__field(u64, cgroup_ino)
284
+
__field(u64, page_cgroup_ino)
283
285
__field(unsigned int, memcg_id)
284
-
__field(ino_t, cgroup_ino)
285
-
__field(ino_t, page_cgroup_ino)
286
286
),
287
287
288
288
TP_fast_assign(
···
297
297
__entry->page_cgroup_ino = cgroup_ino(folio_memcg(folio)->css.cgroup);
298
298
),
299
299
300
-
TP_printk("bdi %s[%llu]: ino=%lu memcg_id=%u cgroup_ino=%lu page_cgroup_ino=%lu",
300
+
TP_printk("bdi %s[%llu]: ino=%llu memcg_id=%u cgroup_ino=%llu page_cgroup_ino=%llu",
301
301
__entry->name,
302
302
__entry->bdi_id,
303
-
(unsigned long)__entry->ino,
303
+
__entry->ino,
304
304
__entry->memcg_id,
305
-
(unsigned long)__entry->cgroup_ino,
306
-
(unsigned long)__entry->page_cgroup_ino
305
+
__entry->cgroup_ino,
306
+
__entry->page_cgroup_ino
307
307
)
308
308
);
309
309
···
316
316
317
317
TP_STRUCT__entry(
318
318
__array(char, name, 32)
319
-
__field(ino_t, cgroup_ino)
319
+
__field(u64, cgroup_ino)
320
320
__field(unsigned int, frn_bdi_id)
321
321
__field(unsigned int, frn_memcg_id)
322
322
),
···
328
328
__entry->frn_memcg_id = frn_memcg_id;
329
329
),
330
330
331
-
TP_printk("bdi %s: cgroup_ino=%lu frn_bdi_id=%u frn_memcg_id=%u",
331
+
TP_printk("bdi %s: cgroup_ino=%llu frn_bdi_id=%u frn_memcg_id=%u",
332
332
__entry->name,
333
-
(unsigned long)__entry->cgroup_ino,
333
+
__entry->cgroup_ino,
334
334
__entry->frn_bdi_id,
335
335
__entry->frn_memcg_id
336
336
)
···
345
345
346
346
TP_STRUCT__entry (
347
347
__array(char, name, 32)
348
-
__field(ino_t, ino)
348
+
__field(u64, ino)
349
+
__field(u64, cgroup_ino)
349
350
__field(int, sync_mode)
350
-
__field(ino_t, cgroup_ino)
351
351
),
352
352
353
353
TP_fast_assign(
···
358
358
__entry->cgroup_ino = __trace_wbc_assign_cgroup(wbc);
359
359
),
360
360
361
-
TP_printk("bdi %s: ino=%lu sync_mode=%d cgroup_ino=%lu",
361
+
TP_printk("bdi %s: ino=%llu sync_mode=%d cgroup_ino=%llu",
362
362
__entry->name,
363
-
(unsigned long)__entry->ino,
363
+
__entry->ino,
364
364
__entry->sync_mode,
365
-
(unsigned long)__entry->cgroup_ino
365
+
__entry->cgroup_ino
366
366
)
367
367
);
368
368
···
385
385
TP_ARGS(wb, work),
386
386
TP_STRUCT__entry(
387
387
__array(char, name, 32)
388
+
__field(u64, cgroup_ino)
388
389
__field(long, nr_pages)
389
390
__field(dev_t, sb_dev)
390
391
__field(int, sync_mode)
···
393
392
__field(int, range_cyclic)
394
393
__field(int, for_background)
395
394
__field(int, reason)
396
-
__field(ino_t, cgroup_ino)
397
395
),
398
396
TP_fast_assign(
399
397
strscpy_pad(__entry->name, bdi_dev_name(wb->bdi), 32);
···
406
406
__entry->cgroup_ino = __trace_wb_assign_cgroup(wb);
407
407
),
408
408
TP_printk("bdi %s: sb_dev %d:%d nr_pages=%ld sync_mode=%d "
409
-
"kupdate=%d range_cyclic=%d background=%d reason=%s cgroup_ino=%lu",
409
+
"kupdate=%d range_cyclic=%d background=%d reason=%s cgroup_ino=%llu",
410
410
__entry->name,
411
411
MAJOR(__entry->sb_dev), MINOR(__entry->sb_dev),
412
412
__entry->nr_pages,
···
415
415
__entry->range_cyclic,
416
416
__entry->for_background,
417
417
__print_symbolic(__entry->reason, WB_WORK_REASON),
418
-
(unsigned long)__entry->cgroup_ino
418
+
__entry->cgroup_ino
419
419
)
420
420
);
421
421
#define DEFINE_WRITEBACK_WORK_EVENT(name) \
···
445
445
TP_ARGS(wb),
446
446
TP_STRUCT__entry(
447
447
__array(char, name, 32)
448
-
__field(ino_t, cgroup_ino)
448
+
__field(u64, cgroup_ino)
449
449
),
450
450
TP_fast_assign(
451
451
strscpy_pad(__entry->name, bdi_dev_name(wb->bdi), 32);
452
452
__entry->cgroup_ino = __trace_wb_assign_cgroup(wb);
453
453
),
454
-
TP_printk("bdi %s: cgroup_ino=%lu",
454
+
TP_printk("bdi %s: cgroup_ino=%llu",
455
455
__entry->name,
456
-
(unsigned long)__entry->cgroup_ino
456
+
__entry->cgroup_ino
457
457
)
458
458
);
459
459
#define DEFINE_WRITEBACK_EVENT(name) \
···
482
482
TP_ARGS(wbc, bdi),
483
483
TP_STRUCT__entry(
484
484
__array(char, name, 32)
485
+
__field(u64, cgroup_ino)
485
486
__field(long, nr_to_write)
486
487
__field(long, pages_skipped)
488
+
__field(long, range_start)
489
+
__field(long, range_end)
487
490
__field(int, sync_mode)
488
491
__field(int, for_kupdate)
489
492
__field(int, for_background)
490
493
__field(int, range_cyclic)
491
-
__field(long, range_start)
492
-
__field(long, range_end)
493
-
__field(ino_t, cgroup_ino)
494
494
),
495
495
496
496
TP_fast_assign(
···
507
507
),
508
508
509
509
TP_printk("bdi %s: towrt=%ld skip=%ld mode=%d kupd=%d bgrd=%d "
510
-
"cyclic=%d start=0x%lx end=0x%lx cgroup_ino=%lu",
510
+
"cyclic=%d start=0x%lx end=0x%lx cgroup_ino=%llu",
511
511
__entry->name,
512
512
__entry->nr_to_write,
513
513
__entry->pages_skipped,
···
517
517
__entry->range_cyclic,
518
518
__entry->range_start,
519
519
__entry->range_end,
520
-
(unsigned long)__entry->cgroup_ino
520
+
__entry->cgroup_ino
521
521
)
522
522
)
523
523
···
535
535
TP_ARGS(wb, work, dirtied_before, moved),
536
536
TP_STRUCT__entry(
537
537
__array(char, name, 32)
538
+
__field(u64, cgroup_ino)
538
539
__field(unsigned long, older)
539
540
__field(long, age)
540
541
__field(int, moved)
541
542
__field(int, reason)
542
-
__field(ino_t, cgroup_ino)
543
543
),
544
544
TP_fast_assign(
545
545
strscpy_pad(__entry->name, bdi_dev_name(wb->bdi), 32);
···
549
549
__entry->reason = work->reason;
550
550
__entry->cgroup_ino = __trace_wb_assign_cgroup(wb);
551
551
),
552
-
TP_printk("bdi %s: older=%lu age=%ld enqueue=%d reason=%s cgroup_ino=%lu",
552
+
TP_printk("bdi %s: older=%lu age=%ld enqueue=%d reason=%s cgroup_ino=%llu",
553
553
__entry->name,
554
554
__entry->older, /* dirtied_before in jiffies */
555
555
__entry->age, /* dirtied_before in relative milliseconds */
556
556
__entry->moved,
557
557
__print_symbolic(__entry->reason, WB_WORK_REASON),
558
-
(unsigned long)__entry->cgroup_ino
558
+
__entry->cgroup_ino
559
559
)
560
560
);
561
561
···
614
614
615
615
TP_STRUCT__entry(
616
616
__array(char, bdi, 32)
617
+
__field(u64, cgroup_ino)
617
618
__field(unsigned long, write_bw)
618
619
__field(unsigned long, avg_write_bw)
619
620
__field(unsigned long, dirty_rate)
620
621
__field(unsigned long, dirty_ratelimit)
621
622
__field(unsigned long, task_ratelimit)
622
623
__field(unsigned long, balanced_dirty_ratelimit)
623
-
__field(ino_t, cgroup_ino)
624
624
),
625
625
626
626
TP_fast_assign(
···
638
638
TP_printk("bdi %s: "
639
639
"write_bw=%lu awrite_bw=%lu dirty_rate=%lu "
640
640
"dirty_ratelimit=%lu task_ratelimit=%lu "
641
-
"balanced_dirty_ratelimit=%lu cgroup_ino=%lu",
641
+
"balanced_dirty_ratelimit=%lu cgroup_ino=%llu",
642
642
__entry->bdi,
643
643
__entry->write_bw, /* write bandwidth */
644
644
__entry->avg_write_bw, /* avg write bandwidth */
···
646
646
__entry->dirty_ratelimit, /* base ratelimit */
647
647
__entry->task_ratelimit, /* ratelimit with position control */
648
648
__entry->balanced_dirty_ratelimit, /* the balanced ratelimit */
649
-
(unsigned long)__entry->cgroup_ino
649
+
__entry->cgroup_ino
650
650
)
651
651
);
652
652
···
667
667
668
668
TP_STRUCT__entry(
669
669
__array( char, bdi, 32)
670
+
__field(u64, cgroup_ino)
670
671
__field(unsigned long, limit)
671
672
__field(unsigned long, setpoint)
672
673
__field(unsigned long, dirty)
···
675
674
__field(unsigned long, wb_dirty)
676
675
__field(unsigned long, dirty_ratelimit)
677
676
__field(unsigned long, task_ratelimit)
678
-
__field(unsigned int, dirtied)
679
-
__field(unsigned int, dirtied_pause)
680
677
__field(unsigned long, paused)
681
678
__field( long, pause)
682
679
__field(unsigned long, period)
683
680
__field( long, think)
684
-
__field(ino_t, cgroup_ino)
681
+
__field(unsigned int, dirtied)
682
+
__field(unsigned int, dirtied_pause)
685
683
),
686
684
687
685
TP_fast_assign(
···
711
711
"wb_setpoint=%lu wb_dirty=%lu "
712
712
"dirty_ratelimit=%lu task_ratelimit=%lu "
713
713
"dirtied=%u dirtied_pause=%u "
714
-
"paused=%lu pause=%ld period=%lu think=%ld cgroup_ino=%lu",
714
+
"paused=%lu pause=%ld period=%lu think=%ld cgroup_ino=%llu",
715
715
__entry->bdi,
716
716
__entry->limit,
717
717
__entry->setpoint,
···
726
726
__entry->pause, /* ms */
727
727
__entry->period, /* ms */
728
728
__entry->think, /* ms */
729
-
(unsigned long)__entry->cgroup_ino
729
+
__entry->cgroup_ino
730
730
)
731
731
);
732
732
···
737
737
738
738
TP_STRUCT__entry(
739
739
__array(char, name, 32)
740
-
__field(ino_t, ino)
740
+
__field(u64, ino)
741
+
__field(u64, cgroup_ino)
741
742
__field(unsigned long, state)
742
743
__field(unsigned long, dirtied_when)
743
-
__field(ino_t, cgroup_ino)
744
744
),
745
745
746
746
TP_fast_assign(
···
752
752
__entry->cgroup_ino = __trace_wb_assign_cgroup(inode_to_wb(inode));
753
753
),
754
754
755
-
TP_printk("bdi %s: ino=%lu state=%s dirtied_when=%lu age=%lu cgroup_ino=%lu",
755
+
TP_printk("bdi %s: ino=%llu state=%s dirtied_when=%lu age=%lu cgroup_ino=%llu",
756
756
__entry->name,
757
-
(unsigned long)__entry->ino,
757
+
__entry->ino,
758
758
show_inode_state(__entry->state),
759
759
__entry->dirtied_when,
760
760
(jiffies - __entry->dirtied_when) / HZ,
761
-
(unsigned long)__entry->cgroup_ino
761
+
__entry->cgroup_ino
762
762
)
763
763
);
764
764
···
773
773
774
774
TP_STRUCT__entry(
775
775
__array(char, name, 32)
776
-
__field(ino_t, ino)
776
+
__field(u64, ino)
777
+
__field(u64, cgroup_ino)
777
778
__field(unsigned long, state)
778
779
__field(unsigned long, dirtied_when)
779
780
__field(unsigned long, writeback_index)
780
-
__field(long, nr_to_write)
781
781
__field(unsigned long, wrote)
782
-
__field(ino_t, cgroup_ino)
782
+
__field(long, nr_to_write)
783
783
),
784
784
785
785
TP_fast_assign(
···
794
794
__entry->cgroup_ino = __trace_wbc_assign_cgroup(wbc);
795
795
),
796
796
797
-
TP_printk("bdi %s: ino=%lu state=%s dirtied_when=%lu age=%lu "
798
-
"index=%lu to_write=%ld wrote=%lu cgroup_ino=%lu",
797
+
TP_printk("bdi %s: ino=%llu state=%s dirtied_when=%lu age=%lu "
798
+
"index=%lu to_write=%ld wrote=%lu cgroup_ino=%llu",
799
799
__entry->name,
800
-
(unsigned long)__entry->ino,
800
+
__entry->ino,
801
801
show_inode_state(__entry->state),
802
802
__entry->dirtied_when,
803
803
(jiffies - __entry->dirtied_when) / HZ,
804
804
__entry->writeback_index,
805
805
__entry->nr_to_write,
806
806
__entry->wrote,
807
-
(unsigned long)__entry->cgroup_ino
807
+
__entry->cgroup_ino
808
808
)
809
809
);
810
810
···
828
828
TP_ARGS(inode),
829
829
830
830
TP_STRUCT__entry(
831
-
__field( dev_t, dev )
832
-
__field( ino_t, ino )
831
+
__field( u64, ino )
833
832
__field(unsigned long, state )
834
-
__field( __u16, mode )
835
833
__field(unsigned long, dirtied_when )
834
+
__field( dev_t, dev )
835
+
__field( __u16, mode )
836
836
),
837
837
838
838
TP_fast_assign(
···
843
843
__entry->dirtied_when = inode->dirtied_when;
844
844
),
845
845
846
-
TP_printk("dev %d,%d ino %lu dirtied %lu state %s mode 0%o",
846
+
TP_printk("dev %d,%d ino %llu dirtied %lu state %s mode 0%o",
847
847
MAJOR(__entry->dev), MINOR(__entry->dev),
848
-
(unsigned long)__entry->ino, __entry->dirtied_when,
848
+
__entry->ino, __entry->dirtied_when,
849
849
show_inode_state(__entry->state), __entry->mode)
850
850
);
851
851