From: Adrian Hunter <adrian.hunter@intel.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>, Ian Rogers <irogers@google.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: [PATCH V1 19/23] libperf evlist: Check nr_mmaps is correct
Date: Thu, 5 May 2022 19:56:35 +0300 [thread overview]
Message-ID: <20220505165639.361733-20-adrian.hunter@intel.com> (raw)
In-Reply-To: <20220505165639.361733-1-adrian.hunter@intel.com>
Print an error message if the predetermined number of mmaps is
incorrect.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
tools/lib/perf/evlist.c | 11 +++++++++--
tools/lib/perf/include/internal/mmap.h | 5 +++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/tools/lib/perf/evlist.c b/tools/lib/perf/evlist.c
index 0acf43946479..8a82b4b94b99 100644
--- a/tools/lib/perf/evlist.c
+++ b/tools/lib/perf/evlist.c
@@ -23,6 +23,7 @@
#include <perf/cpumap.h>
#include <perf/threadmap.h>
#include <api/fd/array.h>
+#include "internal.h"
void perf_evlist__init(struct perf_evlist *evlist)
{
@@ -424,7 +425,7 @@ static void perf_evlist__set_mmap_first(struct perf_evlist *evlist, struct perf_
static int
mmap_per_evsel(struct perf_evlist *evlist, struct perf_evlist_mmap_ops *ops,
int idx, struct perf_mmap_param *mp, int cpu_idx,
- int thread, int *_output, int *_output_overwrite)
+ int thread, int *_output, int *_output_overwrite, int *nr_mmaps)
{
struct perf_cpu evlist_cpu = perf_cpu_map__cpu(evlist->all_cpus, cpu_idx);
struct perf_evsel *evsel;
@@ -480,6 +481,8 @@ mmap_per_evsel(struct perf_evlist *evlist, struct perf_evlist_mmap_ops *ops,
if (ops->mmap(map, mp, *output, evlist_cpu) < 0)
return -1;
+ *nr_mmaps += 1;
+
if (!idx)
perf_evlist__set_mmap_first(evlist, map, overwrite);
} else {
@@ -514,6 +517,7 @@ mmap_per_cpu(struct perf_evlist *evlist, struct perf_evlist_mmap_ops *ops,
{
int nr_threads = perf_thread_map__nr(evlist->threads);
int nr_cpus = perf_cpu_map__nr(evlist->all_cpus);
+ int nr_mmaps = 0;
int cpu, thread;
for (cpu = 0; cpu < nr_cpus; cpu++) {
@@ -522,11 +526,14 @@ mmap_per_cpu(struct perf_evlist *evlist, struct perf_evlist_mmap_ops *ops,
for (thread = 0; thread < nr_threads; thread++) {
if (mmap_per_evsel(evlist, ops, cpu, mp, cpu,
- thread, &output, &output_overwrite))
+ thread, &output, &output_overwrite, &nr_mmaps))
goto out_unmap;
}
}
+ if (nr_mmaps != evlist->nr_mmaps)
+ pr_err("Miscounted nr_mmaps %d vs %d\n", nr_mmaps, evlist->nr_mmaps);
+
return 0;
out_unmap:
diff --git a/tools/lib/perf/include/internal/mmap.h b/tools/lib/perf/include/internal/mmap.h
index 5a062af8e9d8..9b00828e70ef 100644
--- a/tools/lib/perf/include/internal/mmap.h
+++ b/tools/lib/perf/include/internal/mmap.h
@@ -56,4 +56,9 @@ u64 perf_mmap__read_head(struct perf_mmap *map);
int perf_mmap__read_self(struct perf_mmap *map, struct perf_counts_values *count);
+static inline bool perf_mmap__is_mmapped(struct perf_mmap *map)
+{
+ return map->base;
+}
+
#endif /* __LIBPERF_INTERNAL_MMAP_H */
--
2.25.1
next prev parent reply other threads:[~2022-05-05 16:59 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
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 ` Adrian Hunter [this message]
2022-05-06 0:13 ` [PATCH V1 19/23] libperf evlist: Check nr_mmaps is correct 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=20220505165639.361733-20-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=acme@kernel.org \
--cc=alexey.v.bayduraev@linux.intel.com \
--cc=irogers@google.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).