From: Ian Rogers <irogers@google.com>
To: Adrian Hunter <adrian.hunter@intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
Jiri Olsa <jolsa@redhat.com>,
Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>,
Namhyung Kim <namhyung@kernel.org>, Leo Yan <leo.yan@linaro.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH V1 10/23] perf auxtrace: Add mmap_needed to auxtrace_mmap_params
Date: Thu, 5 May 2022 16:40:52 -0700 [thread overview]
Message-ID: <CAP-5=fVta9pbdksMD=p8XGC=Sr0Lj812bSbvVQmKQwbp_n=5Ng@mail.gmail.com> (raw)
In-Reply-To: <20220505165639.361733-11-adrian.hunter@intel.com>
On Thu, May 5, 2022 at 9:57 AM Adrian Hunter <adrian.hunter@intel.com> wrote:
>
> Add mmap_needed to auxtrace_mmap_params.
>
> Currently an auxtrace mmap is always attempted even if the event is not an
> auxtrace event. That works because, when AUX area tracing, there is always
> an auxtrace event first for every mmap. Prepare for that not being the
> case, which it won't be when sideband tracking events are allowed on
> all CPUs even when auxtrace is limited to selected CPUs.
>
> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
> ---
> tools/perf/util/auxtrace.c | 10 ++++++++--
> tools/perf/util/auxtrace.h | 7 +++++--
> tools/perf/util/evlist.c | 5 +++--
> tools/perf/util/mmap.c | 1 +
> 4 files changed, 17 insertions(+), 6 deletions(-)
>
> diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
> index b11549ae39df..b446cfa66469 100644
> --- a/tools/perf/util/auxtrace.c
> +++ b/tools/perf/util/auxtrace.c
> @@ -125,7 +125,7 @@ int auxtrace_mmap__mmap(struct auxtrace_mmap *mm,
> mm->tid = mp->tid;
> mm->cpu = mp->cpu.cpu;
>
> - if (!mp->len) {
> + if (!mp->len || !mp->mmap_needed) {
> mm->base = NULL;
> return 0;
> }
> @@ -168,9 +168,15 @@ void auxtrace_mmap_params__init(struct auxtrace_mmap_params *mp,
> }
>
> void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp,
> - struct evlist *evlist, int idx,
> + struct evlist *evlist,
> + struct evsel *evsel, int idx,
> bool per_cpu)
> {
> + mp->mmap_needed = evsel->needs_auxtrace_mmap;
> +
> + if (!mp->mmap_needed)
> + return;
> +
> mp->idx = idx;
>
> if (per_cpu) {
> diff --git a/tools/perf/util/auxtrace.h b/tools/perf/util/auxtrace.h
> index dc38b6f57232..4e715e2d9291 100644
> --- a/tools/perf/util/auxtrace.h
> +++ b/tools/perf/util/auxtrace.h
> @@ -353,6 +353,7 @@ struct auxtrace_mmap_params {
> int prot;
> int idx;
> pid_t tid;
> + bool mmap_needed;
It'd be useful to add or fix some context documentation here. Above it says:
* struct auxtrace_mmap_params - parameters to set up struct auxtrace_mmap.
but this flag seems intended for the operation to fail. Clarifying the
intention of the flag would be useful.
Thanks,
Ian
> struct perf_cpu cpu;
> };
>
> @@ -490,7 +491,8 @@ void auxtrace_mmap_params__init(struct auxtrace_mmap_params *mp,
> unsigned int auxtrace_pages,
> bool auxtrace_overwrite);
> void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp,
> - struct evlist *evlist, int idx,
> + struct evlist *evlist,
> + struct evsel *evsel, int idx,
> bool per_cpu);
>
> typedef int (*process_auxtrace_t)(struct perf_tool *tool,
> @@ -863,7 +865,8 @@ void auxtrace_mmap_params__init(struct auxtrace_mmap_params *mp,
> unsigned int auxtrace_pages,
> bool auxtrace_overwrite);
> void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp,
> - struct evlist *evlist, int idx,
> + struct evlist *evlist,
> + struct evsel *evsel, int idx,
> bool per_cpu);
>
> #define ITRACE_HELP ""
> diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
> index 7ae56b062f44..996bdc203616 100644
> --- a/tools/perf/util/evlist.c
> +++ b/tools/perf/util/evlist.c
> @@ -747,15 +747,16 @@ static struct mmap *evlist__alloc_mmap(struct evlist *evlist,
>
> static void
> perf_evlist__mmap_cb_idx(struct perf_evlist *_evlist,
> - struct perf_evsel *_evsel __maybe_unused,
> + struct perf_evsel *_evsel,
> struct perf_mmap_param *_mp,
> int idx)
> {
> struct evlist *evlist = container_of(_evlist, struct evlist, core);
> struct mmap_params *mp = container_of(_mp, struct mmap_params, core);
> bool per_cpu = !perf_cpu_map__empty(_evlist->user_requested_cpus);
> + struct evsel *evsel = container_of(_evsel, struct evsel, core);
>
> - auxtrace_mmap_params__set_idx(&mp->auxtrace_mp, evlist, idx, per_cpu);
> + auxtrace_mmap_params__set_idx(&mp->auxtrace_mp, evlist, evsel, idx, per_cpu);
> }
>
> static struct perf_mmap*
> diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c
> index 50502b4a7ca4..de59c4da852b 100644
> --- a/tools/perf/util/mmap.c
> +++ b/tools/perf/util/mmap.c
> @@ -62,6 +62,7 @@ void __weak auxtrace_mmap_params__init(struct auxtrace_mmap_params *mp __maybe_u
>
> void __weak auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp __maybe_unused,
> struct evlist *evlist __maybe_unused,
> + struct evsel *evsel __maybe_unused,
> int idx __maybe_unused,
> bool per_cpu __maybe_unused)
> {
> --
> 2.25.1
>
next prev parent reply other threads:[~2022-05-05 23:41 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-05 16:56 [PATCH V1 00/23] perf intel-pt: Better support for perf record --cpu Adrian Hunter
2022-05-05 16:56 ` [PATCH V1 01/23] perf intel-pt: Add a test for system-wide side band Adrian Hunter
2022-05-05 22:37 ` Ian Rogers
2022-05-05 16:56 ` [PATCH V1 02/23] libperf evsel: Add perf_evsel__enable_thread() Adrian Hunter
2022-05-05 22:48 ` Ian Rogers
2022-05-06 7:18 ` Adrian Hunter
2022-05-05 16:56 ` [PATCH V1 03/23] perf evlist: Use libperf functions in evlist__enable_event_idx() Adrian Hunter
2022-05-05 22:58 ` Ian Rogers
2022-05-05 16:56 ` [PATCH V1 04/23] perf auxtrace: Move evlist__enable_event_idx() to auxtrace.c Adrian Hunter
2022-05-05 23:06 ` Ian Rogers
2022-05-05 16:56 ` [PATCH V1 05/23] perf auxtrace: Do not mix up mmap idx Adrian Hunter
2022-05-05 23:08 ` Ian Rogers
2022-05-05 16:56 ` [PATCH V1 06/23] libperf evlist: Remove ->idx() per_cpu parameter Adrian Hunter
2022-05-05 23:08 ` Ian Rogers
2022-05-05 16:56 ` [PATCH V1 07/23] libperf evlist: Move ->idx() into mmap_per_evsel() Adrian Hunter
2022-05-05 23:09 ` Ian Rogers
2022-05-05 16:56 ` [PATCH V1 08/23] libperf evlist: Add evsel as a parameter to ->idx() Adrian Hunter
2022-05-05 23:27 ` Ian Rogers
2022-05-05 16:56 ` [PATCH V1 09/23] perf auxtrace: Record whether an auxtrace mmap is needed Adrian Hunter
2022-05-05 23:28 ` Ian Rogers
2022-05-05 16:56 ` [PATCH V1 10/23] perf auxtrace: Add mmap_needed to auxtrace_mmap_params Adrian Hunter
2022-05-05 23:40 ` Ian Rogers [this message]
2022-05-05 16:56 ` [PATCH V1 11/23] perf auxtrace: Remove auxtrace_mmap_params__set_idx() per_cpu parameter Adrian Hunter
2022-05-05 22:13 ` Ian Rogers
2022-05-05 16:56 ` [PATCH V1 12/23] perf evlist: Factor out evlist__dummy_event() Adrian Hunter
2022-05-05 23:42 ` Ian Rogers
2022-05-05 16:56 ` [PATCH V1 13/23] perf evlist: Add evlist__add_system_wide_dummy() Adrian Hunter
2022-05-05 23:56 ` Ian Rogers
2022-05-06 8:14 ` Adrian Hunter
2022-05-06 8:34 ` Ian Rogers
2022-05-06 9:27 ` Adrian Hunter
2022-05-05 16:56 ` [PATCH V1 14/23] perf record: Use evlist__add_system_wide_dummy() in record__config_text_poke() Adrian Hunter
2022-05-05 23:57 ` Ian Rogers
2022-05-05 16:56 ` [PATCH V1 15/23] perf intel-pt: Use evlist__add_system_wide_dummy() for switch tracking Adrian Hunter
2022-05-05 23:58 ` Ian Rogers
2022-05-05 16:56 ` [PATCH V1 16/23] perf intel-pt: Track sideband system-wide when needed Adrian Hunter
2022-05-06 0:01 ` Ian Rogers
2022-05-05 16:56 ` [PATCH V1 17/23] perf tools: Allow all_cpus to be a superset of user_requested_cpus Adrian Hunter
2022-05-05 16:56 ` [PATCH V1 18/23] libperf evlist: Allow mixing per-thread and per-cpu mmaps Adrian Hunter
2022-05-06 0:09 ` Ian Rogers
2022-05-05 16:56 ` [PATCH V1 19/23] libperf evlist: Check nr_mmaps is correct Adrian Hunter
2022-05-06 0:13 ` Ian Rogers
2022-05-05 16:56 ` [PATCH V1 20/23] perf stat: Add requires_cpu flag for uncore Adrian Hunter
2022-05-06 0:50 ` Ian Rogers
2022-05-06 0:52 ` Ian Rogers
2022-05-05 16:56 ` [PATCH V1 21/23] libperf evsel: Add comments for booleans Adrian Hunter
2022-05-06 0:55 ` Ian Rogers
2022-05-05 16:56 ` [PATCH V1 22/23] perf tools: Allow system-wide events to keep their own CPUs Adrian Hunter
2022-05-06 1:00 ` Ian Rogers
2022-05-05 16:56 ` [PATCH V1 23/23] perf tools: Allow system-wide events to keep their own threads Adrian Hunter
2022-05-06 0:51 ` Ian Rogers
2022-05-06 1:06 ` [PATCH V1 00/23] perf intel-pt: Better support for perf record --cpu 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='CAP-5=fVta9pbdksMD=p8XGC=Sr0Lj812bSbvVQmKQwbp_n=5Ng@mail.gmail.com' \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexey.v.bayduraev@linux.intel.com \
--cc=jolsa@redhat.com \
--cc=leo.yan@linaro.org \
--cc=linux-kernel@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).