From: Alexey Budankov <alexey.budankov@linux.intel.com>
To: Jiri Olsa <jolsa@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>, Andi Kleen <ak@linux.intel.com>,
linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v4 3/3] perf record: adapt affinity to machines with #CPUs > 1K
Date: Tue, 3 Dec 2019 13:48:05 +0300 [thread overview]
Message-ID: <cc0dd7dc-400f-7097-b371-e895c016aaae@linux.intel.com> (raw)
In-Reply-To: <20191203101252.GD17468@krava>
On 03.12.2019 13:12, Jiri Olsa wrote:
> On Mon, Dec 02, 2019 at 09:58:48AM +0300, Alexey Budankov wrote:
>
> SNIP
>
>>
>> -static void build_node_mask(int node, cpu_set_t *mask)
>> +static void build_node_mask(int node, struct mmap_cpu_mask *mask)
>> {
>> int c, cpu, nr_cpus;
>> const struct perf_cpu_map *cpu_map = NULL;
>> @@ -240,17 +242,23 @@ static void build_node_mask(int node, cpu_set_t *mask)
>> for (c = 0; c < nr_cpus; c++) {
>> cpu = cpu_map->map[c]; /* map c index to online cpu index */
>> if (cpu__get_node(cpu) == node)
>> - CPU_SET(cpu, mask);
>> + set_bit(cpu, mask->bits);
>> }
>> }
>>
>> -static void perf_mmap__setup_affinity_mask(struct mmap *map, struct mmap_params *mp)
>> +static int perf_mmap__setup_affinity_mask(struct mmap *map, struct mmap_params *mp)
>> {
>> - CPU_ZERO(&map->affinity_mask);
>> + map->affinity_mask.nbits = cpu__max_cpu();
>> + map->affinity_mask.bits = bitmap_alloc(map->affinity_mask.nbits);
>> + if (!map->affinity_mask.bits)
>> + return -1;
>
> hum, this one should be also behind (rec->opts.affinity != PERF_AFFINITY_SYS)
> condition, right? sry I haven't noticed that before..
That has not been so far, but, probably like this:
diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c
index 7f573f646431..832d2cb94b2c 100644
--- a/tools/perf/util/mmap.c
+++ b/tools/perf/util/mmap.c
@@ -269,7 +269,8 @@ int mmap__mmap(struct mmap *map, struct mmap_params *mp, int fd, int cpu)
return -1;
}
- if (perf_mmap__setup_affinity_mask(map, mp)) {
+ if (mp->affinity != PERF_AFFINITY_SYS &&
+ perf_mmap__setup_affinity_mask(map, mp)) {
pr_debug2("failed to alloc mmap affinity mask, error %d\n",
errno);
return -1;
Thanks,
Alexey
next prev parent reply other threads:[~2019-12-03 10:48 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-02 6:51 [PATCH v4 0/3] perf record: adapt NUMA awareness to machines with #CPUs > 1K Alexey Budankov
2019-12-02 6:57 ` [PATCH v4 1/3] tools bitmap: implement bitmap_equal() operation at bitmap API Alexey Budankov
2019-12-02 6:58 ` [PATCH v4 2/3] perf mmap: declare type for cpu mask of arbitrary length Alexey Budankov
2019-12-02 6:58 ` [PATCH v4 3/3] perf record: adapt affinity to machines with #CPUs > 1K Alexey Budankov
2019-12-03 10:12 ` Jiri Olsa
2019-12-03 10:48 ` Alexey Budankov [this message]
2019-12-03 11:23 ` Jiri Olsa
2019-12-03 11:40 ` Alexey Budankov
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=cc0dd7dc-400f-7097-b371-e895c016aaae@linux.intel.com \
--to=alexey.budankov@linux.intel.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.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).