Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH v3 3/3] perf record: adapt affinity to machines with #CPUs
 > 1K
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>
References: <908dbe98-7d8d-0ec1-d4ae-242f3e104979@linux.intel.com>
 <21bc3ad7-e1f2-68da-f004-36354a6e40ea@linux.intel.com>
 <20191129130710.GB14169@krava>
From:   Alexey Budankov <alexey.budankov@linux.intel.com>
Organization: Intel Corp.
Message-ID: <d11eb388-2a66-c791-3ad3-40eed930480a@linux.intel.com>
Date:   Fri, 29 Nov 2019 18:49:25 +0300
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101
 Thunderbird/60.9.1
MIME-Version: 1.0
In-Reply-To: <20191129130710.GB14169@krava>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


On 29.11.2019 16:07, Jiri Olsa wrote:
> On Fri, Nov 29, 2019 at 01:05:26PM +0300, Alexey Budankov wrote:
> 
> SNIP
> 
>>  # undef REASON
>>  #endif
>>  
>> -	CPU_ZERO(&rec->affinity_mask);
>>  	rec->opts.affinity = PERF_AFFINITY_SYS;
>>  
>>  	rec->evlist = evlist__new();
>> @@ -2499,6 +2504,14 @@ int cmd_record(int argc, const char **argv)
>>  
>>  	symbol__init(NULL);
>>  
>> +	rec->affinity_mask.nbits = cpu__max_cpu();
>> +	rec->affinity_mask.bits = bitmap_alloc(rec->affinity_mask.nbits);
>> +	if (!rec->affinity_mask.bits) {
>> +		pr_err("Failed to allocate thread mask for %ld cpus\n", rec->affinity_mask.nbits);
>> +		return -ENOMEM;
>> +	}
>> +	pr_debug2("thread mask[%ld]: empty\n", rec->affinity_mask.nbits);
> 
> above can be done only for (rec->opts.affinity != PERF_AFFINITY_SYS)

Indeed. Corrected in v4.

> 
> 
>> +
>>  	err = record__auxtrace_init(rec);
>>  	if (err)
>>  		goto out;
>> @@ -2613,6 +2626,8 @@ int cmd_record(int argc, const char **argv)
>>  
>>  	err = __cmd_record(&record, argc, argv);
>>  out:
>> +	if (rec->affinity_mask.bits)
>> +		bitmap_free(rec->affinity_mask.bits);
>>  	evlist__delete(rec->evlist);
>>  	symbol__exit();
>>  	auxtrace_record__free(rec->itr);
>> diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c
>> index 30ff7aef06f2..615d05870849 100644
>> --- a/tools/perf/util/mmap.c
>> +++ b/tools/perf/util/mmap.c
>> @@ -219,6 +219,9 @@ static void perf_mmap__aio_munmap(struct mmap *map __maybe_unused)
>>  
>>  void mmap__munmap(struct mmap *map)
>>  {
>> +	if (map->affinity_mask.bits)
>> +		bitmap_free(map->affinity_mask.bits);
> 
> you don't need to check map->affinity_mask.bits, it's checked in free

Makes sense. Corrected in v4.

> 
> jirka

Thanks,
Alexey