[RFC PATCH V2 7/9] perf session: Support the monotonic raw clock conversion information

kan.liang
2023-02-13T19:08:30Z

From: Kan Liang <kan.liang@linux.intel.com>

The monotonic raw clock conversion information can be retrieved from
the perf_event_mmap_page::cap_user_time_mono_raw ABI. Store the
information in the struct perf_record_time_conv for later usage.
Dump the information in TIME_CONV event as well.

Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
---
tools/lib/perf/include/perf/event.h | 8 +++++++-
tools/perf/util/session.c | 8 ++++++++
tools/perf/util/tsc.c | 22 +++++++++++++++++++++-
tools/perf/util/tsc.h | 6 ++++++
4 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/tools/lib/perf/include/perf/event.h b/tools/lib/perf/include/perf/event.h
index ad47d7b31046..20187a3d84c8 100644
--- a/tools/lib/perf/include/perf/event.h
+++ b/tools/lib/perf/include/perf/event.h
@@ -422,9 +422,15 @@ struct perf_record_time_conv {
__u64 time_zero;
__u64 time_cycles;
__u64 time_mask;
+ __u64 time_mono_last;
+ __u32 time_mono_mult;
+ __u32 time_mono_shift;
+ __u64 time_mono_nsec;
+ __u64 time_mono_base;
__u8 cap_user_time_zero;
__u8 cap_user_time_short;
- __u8 reserved[6]; /* For alignment */
+ __u8 cap_user_time_mono_raw;
+ __u8 reserved[5]; /* For alignment */
};

struct perf_record_header_feature {
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 7c021c6cedb9..189149a7012f 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -995,6 +995,14 @@ static void perf_event__time_conv_swap(union perf_event *event,
event->time_conv.time_cycles = bswap_64(event->time_conv.time_cycles);
event->time_conv.time_mask = bswap_64(event->time_conv.time_mask);
}
+
+ if (event_contains(event->time_conv, time_mono_last)) {
+ event->time_conv.time_mono_last = bswap_64(event->time_conv.time_mono_last);
+ event->time_conv.time_mono_mult = bswap_32(event->time_conv.time_mono_mult);
+ event->time_conv.time_mono_shift = bswap_32(event->time_conv.time_mono_shift);
+ event->time_conv.time_mono_nsec = bswap_64(event->time_conv.time_mono_nsec);
+ event->time_conv.time_mono_base = bswap_64(event->time_conv.time_mono_base);
+ }
}

typedef void (*perf_event__swap_op)(union perf_event *event,
diff --git a/tools/perf/util/tsc.c b/tools/perf/util/tsc.c
index f19791d46e99..0b59c0f815f9 100644
--- a/tools/perf/util/tsc.c
+++ b/tools/perf/util/tsc.c
@@ -54,8 +54,14 @@ int perf_read_tsc_conversion(const struct perf_event_mmap_page *pc,
tc->time_zero = pc->time_zero;
tc->time_cycles = pc->time_cycles;
tc->time_mask = pc->time_mask;
+ tc->time_mono_last = pc->time_mono_last;
+ tc->time_mono_mult = pc->time_mono_mult;
+ tc->time_mono_shift = pc->time_mono_shift;
+ tc->time_mono_nsec = pc->time_mono_nsec;
+ tc->time_mono_base = pc->time_mono_base;
tc->cap_user_time_zero = pc->cap_user_time_zero;
tc->cap_user_time_short = pc->cap_user_time_short;
+ tc->cap_user_time_mono_raw = pc->cap_user_time_mono_raw;
rmb();
if (pc->lock == seq && !(seq & 1))
break;
@@ -65,7 +71,7 @@ int perf_read_tsc_conversion(const struct perf_event_mmap_page *pc,
}
}

- if (!tc->cap_user_time_zero)
+ if (!tc->cap_user_time_zero && !tc->cap_user_time_mono_raw)
return -EOPNOTSUPP;

return 0;
@@ -102,8 +108,14 @@ int perf_event__synth_time_conv(const struct perf_event_mmap_page *pc,
event.time_conv.time_zero = tc.time_zero;
event.time_conv.time_cycles = tc.time_cycles;
event.time_conv.time_mask = tc.time_mask;
+ event.time_conv.time_mono_last = tc.time_mono_last;
+ event.time_conv.time_mono_mult = tc.time_mono_mult;
+ event.time_conv.time_mono_shift = tc.time_mono_shift;
+ event.time_conv.time_mono_nsec = tc.time_mono_nsec;
+ event.time_conv.time_mono_base = tc.time_mono_base;
event.time_conv.cap_user_time_zero = tc.cap_user_time_zero;
event.time_conv.cap_user_time_short = tc.cap_user_time_short;
+ event.time_conv.cap_user_time_mono_raw = tc.cap_user_time_mono_raw;

return process(tool, &event, NULL, machine);
}
@@ -138,5 +150,13 @@ size_t perf_event__fprintf_time_conv(union perf_event *event, FILE *fp)
tc->cap_user_time_short);
}

+ ret += fprintf(fp, "... Cap Time Monotonic Raw %" PRId32 "\n",
+ tc->cap_user_time_mono_raw);
+ ret += fprintf(fp, "... Time Last %" PRI_lu64 "\n", tc->time_mono_last);
+ ret += fprintf(fp, "... Time Multiplier %" PRId32 "\n", tc->time_mono_mult);
+ ret += fprintf(fp, "... Time Shift %" PRId32 "\n", tc->time_mono_shift);
+ ret += fprintf(fp, "... Time Nsec %" PRI_lu64 "\n", tc->time_mono_nsec);
+ ret += fprintf(fp, "... Time Base %" PRI_lu64 "\n", tc->time_mono_base);
+
return ret;
}
diff --git a/tools/perf/util/tsc.h b/tools/perf/util/tsc.h
index 88fd1c4c1cb8..6bacc450a14d 100644
--- a/tools/perf/util/tsc.h
+++ b/tools/perf/util/tsc.h
@@ -12,9 +12,15 @@ struct perf_tsc_conversion {
u64 time_zero;
u64 time_cycles;
u64 time_mask;
+ u64 time_mono_last;
+ u32 time_mono_mult;
+ u32 time_mono_shift;
+ u64 time_mono_nsec;
+ u64 time_mono_base;

bool cap_user_time_zero;
bool cap_user_time_short;
+ bool cap_user_time_mono_raw;
};

struct perf_event_mmap_page;
--
2.35.1