Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1461023 > unrolled thread

[PATCH] time: alarmtimer: Add the trcepoints for alarmtimer

Back to article view | Back to linux.kernel

Contents

  [PATCH] time: alarmtimer: Add the trcepoints for alarmtimer Baolin Wang <baolin.wang@linaro.org> - 2016-08-12 11:20 +0200
    Re: [PATCH] time: alarmtimer: Add the trcepoints for alarmtimer kbuild test robot <lkp@intel.com> - 2016-08-12 13:10 +0200
    Re: [PATCH] time: alarmtimer: Add the trcepoints for alarmtimer John Stultz <john.stultz@linaro.org> - 2016-08-17 22:10 +0200
      Re: [PATCH] time: alarmtimer: Add the trcepoints for alarmtimer Baolin Wang <baolin.wang@linaro.org> - 2016-08-18 04:30 +0200

#1461023 — [PATCH] time: alarmtimer: Add the trcepoints for alarmtimer

For system debugging, we usually want to know who sets one alarm timer, the
time of the timer, when the timer started and fired and so on.

Thus adding tracepoints can help us trace the alarmtimer information.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
 include/trace/events/alarmtimer.h |  135 +++++++++++++++++++++++++++++++++++++
 kernel/time/alarmtimer.c          |   21 +++++-
 2 files changed, 153 insertions(+), 3 deletions(-)
 create mode 100644 include/trace/events/alarmtimer.h

diff --git a/include/trace/events/alarmtimer.h b/include/trace/events/alarmtimer.h
new file mode 100644
index 0000000..69f69b6
--- /dev/null
+++ b/include/trace/events/alarmtimer.h
@@ -0,0 +1,135 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM alarmtimer
+
+#if !defined(_TRACE_ALARMTIMER_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_ALARMTIMER_H
+
+#include <linux/alarmtimer.h>
+#include <linux/ktime.h>
+#include <linux/tracepoint.h>
+
+#define show_alarm_type(type)	__print_flags(type, " | ",	\
+	{ 1 << ALARM_REALTIME, "ALARM_REALTIME" },		\
+	{ 1 << ALARM_BOOTTIME, "ALARM_BOOTTIME" })
+
+DECLARE_EVENT_CLASS(alarm_setting,
+
+	TP_PROTO(struct rtc_time *rtc_time, int flag),
+
+	TP_ARGS(rtc_time, flag),
+
+	TP_STRUCT__entry(
+		__field(unsigned int, second)
+		__field(unsigned int, minute)
+		__field(unsigned int, hour)
+		__field(unsigned int, day)
+		__field(unsigned int, mon)
+		__field(unsigned int, year)
+		__field(unsigned int, alarm_type)
+	),
+
+	TP_fast_assign(
+		__entry->second = rtc_time->tm_sec;
+		__entry->minute = rtc_time->tm_min;
+		__entry->hour = rtc_time->tm_hour;
+		__entry->day = rtc_time->tm_mday;
+		__entry->mon = rtc_time->tm_mon;
+		__entry->year = rtc_time->tm_year;
+		__entry->alarm_type = flag;
+	),
+
+	TP_printk("alarmtimer type:%s expires time: %u-%u-%u %u:%u:%u",
+		  show_alarm_type((1 << __entry->alarm_type)),
+		  __entry->year + 1900,
+		  __entry->mon + 1,
+		  __entry->day,
+		  __entry->hour,
+		  __entry->minute,
+		  __entry->second
+	)
+);
+
+DEFINE_EVENT(alarm_setting, alarmtimer_suspend,
+
+	TP_PROTO(struct rtc_time *time, int flag),
+
+	TP_ARGS(time, flag)
+);
+
+DECLARE_EVENT_CLASS(alarm_processing,
+
+	TP_PROTO(struct alarm *alarm, char *process_name),
+
+	TP_ARGS(alarm, process_name),
+
+	TP_STRUCT__entry(
+		__field(unsigned long long, expires)
+		__field(unsigned int, second)
+		__field(unsigned int, minute)
+		__field(unsigned int, hour)
+		__field(unsigned int, day)
+		__field(unsigned int, mon)
+		__field(unsigned int, year)
+		__field(unsigned int, alarm_type)
+		__string(name, process_name)
+	),
+
+	TP_fast_assign(
+		__entry->expires = alarm->node.expires.tv64;
+		__entry->second = rtc_ktime_to_tm(alarm->node.expires).tm_sec;
+		__entry->minute = rtc_ktime_to_tm(alarm->node.expires).tm_min;
+		__entry->hour = rtc_ktime_to_tm(alarm->node.expires).tm_hour;
+		__entry->day = rtc_ktime_to_tm(alarm->node.expires).tm_mday;
+		__entry->mon = rtc_ktime_to_tm(alarm->node.expires).tm_mon;
+		__entry->year = rtc_ktime_to_tm(alarm->node.expires).tm_year;
+		__entry->alarm_type = alarm->type;
+		__assign_str(name, process_name);
+	),
+
+	TP_printk("process:%s alarmtimer type:%s expires:%llu "
+		  "state:%s time: %u-%u-%u %u:%u:%u",
+		  __get_str(name),
+		  show_alarm_type((1 << __entry->alarm_type)),
+		  __entry->expires,
+		  strcmp(__get_str(name), "null") ? "fired" : "not fired",
+		  __entry->year + 1900,
+		  __entry->mon + 1,
+		  __entry->day,
+		  __entry->hour,
+		  __entry->minute,
+		  __entry->second
+	)
+);
+
+DEFINE_EVENT(alarm_processing, alarmtimer_fired,
+
+	TP_PROTO(struct alarm *alarm, char *process_name),
+
+	TP_ARGS(alarm, process_name)
+);
+
+DEFINE_EVENT(alarm_processing, alarmtimer_start,
+
+	TP_PROTO(struct alarm *alarm, char *process_name),
+
+	TP_ARGS(alarm, process_name)
+);
+
+DEFINE_EVENT(alarm_processing, alarmtimer_restart,
+
+	TP_PROTO(struct alarm *alarm, char *process_name),
+
+	TP_ARGS(alarm, process_name)
+);
+
+DEFINE_EVENT(alarm_processing, alarmtimer_cancel,
+
+	TP_PROTO(struct alarm *alarm, char *process_name),
+
+	TP_ARGS(alarm, process_name)
+);
+
+#endif /* _TRACE_ALARMTIMER_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index c3aad68..866d668 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -26,6 +26,9 @@
 #include <linux/workqueue.h>
 #include <linux/freezer.h>
 
