perf session: Dump PERF_RECORD_TIME_CONV event
Now perf tool uses the common stub function process_event_op2_stub() for dumping TIME_CONV event, thus it doesn't output the clock parameters contained in the event. This patch adds the callback function for dumping the hardware clock parameters in TIME_CONV event. Before: # perf report -D 0x978 [0x38]: event: 79 . . ... raw event: size 56 bytes . 0000: 4f 00 00 00 00 00 38 00 15 00 00 00 00 00 00 00 O.....8......... . 0010: 00 00 40 01 00 00 00 00 86 89 0b bf df ff ff ff ..@........<BF><DF><FF><FF><FF> . 0020: d1 c1 b2 39 03 00 00 00 ff ff ff ff ff ff ff 00 <D1><C1><B2>9....<FF><FF><FF><FF><FF><FF><FF>. . 0030: 01 01 00 00 00 00 00 00 ........ 0 0 0x978 [0x38]: PERF_RECORD_TIME_CONV : unhandled! [...] After: # perf report -D 0x978 [0x38]: event: 79 . . ... raw event: size 56 bytes . 0000: 4f 00 00 00 00 00 38 00 15 00 00 00 00 00 00 00 O.....8......... . 0010: 00 00 40 01 00 00 00 00 86 89 0b bf df ff ff ff ..@........<BF><DF><FF><FF><FF> . 0020: d1 c1 b2 39 03 00 00 00 ff ff ff ff ff ff ff 00 <D1><C1><B2>9....<FF><FF><FF><FF><FF><FF><FF>. . 0030: 01 01 00 00 00 00 00 00 ........ 0 0 0x978 [0x38]: PERF_RECORD_TIME_CONV ... Time Shift 21 ... Time Muliplier 20971520 ... Time Zero 18446743935180835206 ... Time Cycles 13852918225 ... Time Mask 0xffffffffffffff ... Cap Time Zero 1 ... Cap Time Short 1 : unhandled! [...] Signed-off-by: Leo Yan <leo.yan@linaro.org> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Gustavo A. R. Silva <gustavoars@kernel.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Steve MacLean <Steve.MacLean@Microsoft.com> Cc: Yonatan Goldschmidt <yonatan.goldschmidt@granulate.io> Link: https://lore.kernel.org/r/20210428120915.7123-5-leo.yan@linaro.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
050ffc4490
commit
81e70d7ee4
|
@ -29,6 +29,7 @@
|
||||||
#include "thread-stack.h"
|
#include "thread-stack.h"
|
||||||
#include "sample-raw.h"
|
#include "sample-raw.h"
|
||||||
#include "stat.h"
|
#include "stat.h"
|
||||||
|
#include "tsc.h"
|
||||||
#include "ui/progress.h"
|
#include "ui/progress.h"
|
||||||
#include "../perf.h"
|
#include "../perf.h"
|
||||||
#include "arch/common.h"
|
#include "arch/common.h"
|
||||||
|
@ -451,6 +452,16 @@ static int process_stat_round_stub(struct perf_session *perf_session __maybe_unu
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int process_event_time_conv_stub(struct perf_session *perf_session __maybe_unused,
|
||||||
|
union perf_event *event)
|
||||||
|
{
|
||||||
|
if (dump_trace)
|
||||||
|
perf_event__fprintf_time_conv(event, stdout);
|
||||||
|
|
||||||
|
dump_printf(": unhandled!\n");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static int perf_session__process_compressed_event_stub(struct perf_session *session __maybe_unused,
|
static int perf_session__process_compressed_event_stub(struct perf_session *session __maybe_unused,
|
||||||
union perf_event *event __maybe_unused,
|
union perf_event *event __maybe_unused,
|
||||||
u64 file_offset __maybe_unused)
|
u64 file_offset __maybe_unused)
|
||||||
|
@ -532,7 +543,7 @@ void perf_tool__fill_defaults(struct perf_tool *tool)
|
||||||
if (tool->stat_round == NULL)
|
if (tool->stat_round == NULL)
|
||||||
tool->stat_round = process_stat_round_stub;
|
tool->stat_round = process_stat_round_stub;
|
||||||
if (tool->time_conv == NULL)
|
if (tool->time_conv == NULL)
|
||||||
tool->time_conv = process_event_op2_stub;
|
tool->time_conv = process_event_time_conv_stub;
|
||||||
if (tool->feature == NULL)
|
if (tool->feature == NULL)
|
||||||
tool->feature = process_event_op2_stub;
|
tool->feature = process_event_op2_stub;
|
||||||
if (tool->compressed == NULL)
|
if (tool->compressed == NULL)
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
// SPDX-License-Identifier: GPL-2.0
|
// SPDX-License-Identifier: GPL-2.0
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
#include <inttypes.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
#include <linux/compiler.h>
|
#include <linux/compiler.h>
|
||||||
#include <linux/perf_event.h>
|
#include <linux/perf_event.h>
|
||||||
|
@ -110,3 +112,31 @@ u64 __weak rdtsc(void)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
size_t perf_event__fprintf_time_conv(union perf_event *event, FILE *fp)
|
||||||
|
{
|
||||||
|
struct perf_record_time_conv *tc = (struct perf_record_time_conv *)event;
|
||||||
|
size_t ret;
|
||||||
|
|
||||||
|
ret = fprintf(fp, "\n... Time Shift %" PRI_lu64 "\n", tc->time_shift);
|
||||||
|
ret += fprintf(fp, "... Time Muliplier %" PRI_lu64 "\n", tc->time_mult);
|
||||||
|
ret += fprintf(fp, "... Time Zero %" PRI_lu64 "\n", tc->time_zero);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The event TIME_CONV was extended for the fields from "time_cycles"
|
||||||
|
* when supported cap_user_time_short, for backward compatibility,
|
||||||
|
* prints the extended fields only if they are contained in the event.
|
||||||
|
*/
|
||||||
|
if (event_contains(*tc, time_cycles)) {
|
||||||
|
ret += fprintf(fp, "... Time Cycles %" PRI_lu64 "\n",
|
||||||
|
tc->time_cycles);
|
||||||
|
ret += fprintf(fp, "... Time Mask %#" PRI_lx64 "\n",
|
||||||
|
tc->time_mask);
|
||||||
|
ret += fprintf(fp, "... Cap Time Zero %" PRId32 "\n",
|
||||||
|
tc->cap_user_time_zero);
|
||||||
|
ret += fprintf(fp, "... Cap Time Short %" PRId32 "\n",
|
||||||
|
tc->cap_user_time_short);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
|
@ -4,6 +4,8 @@
|
||||||
|
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
|
|
||||||
|
#include "event.h"
|
||||||
|
|
||||||
struct perf_tsc_conversion {
|
struct perf_tsc_conversion {
|
||||||
u16 time_shift;
|
u16 time_shift;
|
||||||
u32 time_mult;
|
u32 time_mult;
|
||||||
|
@ -24,4 +26,6 @@ u64 perf_time_to_tsc(u64 ns, struct perf_tsc_conversion *tc);
|
||||||
u64 tsc_to_perf_time(u64 cyc, struct perf_tsc_conversion *tc);
|
u64 tsc_to_perf_time(u64 cyc, struct perf_tsc_conversion *tc);
|
||||||
u64 rdtsc(void);
|
u64 rdtsc(void);
|
||||||
|
|
||||||
|
size_t perf_event__fprintf_time_conv(union perf_event *event, FILE *fp);
|
||||||
|
|
||||||
#endif // __PERF_TSC_H
|
#endif // __PERF_TSC_H
|
||||||
|
|
Loading…
Reference in New Issue