Add the PERF_AUXTRACE_POWERPC_HTM enum value to auxtrace.h and wire the dispatch in perf_event__process_auxtrace_info() to call powerpc_htm_process_auxtrace_info().
This patch sets auxtrace_info->type = PERF_AUXTRACE_POWERPC_HTM in htm_info_fill() (introduced in the previous patch) now that the constant is defined, completing the record-side setup. Signed-off-by: Athira Rajeev <[email protected]> --- Changes in V2: - Scope narrowed: this patch now only adds the PERF_AUXTRACE_POWERPC_HTM enum constant to auxtrace.h and wires the dispatch in perf_event__process_auxtrace_info() to call powerpc_htm_process_auxtrace_info(). It also amends htm_info_fill() (from patch 2) to set auxtrace_info->type now that the constant is defined. - All file-writing and decoding logic is moved to patch 6. - Patch is now 5/6 instead of 5/9. tools/perf/arch/powerpc/util/htm.c | 2 +- tools/perf/util/Build | 1 + tools/perf/util/auxtrace.c | 4 + tools/perf/util/auxtrace.h | 1 + tools/perf/util/powerpc-htm.c | 115 +++++++++++++++++++++++++++++ 5 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 tools/perf/util/powerpc-htm.c diff --git a/tools/perf/arch/powerpc/util/htm.c b/tools/perf/arch/powerpc/util/htm.c index 07b496e4be2f..9555cf356617 100644 --- a/tools/perf/arch/powerpc/util/htm.c +++ b/tools/perf/arch/powerpc/util/htm.c @@ -99,7 +99,7 @@ htm_info_fill(struct auxtrace_record *itr, if (priv_size != HTM_AUXTRACE_PRIV_SIZE(expected_n)) return -EINVAL; - // To set: auxtrace_info->type + auxtrace_info->type = PERF_AUXTRACE_POWERPC_HTM; auxtrace_info->priv[POWERPC_HTM_PMU_TYPE] = htm_r->evsel->core.attr.type; auxtrace_info->priv[POWERPC_HTM_NUM_EVENTS] = expected_n; diff --git a/tools/perf/util/Build b/tools/perf/util/Build index 330311cac550..7fa354853d2a 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -141,6 +141,7 @@ perf-util-y += hisi-ptt.o perf-util-y += hisi-ptt-decoder/ perf-util-y += s390-cpumsf.o perf-util-y += powerpc-vpadtl.o +perf-util-y += powerpc-htm.o ifdef CONFIG_LIBOPENCSD perf-util-y += cs-etm.o diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c index 0b851f32e98c..9f32f54fad43 100644 --- a/tools/perf/util/auxtrace.c +++ b/tools/perf/util/auxtrace.c @@ -56,6 +56,7 @@ #include "s390-cpumsf.h" #include "util/mmap.h" #include "powerpc-vpadtl.h" +#include "powerpc-htm.h" #include <linux/ctype.h> #include "symbol/kallsyms.h" @@ -1427,6 +1428,9 @@ int perf_event__process_auxtrace_info(const struct perf_tool *tool __maybe_unuse case PERF_AUXTRACE_VPA_DTL: err = powerpc_vpadtl_process_auxtrace_info(event, session); break; + case PERF_AUXTRACE_POWERPC_HTM: + err = powerpc_htm_process_auxtrace_info(event, session); + break; case PERF_AUXTRACE_UNKNOWN: default: return -EINVAL; diff --git a/tools/perf/util/auxtrace.h b/tools/perf/util/auxtrace.h index 6947f3f284c0..68b17802a419 100644 --- a/tools/perf/util/auxtrace.h +++ b/tools/perf/util/auxtrace.h @@ -46,6 +46,7 @@ enum auxtrace_type { PERF_AUXTRACE_S390_CPUMSF, PERF_AUXTRACE_HISI_PTT, PERF_AUXTRACE_VPA_DTL, + PERF_AUXTRACE_POWERPC_HTM, }; enum itrace_period_type { diff --git a/tools/perf/util/powerpc-htm.c b/tools/perf/util/powerpc-htm.c new file mode 100644 index 000000000000..8d28d02031d6 --- /dev/null +++ b/tools/perf/util/powerpc-htm.c @@ -0,0 +1,115 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <stdio.h> +#include <stdlib.h> +#include <fcntl.h> +#include <unistd.h> +#include <string.h> +#include <errno.h> +#include <endian.h> +#include "util/evsel.h" +#include "util/evlist.h" +#include "util/session.h" +#include "color.h" +#include "powerpc-htm.h" +#include "debug.h" +#include "sample.h" + +struct powerpc_htm { + struct auxtrace auxtrace; + struct auxtrace_queues queues; + struct auxtrace_heap heap; + u32 auxtrace_type; + struct perf_session *session; + struct machine *machine; +}; + +static void powerpc_htm_dump_event(size_t len) +{ + const char *color = PERF_COLOR_BLUE; + + if (dump_trace) { + color_fprintf(stdout, color, + ". ... HTM PMU data: size %zu bytes\n", len); + } +} + +static int powerpc_htm_process_event(struct perf_session *session __maybe_unused, + union perf_event *event __maybe_unused, + struct perf_sample *sample __maybe_unused, + const struct perf_tool *tool __maybe_unused) +{ + return 0; +} + +static int powerpc_htm_process_auxtrace_event(struct perf_session *session __maybe_unused, + union perf_event *event, + const struct perf_tool *tool __maybe_unused) +{ + if (dump_trace) + powerpc_htm_dump_event(event->auxtrace.size); + + return 0; +} + +static int powerpc_htm_flush(struct perf_session *session __maybe_unused, + const struct perf_tool *tool __maybe_unused) +{ + return 0; +} + +static void powerpc_htm_free_events(struct perf_session *session) +{ + struct powerpc_htm *htm; + + if (!session || !session->auxtrace) + return; + + htm = container_of(session->auxtrace, struct powerpc_htm, auxtrace); + auxtrace_queues__free(&htm->queues); +} + +static void powerpc_htm_free(struct perf_session *session) +{ + struct powerpc_htm *htm; + + if (!session || !session->auxtrace) + return; + + htm = container_of(session->auxtrace, struct powerpc_htm, auxtrace); + powerpc_htm_free_events(session); + session->auxtrace = NULL; + free(htm); +} + +int powerpc_htm_process_auxtrace_info(union perf_event *event, + struct perf_session *session) +{ + struct perf_record_auxtrace_info *auxtrace_info = &event->auxtrace_info; + struct powerpc_htm *htm; + int err; + + if (auxtrace_info->header.size < sizeof(struct perf_record_auxtrace_info) + + HTM_AUXTRACE_PRIV_FIXED) + return -EINVAL; + + htm = zalloc(sizeof(struct powerpc_htm)); + if (!htm) + return -ENOMEM; + + err = auxtrace_queues__init(&htm->queues); + if (err) { + free(htm); + return err; + } + + htm->session = session; + htm->machine = &session->machines.host; + htm->auxtrace.process_event = powerpc_htm_process_event; + htm->auxtrace.process_auxtrace_event = powerpc_htm_process_auxtrace_event; + htm->auxtrace.flush_events = powerpc_htm_flush; + htm->auxtrace.free_events = powerpc_htm_free_events; + htm->auxtrace.free = powerpc_htm_free; + session->auxtrace = &htm->auxtrace; + + return 0; +} -- 2.43.0
