From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Adrian Hunter <adrian.hunter@intel.com>, Ian Rogers <irogers@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>, Andrii Nakryiko <andriin@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@chromium.org>, Andi Kleen <ak@linux.intel.com>,
Athira Rajeev <atrajeev@linux.vnet.ibm.com>,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
bpf@vger.kernel.org, Stephane Eranian <eranian@google.com>
Subject: Re: [PATCH v2 4/5] perf record: Don't clear event's period if set by a term
Date: Wed, 29 Jul 2020 15:58:07 -0300 [thread overview]
Message-ID: <20200729185807.GD433799@kernel.org> (raw)
In-Reply-To: <20200728085734.609930-5-irogers@google.com>
Em Tue, Jul 28, 2020 at 01:57:33AM -0700, Ian Rogers escreveu:
> If events in a group explicitly set a frequency or period with leader
> sampling, don't disable the samples on those events.
>
> Prior to 5.8:
> perf record -e '{cycles/period=12345000/,instructions/period=6789000/}:S'
> would clear the attributes then apply the config terms. In commit
> 5f34278867b7 leader sampling configuration was moved to after applying the
> config terms, in the example, making the instructions' event have its period
> cleared.
> This change makes it so that sampling is only disabled if configuration
> terms aren't present.
Adrian, can you take a look at this one?
- Arnaldo
> Fixes: 5f34278867b7 ("perf evlist: Move leader-sampling configuration")
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/perf/util/record.c | 28 ++++++++++++++++++++--------
> 1 file changed, 20 insertions(+), 8 deletions(-)
>
> diff --git a/tools/perf/util/record.c b/tools/perf/util/record.c
> index a4cc11592f6b..01d1c6c613f7 100644
> --- a/tools/perf/util/record.c
> +++ b/tools/perf/util/record.c
> @@ -2,6 +2,7 @@
> #include "debug.h"
> #include "evlist.h"
> #include "evsel.h"
> +#include "evsel_config.h"
> #include "parse-events.h"
> #include <errno.h>
> #include <limits.h>
> @@ -38,6 +39,9 @@ static void evsel__config_leader_sampling(struct evsel *evsel, struct evlist *ev
> struct perf_event_attr *attr = &evsel->core.attr;
> struct evsel *leader = evsel->leader;
> struct evsel *read_sampler;
> + struct evsel_config_term *term;
> + struct list_head *config_terms = &evsel->config_terms;
> + int term_types, freq_mask;
>
> if (!leader->sample_read)
> return;
> @@ -47,16 +51,24 @@ static void evsel__config_leader_sampling(struct evsel *evsel, struct evlist *ev
> if (evsel == read_sampler)
> return;
>
> + /* Determine the evsel's config term types. */
> + term_types = 0;
> + list_for_each_entry(term, config_terms, list) {
> + term_types |= 1 << term->type;
> + }
> /*
> - * Disable sampling for all group members other than the leader in
> - * case the leader 'leads' the sampling, except when the leader is an
> - * AUX area event, in which case the 2nd event in the group is the one
> - * that 'leads' the sampling.
> + * Disable sampling for all group members except those with explicit
> + * config terms or the leader. In the case of an AUX area event, the 2nd
> + * event in the group is the one that 'leads' the sampling.
> */
> - attr->freq = 0;
> - attr->sample_freq = 0;
> - attr->sample_period = 0;
> - attr->write_backward = 0;
> + freq_mask = (1 << EVSEL__CONFIG_TERM_FREQ) | (1 << EVSEL__CONFIG_TERM_PERIOD);
> + if ((term_types & freq_mask) == 0) {
> + attr->freq = 0;
> + attr->sample_freq = 0;
> + attr->sample_period = 0;
> + }
> + if ((term_types & (1 << EVSEL__CONFIG_TERM_OVERWRITE)) == 0)
> + attr->write_backward = 0;
>
> /*
> * We don't get a sample for slave events, we make them when delivering
> --
> 2.28.0.163.g6104cc2f0b6-goog
>
--
- Arnaldo
next prev parent reply other threads:[~2020-07-29 18:58 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-28 8:57 [PATCH v2 0/5] Fixes for setting event freq/periods Ian Rogers
2020-07-28 8:57 ` [PATCH v2 1/5] perf record: Set PERF_RECORD_PERIOD if attr->freq is set Ian Rogers
2020-07-28 15:43 ` Jiri Olsa
2020-07-28 16:03 ` Arnaldo Carvalho de Melo
2020-07-29 15:11 ` Athira Rajeev
2020-07-29 18:52 ` Arnaldo Carvalho de Melo
2020-07-29 21:43 ` Ian Rogers
2020-09-04 5:39 ` Ian Rogers
2020-07-28 8:57 ` [PATCH v2 2/5] perf record: Prevent override of attr->sample_period for libpfm4 events Ian Rogers
2020-07-28 15:59 ` Jiri Olsa
2020-07-28 16:09 ` Jiri Olsa
2020-07-29 23:24 ` Ian Rogers
2020-09-04 5:41 ` Ian Rogers
2020-09-04 16:03 ` Jiri Olsa
2020-09-04 16:22 ` Ian Rogers
2020-09-04 18:48 ` Arnaldo Carvalho de Melo
2020-09-04 18:50 ` Arnaldo Carvalho de Melo
2020-09-04 18:51 ` Arnaldo Carvalho de Melo
2020-09-11 22:34 ` Ian Rogers
2020-09-12 3:02 ` Ian Rogers
2020-07-29 18:54 ` Arnaldo Carvalho de Melo
2020-07-28 8:57 ` [PATCH v2 3/5] perf test: Ensure sample_period is set " Ian Rogers
2020-07-28 12:45 ` Arnaldo Carvalho de Melo
2020-07-28 8:57 ` [PATCH v2 4/5] perf record: Don't clear event's period if set by a term Ian Rogers
2020-07-29 18:58 ` Arnaldo Carvalho de Melo [this message]
2020-08-04 10:08 ` Adrian Hunter
2020-08-04 13:33 ` Ian Rogers
2020-08-04 14:48 ` Adrian Hunter
2020-08-04 15:50 ` Ian Rogers
2020-09-04 5:43 ` Ian Rogers
2020-09-07 6:36 ` Adrian Hunter
2020-07-28 8:57 ` [PATCH v2 5/5] perf test: Leader sampling shouldn't clear sample period Ian Rogers
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=20200729185807.GD433799@kernel.org \
--to=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=atrajeev@linux.vnet.ibm.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eranian@google.com \
--cc=irogers@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@redhat.com \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=songliubraving@fb.com \
--cc=yhs@fb.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;
as well as URLs for NNTP newsgroup(s).