+#define CREATE_TRACE_POINTS
+#include <trace/events/alarmtimer.h>
+
 /**
  * struct alarm_base - Alarm timer bases
  * @lock:		Lock for syncrhonized access to the base
@@ -194,6 +197,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer)
 	}
 	spin_unlock_irqrestore(&base->lock, flags);
 
+	trace_alarmtimer_fired(alarm, NULL);
 	return ret;
 
 }
@@ -218,11 +222,11 @@ EXPORT_SYMBOL_GPL(alarm_expires_remaining);
  */
 static int alarmtimer_suspend(struct device *dev)
 {
-	struct rtc_time tm;
+	struct rtc_time tm, tm_set;
 	ktime_t min, now;
 	unsigned long flags;
 	struct rtc_device *rtc;
-	int i;
+	int i, type = 0;
 	int ret;
 
 	spin_lock_irqsave(&freezer_delta_lock, flags);
@@ -247,8 +251,10 @@ static int alarmtimer_suspend(struct device *dev)
 		if (!next)
 			continue;
 		delta = ktime_sub(next->expires, base->gettime());
-		if (!min.tv64 || (delta.tv64 < min.tv64))
+		if (!min.tv64 || (delta.tv64 < min.tv64)) {
 			min = delta;
+			type = i;
+		}
 	}
 	if (min.tv64 == 0)
 		return 0;
@@ -264,6 +270,9 @@ static int alarmtimer_suspend(struct device *dev)
 	now = rtc_tm_to_ktime(tm);
 	now = ktime_add(now, min);
 
+	tm_set = rtc_ktime_to_tm(now);
+	trace_alarmtimer_suspend(&tm_set, type);
+
 	/* Set alarm, if in the past reject suspend briefly to handle */
 	ret = rtc_timer_start(rtc, &rtctimer, now, ktime_set(0, 0));
 	if (ret < 0)
