Commit b9a49f8c authored Dec 08, 2022 by Arnaldo Carvalho de Melo

perf tools: Check if libtracevent has TEP_FIELD_IS_RELATIVE



Some distros have older versions of libtraceevent where
TEP_FIELD_IS_RELATIVE and its associated semantics are not present, so
we need to check if the version has it, it was introduced in
libtraceevent 1.5.0.

Reported-by: Athira Jajeev <atrajeev@linux.vnet.ibm.com>
Tested-by: Athira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>,
Cc: Stephane Eranian <eranian@google.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 4171925a

tools/perf/Makefile.config

+4 −0

Original line number	Diff line number	Diff line
		@@ -1197,6 +1197,10 @@ ifneq ($(NO_LIBTRACEEVENT),1)
		LIBTRACEEVENT_VERSION_CPP := $(shell expr $(LIBTRACEEVENT_VERSION_1) \* 255 \* 255 + $(LIBTRACEEVENT_VERSION_2) \* 255 + $(LIBTRACEEVENT_VERSION_3))
		CFLAGS += -DLIBTRACEEVENT_VERSION=$(LIBTRACEEVENT_VERSION_CPP)
		$(call detected,CONFIG_LIBTRACEEVENT)
		LIBTRACEEVENT_VERSION_WITH_TEP_FIELD_IS_RELATIVE := $(shell expr 1 \* 255 \* 255 + 5 \* 255 + 0) # 1.5.0
		ifeq ($(shell test $(LIBTRACEEVENT_VERSION_CPP) -gt $(LIBTRACEEVENT_VERSION_WITH_TEP_FIELD_IS_RELATIVE); echo $$?),0)
		CFLAGS += -DHAVE_LIBTRACEEVENT_TEP_FIELD_IS_RELATIVE
		endif
		else
		dummy := $(warning Warning: libtraceevent is missing limiting functionality, please install libtraceevent-dev/libtraceevent-devel)
		endif

tools/perf/builtin-trace.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -2729,8 +2729,10 @@ static size_t trace__fprintf_tp_fields(struct trace trace, struct evsel evsel,
		offset = format_field__intval(field, sample, evsel->needs_swap);
		syscall_arg.len = offset >> 16;
		offset &= 0xffff;
		#ifdef HAVE_LIBTRACEEVENT_TEP_FIELD_IS_RELATIVE
		if (field->flags & TEP_FIELD_IS_RELATIVE)
		offset += field->offset + field->size;
		#endif
		}

		val = (uintptr_t)(sample->raw_data + offset);

tools/perf/util/data-convert-bt.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -322,8 +322,10 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,
		offset = tmp_val;
		len = offset >> 16;
		offset &= 0xffff;
		#ifdef HAVE_LIBTRACEEVENT_TEP_FIELD_IS_RELATIVE
		if (flags & TEP_FIELD_IS_RELATIVE)
		offset += fmtf->offset + fmtf->size;
		#endif
		}

		if (flags & TEP_FIELD_IS_ARRAY) {

tools/perf/util/evsel.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -2784,8 +2784,10 @@ void evsel__rawptr(struct evsel evsel, struct perf_sample *sample, const char
		if (field->flags & TEP_FIELD_IS_DYNAMIC) {
		offset = (int )(sample->raw_data + field->offset);
		offset &= 0xffff;
		#ifdef HAVE_LIBTRACEEVENT_TEP_FIELD_IS_RELATIVE
		if (field->flags & TEP_FIELD_IS_RELATIVE)
		offset += field->offset + field->size;
		#endif
		}

		return sample->raw_data + offset;

tools/perf/util/python.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -442,8 +442,10 @@ tracepoint_field(struct pyrf_event pe, struct tep_format_field field)
		offset = val;
		len = offset >> 16;
		offset &= 0xffff;
		#ifdef HAVE_LIBTRACEEVENT_TEP_FIELD_IS_RELATIVE
		if (field->flags & TEP_FIELD_IS_RELATIVE)
		offset += field->offset + field->size;
		#endif
		}
		if (field->flags & TEP_FIELD_IS_STRING &&
		is_printable_array(data + offset, len)) {