Fix: timer_start changed in linux 6.8.0-rc1

[lttng-modules.git] / include / instrumentation / events / timer.h

diff --git a/include/instrumentation/events/timer.h b/include/instrumentation/events/timer.h
index 91a2cd936b3f1a0c3b0b384abbb75815dc9e8bdf..193650bb3780d5755fd7d8878afba027ec9ef81a 100644 (file)
--- a/include/instrumentation/events/timer.h
+++ b/include/instrumentation/events/timer.h
@@ -17,6 +17,38 @@ struct timer_list;
 
 #endif /* _TRACE_TIMER_DEF_ */
 
+LTTNG_TRACEPOINT_ENUM(hrtimer_mode,
+       TP_ENUM_VALUES(
+               ctf_enum_value("HRTIMER_MODE_ABS", HRTIMER_MODE_ABS)
+               ctf_enum_value("HRTIMER_MODE_REL", HRTIMER_MODE_REL)
+               ctf_enum_value("HRTIMER_MODE_PINNED", HRTIMER_MODE_PINNED)
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,16,0))
+               ctf_enum_value("HRTIMER_MODE_SOFT", HRTIMER_MODE_SOFT)
+#endif
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,4,0))
+               ctf_enum_value("HRTIMER_MODE_HARD", HRTIMER_MODE_HARD)
+#endif
+
+               ctf_enum_value("HRTIMER_MODE_ABS_PINNED", HRTIMER_MODE_ABS_PINNED)
+               ctf_enum_value("HRTIMER_MODE_REL_PINNED", HRTIMER_MODE_REL_PINNED)
+
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,16,0))
+               ctf_enum_value("HRTIMER_MODE_ABS_SOFT", HRTIMER_MODE_ABS_SOFT)
+               ctf_enum_value("HRTIMER_MODE_REL_SOFT", HRTIMER_MODE_REL_SOFT)
+
+               ctf_enum_value("HRTIMER_MODE_ABS_PINNED_SOFT", HRTIMER_MODE_ABS_PINNED_SOFT)
+               ctf_enum_value("HRTIMER_MODE_REL_PINNED_SOFT", HRTIMER_MODE_REL_PINNED_SOFT)
+#endif
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,4,0))
+               ctf_enum_value("HRTIMER_MODE_ABS_HARD", HRTIMER_MODE_ABS_HARD)
+               ctf_enum_value("HRTIMER_MODE_REL_HARD", HRTIMER_MODE_REL_HARD)
+
+               ctf_enum_value("HRTIMER_MODE_ABS_PINNED_HARD", HRTIMER_MODE_ABS_PINNED_HARD)
+               ctf_enum_value("HRTIMER_MODE_REL_PINNED_HARD", HRTIMER_MODE_REL_PINNED_HARD)
+#endif
+       )
+)
+
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0))
 #define lttng_ktime_get_tv64(kt)       (kt)
 #else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0)) */
@@ -45,8 +77,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(timer_class, timer_init,
        TP_ARGS(timer)
 )
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,2,0) || \
-       LTTNG_RHEL_KERNEL_RANGE(3,10,0,957,0,0, 3,11,0,0,0,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0))
 /**
  * timer_start - called when the timer is started
  * @timer:     pointer to struct timer_list
@@ -55,39 +86,42 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(timer_class, timer_init,
  */
 LTTNG_TRACEPOINT_EVENT(timer_start,
 
-       TP_PROTO(struct timer_list *timer, unsigned long expires,
-               unsigned int flags),
+       TP_PROTO(struct timer_list *timer, unsigned long bucket_expiry),
 
-       TP_ARGS(timer, expires, flags),
+       TP_ARGS(timer, bucket_expiry),
 
        TP_FIELDS(
                ctf_integer_hex(void *, timer, timer)
                ctf_integer_hex(void *, function, timer->function)
-               ctf_integer(unsigned long, expires, expires)
+               ctf_integer(unsigned long, expires, timer->expires)
+               ctf_integer(unsigned long, bucket_expiry, bucket_expiry)
                ctf_integer(unsigned long, now, jiffies)
-               ctf_integer(unsigned int, flags, flags)
+               ctf_integer(unsigned int, flags, timer->flags)
        )
 )
-#else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,2,0)) */
+#else
 /**
  * timer_start - called when the timer is started
  * @timer:     pointer to struct timer_list
  * @expires:   the timers expiry time
+ * @flags:     the timers expiry time
  */
 LTTNG_TRACEPOINT_EVENT(timer_start,
 
-       TP_PROTO(struct timer_list *timer, unsigned long expires),
+       TP_PROTO(struct timer_list *timer, unsigned long expires,
+               unsigned int flags),
 
-       TP_ARGS(timer, expires),
+       TP_ARGS(timer, expires, flags),
 
        TP_FIELDS(
                ctf_integer_hex(void *, timer, timer)
                ctf_integer_hex(void *, function, timer->function)
                ctf_integer(unsigned long, expires, expires)
                ctf_integer(unsigned long, now, jiffies)
+               ctf_integer(unsigned int, flags, flags)
        )
 )
-#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,2,0)) */
+#endif
 
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,2,0) || \
        LTTNG_RHEL_KERNEL_RANGE(4,18,0,193,0,0, 4,19,0,0,0,0))
@@ -177,7 +211,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_init,
        TP_FIELDS(
                ctf_integer_hex(void *, hrtimer, hrtimer)
                ctf_integer(clockid_t, clockid, clockid)
-               ctf_integer(enum hrtimer_mode, mode, mode)
+               ctf_enum(hrtimer_mode, unsigned int, mode, mode)
        )
 )
 
@@ -202,7 +236,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start,
                        lttng_ktime_get_tv64(hrtimer_get_expires(hrtimer)))
                ctf_integer(s64, softexpires,
                        lttng_ktime_get_tv64(hrtimer_get_softexpires(hrtimer)))
-               ctf_integer(enum hrtimer_mode, mode, mode)
+               ctf_enum(hrtimer_mode, unsigned int, mode, mode)
        )
 )
 #else