Commit 7c689c83 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Steven Rostedt (VMware)
Browse files

tools/perf: Add '__rel_loc' event field parsing support 

Add new '__rel_loc' dynamic data location attribute support.
This type attribute is similar to the '__data_loc' but records the
offset from the field itself.
The libtraceevent adds TEP_FIELD_IS_RELATIVE to the
'tep_format_field::flags' with TEP_FIELD_IS_DYNAMIC for'__rel_loc'.

Link: https://lkml.kernel.org/r/163757344810.510314.12449413842136229871.stgit@devnote2



Cc: Beau Belgrave <beaub@linux.microsoft.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Tom Zanussi <zanussi@kernel.org>
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent cd772904

tools/perf/builtin-trace.c

+2 −0
Original line number Diff line number Diff line
@@ -2726,6 +2726,8 @@ 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;

				if (field->flags & TEP_FIELD_IS_RELATIVE)

					offset += field->offset + field->size;

			}



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

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

+2 −0
Original line number Diff line number Diff line
@@ -318,6 +318,8 @@ static int add_tracepoint_field_value(struct ctf_writer *cw, 
		offset = tmp_val;

		len = offset >> 16;

		offset &= 0xffff;

		if (flags & TEP_FIELD_IS_RELATIVE)

			offset += fmtf->offset + fmtf->size;

	}



	if (flags & TEP_FIELD_IS_ARRAY) {

tools/perf/util/evsel.c

+2 −0
Original line number Diff line number Diff line
@@ -2706,6 +2706,8 @@ 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;

		if (field->flags & TEP_FIELD_IS_RELATIVE)

			offset += field->offset + field->size;

	}



	return sample->raw_data + offset;

tools/perf/util/python.c

+2 −0
Original line number Diff line number Diff line
@@ -428,6 +428,8 @@ tracepoint_field(struct pyrf_event *pe, struct tep_format_field *field) 
			offset  = val;

			len     = offset >> 16;

			offset &= 0xffff;

			if (field->flags & TEP_FIELD_IS_RELATIVE)

				offset += field->offset + field->size;

		}

		if (field->flags & TEP_FIELD_IS_STRING &&

		    is_printable_array(data + offset, len)) {

tools/perf/util/scripting-engines/trace-event-perl.c

+2 −0
Original line number Diff line number Diff line
@@ -392,6 +392,8 @@ static void perl_process_tracepoint(struct perf_sample *sample, 
			if (field->flags & TEP_FIELD_IS_DYNAMIC) {

				offset = *(int *)(data + field->offset);

				offset &= 0xffff;

				if (field->flags & TEP_FIELD_IS_RELATIVE)

					offset += field->offset + field->size;

			} else

				offset = field->offset;

			XPUSHs(sv_2mortal(newSVpv((char *)data + offset, 0)));