From: Andi Kleen <andi@firstfloor.org>
To: acme@kernel.org, linux-perf-users@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, jolsa@kernel.org,
namhyung@kernel.org, eranian@google.com,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 01/11] perf tools script: Handle missing fields with -F +..
Date: Sun, 24 Feb 2019 07:37:12 -0800 [thread overview]
Message-ID: <20190224153722.27020-2-andi@firstfloor.org> (raw)
In-Reply-To: <20190224153722.27020-1-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
When using -F + syntax to add a field the existing defaults
are currently all marked user_set. This can cause errors when
some field is missing in the perf.data
This patch tracks the actually user set fields separately,
so that we don't error out in this case.
Before:
% perf record true
% perf script -F +metric
Samples for 'cycles:ppp' event do not have CPU attribute set. Cannot print 'cpu' field.
%
After
5 perf record true
% perf script -F +metric
perf 28936 278636.237688: 1 cycles:ppp: ffffffff8117da99 perf_event_exec+0x59 (/lib/modules/4.20.0-odilo/build/vmlinux)
...
%
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
tools/perf/builtin-script.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 8d5fe092525c..29e95a25c6e6 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -149,6 +149,7 @@ static struct {
unsigned int print_ip_opts;
u64 fields;
u64 invalid_fields;
+ u64 user_set_fields;
} output[OUTPUT_TYPE_MAX] = {
[PERF_TYPE_HARDWARE] = {
@@ -345,7 +346,7 @@ static int perf_evsel__do_check_stype(struct perf_evsel *evsel,
if (attr->sample_type & sample_type)
return 0;
- if (output[type].user_set) {
+ if (output[type].user_set_fields & field) {
if (allow_user_set)
return 0;
evname = perf_evsel__name(evsel);
@@ -2628,10 +2629,13 @@ static int parse_output_fields(const struct option *opt __maybe_unused,
pr_warning("\'%s\' not valid for %s events. Ignoring.\n",
all_output_options[i].str, event_type(j));
} else {
- if (change == REMOVE)
+ if (change == REMOVE) {
output[j].fields &= ~all_output_options[i].field;
- else
+ output[j].user_set_fields &= ~all_output_options[i].field;
+ } else {
output[j].fields |= all_output_options[i].field;
+ output[j].user_set_fields |= all_output_options[i].field;
+ }
output[j].user_set = true;
output[j].wildcard_set = true;
}
--
2.17.2
next prev parent reply other threads:[~2019-02-24 15:38 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-24 15:37 Support sample context in perf report Andi Kleen
2019-02-24 15:37 ` Andi Kleen [this message]
2019-02-25 12:56 ` [PATCH 01/11] perf tools script: Handle missing fields with -F + Jiri Olsa
2019-02-25 13:49 ` Arnaldo Carvalho de Melo
2019-02-28 8:04 ` [tip:perf/core] perf " tip-bot for Andi Kleen
2019-02-24 15:37 ` [PATCH 02/11] perf tools script: Support insn output for normal samples Andi Kleen
2019-02-25 12:56 ` Jiri Olsa
2019-02-25 12:56 ` Jiri Olsa
2019-02-24 15:37 ` [PATCH 03/11] perf tools report: Support nano seconds Andi Kleen
2019-02-25 16:40 ` Sebastien Boisvert
2019-02-25 17:34 ` Andi Kleen
2019-02-24 15:37 ` [PATCH 04/11] perf tools report: Parse time quantum Andi Kleen
2019-02-25 12:55 ` Jiri Olsa
2019-02-24 15:37 ` [PATCH 05/11] perf tools report: Support time sort key Andi Kleen
2019-02-24 15:37 ` [PATCH 06/11] perf tools report: Use less for scripts output Andi Kleen
2019-02-25 12:55 ` Jiri Olsa
2019-02-24 15:37 ` [PATCH 07/11] perf tools report: Support running scripts for current time range Andi Kleen
2019-02-25 12:55 ` Jiri Olsa
2019-02-25 12:56 ` Jiri Olsa
2019-02-25 13:28 ` Andi Kleen
2019-02-25 13:35 ` Jiri Olsa
2019-02-24 15:37 ` [PATCH 08/11] perf tools: Add perf_exe() helper to find perf binary Andi Kleen
2019-02-25 12:56 ` Jiri Olsa
2019-02-25 13:58 ` Arnaldo Carvalho de Melo
2019-02-28 8:05 ` [tip:perf/core] " tip-bot for Andi Kleen
2019-02-24 15:37 ` [PATCH 09/11] perf tools report: Support builtin perf script in scripts menu Andi Kleen
2019-02-25 12:57 ` Jiri Olsa
2019-02-24 15:37 ` [PATCH 10/11] perf tools: Add utility function to print ns time stamps Andi Kleen
2019-02-24 15:37 ` [PATCH 11/11] perf tools report: Implement browsing of individual samples Andi Kleen
2019-02-25 12:56 ` Jiri Olsa
2019-02-25 12:56 ` Jiri Olsa
2019-02-25 13:33 ` Andi Kleen
2019-03-04 14:48 ` Jiri Olsa
2019-02-25 12:56 ` Jiri Olsa
2019-02-25 13:31 ` Andi Kleen
2019-02-25 13:35 ` Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190224153722.27020-2-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=eranian@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).