Commit 51aad0ae authored by Deepa Dinamani's avatar Deepa Dinamani Committed by Linus Torvalds

trace: make trace_hwlat timestamp y2038 safe

struct timespec is not y2038 safe on 32 bit machines and needs to be
replaced by struct timespec64 in order to represent times beyond year
2038 on such machines.

Fix all the timestamp representation in struct trace_hwlat and all the
corresponding implementations.

Link: http://lkml.kernel.org/r/1491613030-11599-3-git-send-email-deepa.kernel@gmail.comSigned-off-by: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Acked-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 48fbfe50
...@@ -348,14 +348,14 @@ FTRACE_ENTRY(hwlat, hwlat_entry, ...@@ -348,14 +348,14 @@ FTRACE_ENTRY(hwlat, hwlat_entry,
__field( u64, duration ) __field( u64, duration )
__field( u64, outer_duration ) __field( u64, outer_duration )
__field( u64, nmi_total_ts ) __field( u64, nmi_total_ts )
__field_struct( struct timespec, timestamp ) __field_struct( struct timespec64, timestamp )
__field_desc( long, timestamp, tv_sec ) __field_desc( s64, timestamp, tv_sec )
__field_desc( long, timestamp, tv_nsec ) __field_desc( long, timestamp, tv_nsec )
__field( unsigned int, nmi_count ) __field( unsigned int, nmi_count )
__field( unsigned int, seqnum ) __field( unsigned int, seqnum )
), ),
F_printk("cnt:%u\tts:%010lu.%010lu\tinner:%llu\touter:%llunmi-ts:%llu\tnmi-count:%u\n", F_printk("cnt:%u\tts:%010llu.%010lu\tinner:%llu\touter:%llunmi-ts:%llu\tnmi-count:%u\n",
__entry->seqnum, __entry->seqnum,
__entry->tv_sec, __entry->tv_sec,
__entry->tv_nsec, __entry->tv_nsec,
......
...@@ -79,12 +79,12 @@ static u64 last_tracing_thresh = DEFAULT_LAT_THRESHOLD * NSEC_PER_USEC; ...@@ -79,12 +79,12 @@ static u64 last_tracing_thresh = DEFAULT_LAT_THRESHOLD * NSEC_PER_USEC;
/* Individual latency samples are stored here when detected. */ /* Individual latency samples are stored here when detected. */
struct hwlat_sample { struct hwlat_sample {
u64 seqnum; /* unique sequence */ u64 seqnum; /* unique sequence */
u64 duration; /* delta */ u64 duration; /* delta */
u64 outer_duration; /* delta (outer loop) */ u64 outer_duration; /* delta (outer loop) */
u64 nmi_total_ts; /* Total time spent in NMIs */ u64 nmi_total_ts; /* Total time spent in NMIs */
struct timespec timestamp; /* wall time */ struct timespec64 timestamp; /* wall time */
int nmi_count; /* # NMIs during this sample */ int nmi_count; /* # NMIs during this sample */
}; };
/* keep the global state somewhere. */ /* keep the global state somewhere. */
...@@ -250,7 +250,7 @@ static int get_sample(void) ...@@ -250,7 +250,7 @@ static int get_sample(void)
s.seqnum = hwlat_data.count; s.seqnum = hwlat_data.count;
s.duration = sample; s.duration = sample;
s.outer_duration = outer_sample; s.outer_duration = outer_sample;
s.timestamp = CURRENT_TIME; ktime_get_real_ts64(&s.timestamp);
s.nmi_total_ts = nmi_total_ts; s.nmi_total_ts = nmi_total_ts;
s.nmi_count = nmi_count; s.nmi_count = nmi_count;
trace_hwlat_sample(&s); trace_hwlat_sample(&s);
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
* Copyright (C) 2008 Red Hat Inc, Steven Rostedt <srostedt@redhat.com> * Copyright (C) 2008 Red Hat Inc, Steven Rostedt <srostedt@redhat.com>
* *
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/ftrace.h> #include <linux/ftrace.h>
...@@ -1161,11 +1160,11 @@ trace_hwlat_print(struct trace_iterator *iter, int flags, ...@@ -1161,11 +1160,11 @@ trace_hwlat_print(struct trace_iterator *iter, int flags,
trace_assign_type(field, entry); trace_assign_type(field, entry);
trace_seq_printf(s, "#%-5u inner/outer(us): %4llu/%-5llu ts:%ld.%09ld", trace_seq_printf(s, "#%-5u inner/outer(us): %4llu/%-5llu ts:%lld.%09ld",
field->seqnum, field->seqnum,
field->duration, field->duration,
field->outer_duration, field->outer_duration,
field->timestamp.tv_sec, (long long)field->timestamp.tv_sec,
field->timestamp.tv_nsec); field->timestamp.tv_nsec);
if (field->nmi_count) { if (field->nmi_count) {
...@@ -1195,10 +1194,10 @@ trace_hwlat_raw(struct trace_iterator *iter, int flags, ...@@ -1195,10 +1194,10 @@ trace_hwlat_raw(struct trace_iterator *iter, int flags,
trace_assign_type(field, iter->ent); trace_assign_type(field, iter->ent);
trace_seq_printf(s, "%llu %lld %ld %09ld %u\n", trace_seq_printf(s, "%llu %lld %lld %09ld %u\n",
field->duration, field->duration,
field->outer_duration, field->outer_duration,
field->timestamp.tv_sec, (long long)field->timestamp.tv_sec,
field->timestamp.tv_nsec, field->timestamp.tv_nsec,
field->seqnum); field->seqnum);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment