linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de>
Cc: Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
	Clark Williams <williams@redhat.com>,
	linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Alexey Budankov <alexey.budankov@linux.intel.com>,
	Andi Kleen <ak@linux.intel.com>,
	Jin Yao <yao.jin@linux.intel.com>,
	Michael Petlan <mpetlan@redhat.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Stephane Eranian <eranian@google.com>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 44/57] libperf: Move mmap allocation to perf_evlist__mmap_ops::get
Date: Mon, 21 Oct 2019 10:38:21 -0300	[thread overview]
Message-ID: <20191021133834.25998-45-acme@kernel.org> (raw)
In-Reply-To: <20191021133834.25998-1-acme@kernel.org>

From: Jiri Olsa <jolsa@kernel.org>

Move allocation of the mmap array into perf_evlist__mmap_ops::get, to
centralize the mmap allocation.

Also move nr_mmap setup to perf_evlist__mmap_ops so it's centralized and
shared by both perf and libperf mmap code.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lore.kernel.org/lkml/20191017105918.20873-3-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/lib/evlist.c  | 42 ++++++++++++++++++++++++----------------
 tools/perf/util/evlist.c | 24 +++++++++--------------
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/tools/perf/lib/evlist.c b/tools/perf/lib/evlist.c
index 854efff1519d..73aac6bb2ac5 100644
--- a/tools/perf/lib/evlist.c
+++ b/tools/perf/lib/evlist.c
@@ -338,10 +338,6 @@ static struct perf_mmap* perf_evlist__alloc_mmap(struct perf_evlist *evlist, boo
 	int i;
 	struct perf_mmap *map;
 
-	evlist->nr_mmaps = perf_cpu_map__nr(evlist->cpus);
-	if (perf_cpu_map__empty(evlist->cpus))
-		evlist->nr_mmaps = perf_thread_map__nr(evlist->threads);
-
 	map = zalloc(evlist->nr_mmaps * sizeof(struct perf_mmap));
 	if (!map)
 		return NULL;
@@ -384,18 +380,22 @@ static void perf_evlist__set_sid_idx(struct perf_evlist *evlist,
 static struct perf_mmap*
 perf_evlist__mmap_cb_get(struct perf_evlist *evlist, bool overwrite, int idx)
 {
-	struct perf_mmap *map = &evlist->mmap[idx];
+	struct perf_mmap *maps;
 
-	if (overwrite) {
-		if (!evlist->mmap_ovw) {
-			evlist->mmap_ovw = perf_evlist__alloc_mmap(evlist, true);
-			if (!evlist->mmap_ovw)
-				return NULL;
-		}
-		map = &evlist->mmap_ovw[idx];
+	maps = overwrite ? evlist->mmap_ovw : evlist->mmap;
+
+	if (!maps) {
+		maps = perf_evlist__alloc_mmap(evlist, overwrite);
+		if (!maps)
+			return NULL;
+
+		if (overwrite)
+			evlist->mmap_ovw = maps;
+		else
+			evlist->mmap = maps;
 	}
 
-	return map;
+	return &maps[idx];
 }
 
 #define FD(e, x, y) (*(int *) xyarray__entry(e->fd, x, y))
@@ -556,6 +556,17 @@ mmap_per_cpu(struct perf_evlist *evlist, struct perf_evlist_mmap_ops *ops,
 	return -1;
 }
 
+static int perf_evlist__nr_mmaps(struct perf_evlist *evlist)
+{
+	int nr_mmaps;
+
+	nr_mmaps = perf_cpu_map__nr(evlist->cpus);
+	if (perf_cpu_map__empty(evlist->cpus))
+		nr_mmaps = perf_thread_map__nr(evlist->threads);
+
+	return nr_mmaps;
+}
+
 int perf_evlist__mmap_ops(struct perf_evlist *evlist,
 			  struct perf_evlist_mmap_ops *ops,
 			  struct perf_mmap_param *mp)
@@ -567,10 +578,7 @@ int perf_evlist__mmap_ops(struct perf_evlist *evlist,
 	if (!ops || !ops->get || !ops->mmap)
 		return -EINVAL;
 
-	if (!evlist->mmap)
-		evlist->mmap = perf_evlist__alloc_mmap(evlist, false);
-	if (!evlist->mmap)
-		return -ENOMEM;
+	evlist->nr_mmaps = perf_evlist__nr_mmaps(evlist);
 
 	perf_evlist__for_each_entry(evlist, evsel) {
 		if ((evsel->attr.read_format & PERF_FORMAT_ID) &&
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 6cda5a311ba5..5cded4ec5806 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -599,9 +599,6 @@ static struct mmap *evlist__alloc_mmap(struct evlist *evlist,
 	int i;
 	struct mmap *map;
 
-	evlist->core.nr_mmaps = perf_cpu_map__nr(evlist->core.cpus);
-	if (perf_cpu_map__empty(evlist->core.cpus))
-		evlist->core.nr_mmaps = perf_thread_map__nr(evlist->core.threads);
 	map = zalloc(evlist->core.nr_mmaps * sizeof(struct mmap));
 	if (!map)
 		return NULL;
@@ -639,19 +636,21 @@ static struct perf_mmap*
 perf_evlist__mmap_cb_get(struct perf_evlist *_evlist, bool overwrite, int idx)
 {
 	struct evlist *evlist = container_of(_evlist, struct evlist, core);
-	struct mmap *maps = evlist->mmap;
+	struct mmap *maps;
 
-	if (overwrite) {
-		maps = evlist->overwrite_mmap;
+	maps = overwrite ? evlist->overwrite_mmap : evlist->mmap;
 
-		if (!maps) {
-			maps = evlist__alloc_mmap(evlist, true);
-			if (!maps)
-				return NULL;
+	if (!maps) {
+		maps = evlist__alloc_mmap(evlist, overwrite);
+		if (!maps)
+			return NULL;
 
+		if (overwrite) {
 			evlist->overwrite_mmap = maps;
 			if (evlist->bkw_mmap_state == BKW_MMAP_NOTREADY)
 				perf_evlist__toggle_bkw_mmap(evlist, BKW_MMAP_RUNNING);
+		} else {
+			evlist->mmap = maps;
 		}
 	}
 
@@ -812,11 +811,6 @@ int evlist__mmap_ex(struct evlist *evlist, unsigned int pages,
 		.mmap = perf_evlist__mmap_cb_mmap,
 	};
 
-	if (!evlist->mmap)
-		evlist->mmap = evlist__alloc_mmap(evlist, false);
-	if (!evlist->mmap)
-		return -ENOMEM;
-
 	evlist->core.mmap_len = evlist__mmap_size(pages);
 	pr_debug("mmap size %zuB\n", evlist->core.mmap_len);
 	mp.core.mask = evlist->core.mmap_len - page_size - 1;
-- 
2.21.0


  parent reply	other threads:[~2019-10-21 13:42 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-21 13:37 [GIT PULL] perf/core improvements and fixes Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 01/57] perf tools: Allow to build with -ltcmalloc Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 02/57] perf script: Fix --reltime with --time Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 03/57] perf evlist: Fix fix for freed id arrays Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 04/57] perf test: Report failure for mmap events Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 05/57] perf test: Avoid infinite loop for task exit case Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 06/57] perf report: Add warning when libunwind not compiled in Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 07/57] perf annotate: Avoid reallocation in objdump parsing Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 08/57] perf annotate: Use libsubcmd's run-command.h to fork objdump Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 09/57] perf annotate: Don't pipe objdump output through 'grep' command Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 10/57] perf annotate: Don't pipe objdump output through 'expand' command Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 11/57] perf annotate: Fix objdump --no-show-raw-insn flag Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 12/57] perf jvmti: Link against tools/lib/ctype.h to have weak strlcpy() Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 13/57] perf stat: Support --all-kernel/--all-user Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 14/57] perf trace: Add syscall failure stats to -s/--summary and -S/--with-summary Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 15/57] perf trace: Introduce --errno-summary Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 16/57] perf string: Export asprintf__tp_filter_pids() Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 17/57] perf trace: Filter own pid to avoid a feedback look in 'perf trace record -a' Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 18/57] perf trace: Support tracepoint dynamic char arrays Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 19/57] perf vendor events arm64: Fix Hisi hip08 DDRC PMU eventname Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 20/57] perf vendor events arm64: Add some missing events for Hisi hip08 DDRC PMU Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 21/57] perf vendor events arm64: Add some missing events for Hisi hip08 L3C PMU Arnaldo Carvalho de Melo
2019-10-21 13:37 ` [PATCH 22/57] perf vendor events arm64: Add some missing events for Hisi hip08 HHA PMU Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 23/57] tools arch x86: Grab a copy of the file containing the IRQ vector defines Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 24/57] libbeauty: Add a generator for x86's IRQ vectors -> strings Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 25/57] libbeauty: Hook up the x86 irq_vectors table generator Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 26/57] libbeauty: Add a strarray__scnprintf_suffix() method Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 27/57] perf trace beauty: Add the glue for the autogenerated x86 IRQ vector array Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 28/57] perf trace: Hook the 'vec' tracepoint argument with the x86 IRQ vectors scnprintf/strtoul Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 29/57] perf trace: Show error message when not finding a field used in a filter expression Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 30/57] perf trace: Introduce accessors to trace specific evsel->priv Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 31/57] perf trace: Hide evsel->access further, simplify code Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 32/57] perf trace: Introduce 'struct evsel__trace' for evsel->priv needs Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 33/57] perf trace: Initialize evsel_trace->fmt for syscalls:sys_enter_* tracepoints Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 34/57] perf scripting engines: Iterate on tep event arrays directly Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 35/57] perf tools: Remove unused trace_find_next_event() Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 36/57] libbeauty: Introduce syscall_arg__strtoul_strarray() Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 37/57] perf trace: Honour --max-events in processing syscalls:sys_enter_* Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 38/57] perf trace: Pass a syscall_arg to syscall_arg_fmt->strtoul() Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 39/57] perf list: Hide deprecated events by default Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 40/57] perf tests: Remove needless headers for bp_account Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 41/57] perf tests bp_account: Add dedicated checking helper is_supported() Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 42/57] perf tests: Disable bp_signal testing for arm64 Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 43/57] libperf: Introduce perf_evlist__for_each_mmap() Arnaldo Carvalho de Melo
2019-10-21 13:38 ` Arnaldo Carvalho de Melo [this message]
2019-10-21 13:38 ` [PATCH 45/57] libperf: Move mask setup to perf_evlist__mmap_ops() Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 46/57] libperf: Link static tests with libapi.a Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 47/57] libperf: Add tests_mmap_thread test Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 48/57] libperf: Add tests_mmap_cpus test Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 49/57] libperf: Keep count of failed tests Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 50/57] libperf: Do not export perf_evsel__init()/perf_evlist__init() Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 51/57] libperf: Add pr_err() macro Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 52/57] libbeauty: Introduce syscall_arg__strtoul_strarrays() Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 53/57] perf trace: Use strtoul for the fcntl 'cmd' argument Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 54/57] libbeauty: Make the mmap_flags strarray visible outside of its beautifier Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 55/57] libbeauty: Introduce strarray__strtoul_flags() Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 56/57] perf trace: Wire up strarray__strtoul_flags() Arnaldo Carvalho de Melo
2019-10-21 13:38 ` [PATCH 57/57] perf trace: Use STUL_STRARRAY_FLAGS with mmap Arnaldo Carvalho de Melo
2019-10-21 23:16 ` [GIT PULL] perf/core improvements and fixes Ingo Molnar

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=20191021133834.25998-45-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=ak@linux.intel.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=alexey.budankov@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=mingo@kernel.org \
    --cc=mpetlan@redhat.com \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=williams@redhat.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;
as well as URLs for NNTP newsgroup(s).