perf tools: Handle kernels that don't support attr .exclude_{guest,host}
Commit-ID: 0c9781280fb672ca09c997df3f14ba506bbdb977 Gitweb: http://git.kernel.org/tip/0c9781280fb672ca09c997df3f14ba506bbdb977 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 14 Feb 2012 14:05:30 -0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 14 Feb 2012 14:05:30 -0200
perf tools: Handle kernels that don't support attr.exclude_{guest,host}
Just fall back to resetting those fields, if set, warning the user that that feature is not available.
If guest samples appear they will just be discarded because no struct machine will be found and thus the event will be accounted as not handled and dropped, see 0c09571.
Reported-by Namhyung Kim <[email protected]>
Tested-by Joerg Roedel <[email protected]>
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Joerg Roedel <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-record.c | 29 ++++++++++++++++++++--------- tools/perf/builtin-top.c | 23 +++++++++++++++++------ tools/perf/perf.h | 1 + tools/perf/util/top.h | 1 + 4 files changed, 39 insertions(+), 15 deletions(-)
tools/perf/builtin-record.c +20 -9
@@ -205,6 +205,9 @@ static void perf_record__open(struct perf_record *rec)if (opts->group && pos != first) group_fd = first->fd; +fallback_missing_features: +if (opts->exclude_guest_missing) + attr->exclude_guest = attr->exclude_host =0 ; retry_sample_id: attr->sample_id_all = opts->sample_id_all_avail ?1 :0 ; try_again:
@@ -218,15 +221,23 @@ try_again: }else if (err ==ENODEV && opts->cpu_list) {die ("No such device - did you specify" " an out-of-range profile CPU?\n" ); - }else if (err ==EINVAL && opts->sample_id_all_avail) { -/* -* Old kernel, no attr->sample_id_type_all field -*/ - opts->sample_id_all_avail = false; -if (!opts->sample_time && !opts->raw_samples && !time_needed) - attr->sample_type &= ~PERF_SAMPLE_TIME ; - - goto retry_sample_id; + }else if (err ==EINVAL ) { +if (!opts->exclude_guest_missing && + (attr->exclude_guest || attr->exclude_host)) { +pr_debug ("Old kernel, cannot exclude " +"guest or host samples.\n" ); + opts->exclude_guest_missing = true; + goto fallback_missing_features; + }else if (opts->sample_id_all_avail) { +/* +* Old kernel, no attr->sample_id_type_all field +*/ + opts->sample_id_all_avail = false; +if (!opts->sample_time && !opts->raw_samples && !time_needed) + attr->sample_type &= ~PERF_SAMPLE_TIME ; + + goto retry_sample_id; + } }/*
tools/perf/builtin-top.c +17 -6
@@ -872,6 +872,9 @@ static void perf_top__start_counters(struct perf_top *top) attr->mmap =1 ; attr->comm =1 ; attr->inherit = top->inherit; +fallback_missing_features: +if (top->exclude_guest_missing) + attr->exclude_guest = attr->exclude_host =0 ; retry_sample_id: attr->sample_id_all = top->sample_id_all_avail ?1 :0 ; try_again:
@@ -883,12 +886,20 @@ try_again:if (err ==EPERM || err ==EACCES ) {ui__error_paranoid (); goto out_err; - }else if (err ==EINVAL && top->sample_id_all_avail) { -/* -* Old kernel, no attr->sample_id_type_all field -*/ - top->sample_id_all_avail = false; - goto retry_sample_id; + }else if (err ==EINVAL ) { +if (!top->exclude_guest_missing && + (attr->exclude_guest || attr->exclude_host)) { +pr_debug ("Old kernel, cannot exclude " +"guest or host samples.\n" ); + top->exclude_guest_missing = true; + goto fallback_missing_features; + }else if (top->sample_id_all_avail) { +/* +* Old kernel, no attr->sample_id_type_all field +*/ + top->sample_id_all_avail = false; + goto retry_sample_id; + } }/* * If it's cycles then fall back to hrtimer
tools/perf/perf.h +1 -0
@@ -199,6 +199,7 @@ struct perf_record_opts {bool sample_address;bool sample_time;bool sample_id_all_avail; +bool exclude_guest_missing;bool system_wide;bool period;unsigned int freq;
tools/perf/util/top.h +1 -0
@@ -35,6 +35,7 @@ struct perf_top {bool inherit;bool group;bool sample_id_all_avail; +bool exclude_guest_missing;bool dump_symtab;const char *cpu_list;struct hist_entry *sym_filter_entry;