From: tip-bot for Kan Liang <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: peterz@infradead.org, acme@redhat.com, mingo@kernel.org,
jolsa@kernel.org, ak@linux.intel.com, yao.jin@linux.intel.com,
tglx@linutronix.de, linux-kernel@vger.kernel.org,
kan.liang@intel.com, hpa@zytor.com, namhyung@kernel.org,
wangnan0@huawei.com
Subject: [tip:perf/urgent] perf top: Check per-event overwrite term
Date: Fri, 16 Feb 2018 01:39:11 -0800 [thread overview]
Message-ID: <tip-63878a53cedc3df31bd4ba8740a49fa0fc116ac6@git.kernel.org> (raw)
In-Reply-To: <1516310792-208685-12-git-send-email-kan.liang@intel.com>
Commit-ID: 63878a53cedc3df31bd4ba8740a49fa0fc116ac6
Gitweb: https://git.kernel.org/tip/63878a53cedc3df31bd4ba8740a49fa0fc116ac6
Author: Kan Liang <kan.liang@intel.com>
AuthorDate: Thu, 18 Jan 2018 13:26:26 -0800
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 15 Feb 2018 09:54:42 -0300
perf top: Check per-event overwrite term
Per-event overwrite term is not forbidden in 'perf top', which can bring
problems. Because 'perf top' only support non-overwrite mode now.
Add new rules and check regarding to overwrite term for 'perf top'.
- All events either have same per-event term or don't have per-event
mode setting. Otherwise, it will error out.
- Per-event overwrite term should be consistent as opts->overwrite.
If not, updating the opts->overwrite according to per-event term.
Make it possible to support either non-overwrite or overwrite mode.
The overwrite mode is forbidden now, which will be removed when the
overwrite mode is supported later.
Signed-off-by: Kan Liang <kan.liang@intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1516310792-208685-12-git-send-email-kan.liang@intel.com
[ Renamed perf_top_overwrite_check to perf_top__overwrite_check, to follow existing convention ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-top.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 73 insertions(+)
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index c6ccda5..1778379 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -881,6 +881,68 @@ static void perf_top__mmap_read(struct perf_top *top)
perf_top__mmap_read_idx(top, i);
}
+/*
+ * Check per-event overwrite term.
+ * perf top should support consistent term for all events.
+ * - All events don't have per-event term
+ * E.g. "cpu/cpu-cycles/,cpu/instructions/"
+ * Nothing change, return 0.
+ * - All events have same per-event term
+ * E.g. "cpu/cpu-cycles,no-overwrite/,cpu/instructions,no-overwrite/
+ * Using the per-event setting to replace the opts->overwrite if
+ * they are different, then return 0.
+ * - Events have different per-event term
+ * E.g. "cpu/cpu-cycles,overwrite/,cpu/instructions,no-overwrite/"
+ * Return -1
+ * - Some of the event set per-event term, but some not.
+ * E.g. "cpu/cpu-cycles/,cpu/instructions,no-overwrite/"
+ * Return -1
+ */
+static int perf_top__overwrite_check(struct perf_top *top)
+{
+ struct record_opts *opts = &top->record_opts;
+ struct perf_evlist *evlist = top->evlist;
+ struct perf_evsel_config_term *term;
+ struct list_head *config_terms;
+ struct perf_evsel *evsel;
+ int set, overwrite = -1;
+
+ evlist__for_each_entry(evlist, evsel) {
+ set = -1;
+ config_terms = &evsel->config_terms;
+ list_for_each_entry(term, config_terms, list) {
+ if (term->type == PERF_EVSEL__CONFIG_TERM_OVERWRITE)
+ set = term->val.overwrite ? 1 : 0;
+ }
+
+ /* no term for current and previous event (likely) */
+ if ((overwrite < 0) && (set < 0))
+ continue;
+
+ /* has term for both current and previous event, compare */
+ if ((overwrite >= 0) && (set >= 0) && (overwrite != set))
+ return -1;
+
+ /* no term for current event but has term for previous one */
+ if ((overwrite >= 0) && (set < 0))
+ return -1;
+
+ /* has term for current event */
+ if ((overwrite < 0) && (set >= 0)) {
+ /* if it's first event, set overwrite */
+ if (evsel == perf_evlist__first(evlist))
+ overwrite = set;
+ else
+ return -1;
+ }
+ }
+
+ if ((overwrite >= 0) && (opts->overwrite != overwrite))
+ opts->overwrite = overwrite;
+
+ return 0;
+}
+
static int perf_top__start_counters(struct perf_top *top)
{
char msg[BUFSIZ];
@@ -888,6 +950,17 @@ static int perf_top__start_counters(struct perf_top *top)
struct perf_evlist *evlist = top->evlist;
struct record_opts *opts = &top->record_opts;
+ if (perf_top__overwrite_check(top)) {
+ ui__error("perf top only support consistent per-event "
+ "overwrite setting for all events\n");
+ goto out_err;
+ }
+
+ if (opts->overwrite) {
+ ui__error("not support overwrite mode yet\n");
+ goto out_err;
+ }
+
perf_evlist__config(evlist, opts, &callchain_param);
evlist__for_each_entry(evlist, counter) {
next prev parent reply other threads:[~2018-02-16 9:49 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-18 21:26 [PATCH V5 00/17] perf top overwrite mode kan.liang
2018-01-18 21:26 ` [PATCH V5 01/17] perf evlist: remove stale mmap read for backward kan.liang
2018-02-13 12:04 ` [tip:perf/urgent] perf evlist: Remove " tip-bot for Kan Liang
2018-02-16 9:34 ` tip-bot for Kan Liang
2018-01-18 21:26 ` [PATCH V5 02/17] perf mmap: fix: recalculate size for overwrite mode kan.liang
2018-02-01 21:23 ` Arnaldo Carvalho de Melo
2018-02-01 21:55 ` Liang, Kan
2018-02-13 12:04 ` [tip:perf/urgent] perf mmap: Recalculate " tip-bot for Kan Liang
2018-02-16 9:34 ` tip-bot for Kan Liang
2018-01-18 21:26 ` [PATCH V5 03/17] perf mmap: cleanup perf_mmap__push() kan.liang
2018-02-13 12:05 ` [tip:perf/urgent] perf mmap: Cleanup perf_mmap__push() tip-bot for Kan Liang
2018-02-16 9:35 ` tip-bot for Kan Liang
2018-01-18 21:26 ` [PATCH V5 04/17] perf mmap: introduce perf_mmap__read_init() kan.liang
2018-02-13 12:05 ` [tip:perf/urgent] perf mmap: Introduce perf_mmap__read_init() tip-bot for Kan Liang
2018-02-16 9:35 ` tip-bot for Kan Liang
2018-01-18 21:26 ` [PATCH V5 05/17] perf mmap: add new return value logic for perf_mmap__read_init() kan.liang
2018-02-13 12:06 ` [tip:perf/urgent] perf mmap: Add " tip-bot for Kan Liang
2018-02-16 9:36 ` tip-bot for Kan Liang
2018-01-18 21:26 ` [PATCH V5 06/17] perf mmap: discard 'prev' in perf_mmap__read() kan.liang
2018-02-13 12:06 ` [tip:perf/urgent] perf mmap: Discard " tip-bot for Kan Liang
2018-02-16 9:36 ` tip-bot for Kan Liang
2018-01-18 21:26 ` [PATCH V5 07/17] perf mmap: introduce perf_mmap__read_done kan.liang
2018-02-13 12:07 ` [tip:perf/urgent] perf mmap: Introduce perf_mmap__read_done() tip-bot for Kan Liang
2018-02-16 9:37 ` tip-bot for Kan Liang
2018-01-18 21:26 ` [PATCH V5 08/17] perf mmap: introduce perf_mmap__read_event() kan.liang
2018-02-13 12:07 ` [tip:perf/urgent] perf mmap: Introduce perf_mmap__read_event() tip-bot for Kan Liang
2018-02-16 9:37 ` tip-bot for Kan Liang
2018-01-18 21:26 ` [PATCH V5 09/17] perf test: update mmap read functions for backward-ring-buffer test kan.liang
2018-02-13 12:07 ` [tip:perf/urgent] perf test: Update " tip-bot for Kan Liang
2018-02-16 9:38 ` tip-bot for Kan Liang
2018-01-18 21:26 ` [PATCH V5 10/17] perf mmap: discard legacy interface for mmap read kan.liang
2018-02-13 12:08 ` [tip:perf/urgent] perf mmap: Discard " tip-bot for Kan Liang
2018-02-16 9:38 ` tip-bot for Kan Liang
2018-01-18 21:26 ` [PATCH V5 11/17] perf top: check per-event overwrite term kan.liang
2018-02-13 12:08 ` [tip:perf/urgent] perf top: Check " tip-bot for Kan Liang
2018-02-16 9:39 ` tip-bot for Kan Liang [this message]
2018-01-18 21:26 ` [PATCH V5 12/17] perf evsel: expose perf_missing_features.write_backward kan.liang
2018-02-02 14:26 ` Arnaldo Carvalho de Melo
2018-02-02 14:53 ` Liang, Kan
2018-01-18 21:26 ` [PATCH V5 13/17] perf top: add overwrite fall back kan.liang
2018-02-13 12:09 ` [tip:perf/urgent] perf top: Add " tip-bot for Kan Liang
2018-02-16 9:40 ` tip-bot for Kan Liang
2018-01-18 21:26 ` [PATCH V5 14/17] perf hists browser: add parameter to disable lost event warning kan.liang
2018-02-13 12:10 ` [tip:perf/urgent] perf hists browser: Add " tip-bot for Kan Liang
2018-02-16 9:40 ` tip-bot for Kan Liang
2018-01-18 21:26 ` [PATCH V5 15/17] perf top: remove lost events checking kan.liang
2018-02-13 12:10 ` [tip:perf/urgent] perf top: Remove " tip-bot for Kan Liang
2018-02-16 9:41 ` tip-bot for Kan Liang
2018-01-18 21:26 ` [PATCH V5 16/17] perf top: switch default mode to overwrite mode kan.liang
2018-02-13 12:10 ` [tip:perf/urgent] perf top: Switch " tip-bot for Kan Liang
2018-02-16 9:41 ` tip-bot for Kan Liang
2018-01-18 21:26 ` [PATCH V5 17/17] perf top: check the latency of perf_top__mmap_read() kan.liang
2018-02-13 12:11 ` [tip:perf/urgent] perf top: Check " tip-bot for Kan Liang
2018-02-16 9:42 ` tip-bot for Kan Liang
2018-01-21 12:59 ` [PATCH V5 00/17] perf top overwrite mode 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=tip-63878a53cedc3df31bd4ba8740a49fa0fc116ac6@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=ak@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=wangnan0@huawei.com \
--cc=yao.jin@linux.intel.com \
/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