hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2
kernel/include/trace/events/timer.h
....@@ -73,7 +73,7 @@
7373 __entry->flags = flags;
7474 ),
7575
76
- TP_printk("timer=%p function=%pf expires=%lu [timeout=%ld] cpu=%u idx=%u flags=%s",
76
+ TP_printk("timer=%p function=%ps expires=%lu [timeout=%ld] cpu=%u idx=%u flags=%s",
7777 __entry->timer, __entry->function, __entry->expires,
7878 (long)__entry->expires - __entry->now,
7979 __entry->flags & TIMER_CPUMASK,
....@@ -89,23 +89,27 @@
8989 */
9090 TRACE_EVENT(timer_expire_entry,
9191
92
- TP_PROTO(struct timer_list *timer),
92
+ TP_PROTO(struct timer_list *timer, unsigned long baseclk),
9393
94
- TP_ARGS(timer),
94
+ TP_ARGS(timer, baseclk),
9595
9696 TP_STRUCT__entry(
9797 __field( void *, timer )
9898 __field( unsigned long, now )
9999 __field( void *, function)
100
+ __field( unsigned long, baseclk )
100101 ),
101102
102103 TP_fast_assign(
103104 __entry->timer = timer;
104105 __entry->now = jiffies;
105106 __entry->function = timer->function;
107
+ __entry->baseclk = baseclk;
106108 ),
107109
108
- TP_printk("timer=%p function=%pf now=%lu", __entry->timer, __entry->function,__entry->now)
110
+ TP_printk("timer=%p function=%ps now=%lu baseclk=%lu",
111
+ __entry->timer, __entry->function, __entry->now,
112
+ __entry->baseclk)
109113 );
110114
111115 /**
....@@ -152,7 +156,11 @@
152156 { HRTIMER_MODE_ABS_SOFT, "ABS|SOFT" }, \
153157 { HRTIMER_MODE_REL_SOFT, "REL|SOFT" }, \
154158 { HRTIMER_MODE_ABS_PINNED_SOFT, "ABS|PINNED|SOFT" }, \
155
- { HRTIMER_MODE_REL_PINNED_SOFT, "REL|PINNED|SOFT" })
159
+ { HRTIMER_MODE_REL_PINNED_SOFT, "REL|PINNED|SOFT" }, \
160
+ { HRTIMER_MODE_ABS_HARD, "ABS|HARD" }, \
161
+ { HRTIMER_MODE_REL_HARD, "REL|HARD" }, \
162
+ { HRTIMER_MODE_ABS_PINNED_HARD, "ABS|PINNED|HARD" }, \
163
+ { HRTIMER_MODE_REL_PINNED_HARD, "REL|PINNED|HARD" })
156164
157165 /**
158166 * hrtimer_init - called when the hrtimer is initialized
....@@ -210,7 +218,7 @@
210218 __entry->mode = mode;
211219 ),
212220
213
- TP_printk("hrtimer=%p function=%pf expires=%llu softexpires=%llu "
221
+ TP_printk("hrtimer=%p function=%ps expires=%llu softexpires=%llu "
214222 "mode=%s", __entry->hrtimer, __entry->function,
215223 (unsigned long long) __entry->expires,
216224 (unsigned long long) __entry->softexpires,
....@@ -243,7 +251,8 @@
243251 __entry->function = hrtimer->function;
244252 ),
245253
246
- TP_printk("hrtimer=%p function=%pf now=%llu", __entry->hrtimer, __entry->function,
254
+ TP_printk("hrtimer=%p function=%ps now=%llu",
255
+ __entry->hrtimer, __entry->function,
247256 (unsigned long long) __entry->now)
248257 );
249258
....@@ -298,7 +307,7 @@
298307 */
299308 TRACE_EVENT(itimer_state,
300309
301
- TP_PROTO(int which, const struct itimerval *const value,
310
+ TP_PROTO(int which, const struct itimerspec64 *const value,
302311 unsigned long long expires),
303312
304313 TP_ARGS(which, value, expires),
....@@ -307,24 +316,24 @@
307316 __field( int, which )
308317 __field( unsigned long long, expires )
309318 __field( long, value_sec )
310
- __field( long, value_usec )
319
+ __field( long, value_nsec )
311320 __field( long, interval_sec )
312
- __field( long, interval_usec )
321
+ __field( long, interval_nsec )
313322 ),
314323
315324 TP_fast_assign(
316325 __entry->which = which;
317326 __entry->expires = expires;
318327 __entry->value_sec = value->it_value.tv_sec;
319
- __entry->value_usec = value->it_value.tv_usec;
328
+ __entry->value_nsec = value->it_value.tv_nsec;
320329 __entry->interval_sec = value->it_interval.tv_sec;
321
- __entry->interval_usec = value->it_interval.tv_usec;
330
+ __entry->interval_nsec = value->it_interval.tv_nsec;
322331 ),
323332
324
- TP_printk("which=%d expires=%llu it_value=%ld.%ld it_interval=%ld.%ld",
333
+ TP_printk("which=%d expires=%llu it_value=%ld.%06ld it_interval=%ld.%06ld",
325334 __entry->which, __entry->expires,
326
- __entry->value_sec, __entry->value_usec,
327
- __entry->interval_sec, __entry->interval_usec)
335
+ __entry->value_sec, __entry->value_nsec / NSEC_PER_USEC,
336
+ __entry->interval_sec, __entry->interval_nsec / NSEC_PER_USEC)
328337 );
329338
330339 /**
....@@ -362,7 +371,9 @@
362371 tick_dep_name(POSIX_TIMER) \
363372 tick_dep_name(PERF_EVENTS) \
364373 tick_dep_name(SCHED) \
365
- tick_dep_name_end(CLOCK_UNSTABLE)
374
+ tick_dep_name(CLOCK_UNSTABLE) \
375
+ tick_dep_name(RCU) \
376
+ tick_dep_name_end(RCU_EXP)
366377
367378 #undef tick_dep_name
368379 #undef tick_dep_mask_name