@@ -342,6 +351,8 @@ void alarm_start(struct alarm *alarm, ktime_t start)
 	alarmtimer_enqueue(base, alarm);
 	hrtimer_start(&alarm->timer, alarm->node.expires, HRTIMER_MODE_ABS);
 	spin_unlock_irqrestore(&base->lock, flags);
+
+	trace_alarmtimer_start(alarm, current->comm);
 }
 EXPORT_SYMBOL_GPL(alarm_start);
 
@@ -369,6 +380,8 @@ void alarm_restart(struct alarm *alarm)
 	hrtimer_restart(&alarm->timer);
 	alarmtimer_enqueue(base, alarm);
 	spin_unlock_irqrestore(&base->lock, flags);
+
+	trace_alarmtimer_restart(alarm, current->comm);
 }
 EXPORT_SYMBOL_GPL(alarm_restart);
 
@@ -390,6 +403,8 @@ int alarm_try_to_cancel(struct alarm *alarm)
 	if (ret >= 0)
 		alarmtimer_dequeue(base, alarm);
 	spin_unlock_irqrestore(&base->lock, flags);
+
+	trace_alarmtimer_cancel(alarm, current->comm);
 	return ret;
 }
 EXPORT_SYMBOL_GPL(alarm_try_to_cancel);
-- 
1.7.9.5

[toc] | [next] | [standalone]

#1461087

[Multipart message — attachments visible in raw view] — view raw

Hi Baolin,

[auto build test ERROR on tip/timers/core]
[also build test ERROR on v4.8-rc1 next-20160812]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Baolin-Wang/time-alarmtimer-Add-the-trcepoints-for-alarmtimer/20160812-171954
config: s390-default_defconfig (attached as .config)
compiler: s390x-linux-gnu-gcc (Debian 5.4.0-6) 5.4.0 20160609
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=s390 

All errors (new ones prefixed by >>):

   kernel/built-in.o: In function `perf_trace_alarm_processing':
>> include/trace/events/alarmtimer.h:59: undefined reference to `rtc_ktime_to_tm'
>> include/trace/events/alarmtimer.h:59: undefined reference to `rtc_ktime_to_tm'
>> include/trace/events/alarmtimer.h:59: undefined reference to `rtc_ktime_to_tm'
>> include/trace/events/alarmtimer.h:59: undefined reference to `rtc_ktime_to_tm'
>> include/trace/events/alarmtimer.h:59: undefined reference to `rtc_ktime_to_tm'
   kernel/built-in.o:include/trace/events/alarmtimer.h:59: more undefined references to `rtc_ktime_to_tm' follow

vim +59 include/trace/events/alarmtimer.h

    53	
    54		TP_PROTO(struct rtc_time *time, int flag),
    55	
    56		TP_ARGS(time, flag)
    57	);
    58	
  > 59	DECLARE_EVENT_CLASS(alarm_processing,
    60	
    61		TP_PROTO(struct alarm *alarm, char *process_name),
    62	

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[toc] | [prev] | [next] | [standalone]

#1464777

On Fri, Aug 12, 2016 at 2:16 AM, Baolin Wang <baolin.wang@linaro.org> wrote:
> For system debugging, we usually want to know who sets one alarm timer, the
> time of the timer, when the timer started and fired and so on.
>
> Thus adding tracepoints can help us trace the alarmtimer information.
>
> Signed-off-by: Baolin Wang <baolin.wang@linaro.org>


Looks reasonable to me.  Might be good to get a specific example of
something you've used this for (with example output) in the commit
log.

Please also fix up the kbuild test issues and resubmit.

thanks
-john

[toc] | [prev] | [next] | [standalone]

#1464896

Hi John,

On 18 August 2016 at 04:00, John Stultz <john.stultz@linaro.org> wrote:
> On Fri, Aug 12, 2016 at 2:16 AM, Baolin Wang <baolin.wang@linaro.org> wrote:
>> For system debugging, we usually want to know who sets one alarm timer, the
>> time of the timer, when the timer started and fired and so on.
>>
>> Thus adding tracepoints can help us trace the alarmtimer information.
>>
>> Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
>
>
> Looks reasonable to me.  Might be good to get a specific example of
> something you've used this for (with example output) in the commit
> log.

OK. Will add one example with the trace log in next version.

>
> Please also fix up the kbuild test issues and resubmit.

OK. Thanks.

>
> thanks
> -john



-- 
Baolin.wang
Best Regards

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web