perf tools: some fixes and tweaks
Adrian Hunter
reviewerv10 cover perf tools: some fixes and tweaks
Hi
Here are some fixes and tweaks to perf tools (version 10).
Changes in V10:
Re-based on:
perf/core branch of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git
commit 207353be1574027c151609a31167ac5919a056c8: perf tools: Remove filter parameter of thread__find_addr_map()
perf tools: add debug prints
Changed to use macros
perf tools: add pid to struct thread
Added David's Ack
perf tools: change machine__findnew_thread() to set thread pid
Added David's Ack
perf tools: remove references to struct ip_event
Also remove from hists_link.c
perf tools: move struct ip_event
Dropped since it is covered by "perf tools: remove references to struct ip_event"
perf tools: add a sample parsing test
Fix missing sample comparison for PERF_SAMPLE_READ
Changes in V9:
perf: Update perf_event_type documentation
Dropped since its been applied
perf tools: tidy up sample parsing overflow checking
Changed to use a single overflow function Updated for PERF_SAMPLE_READ
perf: make events stream always parsable
Added more about sample parsing to the commit message
perf tools: add support for PERF_SAMPLE_IDENTFIER
When selecting PERF_SAMPLE_IDENTFIER, ensure PERF_SAMPLE_ID is deselected
perf tools: expand perf_event__synthesize_sample()
Updated for PERF_SAMPLE_READ
perf tools: add a function to calculate sample event size
Updated for PERF_SAMPLE_READ
perf tools: add a sample parsing test
Updated for PERF_SAMPLE_READ
Changes in V8:
perf tools: add debug prints
Fixed Python link errors
perf tools: move perf_evlist__config() to a new source file
New Patch to avoid Python link errors
perf tools: add support for PERF_SAMPLE_IDENTFIER
Adjustments due to patch above
Changes in V7:
perf: Update perf_event_type documentation
Proposed new patch from Peter Zijlstra
perf: make events stream always parsable
Adjustments due to patch above
perf tools: tidy up sample parsing overflow checking
Change to a single overflow function Amend comment
perf tools: add a function to calculate sample event size
New patch
perf tools: add a sample parsing test
Amended to use sample event size calculation
Changes in V6:
Some checkpatch fixes
perf: make events stream always parsable
Add sample format comments
Changes in V5:
Re-based to Arnaldo's tree and dropped already applied patches:
perf tools: remove unused parameter
perf tools: fix missing tool parameter
perf tools: fix missing 'finished_round'
perf tools: fix parse_events_terms() segfault on error path perf tools: fix new_term() missing free on error path perf tools: add const specifier to perf_pmu__find name parameter perf tools: tidy duplicated munmap code
perf tools: validate perf event header size
perf tools: add debug prints
Changed to perf_event_attr__fprintf()
perf tools: add pid to struct thread
Always set the pid, even if a pid is already set
perf tools: change machine__findnew_thread() to set thread pid
Replaces: perf tools: change "machine" functions to set thread pid
perf tools: add support for PERF_SAMPLE_IDENTFIER
Only use PERF_SAMPLE_IDENTFIER if sample types are different
perf tools: expand perf_event__synthesize_sample()
New patch in preparation of a sample parsing test
perf tools: add a sample parsing test
New patch
Changes in V4:
I added kernel support for matching sample types via PERF_SAMPLE_IDENTIFIER. perf tools support for that required first fixing some other things.
perf tools: fix parse_events_terms() freeing local variable on error path
Dropped - covered by David Ahern
perf tools: struct thread has a tid not a pid
Added ack by David Ahern
perf tools: add pid to struct thread
Remove unused function
perf tools: fix missing increment in sample parsing
New patch
perf tools: tidy up sample parsing overflow checking
New patch
perf tools: remove unnecessary callchain validation
New patch
perf tools: remove references to struct ip_event
New patch
perf tools: move struct ip_event
New patch
perf: make events stream always parsable
New patch
perf tools: add support for PERF_SAMPLE_IDENTFIER
New patch
Changes in V3:
perf tools: add pid to struct thread
Split into 2 patches
perf tools: fix ppid in thread__fork()
Dropped for now
Changes in V2:
perf tools: fix missing tool parameter
Fixed one extra occurrence
perf tools: fix parse_events_terms() freeing local variable on error path
Made "freeing" code into a new function
perf tools: validate perf event header size
Corrected byte-swapping
perf tools: allow non-matching sample types
Added comments
Fixed id_pos calculation
id_pos/is_pos updated whenever sample_type changes Removed perf_evlist__sample_type()
Added __perf_evlist__combined_sample_type()
Added perf_evlist__combined_sample_type()
Added perf_evlist__make_sample_types_compatible()
Added ack's to patches acked by Jiri Olsa
Adrian Hunter (13):
perf tools: add debug prints
perf tools: allow non-matching sample types
perf tools: add pid to struct thread
perf tools: change machine__findnew_thread() to set thread pid perf tools: tidy up sample parsing overflow checking perf tools: remove unnecessary callchain validation perf tools: remove references to struct ip_event
perf: make events stream always parsable
perf tools: move perf_evlist__config() to a new source file perf tools: add support for PERF_SAMPLE_IDENTFIER perf tools: expand perf_event__synthesize_sample() perf tools: add a function to calculate sample event size perf tools: add a sample parsing test
include/uapi/linux/perf_event.h | 27 ++- kernel/events/core.c | 11 +- tools/perf/Makefile | 2 + tools/perf/builtin-inject.c | 8 +- tools/perf/builtin-kmem.c | 3 +- tools/perf/builtin-kvm.c | 2 +- tools/perf/builtin-lock.c | 3 +- tools/perf/builtin-mem.c | 2 +- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-sched.c | 20 +- tools/perf/builtin-script.c | 3 +- tools/perf/builtin-top.c | 11 +- tools/perf/builtin-trace.c | 12 +- tools/perf/tests/builtin-test.c | 4 + tools/perf/tests/code-reading.c | 4 +- tools/perf/tests/hists_link.c | 23 +- tools/perf/tests/mmap-basic.c | 2 +- tools/perf/tests/sample-parsing.c | 313 +++++++++++++++++++++++++ tools/perf/tests/tests.h | 1 + tools/perf/util/build-id.c | 11 +- tools/perf/util/callchain.c | 8 - tools/perf/util/callchain.h | 5 - tools/perf/util/event.c | 5 +- tools/perf/util/event.h | 33 ++- tools/perf/util/evlist.c | 146 ++++++++++-- tools/perf/util/evlist.h | 10 +- tools/perf/util/evsel.c | 471 ++++++++++++++++++++++++++++++++++---- tools/perf/util/evsel.h | 13 +- tools/perf/util/machine.c | 37 ++- tools/perf/util/machine.h | 3 +- tools/perf/util/python.c | 20 ++ tools/perf/util/record.c | 111 +++++++++ tools/perf/util/session.c | 32 +-- tools/perf/util/thread.c | 3 +- tools/perf/util/thread.h | 3 +- 35 files changed, 1174 insertions(+), 190 deletions(-) create mode 100644 tools/perf/tests/sample-parsing.c create mode 100644 tools/perf/util/record.c
Regards
Adrian
Adrian Hunter
reviewerPATCH v10 1/13 perf tools: add debug prints
It is useful to see the arguments to perf_event_open and whether the perf events ring buffer was mmapped per-cpu or per-thread. That information will now be displayed when verbose is 2 i.e option -vv
--- tools/perf/util/evlist.c | 3 +++ tools/perf/util/evsel.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/python.c | 20 ++++++++++++++ 3 files changed, 91 insertions(+)
tools/perf/util/evlist.c +3 -0
@@ -14,6 +14,7 @@#include "target.h" #include "evlist.h" #include "evsel.h" +#include "debug.h" #include <unistd.h> #include "parse-events.h"
@@ -486,6 +487,7 @@ static int perf_evlist__mmap_per_cpu(struct perf_evlist *evlist, int prot, int mint nr_cpus =cpu_map__nr (evlist->cpus);int nr_threads =thread_map__nr (evlist->threads); +pr_debug2 ("perf event ring buffer mmapped per cpu\n" );for (cpu =0 ; cpu < nr_cpus; cpu++) {int output =-1 ;
@@ -524,6 +526,7 @@ static int perf_evlist__mmap_per_thread(struct perf_evlist *evlist, int prot, inint thread;int nr_threads =thread_map__nr (evlist->threads); +pr_debug2 ("perf event ring buffer mmapped per thread\n" );for (thread =0 ; thread < nr_threads; thread++) {int output =-1 ;
tools/perf/util/evsel.c +68 -0
92 lines not on this page · raw message
tools/perf/util/python.c +20 -0
@@ -8,6 +8,26 @@#include "cpumap.h" #include "thread_map.h" +/* +* Support debug printing even though util/debug.c is not linked. That means +* implementing 'verbose' and 'eprintf'. +*/ +int verbose; + +int eprintf (int level,const char *fmt, ...) +{ +va_list args; +int ret =0 ; + +if (verbose >= level) { +va_start (args, fmt); + ret =vfprintf (stderr, fmt, args); +va_end (args); + } + +return ret; +} +/* Define PyVarObject_HEAD_INIT for python 2.5 */ #ifndef PyVarObject_HEAD_INIT# define PyVarObject_HEAD_INIT (type, size) PyObject_HEAD_INIT(type) size,
Signature · 1 line
1.7.11.7
Re: [PATCH V10 01/13] perf tools: add debug prints
Quoted 4 lines · Adrian Hunter
It is useful to see the arguments to
perf_event_openand whether the perf events ring buffer was mmapped per-cpu or per-thread. That information will now be displayed when verbose is 2 i.e option -vv
I have two nitpicks below, but other than that it looks good, so
[SNIP]
Quoted 11 lines
tools/perf/util/evsel.c +11
-0+#define __PRINT_ATTR (fmt, cast, field) \ + fprintf(fp, " %-19s "fmt"\n", #field, cast attr->field) + +#define PRINT_ATTR_U32 (field) __PRINT_ATTR("%u" , , field) +#define PRINT_ATTR_X32 (field) __PRINT_ATTR("%#x", , field) +#define PRINT_ATTR_U64 (field) __PRINT_ATTR("%" PRIu64, (uint64_t), field) +#define PRINT_ATTR_X64 (field) __PRINT_ATTR("%#"PRIx64, (uint64_t), field) + +#define PRINT_ATTR2N (name1, field1, name2, field2) \ + fprintf(fp, " %-19s %u %-19s %u\n", \ + name1, attr->field1, name2, attr->field2)
tools/perf/util/evsel.c static int get_group_fd(struct perf_evsel *evsel, int cpu, int thread) · line 885
Quoted 10 lines
tools/perf/util/evsel.c +10
-0+ +#define PRINT_ATTR2 (field1, field2) \ + PRINT_ATTR2N(#field1, field1, #field2, field2) + +static size_t perf_event_attr__fprintf (struct perf_event_attr *attr,FILE *fp) +{ +size_t ret =0 ; + + ret +=fprintf (fp,"------------------------------" ); + ret +=fprintf (fp,"------------------------------\n" );
We have 'graph_dotted_line' for this.
Quoted 39 lines
tools/perf/util/evsel.c +39
-0+ ret +=fprintf (fp,"perf_event_attr:\n" ); + + ret +=PRINT_ATTR_U32 (type); + ret +=PRINT_ATTR_U32 (size); + ret +=PRINT_ATTR_X64 (config); + ret +=PRINT_ATTR_U64 (sample_period); + ret +=PRINT_ATTR_U64 (sample_freq); + ret +=PRINT_ATTR_X64 (sample_type); + ret +=PRINT_ATTR_X64 (read_format); + + ret +=PRINT_ATTR2 (disabled, inherit); + ret +=PRINT_ATTR2 (pinned, exclusive); + ret +=PRINT_ATTR2 (exclude_user, exclude_kernel); + ret +=PRINT_ATTR2 (exclude_hv, exclude_idle); + ret +=PRINT_ATTR2 (mmap, comm); + ret +=PRINT_ATTR2 (freq, inherit_stat); + ret +=PRINT_ATTR2 (enable_on_exec, task); + ret +=PRINT_ATTR2 (watermark, precise_ip); + ret +=PRINT_ATTR2 (mmap_data, sample_id_all); + ret +=PRINT_ATTR2 (exclude_host, exclude_guest); + ret +=PRINT_ATTR2N ("excl.callchain_kern" , exclude_callchain_kernel, +"excl.callchain_user" , exclude_callchain_user); + + ret +=PRINT_ATTR_U32 (wakeup_events); + ret +=PRINT_ATTR_U32 (wakeup_watermark); + ret +=PRINT_ATTR_X32 (bp_type); + ret +=PRINT_ATTR_X64 (bp_addr); + ret +=PRINT_ATTR_X64 (config1); + ret +=PRINT_ATTR_U64 (bp_len); + ret +=PRINT_ATTR_X64 (config2); + ret +=PRINT_ATTR_X64 (branch_sample_type); + ret +=PRINT_ATTR_X64 (sample_regs_user); + ret +=PRINT_ATTR_U32 (sample_stack_user); + + ret +=fprintf (fp,"------------------------------" ); + ret +=fprintf (fp,"------------------------------\n" ); + +return ret; +}
[SNIP]
Quoted 17 lines
tools/perf/util/python.c +9
-0@@ -8,6 +8,26 @@#include "cpumap.h" #include "thread_map.h" +/* +* Support debug printing even though util/debug.c is not linked. That means +* implementing 'verbose' and 'eprintf'. +*/ +int verbose; + +int eprintf (int level,const char *fmt, ...) +{ +va_list args;
tools/perf/util/python.c line 29
Quoted 10 lines
tools/perf/util/python.c +10
-0+int ret =0 ; + +if (verbose >= level) { +va_start (args, fmt); + ret =vfprintf (stderr, fmt, args); +va_end (args); + } + +return ret; +}
Not sure this duplication is the right way. Maybe linking util/debug.c into the python extension and move trace_event() somewhere is a better approach. But it'd make the util/debug.c more fragile?
Anyway this change could be splitted as a preparation patch.
Thanks,
Namhyung
Adrian Hunter
reviewerRe: [PATCH V10 01/13] perf tools: add debug prints
Quoted 103 lines · Namhyung Kim
Quoted 4 lines · Adrian Hunter
It is useful to see the arguments to
perf_event_openand whether the perf events ring buffer was mmapped per-cpu or per-thread. That information will now be displayed when verbose is 2 i.e option -vvI have two nitpicks below, but other than that it looks good, so
Acked-by Namhyung Kim <[email protected]>[SNIP]
Quoted 11 lines
tools/perf/util/evsel.c +11
-0+#define __PRINT_ATTR (fmt, cast, field) \ + fprintf(fp, " %-19s "fmt"\n", #field, cast attr->field) + +#define PRINT_ATTR_U32 (field) __PRINT_ATTR("%u" , , field) +#define PRINT_ATTR_X32 (field) __PRINT_ATTR("%#x", , field) +#define PRINT_ATTR_U64 (field) __PRINT_ATTR("%" PRIu64, (uint64_t), field) +#define PRINT_ATTR_X64 (field) __PRINT_ATTR("%#"PRIx64, (uint64_t), field) + +#define PRINT_ATTR2N (name1, field1, name2, field2) \ + fprintf(fp, " %-19s %u %-19s %u\n", \ + name1, attr->field1, name2, attr->field2)tools/perf/util/evsel.c static int get_group_fd(struct perf_evsel *evsel, int cpu, int thread) · line 885
Quoted 10 lines
tools/perf/util/evsel.c +10
-0+ +#define PRINT_ATTR2 (field1, field2) \ + PRINT_ATTR2N(#field1, field1, #field2, field2) + +static size_t perf_event_attr__fprintf (struct perf_event_attr *attr,FILE *fp) +{ +size_t ret =0 ; + + ret +=fprintf (fp,"------------------------------" ); + ret +=fprintf (fp,"------------------------------\n" );We have '
graph_dotted_line' for this.Quoted 39 lines
tools/perf/util/evsel.c +39
-0+ ret +=fprintf (fp,"perf_event_attr:\n" ); + + ret +=PRINT_ATTR_U32 (type); + ret +=PRINT_ATTR_U32 (size); + ret +=PRINT_ATTR_X64 (config); + ret +=PRINT_ATTR_U64 (sample_period); + ret +=PRINT_ATTR_U64 (sample_freq); + ret +=PRINT_ATTR_X64 (sample_type); + ret +=PRINT_ATTR_X64 (read_format); + + ret +=PRINT_ATTR2 (disabled, inherit); + ret +=PRINT_ATTR2 (pinned, exclusive); + ret +=PRINT_ATTR2 (exclude_user, exclude_kernel); + ret +=PRINT_ATTR2 (exclude_hv, exclude_idle); + ret +=PRINT_ATTR2 (mmap, comm); + ret +=PRINT_ATTR2 (freq, inherit_stat); + ret +=PRINT_ATTR2 (enable_on_exec, task); + ret +=PRINT_ATTR2 (watermark, precise_ip); + ret +=PRINT_ATTR2 (mmap_data, sample_id_all); + ret +=PRINT_ATTR2 (exclude_host, exclude_guest); + ret +=PRINT_ATTR2N ("excl.callchain_kern" , exclude_callchain_kernel, +"excl.callchain_user" , exclude_callchain_user); + + ret +=PRINT_ATTR_U32 (wakeup_events); + ret +=PRINT_ATTR_U32 (wakeup_watermark); + ret +=PRINT_ATTR_X32 (bp_type); + ret +=PRINT_ATTR_X64 (bp_addr); + ret +=PRINT_ATTR_X64 (config1); + ret +=PRINT_ATTR_U64 (bp_len); + ret +=PRINT_ATTR_X64 (config2); + ret +=PRINT_ATTR_X64 (branch_sample_type); + ret +=PRINT_ATTR_X64 (sample_regs_user); + ret +=PRINT_ATTR_U32 (sample_stack_user); + + ret +=fprintf (fp,"------------------------------" ); + ret +=fprintf (fp,"------------------------------\n" ); + +return ret; +}[SNIP]
Quoted 23 lines
tools/perf/util/python.c +15
-0@@ -8,6 +8,26 @@#include "cpumap.h" #include "thread_map.h" +/* +* Support debug printing even though util/debug.c is not linked. That means +* implementing 'verbose' and 'eprintf'. +*/ +int verbose; + +int eprintf (int level,const char *fmt, ...) +{ +va_list args; +int ret =0 ; + +if (verbose >= level) { +va_start (args, fmt); + ret =vfprintf (stderr, fmt, args); +va_end (args);
Quoted 8 lines
tools/perf/util/python.c line 29
Quoted 4 lines
tools/perf/util/python.c +4
-0+ } + +return ret; +}Not sure this duplication is the right way. Maybe linking
util/debug.cinto the python extension and movetrace_event()somewhere is a better approach. But it'd make theutil/debug.cmore fragile?
trace_event is not the problem. ui_helpline__vshow is. So eprintf has to be re-implemented anyway.
Quoted 7 lines
Anyway this change could be splitted as a preparation patch.
Thanks,
Namhyung
Adrian Hunter
reviewerPATCH v10 2/13 perf tools: allow non-matching sample types
In reply to Adrian HunterSample types need not be identical to determine the sample id from the event. Only the position of the sample id needs to be the same.
Compatible sample types are ones in which the bits defined by PERF_COMPAT_MASK are the same. 'perf_evlist__config()' forces sample types to be compatible on that basis.
--- tools/perf/builtin-report.c | 2 +- tools/perf/util/event.h | 14 +++++ tools/perf/util/evlist.c | 136 ++++++++++++++++++++++++++++++++++++++++++-- tools/perf/util/evlist.h | 8 ++- tools/perf/util/evsel.c | 64 ++++++++++++++++++++- tools/perf/util/evsel.h | 10 ++++ tools/perf/util/session.c | 4 +- 7 files changed, 228 insertions(+), 10 deletions(-)
tools/perf/builtin-report.c +1 -1
@@ -365,7 +365,7 @@ static int process_read_event(struct perf_tool *tool,static int perf_report__setup_sample_type (struct perf_report *rep) {struct perf_session *self = rep->session; -u64 sample_type =perf_evlist__sample_type (self->evlist); +u64 sample_type =perf_evlist__combined_sample_type (self->evlist);if (!self->fd_pipe && !(sample_type &PERF_SAMPLE_CALLCHAIN )) {if (sort__has_parent) {
tools/perf/util/event.h +14 -0
@@ -65,6 +65,20 @@ struct read_event { PERF_SAMPLE_ID | PERF_SAMPLE_STREAM_ID | \ PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD) +/* +* Events have compatible sample types if the following bits all have the same +* value. This is because the order of sample members is fixed. For sample +* events the order is: PERF_SAMPLE_IP, PERF_SAMPLE_TID, PERF_SAMPLE_TIME, +* PERF_SAMPLE_ADDR, PERF_SAMPLE_ID. For non-sample events the sample members +* are accessed in reverse order. The order is: PERF_SAMPLE_ID, +* PERF_SAMPLE_STREAM_ID, PERF_SAMPLE_CPU. +*/ +#define PERF_COMPAT_MASK \ + (PERF_SAMPLE_IP | PERF_SAMPLE_TID | \ + PERF_SAMPLE_TIME | PERF_SAMPLE_ADDR | \ + PERF_SAMPLE_ID | PERF_SAMPLE_STREAM_ID | \ + PERF_SAMPLE_CPU) +struct sample_event {struct perf_event_header header;u64 array[];
tools/perf/util/evlist.c +131 -5
187 lines not on this page · raw message
tools/perf/util/evlist.h +7 -1
@@ -32,11 +32,15 @@ struct perf_evlist {int nr_fds;int nr_mmaps;int mmap_len; +int id_pos; +int is_pos; +u64 combined_sample_type;struct {int cork_fd;pid_t pid; } workload;bool overwrite; +bool matching_sample_types;struct perf_mmap *mmap;struct pollfd *pollfd;struct thread_map *threads;
@@ -85,6 +89,7 @@ union perf_event *perf_evlist__mmap_read(struct perf_evlist *self, int idx);int perf_evlist__open (struct perf_evlist *evlist);void perf_evlist__close (struct perf_evlist *evlist); +void perf_evlist__make_sample_types_compatible (struct perf_evlist *evlist);void perf_evlist__config (struct perf_evlist *evlist,struct perf_record_opts *opts);
@@ -121,7 +126,8 @@ void __perf_evlist__set_leader(struct list_head *list);void perf_evlist__set_leader (struct perf_evlist *evlist);u64 perf_evlist__read_format (struct perf_evlist *evlist); -u64 perf_evlist__sample_type (struct perf_evlist *evlist); +u64 __perf_evlist__combined_sample_type (struct perf_evlist *evlist); +u64 perf_evlist__combined_sample_type (struct perf_evlist *evlist);bool perf_evlist__sample_id_all (struct perf_evlist *evlist);u16 perf_evlist__id_hdr_size (struct perf_evlist *evlist);
tools/perf/util/evsel.c +63 -1
94 lines not on this page · raw message
tools/perf/util/evsel.h +10 -0
@@ -48,6 +48,11 @@ struct perf_sample_id {* @name - Can be set to retain the original event name passed by the user, * so that when showing results in tools such as 'perf stat', we * show the name used, not some alias. +* @id_pos: the position of the event id (PERF_SAMPLE_ID) in a sample event +* i.e. in the array of struct sample_event +* @is_pos: the position (counting backwards) of the event id (PERF_SAMPLE_ID) +* in a non-sample event i.e. if sample_id_all is used there is an id +* sample appended to non-sample events */ struct perf_evsel {struct list_head node;
@@ -74,6 +79,8 @@ struct perf_evsel { } handler;struct cpu_map *cpus;unsigned int sample_size; +int id_pos; +int is_pos;bool supported;bool needs_swap;/* parse modifier helper */
@@ -104,6 +111,9 @@ void perf_evsel__delete(struct perf_evsel *evsel);void perf_evsel__config (struct perf_evsel *evsel,struct perf_record_opts *opts); +int __perf_evsel__sample_size (u64 sample_type); +void perf_evsel__calc_id_pos (struct perf_evsel *evsel); +bool perf_evsel__is_cache_op_valid (u8 type,u8 op);#define PERF_EVSEL__MAX_ALIASES 8
tools/perf/util/session.c +2 -2
@@ -739,7 +739,7 @@ static void perf_session__print_tstamp(struct perf_session *session,union perf_event *event, struct perf_sample *sample) { - u64 sample_type = perf_evlist__sample_type(session->evlist); + u64 sample_type = __perf_evlist__combined_sample_type(session->evlist);if (event->header.type !=PERF_RECORD_SAMPLE && !perf_evlist__sample_id_all (session->evlist)) {
@@ -1001,7 +1001,7 @@ static int perf_session__preprocess_sample(struct perf_session *session, union perf_event *event, struct perf_sample *sample) {if (event->header.type !=PERF_RECORD_SAMPLE || - !(perf_evlist__sample_type (session->evlist) &PERF_SAMPLE_CALLCHAIN )) + !sample->callchain)return 0 ;if (!ip_callchain__valid (sample->callchain, event)) {
Signature · 1 line
1.7.11.7
Adrian Hunter
reviewerPATCH v10 3/13 perf tools: add pid to struct thread
In reply to Adrian HunterRecord pid on struct thread. The member is named 'pid_' to avoid confusion with the 'tid' member which was previously named 'pid'.
--- tools/perf/util/machine.c | 16 +++++++++++----- tools/perf/util/thread.c | 3 ++- tools/perf/util/thread.h | 3 ++- 3 files changed, 15 insertions(+), 7 deletions(-)
tools/perf/util/machine.c +11 -5
@@ -253,7 +253,8 @@ void machines__set_id_hdr_size(struct machines *machines, u16 id_hdr_size)return ; } -static struct thread *__machine__findnew_thread (struct machine *machine,pid_t tid, +static struct thread *__machine__findnew_thread (struct machine *machine, +pid_t pid,pid_t tid,bool create) {struct rb_node **p = &machine->threads.rb_node;
@@ -265,8 +266,11 @@ static struct thread *__machine__findnew_thread(struct machine *machine, pid_t t* so most of the time we dont have to look up * the full rbtree: */ -if (machine->last_match && machine->last_match->tid == tid) +if (machine->last_match && machine->last_match->tid == tid) { +if (pid && pid != machine->last_match->pid_) + machine->last_match->pid_ = pid;return machine->last_match; + }while (*p !=NULL ) { parent = *p;
@@ -274,6 +278,8 @@ static struct thread *__machine__findnew_thread(struct machine *machine, pid_t tif (th->tid == tid) { machine->last_match = th; +if (pid && pid != th->pid_) + th->pid_ = pid;return th; }
@@ -286,7 +292,7 @@ static struct thread *__machine__findnew_thread(struct machine *machine, pid_t tif (!create)return NULL ; - th =thread__new (tid); + th =thread__new (pid, tid);if (th !=NULL ) {rb_link_node (&th->rb_node, parent, p);rb_insert_color (&th->rb_node, &machine->threads);
@@ -298,12 +304,12 @@ static struct thread *__machine__findnew_thread(struct machine *machine, pid_t tstruct thread *machine__findnew_thread (struct machine *machine,pid_t tid) { -return __machine__findnew_thread (machine, tid, true); +return __machine__findnew_thread (machine,0 , tid, true); }struct thread *machine__find_thread (struct machine *machine,pid_t tid) { -return __machine__findnew_thread (machine, tid, false); +return __machine__findnew_thread (machine,0 , tid, false); }int machine__process_comm_event (struct machine *machine,union perf_event *event)
tools/perf/util/thread.c +2 -1
@@ -7,12 +7,13 @@#include "util.h" #include "debug.h" -struct thread *thread__new (pid_t tid) +struct thread *thread__new (pid_t pid,pid_t tid) {struct thread *self =zalloc (sizeof (*self));if (self !=NULL ) {map_groups__init (&self->mg); + self->pid_ = pid; self->tid = tid; self->ppid =-1 ; self->comm =malloc (32 );
tools/perf/util/thread.h +2 -1
@@ -12,6 +12,7 @@ struct thread {struct list_head node; };struct map_groups mg; +pid_t pid_;/* Not all tools update this */ pid_t tid;pid_t ppid;char shortname[3 ];
@@ -24,7 +25,7 @@ struct thread {struct machine ; -struct thread *thread__new (pid_t tid); +struct thread *thread__new (pid_t pid,pid_t tid);void thread__delete (struct thread *self);int thread__set_comm (struct thread *self,const char *comm);
Signature · 1 line
1.7.11.7
Adrian Hunter
reviewerPATCH v10 4/13 perf tools: change machine__findnew_thread() to set thread pid
In reply to Adrian HunterAdd a new parameter for 'pid' to machine__findnew_thread(). Change callers to pass 'pid' when it is known.
--- tools/perf/builtin-inject.c | 2 +- tools/perf/builtin-kmem.c | 3 ++- tools/perf/builtin-kvm.c | 2 +- tools/perf/builtin-lock.c | 3 ++- tools/perf/builtin-sched.c | 20 +++++++++++--------- tools/perf/builtin-script.c | 3 ++- tools/perf/builtin-trace.c | 12 +++++++++--- tools/perf/tests/code-reading.c | 4 ++-- tools/perf/tests/hists_link.c | 3 ++- tools/perf/util/build-id.c | 7 +++++-- tools/perf/util/event.c | 3 ++- tools/perf/util/machine.c | 23 ++++++++++++++++------- tools/perf/util/machine.h | 3 ++- tools/perf/util/session.c | 2 +- 14 files changed, 58 insertions(+), 32 deletions(-)
tools/perf/builtin-inject.c +1 -1
@@ -198,7 +198,7 @@ static int perf_event__inject_buildid(struct perf_tool *tool, cpumode = event->header.misc &PERF_RECORD_MISC_CPUMODE_MASK ; - thread =machine__findnew_thread (machine, event->ip.pid); + thread =machine__findnew_thread (machine, event->ip.pid, event->ip.pid);if (thread ==NULL ) {pr_err ("problem processing %d event, skipping it.\n" , event->header.type);
tools/perf/builtin-kmem.c +2 -1
@@ -305,7 +305,8 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused,struct perf_evsel *evsel, struct machine *machine) { - struct thread *thread = machine__findnew_thread(machine, event->ip.pid); + struct thread *thread = machine__findnew_thread(machine, event->ip.pid, + event->ip.pid);if (thread ==NULL ) { pr_debug("problem processing %d event, skipping it.\n",
tools/perf/builtin-kvm.c +1 -1
@@ -815,7 +815,7 @@ static int process_sample_event(struct perf_tool *tool,if (skip_sample (kvm, sample))return 0 ; - thread =machine__findnew_thread (machine, sample->tid); + thread =machine__findnew_thread (machine, sample->pid, sample->tid);if (thread ==NULL ) {pr_debug ("problem processing %d event, skipping it.\n" , event->header.type);
tools/perf/builtin-lock.c +2 -1
@@ -805,7 +805,8 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused,struct perf_evsel *evsel, struct machine *machine) { - struct thread *thread = machine__findnew_thread(machine, sample->tid); + struct thread *thread = machine__findnew_thread(machine, sample->pid, + sample->tid);if (thread ==NULL ) { pr_debug("problem processing %d event, skipping it.\n",
tools/perf/builtin-sched.c +11 -9
@@ -724,8 +724,10 @@ static int replay_fork_event(struct perf_sched *sched, {struct thread *child, *parent; - child =machine__findnew_thread (machine, event->fork.tid); - parent =machine__findnew_thread (machine, event->fork.ptid); + child =machine__findnew_thread (machine, event->fork.pid, + event->fork.tid); + parent =machine__findnew_thread (machine, event->fork.ppid, + event->fork.ptid);if (child ==NULL || parent ==NULL ) { pr_debug("thread does not exist on fork event: child %p, parent %p\n",
@@ -934,8 +936,8 @@ static int latency_switch_event(struct perf_sched *sched,return -1 ; } - sched_out =machine__findnew_thread (machine, prev_pid); - sched_in =machine__findnew_thread (machine, next_pid); + sched_out =machine__findnew_thread (machine,0 , prev_pid); + sched_in =machine__findnew_thread (machine,0 , next_pid); out_events =thread_atoms_search (&sched->atom_root, sched_out, &sched->cmp_pid);if (!out_events) {
@@ -978,7 +980,7 @@ static int latency_runtime_event(struct perf_sched *sched, {const u32 pid =perf_evsel__intval (evsel, sample,"pid" );const u64 runtime =perf_evsel__intval (evsel, sample,"runtime" ); -struct thread *thread =machine__findnew_thread (machine, pid); +struct thread *thread =machine__findnew_thread (machine,0 , pid);struct work_atoms *atoms =thread_atoms_search (&sched->atom_root, thread, &sched->cmp_pid);u64 timestamp = sample->time;int cpu = sample->cpu;
@@ -1016,7 +1018,7 @@ static int latency_wakeup_event(struct perf_sched *sched,if (!success)return 0 ; - wakee =machine__findnew_thread (machine, pid); + wakee =machine__findnew_thread (machine,0 , pid); atoms =thread_atoms_search (&sched->atom_root, wakee, &sched->cmp_pid);if (!atoms) {if (thread_atoms_insert (sched, wakee))
@@ -1070,7 +1072,7 @@ static int latency_migrate_task_event(struct perf_sched *sched,if (sched->profile_cpu ==-1 )return 0 ; - migrant =machine__findnew_thread (machine, pid); + migrant =machine__findnew_thread (machine,0 , pid); atoms =thread_atoms_search (&sched->atom_root, migrant, &sched->cmp_pid);if (!atoms) {if (thread_atoms_insert (sched, migrant))
@@ -1289,8 +1291,8 @@ static int map_switch_event(struct perf_sched *sched, struct perf_evsel *evsel,return -1 ; } - sched_out =machine__findnew_thread (machine, prev_pid); - sched_in =machine__findnew_thread (machine, next_pid); + sched_out =machine__findnew_thread (machine,0 , prev_pid); + sched_in =machine__findnew_thread (machine,0 , next_pid); sched->curr_thread[this_cpu] = sched_in;
tools/perf/builtin-script.c +2 -1
@@ -501,7 +501,8 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused, struct machine *machine) {struct addr_location al; -struct thread *thread =machine__findnew_thread (machine, event->ip.tid); +struct thread *thread =machine__findnew_thread (machine, event->ip.pid, + event->ip.tid);if (thread ==NULL ) { pr_debug("problem processing %d event, skipping it.\n",
tools/perf/builtin-trace.c +9 -3
@@ -302,7 +302,9 @@ static int trace__sys_enter(struct trace *trace, struct perf_evsel *evsel,char *msg;void *args;size_t printed =0 ; -struct thread *thread =machine__findnew_thread (&trace->host, sample->tid); +struct thread *thread =machine__findnew_thread (&trace->host, + sample->pid, + sample->tid);struct syscall *sc =trace__syscall_info (trace, evsel, sample);struct thread_trace *ttrace =thread__trace (thread);
@@ -345,7 +347,9 @@ static int trace__sys_exit(struct trace *trace, struct perf_evsel *evsel, {int ret;u64 duration =0 ; -struct thread *thread =machine__findnew_thread (&trace->host, sample->tid); +struct thread *thread =machine__findnew_thread (&trace->host, + sample->pid, + sample->tid);struct thread_trace *ttrace =thread__trace (thread);struct syscall *sc =trace__syscall_info (trace, evsel, sample);
@@ -398,7 +402,9 @@ static int trace__sched_stat_runtime(struct trace *trace, struct perf_evsel *evs {u64 runtime =perf_evsel__intval (evsel, sample,"runtime" );double runtime_ms = (double )runtime /NSEC_PER_MSEC ; -struct thread *thread =machine__findnew_thread (&trace->host, sample->tid); +struct thread *thread =machine__findnew_thread (&trace->host, + sample->pid, + sample->tid);struct thread_trace *ttrace =thread__trace (thread);if (ttrace ==NULL )
tools/perf/tests/code-reading.c +2 -2
@@ -257,7 +257,7 @@ static int process_sample_event(struct machine *machine,return -1 ; } - thread =machine__findnew_thread (machine, sample.pid); + thread =machine__findnew_thread (machine, sample.pid, sample.pid);if (!thread) {pr_debug ("machine__findnew_thread failed\n" );return -1 ;
@@ -447,7 +447,7 @@ static int do_test_code_reading(bool try_kcore) goto out_err; } - thread =machine__findnew_thread (machine, pid); + thread =machine__findnew_thread (machine, pid, pid);if (!thread) {pr_debug ("machine__findnew_thread failed\n" ); goto out_err;
tools/perf/tests/hists_link.c +2 -1
@@ -88,7 +88,8 @@ static struct machine *setup_fake_machine(struct machines *machines)for (i =0 ; i <ARRAY_SIZE (fake_threads); i++) {struct thread *thread; - thread =machine__findnew_thread (machine, fake_threads[i].pid); + thread =machine__findnew_thread (machine, fake_threads[i].pid, + fake_threads[i].pid);if (thread ==NULL ) goto out;
tools/perf/util/build-id.c +5 -2
@@ -24,7 +24,8 @@ int build_id__mark_dso_hit(struct perf_tool *tool __maybe_unused, {struct addr_location al;u8 cpumode = event->header.misc &PERF_RECORD_MISC_CPUMODE_MASK ; -struct thread *thread =machine__findnew_thread (machine, event->ip.pid); +struct thread *thread =machine__findnew_thread (machine, event->ip.pid, + event->ip.pid);if (thread ==NULL ) { pr_err("problem processing %d event, skipping it.\n",
@@ -47,7 +48,9 @@ static int perf_event__exit_del_thread(struct perf_tool *tool __maybe_unused, __maybe_unused, struct machine *machine) { -struct thread *thread =machine__findnew_thread (machine, event->fork.tid); +struct thread *thread =machine__findnew_thread (machine, + event->fork.pid, + event->fork.tid);dump_printf ("(%d:%d):(%d:%d)\n" , event->fork.pid, event->fork.tid, event->fork.ppid, event->fork.ptid);
tools/perf/util/event.c +2 -1
@@ -686,7 +686,8 @@ int perf_event__preprocess_sample(const union perf_event *event, struct perf_sample *sample) {u8 cpumode = event->header.misc &PERF_RECORD_MISC_CPUMODE_MASK ; -struct thread *thread =machine__findnew_thread (machine, event->ip.pid); +struct thread *thread =machine__findnew_thread (machine, event->ip.pid, + event->ip.pid);if (thread ==NULL )return -1 ;
tools/perf/util/machine.c +16 -7
@@ -32,7 +32,8 @@ int machine__init(struct machine *machine, const char *root_dir, pid_t pid)return -ENOMEM ;if (pid !=HOST_KERNEL_ID ) { -struct thread *thread =machine__findnew_thread (machine, pid); +struct thread *thread =machine__findnew_thread (machine,0 , + pid);char comm[64 ];if (thread ==NULL )
@@ -302,9 +303,10 @@ static struct thread *__machine__findnew_thread(struct machine *machine,return th; } -struct thread *machine__findnew_thread (struct machine *machine,pid_t tid) +struct thread *machine__findnew_thread (struct machine *machine,pid_t pid, +pid_t tid) { -return __machine__findnew_thread (machine,0 , tid, true); +return __machine__findnew_thread (machine, pid, tid, true); }struct thread *machine__find_thread (struct machine *machine,pid_t tid)
@@ -314,7 +316,9 @@ struct thread *machine__find_thread(struct machine *machine, pid_t tid)int machine__process_comm_event (struct machine *machine,union perf_event *event) { -struct thread *thread =machine__findnew_thread (machine, event->comm.tid); +struct thread *thread =machine__findnew_thread (machine, + event->comm.pid, + event->comm.tid);if (dump_trace)perf_event__fprintf_comm (event, stdout);
@@ -1012,7 +1016,8 @@ int machine__process_mmap_event(struct machine *machine, union perf_event *eventreturn 0 ; } - thread =machine__findnew_thread (machine, event->mmap.pid); + thread =machine__findnew_thread (machine, event->mmap.pid, + event->mmap.pid);if (thread ==NULL ) goto out_problem;
@@ -1039,8 +1044,12 @@ out_problem:int machine__process_fork_event (struct machine *machine,union perf_event *event) { -struct thread *thread =machine__findnew_thread (machine, event->fork.tid); -struct thread *parent =machine__findnew_thread (machine, event->fork.ptid); +struct thread *thread =machine__findnew_thread (machine, + event->fork.pid, + event->fork.tid); +struct thread *parent =machine__findnew_thread (machine, + event->fork.ppid, + event->fork.ptid);if (dump_trace)perf_event__fprintf_task (event, stdout);
tools/perf/util/machine.h +2 -1
@@ -106,7 +106,8 @@ static inline bool machine__is_host(struct machine *machine)return machine ? machine->pid ==HOST_KERNEL_ID : false; } -struct thread *machine__findnew_thread (struct machine *machine,pid_t tid); +struct thread *machine__findnew_thread (struct machine *machine,pid_t pid, +pid_t tid);size_t machine__fprintf (struct machine *machine,FILE *fp);
tools/perf/util/session.c +1 -1
@@ -1099,7 +1099,7 @@ void perf_event_header__bswap(struct perf_event_header *self)struct thread *perf_session__findnew (struct perf_session *session,pid_t pid) { -return machine__findnew_thread (&session->machines.host, pid); +return machine__findnew_thread (&session->machines.host,0 , pid); }static struct thread *perf_session__register_idle_thread (struct perf_session *self)
Signature · 1 line
1.7.11.7
Namhyung Kim
maintainerRe: [PATCH V10 04/13] perf tools: change machine__findnew_thread() to set thread pid
Quoted 2 lines · Adrian Hunter
Add a new parameter for 'pid' to
machine__findnew_thread(). Change callers to pass 'pid' when it is known.
I think the changelog should mention the subtlety of passing pid/tid to prevent possible future misusages.
Thanks,
Namhyung
Adrian Hunter
reviewerPATCH v10 5/13 perf tools: tidy up sample parsing overflow checking
In reply to Adrian HunterThe size of data retrieved from a sample event must be validated to ensure it does not go past the end of the event. That was being done sporadically and without considering integer overflows.
--- tools/perf/util/evsel.c | 112 ++++++++++++++++++++++++++++++------------------ 1 file changed, 71 insertions(+), 41 deletions(-)
tools/perf/util/evsel.c +71 -41
@@ -1168,24 +1168,30 @@ static int perf_evsel__parse_id_sample(const struct perf_evsel *evsel,return 0 ; } -static bool sample_overlap (const union perf_event *event, -const void *offset,u64 size) +static inline bool overflow (const void *endp,u16 max_size,const void *offset, +u64 size) { -const void *base = event; +return size > max_size || offset + size > endp; +} -if (offset + size > base + event->header.size) -return true; +#define OVERFLOW_CHECK (offset, size, max_size) \ + do { \ + if (overflow(endp, (max_size), (offset), (size))) \ + return -EFAULT; \ + } while (0) -return false; -} +#define OVERFLOW_CHECK_u64 (offset) \ + OVERFLOW_CHECK(offset, sizeof(u64), sizeof(u64))int perf_evsel__parse_sample (struct perf_evsel *evsel,union perf_event *event,struct perf_sample *data) {u64 type = evsel->attr.sample_type; -u64 regs_user = evsel->attr.sample_regs_user;bool swapped = evsel->needs_swap;const u64 *array; +u16 max_size = event->header.size; +const void *endp = (void *)event + max_size; +u64 sz;/* * used for cross-endian analysis. See git commit 65014ab3
@@ -1207,6 +1213,11 @@ int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event, array = event->sample.array; +/* +* The evsel's sample_size is based on PERF_SAMPLE_MASK which includes +* up to PERF_SAMPLE_PERIOD. After that overflow() must be used to +* check the format does not go past the end of the event. +*/ if (evsel->sample_size +sizeof (event->header) > event->header.size)return -EFAULT ;
@@ -1272,6 +1283,7 @@ int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event,if (type &PERF_SAMPLE_READ ) {u64 read_format = evsel->attr.read_format; +OVERFLOW_CHECK_u64 (array);if (read_format &PERF_FORMAT_GROUP ) data->read.group.nr = *array;else
@@ -1280,41 +1292,51 @@ int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event, array++;if (read_format &PERF_FORMAT_TOTAL_TIME_ENABLED ) { +OVERFLOW_CHECK_u64 (array); data->read.time_enabled = *array; array++; }if (read_format &PERF_FORMAT_TOTAL_TIME_RUNNING ) { +OVERFLOW_CHECK_u64 (array); data->read.time_running = *array; array++; }/* PERF_FORMAT_ID is forced for PERF_SAMPLE_READ */ if (read_format &PERF_FORMAT_GROUP ) { - data->read.group.values = (struct sample_read_value *) array; - array = (void *) array + data->read.group.nr * -sizeof (struct sample_read_value ); +const u64 max_group_nr =UINT64_MAX / +sizeof (struct sample_read_value ); + +if (data->read.group.nr > max_group_nr) +return -EFAULT ; + sz = data->read.group.nr * +sizeof (struct sample_read_value ); +OVERFLOW_CHECK (array, sz, max_size); + data->read.group.values = + (struct sample_read_value *)array; + array = (void *)array + sz; }else { +OVERFLOW_CHECK_u64 (array); data->read.one.id = *array; array++; } }if (type &PERF_SAMPLE_CALLCHAIN ) { -if (sample_overlap (event, array,sizeof (data->callchain->nr))) -return -EFAULT ; - - data->callchain = (struct ip_callchain *)array; +const u64 max_callchain_nr =UINT64_MAX /sizeof (u64); -if (sample_overlap (event, array, data->callchain->nr)) +OVERFLOW_CHECK_u64 (array); + data->callchain = (struct ip_callchain *)array++; +if (data->callchain->nr > max_callchain_nr)return -EFAULT ; - - array +=1 + data->callchain->nr; + sz = data->callchain->nr *sizeof (u64); +OVERFLOW_CHECK (array, sz, max_size); + array = (void *)array + sz; }if (type &PERF_SAMPLE_RAW ) { -const u64 *pdata; - +OVERFLOW_CHECK_u64 (array); u.val64 = *array;if (WARN_ONCE (swapped,"Endianness of raw data not corrected!\n" )) {
@@ -1323,65 +1345,73 @@ int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event, u.val32[0 ] =bswap_32 (u.val32[0 ]); u.val32[1 ] =bswap_32 (u.val32[1 ]); } - -if (sample_overlap (event, array,sizeof (u32))) -return -EFAULT ; - data->raw_size = u.val32[0 ]; - pdata = (void *) array +sizeof (u32); - -if (sample_overlap (event, pdata, data->raw_size)) -return -EFAULT ; + array = (void *)array +sizeof (u32); - data->raw_data = (void *) pdata; - - array = (void *)array + data->raw_size +sizeof (u32); +OVERFLOW_CHECK (array, data->raw_size, max_size); + data->raw_data = (void *)array; + array = (void *)array + data->raw_size; }if (type &PERF_SAMPLE_BRANCH_STACK ) { -u64 sz; +const u64 max_branch_nr =UINT64_MAX / +sizeof (struct branch_entry ); - data->branch_stack = (struct branch_stack *)array; - array++;/* nr */ +OVERFLOW_CHECK_u64 (array); + data->branch_stack = (struct branch_stack *)array++; +if (data->branch_stack->nr > max_branch_nr) +return -EFAULT ; sz = data->branch_stack->nr *sizeof (struct branch_entry ); - sz /=sizeof (u64); - array += sz; +OVERFLOW_CHECK (array, sz, max_size); + array = (void *)array + sz; }if (type &PERF_SAMPLE_REGS_USER ) { +u64 avail; +/* First u64 tells us if we have any regs in sample. */ -u64 avail = *array++; +OVERFLOW_CHECK_u64 (array); + avail = *array++;if (avail) { +u64 regs_user = evsel->attr.sample_regs_user; + + sz =hweight_long (regs_user) *sizeof (u64); +OVERFLOW_CHECK (array, sz, max_size); data->user_regs.regs = (u64 *)array; - array +=hweight_long (regs_user); + array = (void *)array + sz; } }if (type &PERF_SAMPLE_STACK_USER ) { -u64 size = *array++; +OVERFLOW_CHECK_u64 (array); + sz = *array++; data->user_stack.offset = ((char *)(array -1 ) - (char *) event); -if (!size) { +if (!sz) { data->user_stack.size =0 ; }else { +OVERFLOW_CHECK (array, sz, max_size); data->user_stack.data = (char *)array; - array += size /sizeof (*array); + array = (void *)array + sz; +OVERFLOW_CHECK_u64 (array); data->user_stack.size = *array++; } } data->weight =0 ;if (type &PERF_SAMPLE_WEIGHT ) { +OVERFLOW_CHECK_u64 (array); data->weight = *array; array++; } data->data_src =PERF_MEM_DATA_SRC_NONE ;if (type &PERF_SAMPLE_DATA_SRC ) { +OVERFLOW_CHECK_u64 (array); data->data_src = *array; array++; }
Signature · 1 line
1.7.11.7
Re: [PATCH V10 05/13] perf tools: tidy up sample parsing overflow checking
Quoted 6 lines · Adrian Hunter
The size of data retrieved from a sample event must be validated to ensure it does not go past the end of the event. That was being done sporadically and without considering integer overflows.
Signed-off-by Adrian Hunter <[email protected]>
Adrian Hunter
reviewerPATCH v10 6/13 perf tools: remove unnecessary callchain validation
In reply to Adrian HunterNow that the sample parsing correctly checks data sizes there is no reason for it to be done again for callchains.
--- tools/perf/util/callchain.c | 8 -------- tools/perf/util/callchain.h | 5 ----- tools/perf/util/session.c | 20 -------------------- 3 files changed, 33 deletions(-)
tools/perf/util/callchain.c +0 -8
@@ -21,14 +21,6 @@ __threadstruct callchain_cursor callchain_cursor; -bool ip_callchain__valid (struct ip_callchain *chain, -const union perf_event *event) -{ -unsigned int chain_size = event->header.size; - chain_size -= (unsigned long )&event->ip.__more_data - (unsigned long )event; -return chain->nr *sizeof (u64) <= chain_size; -} -#define chain_for_each_child (child, parent) \ list_for_each_entry(child, &parent->children, siblings)
tools/perf/util/callchain.h +0 -5
@@ -109,11 +109,6 @@ int callchain_append(struct callchain_root *root,int callchain_merge (struct callchain_cursor *cursor,struct callchain_root *dst,struct callchain_root *src); -struct ip_callchain ; -union perf_event ; - -bool ip_callchain__valid (struct ip_callchain *chain, -const union perf_event *event);/* * Initialize a cursor before adding entries inside, but keep * the previously allocated entries as a cache.
tools/perf/util/session.c +0 -20
@@ -997,22 +997,6 @@ static int perf_session_deliver_event(struct perf_session *session, } } -static int perf_session__preprocess_sample (struct perf_session *session, -union perf_event *event,struct perf_sample *sample) -{ -if (event->header.type !=PERF_RECORD_SAMPLE || - !sample->callchain) -return 0 ; - -if (!ip_callchain__valid (sample->callchain, event)) { -pr_debug ("call-chain problem with event, skipping it.\n" ); - ++session->stats.nr_invalid_chains; - session->stats.total_invalid_chains += sample->period; -return -EINVAL ; - } -return 0 ; -} -static int perf_session__process_user_event (struct perf_session *session,union perf_event *event,struct perf_tool *tool,u64 file_offset) {
@@ -1075,10 +1059,6 @@ static int perf_session__process_event(struct perf_session *session,if (ret)return ret; -/* Preprocess sample records - precheck callchains */ -if (perf_session__preprocess_sample (session, event, &sample)) -return 0 ; -if (tool->ordered_samples) { ret =perf_session_queue_event (session, event, &sample, file_offset);
Signature · 1 line
1.7.11.7
Re: [PATCH V10 06/13] perf tools: remove unnecessary callchain validation
Quoted 2 lines · Adrian Hunter
Now that the sample parsing correctly checks data sizes there is no reason for it to be done again for callchains.
Thanks,
Namhyung
Adrian Hunter
reviewerPATCH v10 7/13 perf tools: remove references to struct ip_event
In reply to Adrian Hunterstruct ip_event assumes fixed positions for ip, pid and tid. That is no longer true with the addition of PERF_SAMPLE_IDENTIFIER. The information is anyway in struct sample, so use that instead.
--- tools/perf/builtin-inject.c | 4 ++-- tools/perf/builtin-kmem.c | 4 ++-- tools/perf/builtin-mem.c | 2 +- tools/perf/builtin-script.c | 4 ++-- tools/perf/builtin-top.c | 11 ++++++----- tools/perf/tests/hists_link.c | 20 ++++++++------------ tools/perf/util/build-id.c | 8 ++++---- tools/perf/util/event.c | 6 +++--- tools/perf/util/event.h | 11 ----------- tools/perf/util/evsel.c | 4 ++-- tools/perf/util/session.c | 8 +++++--- 11 files changed, 35 insertions(+), 47 deletions(-)
tools/perf/builtin-inject.c +2 -2
@@ -198,7 +198,7 @@ static int perf_event__inject_buildid(struct perf_tool *tool, cpumode = event->header.misc &PERF_RECORD_MISC_CPUMODE_MASK ; - thread =machine__findnew_thread (machine, event->ip.pid, event->ip.pid); + thread =machine__findnew_thread (machine, sample->pid, sample->pid);if (thread ==NULL ) {pr_err ("problem processing %d event, skipping it.\n" , event->header.type);
@@ -206,7 +206,7 @@ static int perf_event__inject_buildid(struct perf_tool *tool, }thread__find_addr_map (thread, machine, cpumode,MAP__FUNCTION , - event->ip.ip, &al); + sample->ip, &al);if (al.map !=NULL ) {if (!al.map->dso->hit) {
tools/perf/builtin-kmem.c +2 -2
@@ -305,8 +305,8 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused,struct perf_evsel *evsel, struct machine *machine) { - struct thread *thread = machine__findnew_thread(machine, event->ip.pid, - event->ip.pid); + struct thread *thread = machine__findnew_thread(machine, sample->pid, + sample->pid);if (thread ==NULL ) { pr_debug("problem processing %d event, skipping it.\n",
tools/perf/builtin-mem.c +1 -1
@@ -94,7 +94,7 @@ dump_raw_samples(struct perf_tool *tool, symbol_conf.field_sep, sample->tid, symbol_conf.field_sep, - event->ip.ip, + sample->ip, symbol_conf.field_sep, sample->addr, symbol_conf.field_sep,
tools/perf/builtin-script.c +2 -2
@@ -501,8 +501,8 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused, struct machine *machine) {struct addr_location al; -struct thread *thread =machine__findnew_thread (machine, event->ip.pid, - event->ip.tid); +struct thread *thread =machine__findnew_thread (machine, sample->pid, + sample->tid);if (thread ==NULL ) { pr_debug("problem processing %d event, skipping it.\n",
tools/perf/builtin-top.c +6 -5
@@ -689,7 +689,7 @@ static void perf_event__process_sample(struct perf_tool *tool, { struct perf_top *top = container_of(tool, struct perf_top, tool);struct symbol *parent =NULL ; -u64 ip = event->ip.ip; +u64 ip = sample->ip;struct addr_location al;int err;
@@ -699,10 +699,10 @@ static void perf_event__process_sample(struct perf_tool *tool,if (!seen) seen =intlist__new (NULL ); -if (!intlist__has_entry (seen, event->ip.pid)) { +if (!intlist__has_entry (seen, sample->pid)) {pr_err ("Can't find guest [%d]'s kernel information\n" , - event->ip.pid); -intlist__add (seen, event->ip.pid); + sample->pid); +intlist__add (seen, sample->pid); }return ; }
@@ -836,7 +836,8 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx)break ;case PERF_RECORD_MISC_GUEST_KERNEL : ++top->guest_kernel_samples; - machine =perf_session__find_machine (session, event->ip.pid); + machine =perf_session__find_machine (session, + sample.pid);break ;case PERF_RECORD_MISC_GUEST_USER : ++top->guest_us_samples;
tools/perf/tests/hists_link.c +8 -12
@@ -211,15 +211,13 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine)list_for_each_entry (evsel, &evlist->entries, node) {for (k =0 ; k <ARRAY_SIZE (fake_common_samples); k++) {const union perf_event event = { - .ip = { - .header = { - .misc =PERF_RECORD_MISC_USER , - }, - .pid = fake_common_samples[k].pid, - .ip = fake_common_samples[k].ip, + .header = { + .misc =PERF_RECORD_MISC_USER , }, }; + sample.pid = fake_common_samples[k].pid; + sample.ip = fake_common_samples[k].ip;if (perf_event__preprocess_sample (&event, machine, &al, &sample) <0 ) goto out;
@@ -235,15 +233,13 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine)for (k =0 ; k <ARRAY_SIZE (fake_samples[i]); k++) {const union perf_event event = { - .ip = { - .header = { - .misc =PERF_RECORD_MISC_USER , - }, - .pid = fake_samples[i][k].pid, - .ip = fake_samples[i][k].ip, + .header = { + .misc =PERF_RECORD_MISC_USER , }, }; + sample.pid = fake_samples[i][k].pid; + sample.ip = fake_samples[i][k].ip;if (perf_event__preprocess_sample (&event, machine, &al, &sample) <0 ) goto out;
tools/perf/util/build-id.c +4 -4
@@ -18,14 +18,14 @@int build_id__mark_dso_hit (struct perf_tool *tool__maybe_unused ,union perf_event *event, -struct perf_sample *sample__maybe_unused , +struct perf_sample *sample,struct perf_evsel *evsel__maybe_unused ,struct machine *machine) {struct addr_location al;u8 cpumode = event->header.misc &PERF_RECORD_MISC_CPUMODE_MASK ; -struct thread *thread =machine__findnew_thread (machine, event->ip.pid, - event->ip.pid); +struct thread *thread =machine__findnew_thread (machine, sample->pid, + sample->pid);if (thread ==NULL ) { pr_err("problem processing %d event, skipping it.\n",
@@ -34,7 +34,7 @@ int build_id__mark_dso_hit(struct perf_tool *tool __maybe_unused, }thread__find_addr_map (thread, machine, cpumode,MAP__FUNCTION , - event->ip.ip, &al); + sample->ip, &al);if (al.map !=NULL ) al.map->dso->hit =1 ;
tools/perf/util/event.c +3 -3
@@ -686,8 +686,8 @@ int perf_event__preprocess_sample(const union perf_event *event, struct perf_sample *sample) {u8 cpumode = event->header.misc &PERF_RECORD_MISC_CPUMODE_MASK ; -struct thread *thread =machine__findnew_thread (machine, event->ip.pid, - event->ip.pid); +struct thread *thread =machine__findnew_thread (machine, sample->pid, + sample->pid);if (thread ==NULL )return -1 ;
@@ -709,7 +709,7 @@ int perf_event__preprocess_sample(const union perf_event *event,machine__create_kernel_maps (machine);thread__find_addr_map (thread, machine, cpumode,MAP__FUNCTION , - event->ip.ip, al); + sample->ip, al);dump_printf (" ...... dso: %s\n" , al->map ? al->map->dso->long_name : al->level =='H' ?"[hypervisor]" :"<not found>" );
tools/perf/util/event.h +0 -11
@@ -8,16 +8,6 @@#include "map.h" #include "build-id.h" -/* -* PERF_SAMPLE_IP | PERF_SAMPLE_TID | * -*/ -struct ip_event { -struct perf_event_header header; -u64 ip; -u32 pid, tid; -unsigned char __more_data[]; -}; -struct mmap_event {struct perf_event_header header;u32 pid, tid;
@@ -180,7 +170,6 @@ struct tracing_data_event {union perf_event {struct perf_event_header header; -struct ip_event ip;struct mmap_event mmap;struct comm_event comm;struct fork_event fork;
tools/perf/util/evsel.c +2 -2
@@ -1222,7 +1222,7 @@ int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event,return -EFAULT ;if (type &PERF_SAMPLE_IP ) { - data->ip = event->ip.ip; + data->ip = *array; array++; }
@@ -1434,7 +1434,7 @@ int perf_event__synthesize_sample(union perf_event *event, u64 type, array = event->sample.array;if (type &PERF_SAMPLE_IP ) { - event->ip.ip = sample->ip; + *array = sample->ip; array++; }
tools/perf/util/session.c +5 -3
@@ -840,7 +840,8 @@ static void dump_sample(struct perf_evsel *evsel, union perf_event *event,static struct machine *perf_session__find_machine_for_cpumode (struct perf_session *session, -union perf_event *event) +union perf_event *event, +struct perf_sample *sample) {const u8 cpumode = event->header.misc &PERF_RECORD_MISC_CPUMODE_MASK ;
@@ -852,7 +853,7 @@ static struct machine *if (event->header.type ==PERF_RECORD_MMAP ) pid = event->mmap.pid;else - pid = event->ip.pid; + pid = sample->pid;return perf_session__findnew_machine (session, pid); }
@@ -958,7 +959,8 @@ static int perf_session_deliver_event(struct perf_session *session,hists__inc_nr_events (&evsel->hists, event->header.type); } - machine =perf_session__find_machine_for_cpumode (session, event); + machine =perf_session__find_machine_for_cpumode (session, event, + sample);switch (event->header.type) {case PERF_RECORD_SAMPLE :
Signature · 1 line
1.7.11.7
Re: [PATCH V10 07/13] perf tools: remove references to struct ip_event
Quoted 4 lines · Adrian Hunter
struct
ip_eventassumes fixed positions for ip, pid and tid. That is no longer true with the addition ofPERF_SAMPLE_IDENTIFIER. The information is anyway in struct sample, so use that instead.
Thanks,
Namhyung
Adrian Hunter
reviewerPATCH v10 8/13 perf: make events stream always parsable
In reply to Adrian HunterThe event stream is not always parsable because the format of a sample is dependent on the sample_type of the selected event. When there is more than one selected event and the sample_types are not the same then parsing becomes problematic. A sample can be matched to its selected event using the ID that is allocated when the event is opened. Unfortunately, to get the ID from the sample means first parsing it.
This patch adds a new sample format bit PERF_SAMPLE_IDENTIFER that puts the ID at a fixed position so that the ID can be retrieved without parsing the sample. For sample events, that is the first position immediately after the header. For non-sample events, that is the last position.
In this respect parsing samples requires that the sample_type and ID values are recorded. For example, perf tools records struct perf_event_attr and the IDs within the perf.data file. Those must be read first before it is possible to parse samples found later in the perf.data file.
--- include/uapi/linux/perf_event.h | 27 ++++++++++++++++++++------- kernel/events/core.c | 11 ++++++++++- 2 files changed, 30 insertions(+), 8 deletions(-)
include/uapi/linux/perf_event.h +20 -7
@@ -134,8 +134,9 @@ enum perf_event_sample_format {PERF_SAMPLE_STACK_USER =1U <<13 ,PERF_SAMPLE_WEIGHT =1U <<14 ,PERF_SAMPLE_DATA_SRC =1U <<15 , +PERF_SAMPLE_IDENTIFIER =1U <<16 , - PERF_SAMPLE_MAX = 1U << 16, /* non-ABI */ + PERF_SAMPLE_MAX = 1U << 17, /* non-ABI */ };/*
@@ -492,12 +493,12 @@ enum perf_event_type {/* * If perf_event_attr.sample_id_all is set then all event types will * have the sample_type selected fields related to where/when -* (identity) an event took place (TID, TIME, ID, CPU, STREAM_ID) -* described in PERF_RECORD_SAMPLE below, it will be stashed just after -* the perf_event_header and the fields already present for the existing -* fields, i.e. at the end of the payload. That way a newer perf.data -* file will be supported by older perf tools, with these new optional -* fields being ignored. +* (identity) an event took place (TID, TIME, ID, STREAM_ID, CPU, +* IDENTIFIER) described in PERF_RECORD_SAMPLE below, it will be stashed +* just after the perf_event_header and the fields already present for +* the existing fields, i.e. at the end of the payload. That way a newer +* perf.data file will be supported by older perf tools, with these new +* optional fields being ignored. * * struct sample_id { * { u32 pid, tid; } && PERF_SAMPLE_TID
@@ -505,7 +506,12 @@ enum perf_event_type {* { u64 id; } && PERF_SAMPLE_ID * { u64 stream_id;} && PERF_SAMPLE_STREAM_ID * { u32 cpu, res; } && PERF_SAMPLE_CPU +* { u64 id; } && PERF_SAMPLE_IDENTIFIER * } && perf_event_attr::sample_id_all +* +* Note that PERF_SAMPLE_IDENTIFIER duplicates PERF_SAMPLE_ID. The +* advantage of PERF_SAMPLE_IDENTIFIER is that its position is fixed +* relative to header.size. */ /*
@@ -594,6 +600,13 @@ enum perf_event_type {* struct { * struct perf_event_header header; * +* # +* # Note that PERF_SAMPLE_IDENTIFIER duplicates PERF_SAMPLE_ID. +* # The advantage of PERF_SAMPLE_IDENTIFIER is that its position +* # is fixed relative to header. +* # +* +* { u64 id; } && PERF_SAMPLE_IDENTIFIER * { u64 ip; } && PERF_SAMPLE_IP * { u32 pid, tid; } && PERF_SAMPLE_TID * { u64 time; } && PERF_SAMPLE_TIME
kernel/events/core.c +10 -1
@@ -1213,6 +1213,9 @@ static void perf_event__id_header_size(struct perf_event *event)if (sample_type &PERF_SAMPLE_TIME ) size +=sizeof (data->time); +if (sample_type &PERF_SAMPLE_IDENTIFIER ) + size +=sizeof (data->id); +if (sample_type &PERF_SAMPLE_ID ) size +=sizeof (data->id);
@@ -4284,7 +4287,7 @@ static void __perf_event_header__init_id(struct perf_event_header *header,if (sample_type &PERF_SAMPLE_TIME ) data->time =perf_clock (); -if (sample_type &PERF_SAMPLE_ID ) +if (sample_type & (PERF_SAMPLE_ID |PERF_SAMPLE_IDENTIFIER )) data->id =primary_event_id (event);if (sample_type &PERF_SAMPLE_STREAM_ID )
@@ -4323,6 +4326,9 @@ static void __perf_event__output_id_sample(struct perf_output_handle *handle,if (sample_type &PERF_SAMPLE_CPU )perf_output_put (handle, data->cpu_entry); + +if (sample_type &PERF_SAMPLE_IDENTIFIER ) +perf_output_put (handle, data->id); } void perf_event__output_id_sample(struct perf_event *event,
@@ -4436,6 +4442,9 @@ void perf_output_sample(struct perf_output_handle *handle,perf_output_put (handle, *header); +if (sample_type &PERF_SAMPLE_IDENTIFIER ) +perf_output_put (handle, data->id); +if (sample_type &PERF_SAMPLE_IP )perf_output_put (handle, data->ip);
Signature · 1 line
1.7.11.7
Adrian Hunter
reviewerPATCH v10 9/13 perf tools: move perf_evlist__config() to a new source file
In reply to Adrian Hunterperf_evlist__config() must be moved to a separate source file to avoid Python link errors when adding support for PERF_SAMPLE_IDENTIFIER.
It is appropriate to do this because perf_evlist__config() is a helper function for event recording. It is used by tools to apply recording options to perf_evlist. It is not used by the Python API.
--- tools/perf/Makefile | 1 + tools/perf/util/evlist.c | 24 ------------------------ tools/perf/util/record.c | 27 +++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 24 deletions(-) create mode 100644 tools/perf/util/record.c
tools/perf/Makefile +1 -0
@@ -360,6 +360,7 @@ LIB_OBJS += $(OUTPUT)util/rblist.o LIB_OBJS += $(OUTPUT)util/intlist.o LIB_OBJS += $(OUTPUT)util/vdso.o LIB_OBJS += $(OUTPUT)util/stat.o +LIB_OBJS += $(OUTPUT)util/record.o LIB_OBJS += $(OUTPUT)ui/setup.o LIB_OBJS += $(OUTPUT)ui/helpline.o
tools/perf/util/evlist.c +0 -24
@@ -89,30 +89,6 @@ void perf_evlist__make_sample_types_compatible(struct perf_evlist *evlist)perf_evlist__set_id_pos (evlist); } -void perf_evlist__config (struct perf_evlist *evlist, -struct perf_record_opts *opts) -{ -struct perf_evsel *evsel; -/* -* Set the evsel leader links before we configure attributes, -* since some might depend on this info. -*/ -if (opts->group) -perf_evlist__set_leader (evlist); - -if (evlist->cpus->map[0 ] <0 ) - opts->no_inherit = true; - -list_for_each_entry (evsel, &evlist->entries, node) { -perf_evsel__config (evsel, opts); - -if (evlist->nr_entries >1 ) -perf_evsel__set_sample_id (evsel); - } - -perf_evlist__make_sample_types_compatible (evlist); -} -static void perf_evlist__purge (struct perf_evlist *evlist) {struct perf_evsel *pos, *n;
tools/perf/util/record.c new file +27 -0
@@ -0,0 +1,27 @@ +#include "evlist.h" +#include "evsel.h" +#include "cpumap.h" + +void perf_evlist__config (struct perf_evlist *evlist, +struct perf_record_opts *opts) +{ +struct perf_evsel *evsel; +/* +* Set the evsel leader links before we configure attributes, +* since some might depend on this info. +*/ +if (opts->group) +perf_evlist__set_leader (evlist); + +if (evlist->cpus->map[0 ] <0 ) + opts->no_inherit = true; + +list_for_each_entry (evsel, &evlist->entries, node) { +perf_evsel__config (evsel, opts); + +if (evlist->nr_entries >1 ) +perf_evsel__set_sample_id (evsel); + } + +perf_evlist__make_sample_types_compatible (evlist); +}
Signature · 1 line
1.7.11.7
Re: [PATCH V10 09/13] perf tools: move perf_evlist__config() to a new source file
Quoted 8 lines · Adrian Hunter
perf_evlist__config()must be moved to a separate source file to avoid Python link errors when adding support forPERF_SAMPLE_IDENTIFIER.It is appropriate to do this because
perf_evlist__config()is a helper function for event recording. It is used by tools to apply recording options toperf_evlist. It is not used by the Python API.
Thanks,
Namhyung
Adrian Hunter
reviewerPATCH v10 10/13 perf tools: add support for PERF_SAMPLE_IDENTFIER
In reply to Adrian HunterEnable parsing of samples with sample format bit PERF_SAMPLE_IDENTFIER. In addition, if the kernel supports it, prefer it to selecting PERF_SAMPLE_ID thereby avoiding the need to force compatible sample types.
--- tools/perf/tests/mmap-basic.c | 2 +- tools/perf/util/event.h | 9 +++-- tools/perf/util/evlist.c | 5 ++- tools/perf/util/evlist.h | 2 + tools/perf/util/evsel.c | 45 +++++++++++++++++---- tools/perf/util/evsel.h | 3 +- tools/perf/util/record.c | 94 ++++++++++++++++++++++++++++++++++++++++--- 7 files changed, 141 insertions(+), 19 deletions(-)
tools/perf/tests/mmap-basic.c +1 -1
@@ -72,7 +72,7 @@ int test__basic_mmap(void) } evsels[i]->attr.wakeup_events =1 ; -perf_evsel__set_sample_id (evsels[i]); +perf_evsel__set_sample_id (evsels[i], false);perf_evlist__add (evlist, evsels[i]);
tools/perf/util/event.h +6 -3
@@ -53,7 +53,8 @@ struct read_event { (PERF_SAMPLE_IP |PERF_SAMPLE_TID | \PERF_SAMPLE_TIME |PERF_SAMPLE_ADDR | \PERF_SAMPLE_ID |PERF_SAMPLE_STREAM_ID | \ -PERF_SAMPLE_CPU |PERF_SAMPLE_PERIOD ) +PERF_SAMPLE_CPU |PERF_SAMPLE_PERIOD | \ +PERF_SAMPLE_IDENTIFIER )/* * Events have compatible sample types if the following bits all have the same
@@ -61,13 +62,15 @@ struct read_event {* events the order is: PERF_SAMPLE_IP, PERF_SAMPLE_TID, PERF_SAMPLE_TIME, * PERF_SAMPLE_ADDR, PERF_SAMPLE_ID. For non-sample events the sample members * are accessed in reverse order. The order is: PERF_SAMPLE_ID, -* PERF_SAMPLE_STREAM_ID, PERF_SAMPLE_CPU. +* PERF_SAMPLE_STREAM_ID, PERF_SAMPLE_CPU. PERF_SAMPLE_IDENTIFIER is added for +* completeness but it should not be used with PERF_SAMPLE_ID. Sample types +* that include PERF_SAMPLE_IDENTIFIER are always compatible. */ #define PERF_COMPAT_MASK \ (PERF_SAMPLE_IP | PERF_SAMPLE_TID | \ PERF_SAMPLE_TIME | PERF_SAMPLE_ADDR | \ PERF_SAMPLE_ID | PERF_SAMPLE_STREAM_ID | \ - PERF_SAMPLE_CPU) + PERF_SAMPLE_CPU | PERF_SAMPLE_IDENTIFIER)struct sample_event {struct perf_event_header header;
tools/perf/util/evlist.c +4 -1
@@ -56,7 +56,7 @@ struct perf_evlist *perf_evlist__new(void)* Events with compatible sample types all have the same id_pos * and is_pos. For convenience, put a copy on evlist. */ -static void perf_evlist__set_id_pos (struct perf_evlist *evlist) +void perf_evlist__set_id_pos (struct perf_evlist *evlist) {struct perf_evsel *first =perf_evlist__first (evlist);
@@ -848,6 +848,9 @@ u16 perf_evlist__id_hdr_size(struct perf_evlist *evlist)if (sample_type &PERF_SAMPLE_CPU ) size +=sizeof (data->cpu) *2 ; + +if (sample_type &PERF_SAMPLE_IDENTIFIER ) + size +=sizeof (data->id); out:return size; }
tools/perf/util/evlist.h +2 -0
@@ -89,7 +89,9 @@ union perf_event *perf_evlist__mmap_read(struct perf_evlist *self, int idx);int perf_evlist__open (struct perf_evlist *evlist);void perf_evlist__close (struct perf_evlist *evlist); +void perf_evlist__set_id_pos (struct perf_evlist *evlist);void perf_evlist__make_sample_types_compatible (struct perf_evlist *evlist); +bool perf_can_sample_identifier (void );void perf_evlist__config (struct perf_evlist *evlist,struct perf_record_opts *opts);
tools/perf/util/evsel.c +37 -8
110 lines not on this page · raw message
tools/perf/util/evsel.h +2 -1
@@ -152,7 +152,8 @@ void __perf_evsel__reset_sample_bit(struct perf_evsel *evsel,#define perf_evsel__reset_sample_bit (evsel, bit) \ __perf_evsel__reset_sample_bit(evsel, PERF_SAMPLE_##bit) -void perf_evsel__set_sample_id (struct perf_evsel *evsel); +void perf_evsel__set_sample_id (struct perf_evsel *evsel, +bool use_sample_identifier);int perf_evsel__set_filter (struct perf_evsel *evsel,int ncpus,int nthreads,const char *filter);
tools/perf/util/record.c +89 -5
112 lines not on this page · raw message
Signature · 1 line
1.7.11.7
Adrian Hunter
reviewerPATCH v10 11/13 perf tools: expand perf_event__synthesize_sample()
In reply to Adrian HunterExpand perf_event__synthesize_sample() to handle all sample format bits.
--- tools/perf/builtin-inject.c | 4 +- tools/perf/util/event.h | 1 + tools/perf/util/evsel.c | 94 ++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 97 insertions(+), 2 deletions(-)
tools/perf/builtin-inject.c +3 -1
@@ -301,7 +301,9 @@ found: sample_sw.period = sample->period; sample_sw.time = sample->time;perf_event__synthesize_sample (event_sw, evsel->attr.sample_type, - &sample_sw, false); + evsel->attr.sample_regs_user, + evsel->attr.read_format, &sample_sw, + false);build_id__mark_dso_hit (tool, event_sw, &sample_sw, evsel, machine);return perf_event__repipe (tool, event_sw, &sample_sw, machine); }
tools/perf/util/event.h +1 -0
@@ -245,6 +245,7 @@ int perf_event__preprocess_sample(const union perf_event *self,const char *perf_event__name (unsigned int id);int perf_event__synthesize_sample (union perf_event *event,u64 type, +u64 sample_regs_user,u64 read_format,const struct perf_sample *sample,bool swapped);
tools/perf/util/evsel.c +93 -1
110 lines not on this page · raw message
Signature · 1 line
1.7.11.7
Re: [PATCH V10 11/13] perf tools: expand perf_event__synthesize_sample()
On Fri, Aug 09, 2013 at 01:51:57PM +0300, Adrian Hunter wrote:
SNIP
tools/perf/util/evsel.c int perf_event__synthesize_sample(union perf_event *event, u64 type, · line 1586
Quoted 11 lines
tools/perf/util/evsel.c +11
-0+ +if (type &PERF_SAMPLE_BRANCH_STACK ) { + sz = sample->branch_stack->nr *sizeof (struct branch_entry ); + sz +=sizeof (u64); +memcpy (array, sample->branch_stack, sz); + array = (void *)array + sz; + } + +if (type &PERF_SAMPLE_REGS_USER ) { +if (sample->user_regs.regs && sample_regs_user) { + *array++ = sample_regs_user;
this one is still missing 'enum perf_sample_regs_abi' value
as used in perf_inject__sched_stat, we could parse it out in perf_evsel__parse_sample into perf_sample::regs_dump::abi and use the value in here
jirka
Adrian Hunter
reviewerPATCH v10 12/13 perf tools: add a function to calculate sample event size
In reply to Adrian HunterAdd perf_event__sample_event_size() which can be used when synthesizing sample events to determine how big the resulting event will be, and therefore how much memory to allocate.
--- tools/perf/util/event.h | 2 ++ tools/perf/util/evsel.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+)
tools/perf/util/event.h +2 -0
@@ -244,6 +244,8 @@ int perf_event__preprocess_sample(const union perf_event *self,const char *perf_event__name (unsigned int id); +size_t perf_event__sample_event_size (const struct perf_sample *sample,u64 type, +u64 sample_regs_user,u64 read_format); int perf_event__synthesize_sample(union perf_event *event, u64 type, u64 sample_regs_user, u64 read_format, const struct perf_sample *sample,
tools/perf/util/evsel.c +92 -0
98 lines not on this page · raw message
Signature · 1 line
1.7.11.7
Re: [PATCH V10 12/13] perf tools: add a function to calculate sample event size
Quoted 5 lines · Adrian Hunter
Add
perf_event__sample_event_size()which can be used when synthesizing sample events to determine how big the resulting event will be, and therefore how much memory to allocate.Signed-off-by Adrian Hunter <[email protected]>
PERF_SAMPLE_READ code updated..
Adrian Hunter
reviewerPATCH v10 13/13 perf tools: add a sample parsing test
In reply to Adrian HunterAdd a test that checks that sample parsing is correctly implemented.
--- tools/perf/Makefile | 1 + tools/perf/tests/builtin-test.c | 4 + tools/perf/tests/sample-parsing.c | 313 ++++++++++++++++++++++++++++++++++++++ tools/perf/tests/tests.h | 1 + 4 files changed, 319 insertions(+) create mode 100644 tools/perf/tests/sample-parsing.c
tools/perf/Makefile +1 -0
@@ -439,6 +439,7 @@ PERFLIBS = $(LIB_FILE) $(LIBLK) $(LIBTRACEEVENT) ifneq ($(OUTPUT),) CFLAGS += -I$(OUTPUT) endif +LIB_OBJS += $(OUTPUT)tests/sample-parsing.o ifdef NO_LIBELF EXTLIBS := $(filter-out -lelf,$(EXTLIBS))
tools/perf/tests/builtin-test.c +4 -0
@@ -104,6 +104,10 @@ static struct test { .func = test__code_reading, }, { + .desc = "Test sample parsing", + .func = test__sample_parsing, + }, + { .func = NULL, }, };
tools/perf/tests/sample-parsing.c new file +313 -0
313 lines not on this page · raw message
tools/perf/tests/tests.h +1 -0
@@ -37,5 +37,6 @@ int test__task_exit(void);int test__sw_clock_freq (void );int test__perf_time_to_tsc (void );int test__code_reading (void ); +int test__sample_parsing (void );#endif /* TESTS_H */
Signature · 1 line
1.7.11.7
Re: [PATCH V10 13/13] perf tools: add a sample parsing test
Quoted 4 lines · Adrian Hunter
Add a test that checks that sample parsing is correctly implemented.
Signed-off-by Adrian Hunter <[email protected]>
Adrian,
Is there a git tree where I could pull those patches from? That would avoid me pulling them down from my gmail inbox one by one.
I am interested in the PERF_SAMPLE_IDENTIFIER support. And I want to test it.
Thanks.
Quoted 198 lines · Adrian Hunter
Hi
Here are some fixes and tweaks to perf tools (version 10).
Changes in V10:
Re-based on:
perf/core branch ofgit://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git
commit207353be1574027c151609a31167ac5919a056c8: perf tools: Remove filter parameter ofthread__find_addr_map()perf tools: add debug prints
Changed to use macros
perf tools: add pid to struct thread
Added David's Ack
perf tools: changemachine__findnew_thread()to set thread pid
Added David's Ack
perf tools: remove references to structip_event
Also remove fromhists_link.c
perf tools: move structip_event
Dropped since it is covered by "perf tools: remove references to structip_event"
perf tools: add a sample parsing test
Fix missing sample comparison forPERF_SAMPLE_READChanges in V9:
perf: Updateperf_event_typedocumentation
Dropped since its been applied
perf tools: tidy up sample parsing overflow checking
Changed to use a single overflow function Updated forPERF_SAMPLE_READ
perf: make events stream always parsable
Added more about sample parsing to the commit message
perf tools: add support forPERF_SAMPLE_IDENTFIER
When selectingPERF_SAMPLE_IDENTFIER, ensurePERF_SAMPLE_IDis deselected
perf tools: expandperf_event__synthesize_sample()
Updated forPERF_SAMPLE_READ
perf tools: add a function to calculate sample event size
Updated forPERF_SAMPLE_READ
perf tools: add a sample parsing test
Updated forPERF_SAMPLE_READChanges in V8:
perf tools: add debug prints
Fixed Python link errors
perf tools: moveperf_evlist__config()to a new source file
New Patch to avoid Python link errors
perf tools: add support forPERF_SAMPLE_IDENTFIER
Adjustments due to patch aboveChanges in V7:
perf: Updateperf_event_typedocumentation
Proposed new patch from Peter Zijlstra
perf: make events stream always parsable
Adjustments due to patch above
perf tools: tidy up sample parsing overflow checking
Change to a single overflow function Amend comment
perf tools: add a function to calculate sample event size
New patch
perf tools: add a sample parsing test
Amended to use sample event size calculationChanges in V6:
Some checkpatch fixesperf: make events stream always parsable
Add sample format commentsChanges in V5:
Re-based to Arnaldo's tree and dropped already applied patches:
perf tools: remove unused parameter
perf tools: fix missing tool parameter
perf tools: fix missing 'finished_round'
perf tools: fixparse_events_terms()segfault on error path perf tools: fixnew_term()missing free on error path perf tools: add const specifier toperf_pmu__findname parameter perf tools: tidy duplicated munmap code
perf tools: validate perf event header sizeperf tools: add debug prints
Changed toperf_event_attr__fprintf()
perf tools: add pid to struct thread
Always set the pid, even if a pid is already set
perf tools: changemachine__findnew_thread()to set thread pid
Replaces: perf tools: change "machine" functions to set thread pid
perf tools: add support forPERF_SAMPLE_IDENTFIER
Only usePERF_SAMPLE_IDENTFIERif sample types are different
perf tools: expandperf_event__synthesize_sample()
New patch in preparation of a sample parsing test
perf tools: add a sample parsing test
New patchChanges in V4:
I added kernel support for matching sample types viaPERF_SAMPLE_IDENTIFIER. perf tools support for that required first fixing some other things.perf tools: fix
parse_events_terms()freeing local variable on error path
Dropped - covered by David Ahern
perf tools: struct thread has a tid not a pid
Added ack by David Ahern
perf tools: add pid to struct thread
Remove unused function
perf tools: fix missing increment in sample parsing
New patch
perf tools: tidy up sample parsing overflow checking
New patch
perf tools: remove unnecessary callchain validation
New patch
perf tools: remove references to structip_event
New patch
perf tools: move structip_event
New patch
perf: make events stream always parsable
New patch
perf tools: add support forPERF_SAMPLE_IDENTFIER
New patchChanges in V3:
perf tools: add pid to struct thread
Split into 2 patches
perf tools: fix ppid inthread__fork()
Dropped for nowChanges in V2:
perf tools: fix missing tool parameter
Fixed one extra occurrence
perf tools: fixparse_events_terms()freeing local variable on error path
Made "freeing" code into a new function
perf tools: validate perf event header size
Corrected byte-swapping
perf tools: allow non-matching sample types
Added comments
Fixedid_poscalculation
id_pos/is_pos updated wheneversample_typechanges Removedperf_evlist__sample_type()
Added__perf_evlist__combined_sample_type()
Addedperf_evlist__combined_sample_type()
Addedperf_evlist__make_sample_types_compatible()
Added ack's to patches acked by Jiri OlsaAdrian Hunter (13):
perf tools: add debug prints
perf tools: allow non-matching sample types
perf tools: add pid to struct thread
perf tools: changemachine__findnew_thread()to set thread pid perf tools: tidy up sample parsing overflow checking perf tools: remove unnecessary callchain validation perf tools: remove references to structip_event
perf: make events stream always parsable
perf tools: moveperf_evlist__config()to a new source file perf tools: add support forPERF_SAMPLE_IDENTFIERperf tools: expandperf_event__synthesize_sample()perf tools: add a function to calculate sample event size perf tools: add a sample parsing testinclude/uapi/linux/perf_event.h | 27 ++- kernel/events/core.c | 11 +- tools/perf/Makefile | 2 + tools/perf/builtin-inject.c | 8 +- tools/perf/builtin-kmem.c | 3 +- tools/perf/builtin-kvm.c | 2 +- tools/perf/builtin-lock.c | 3 +- tools/perf/builtin-mem.c | 2 +- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-sched.c | 20 +- tools/perf/builtin-script.c | 3 +- tools/perf/builtin-top.c | 11 +- tools/perf/builtin-trace.c | 12 +- tools/perf/tests/builtin-test.c | 4 + tools/perf/tests/code-reading.c | 4 +- tools/perf/tests/hists_link.c | 23 +- tools/perf/tests/mmap-basic.c | 2 +- tools/perf/tests/sample-parsing.c | 313 +++++++++++++++++++++++++ tools/perf/tests/tests.h | 1 + tools/perf/util/build-id.c | 11 +- tools/perf/util/callchain.c | 8 - tools/perf/util/callchain.h | 5 - tools/perf/util/event.c | 5 +- tools/perf/util/event.h | 33 ++- tools/perf/util/evlist.c | 146 ++++++++++-- tools/perf/util/evlist.h | 10 +- tools/perf/util/evsel.c | 471 ++++++++++++++++++++++++++++++++++---- tools/perf/util/evsel.h | 13 +- tools/perf/util/machine.c | 37 ++- tools/perf/util/machine.h | 3 +- tools/perf/util/python.c | 20 ++ tools/perf/util/record.c | 111 +++++++++ tools/perf/util/session.c | 32 +-- tools/perf/util/thread.c | 3 +- tools/perf/util/thread.h | 3 +- 35 files changed, 1174 insertions(+), 190 deletions(-) create mode 100644 tools/perf/tests/sample-parsing.c create mode 100644 tools/perf/util/record.cRegards
Adrian
Adrian Hunter
reviewerQuoted 3 lines · Stephane Eranian
Adrian,
Is there a git tree where I could pull those patches from?
I plonked it down here for you:
http://git.infradead.org/users/ahunter/linux-perf.git
Quoted 210 lines
That would avoid me pulling them down from my gmail inbox one by one.
I am interested in the
PERF_SAMPLE_IDENTIFIERsupport. And I want to test it.Thanks.
Quoted 198 lines · Adrian Hunter
Hi
Here are some fixes and tweaks to perf tools (version 10).
Changes in V10:
Re-based on:
perf/core branch ofgit://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git
commit207353be1574027c151609a31167ac5919a056c8: perf tools: Remove filter parameter ofthread__find_addr_map()perf tools: add debug prints
Changed to use macros
perf tools: add pid to struct thread
Added David's Ack
perf tools: changemachine__findnew_thread()to set thread pid
Added David's Ack
perf tools: remove references to structip_event
Also remove fromhists_link.c
perf tools: move structip_event
Dropped since it is covered by "perf tools: remove references to structip_event"
perf tools: add a sample parsing test
Fix missing sample comparison forPERF_SAMPLE_READChanges in V9:
perf: Updateperf_event_typedocumentation
Dropped since its been applied
perf tools: tidy up sample parsing overflow checking
Changed to use a single overflow function Updated forPERF_SAMPLE_READ
perf: make events stream always parsable
Added more about sample parsing to the commit message
perf tools: add support forPERF_SAMPLE_IDENTFIER
When selectingPERF_SAMPLE_IDENTFIER, ensurePERF_SAMPLE_IDis deselected
perf tools: expandperf_event__synthesize_sample()
Updated forPERF_SAMPLE_READ
perf tools: add a function to calculate sample event size
Updated forPERF_SAMPLE_READ
perf tools: add a sample parsing test
Updated forPERF_SAMPLE_READChanges in V8:
perf tools: add debug prints
Fixed Python link errors
perf tools: moveperf_evlist__config()to a new source file
New Patch to avoid Python link errors
perf tools: add support forPERF_SAMPLE_IDENTFIER
Adjustments due to patch aboveChanges in V7:
perf: Updateperf_event_typedocumentation
Proposed new patch from Peter Zijlstra
perf: make events stream always parsable
Adjustments due to patch above
perf tools: tidy up sample parsing overflow checking
Change to a single overflow function Amend comment
perf tools: add a function to calculate sample event size
New patch
perf tools: add a sample parsing test
Amended to use sample event size calculationChanges in V6:
Some checkpatch fixesperf: make events stream always parsable
Add sample format commentsChanges in V5:
Re-based to Arnaldo's tree and dropped already applied patches:
perf tools: remove unused parameter
perf tools: fix missing tool parameter
perf tools: fix missing 'finished_round'
perf tools: fixparse_events_terms()segfault on error path perf tools: fixnew_term()missing free on error path perf tools: add const specifier toperf_pmu__findname parameter perf tools: tidy duplicated munmap code
perf tools: validate perf event header sizeperf tools: add debug prints
Changed toperf_event_attr__fprintf()
perf tools: add pid to struct thread
Always set the pid, even if a pid is already set
perf tools: changemachine__findnew_thread()to set thread pid
Replaces: perf tools: change "machine" functions to set thread pid
perf tools: add support forPERF_SAMPLE_IDENTFIER
Only usePERF_SAMPLE_IDENTFIERif sample types are different
perf tools: expandperf_event__synthesize_sample()
New patch in preparation of a sample parsing test
perf tools: add a sample parsing test
New patchChanges in V4:
I added kernel support for matching sample types viaPERF_SAMPLE_IDENTIFIER. perf tools support for that required first fixing some other things.perf tools: fix
parse_events_terms()freeing local variable on error path
Dropped - covered by David Ahern
perf tools: struct thread has a tid not a pid
Added ack by David Ahern
perf tools: add pid to struct thread
Remove unused function
perf tools: fix missing increment in sample parsing
New patch
perf tools: tidy up sample parsing overflow checking
New patch
perf tools: remove unnecessary callchain validation
New patch
perf tools: remove references to structip_event
New patch
perf tools: move structip_event
New patch
perf: make events stream always parsable
New patch
perf tools: add support forPERF_SAMPLE_IDENTFIER
New patchChanges in V3:
perf tools: add pid to struct thread
Split into 2 patches
perf tools: fix ppid inthread__fork()
Dropped for nowChanges in V2:
perf tools: fix missing tool parameter
Fixed one extra occurrence
perf tools: fixparse_events_terms()freeing local variable on error path
Made "freeing" code into a new function
perf tools: validate perf event header size
Corrected byte-swapping
perf tools: allow non-matching sample types
Added comments
Fixedid_poscalculation
id_pos/is_pos updated wheneversample_typechanges Removedperf_evlist__sample_type()
Added__perf_evlist__combined_sample_type()
Addedperf_evlist__combined_sample_type()
Addedperf_evlist__make_sample_types_compatible()
Added ack's to patches acked by Jiri OlsaAdrian Hunter (13):
perf tools: add debug prints
perf tools: allow non-matching sample types
perf tools: add pid to struct thread
perf tools: changemachine__findnew_thread()to set thread pid perf tools: tidy up sample parsing overflow checking perf tools: remove unnecessary callchain validation perf tools: remove references to structip_event
perf: make events stream always parsable
perf tools: moveperf_evlist__config()to a new source file perf tools: add support forPERF_SAMPLE_IDENTFIERperf tools: expandperf_event__synthesize_sample()perf tools: add a function to calculate sample event size perf tools: add a sample parsing testinclude/uapi/linux/perf_event.h | 27 ++- kernel/events/core.c | 11 +- tools/perf/Makefile | 2 + tools/perf/builtin-inject.c | 8 +- tools/perf/builtin-kmem.c | 3 +- tools/perf/builtin-kvm.c | 2 +- tools/perf/builtin-lock.c | 3 +- tools/perf/builtin-mem.c | 2 +- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-sched.c | 20 +- tools/perf/builtin-script.c | 3 +- tools/perf/builtin-top.c | 11 +- tools/perf/builtin-trace.c | 12 +- tools/perf/tests/builtin-test.c | 4 + tools/perf/tests/code-reading.c | 4 +- tools/perf/tests/hists_link.c | 23 +- tools/perf/tests/mmap-basic.c | 2 +- tools/perf/tests/sample-parsing.c | 313 +++++++++++++++++++++++++ tools/perf/tests/tests.h | 1 + tools/perf/util/build-id.c | 11 +- tools/perf/util/callchain.c | 8 - tools/perf/util/callchain.h | 5 - tools/perf/util/event.c | 5 +- tools/perf/util/event.h | 33 ++- tools/perf/util/evlist.c | 146 ++++++++++-- tools/perf/util/evlist.h | 10 +- tools/perf/util/evsel.c | 471 ++++++++++++++++++++++++++++++++++---- tools/perf/util/evsel.h | 13 +- tools/perf/util/machine.c | 37 ++- tools/perf/util/machine.h | 3 +- tools/perf/util/python.c | 20 ++ tools/perf/util/record.c | 111 +++++++++ tools/perf/util/session.c | 32 +-- tools/perf/util/thread.c | 3 +- tools/perf/util/thread.h | 3 +- 35 files changed, 1174 insertions(+), 190 deletions(-) create mode 100644 tools/perf/tests/sample-parsing.c create mode 100644 tools/perf/util/record.cRegards
Adrian
Quoted 9 lines · Adrian Hunter
Quoted 3 lines · Stephane Eranian
Adrian,
Is there a git tree where I could pull those patches from?
I plonked it down here for you:
fatal: http://git.infradead.org/users/ahunter/linux-perf.git/info/refs
not found: did you run git update-server-info on the server?
Quoted 211 lines
Quoted 210 lines
That would avoid me pulling them down from my gmail inbox one by one.
I am interested in the
PERF_SAMPLE_IDENTIFIERsupport. And I want to test it.Thanks.
Quoted 198 lines · Adrian Hunter
Hi
Here are some fixes and tweaks to perf tools (version 10).
Changes in V10:
Re-based on:
perf/core branch ofgit://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git
commit207353be1574027c151609a31167ac5919a056c8: perf tools: Remove filter parameter ofthread__find_addr_map()perf tools: add debug prints
Changed to use macros
perf tools: add pid to struct thread
Added David's Ack
perf tools: changemachine__findnew_thread()to set thread pid
Added David's Ack
perf tools: remove references to structip_event
Also remove fromhists_link.c
perf tools: move structip_event
Dropped since it is covered by "perf tools: remove references to structip_event"
perf tools: add a sample parsing test
Fix missing sample comparison forPERF_SAMPLE_READChanges in V9:
perf: Updateperf_event_typedocumentation
Dropped since its been applied
perf tools: tidy up sample parsing overflow checking
Changed to use a single overflow function Updated forPERF_SAMPLE_READ
perf: make events stream always parsable
Added more about sample parsing to the commit message
perf tools: add support forPERF_SAMPLE_IDENTFIER
When selectingPERF_SAMPLE_IDENTFIER, ensurePERF_SAMPLE_IDis deselected
perf tools: expandperf_event__synthesize_sample()
Updated forPERF_SAMPLE_READ
perf tools: add a function to calculate sample event size
Updated forPERF_SAMPLE_READ
perf tools: add a sample parsing test
Updated forPERF_SAMPLE_READChanges in V8:
perf tools: add debug prints
Fixed Python link errors
perf tools: moveperf_evlist__config()to a new source file
New Patch to avoid Python link errors
perf tools: add support forPERF_SAMPLE_IDENTFIER
Adjustments due to patch aboveChanges in V7:
perf: Updateperf_event_typedocumentation
Proposed new patch from Peter Zijlstra
perf: make events stream always parsable
Adjustments due to patch above
perf tools: tidy up sample parsing overflow checking
Change to a single overflow function Amend comment
perf tools: add a function to calculate sample event size
New patch
perf tools: add a sample parsing test
Amended to use sample event size calculationChanges in V6:
Some checkpatch fixesperf: make events stream always parsable
Add sample format commentsChanges in V5:
Re-based to Arnaldo's tree and dropped already applied patches:
perf tools: remove unused parameter
perf tools: fix missing tool parameter
perf tools: fix missing 'finished_round'
perf tools: fixparse_events_terms()segfault on error path perf tools: fixnew_term()missing free on error path perf tools: add const specifier toperf_pmu__findname parameter perf tools: tidy duplicated munmap code
perf tools: validate perf event header sizeperf tools: add debug prints
Changed toperf_event_attr__fprintf()
perf tools: add pid to struct thread
Always set the pid, even if a pid is already set
perf tools: changemachine__findnew_thread()to set thread pid
Replaces: perf tools: change "machine" functions to set thread pid
perf tools: add support forPERF_SAMPLE_IDENTFIER
Only usePERF_SAMPLE_IDENTFIERif sample types are different
perf tools: expandperf_event__synthesize_sample()
New patch in preparation of a sample parsing test
perf tools: add a sample parsing test
New patchChanges in V4:
I added kernel support for matching sample types viaPERF_SAMPLE_IDENTIFIER. perf tools support for that required first fixing some other things.perf tools: fix
parse_events_terms()freeing local variable on error path
Dropped - covered by David Ahern
perf tools: struct thread has a tid not a pid
Added ack by David Ahern
perf tools: add pid to struct thread
Remove unused function
perf tools: fix missing increment in sample parsing
New patch
perf tools: tidy up sample parsing overflow checking
New patch
perf tools: remove unnecessary callchain validation
New patch
perf tools: remove references to structip_event
New patch
perf tools: move structip_event
New patch
perf: make events stream always parsable
New patch
perf tools: add support forPERF_SAMPLE_IDENTFIER
New patchChanges in V3:
perf tools: add pid to struct thread
Split into 2 patches
perf tools: fix ppid inthread__fork()
Dropped for nowChanges in V2:
perf tools: fix missing tool parameter
Fixed one extra occurrence
perf tools: fixparse_events_terms()freeing local variable on error path
Made "freeing" code into a new function
perf tools: validate perf event header size
Corrected byte-swapping
perf tools: allow non-matching sample types
Added comments
Fixedid_poscalculation
id_pos/is_pos updated wheneversample_typechanges Removedperf_evlist__sample_type()
Added__perf_evlist__combined_sample_type()
Addedperf_evlist__combined_sample_type()
Addedperf_evlist__make_sample_types_compatible()
Added ack's to patches acked by Jiri OlsaAdrian Hunter (13):
perf tools: add debug prints
perf tools: allow non-matching sample types
perf tools: add pid to struct thread
perf tools: changemachine__findnew_thread()to set thread pid perf tools: tidy up sample parsing overflow checking perf tools: remove unnecessary callchain validation perf tools: remove references to structip_event
perf: make events stream always parsable
perf tools: moveperf_evlist__config()to a new source file perf tools: add support forPERF_SAMPLE_IDENTFIERperf tools: expandperf_event__synthesize_sample()perf tools: add a function to calculate sample event size perf tools: add a sample parsing testinclude/uapi/linux/perf_event.h | 27 ++- kernel/events/core.c | 11 +- tools/perf/Makefile | 2 + tools/perf/builtin-inject.c | 8 +- tools/perf/builtin-kmem.c | 3 +- tools/perf/builtin-kvm.c | 2 +- tools/perf/builtin-lock.c | 3 +- tools/perf/builtin-mem.c | 2 +- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-sched.c | 20 +- tools/perf/builtin-script.c | 3 +- tools/perf/builtin-top.c | 11 +- tools/perf/builtin-trace.c | 12 +- tools/perf/tests/builtin-test.c | 4 + tools/perf/tests/code-reading.c | 4 +- tools/perf/tests/hists_link.c | 23 +- tools/perf/tests/mmap-basic.c | 2 +- tools/perf/tests/sample-parsing.c | 313 +++++++++++++++++++++++++ tools/perf/tests/tests.h | 1 + tools/perf/util/build-id.c | 11 +- tools/perf/util/callchain.c | 8 - tools/perf/util/callchain.h | 5 - tools/perf/util/event.c | 5 +- tools/perf/util/event.h | 33 ++- tools/perf/util/evlist.c | 146 ++++++++++-- tools/perf/util/evlist.h | 10 +- tools/perf/util/evsel.c | 471 ++++++++++++++++++++++++++++++++++---- tools/perf/util/evsel.h | 13 +- tools/perf/util/machine.c | 37 ++- tools/perf/util/machine.h | 3 +- tools/perf/util/python.c | 20 ++ tools/perf/util/record.c | 111 +++++++++ tools/perf/util/session.c | 32 +-- tools/perf/util/thread.c | 3 +- tools/perf/util/thread.h | 3 +- 35 files changed, 1174 insertions(+), 190 deletions(-) create mode 100644 tools/perf/tests/sample-parsing.c create mode 100644 tools/perf/util/record.cRegards
Adrian
Adrian Hunter
reviewerQuoted 9 lines · Stephane Eranian
Quoted 8 lines · Adrian Hunter
Quoted 3 lines · Stephane Eranian
Adrian,
Is there a git tree where I could pull those patches from?
I plonked it down here for you:
That was just a gitweb link sorry.
Quoted 3 lines
Quoted 1 line
fatal: http://git.infradead.org/users/ahunter/linux-perf.git/info/refs
not found: did you run git update-server-info on the server?
Try:
git://git.infradead.org/users/ahunter/linux-perf.git
Also, it is still on v3.11-rc1 which has scsi regressions, so merge with v3.11-rc4 if you want something that will actually boot.
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
That would avoid me pulling them down from my gmail inbox one by one.
I am interested in the
PERF_SAMPLE_IDENTIFIERsupport. And I want to test it.