hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
Masami Hiramatsu 2021-11-22 18:30:48 +09:00 committed by Steven Rostedt (VMware)
parent cd7729043b
commit 7c689c8397
7 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/builtin-trace.c
View File

@ -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); offset = format_field__intval(field, sample, evsel->needs_swap);
syscall_arg.len = offset >> 16; syscall_arg.len = offset >> 16;
offset &= 0xffff; offset &= 0xffff;
if (field->flags & TEP_FIELD_IS_RELATIVE)
offset += field->offset + field->size;
} }
val = (uintptr_t)(sample->raw_data + offset); val = (uintptr_t)(sample->raw_data + offset);

2
tools/perf/util/data-convert-bt.c
View File

@ -318,6 +318,8 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,
offset = tmp_val; offset = tmp_val;
len = offset >> 16; len = offset >> 16;
offset &= 0xffff; offset &= 0xffff;
if (flags & TEP_FIELD_IS_RELATIVE)
offset += fmtf->offset + fmtf->size;
} }
if (flags & TEP_FIELD_IS_ARRAY) { if (flags & TEP_FIELD_IS_ARRAY) {

2
tools/perf/util/evsel.c
View File

@ -2706,6 +2706,8 @@ void *evsel__rawptr(struct evsel *evsel, struct perf_sample *sample, const char
if (field->flags & TEP_FIELD_IS_DYNAMIC) { if (field->flags & TEP_FIELD_IS_DYNAMIC) {
offset = *(int *)(sample->raw_data + field->offset); offset = *(int *)(sample->raw_data + field->offset);
offset &= 0xffff; offset &= 0xffff;
if (field->flags & TEP_FIELD_IS_RELATIVE)
offset += field->offset + field->size;
} }
return sample->raw_data + offset; return sample->raw_data + offset;

2
tools/perf/util/python.c
View File

@ -428,6 +428,8 @@ tracepoint_field(struct pyrf_event *pe, struct tep_format_field *field)
offset = val; offset = val;
len = offset >> 16; len = offset >> 16;
offset &= 0xffff; offset &= 0xffff;
if (field->flags & TEP_FIELD_IS_RELATIVE)
offset += field->offset + field->size;
} }
if (field->flags & TEP_FIELD_IS_STRING && if (field->flags & TEP_FIELD_IS_STRING &&
is_printable_array(data + offset, len)) { is_printable_array(data + offset, len)) {

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

@ -392,6 +392,8 @@ static void perl_process_tracepoint(struct perf_sample *sample,
if (field->flags & TEP_FIELD_IS_DYNAMIC) { if (field->flags & TEP_FIELD_IS_DYNAMIC) {
offset = *(int *)(data + field->offset); offset = *(int *)(data + field->offset);
offset &= 0xffff; offset &= 0xffff;
if (field->flags & TEP_FIELD_IS_RELATIVE)
offset += field->offset + field->size;
} else } else
offset = field->offset; offset = field->offset;
XPUSHs(sv_2mortal(newSVpv((char *)data + offset, 0))); XPUSHs(sv_2mortal(newSVpv((char *)data + offset, 0)));

2
tools/perf/util/scripting-engines/trace-event-python.c
View File

@ -942,6 +942,8 @@ static void python_process_tracepoint(struct perf_sample *sample,
offset = val; offset = val;
len = offset >> 16; len = offset >> 16;
offset &= 0xffff; offset &= 0xffff;
if (field->flags & TEP_FIELD_IS_RELATIVE)
offset += field->offset + field->size;
} }
if (field->flags & TEP_FIELD_IS_STRING && if (field->flags & TEP_FIELD_IS_STRING &&
is_printable_array(data + offset, len)) { is_printable_array(data + offset, len)) {

2
tools/perf/util/sort.c
View File

@ -2365,6 +2365,8 @@ static int64_t __sort__hde_cmp(struct perf_hpp_fmt *fmt,
tep_read_number_field(field, a->raw_data, &dyn); tep_read_number_field(field, a->raw_data, &dyn);
offset = dyn & 0xffff; offset = dyn & 0xffff;
size = (dyn >> 16) & 0xffff; size = (dyn >> 16) & 0xffff;
if (field->flags & TEP_FIELD_IS_RELATIVE)
offset += field->offset + field->size;
/* record max width for output */ /* record max width for output */
if (size > hde->dynamic_len) if (size > hde->dynamic_len)