Re: [PATCH v8 01/22] perf record: Introduce thread affinity and mmap masks

[Bayduraev, Alexey V]

Hi,

On 30.06.2021 19:17, Arnaldo Carvalho de Melo wrote:
> Em Wed, Jun 30, 2021 at 06:54:40PM +0300, Alexey Bayduraev escreveu:
[SNIP]
>> +static void record__mmap_cpu_mask_free(struct mmap_cpu_mask *mask)
>> +{
>> +	bitmap_free(mask->bits);
>> +	mask->nbits = 0;
> 
> Plese use NULL, as 'mask->nbits' is a pointer.

In perf/util/mmap.h "nbits" is size_t:

struct mmap_cpu_mask {
        unsigned long *bits;
        size_t nbits;
};

Regards,
Alexey

> 
>> +}
>> +
>> +static void record__thread_mask_clear(struct thread_mask *mask)
>> +{
>> +	bitmap_zero(mask->maps.bits, mask->maps.nbits);
>> +	bitmap_zero(mask->affinity.bits, mask->affinity.nbits);
>> +}
>> +
>> +static int record__thread_mask_alloc(struct thread_mask *mask, int nr_bits)
>> +{
>> +	int ret;
>> +
>> +	ret = record__mmap_cpu_mask_alloc(&mask->maps, nr_bits);
> 
> 
> please combine such decl + assign into one line, i.e.:
> 
> 	int ret = record__mmap_cpu_mask_alloc(&mask->maps, nr_bits);
> 
>> +	if (ret) {
>> +		mask->affinity.bits = NULL;
>> +		return ret;
>> +	}
>> +
>> +	ret = record__mmap_cpu_mask_alloc(&mask->affinity, nr_bits);
>> +	if (ret) {
>> +		record__mmap_cpu_mask_free(&mask->maps);
>> +		mask->maps.bits = NULL;
>> +	}
>> +
>> +	return ret;
>> +}
>> +
>> +static void record__thread_mask_free(struct thread_mask *mask)
>> +{
>> +	record__mmap_cpu_mask_free(&mask->maps);
>> +	record__mmap_cpu_mask_free(&mask->affinity);
>> +}
>> +
>>  static int parse_output_max_size(const struct option *opt,
>>  				 const char *str, int unset)
>>  {
>> @@ -2664,6 +2720,70 @@ static struct option __record_options[] = {
>>  
>>  struct option *record_options = __record_options;
>>  
>> +static void record__mmap_cpu_mask_init(struct mmap_cpu_mask *mask, struct perf_cpu_map *cpus)
>> +{
>> +	int c;
>> +
>> +	for (c = 0; c < cpus->nr; c++)
>> +		set_bit(cpus->map[c], mask->bits);
>> +}
>> +
>> +static int record__alloc_thread_masks(struct record *rec, int nr_threads, int nr_bits)
>> +{
>> +	int t, ret;
>> +
>> +	rec->thread_masks = zalloc(nr_threads * sizeof(*(rec->thread_masks)));
>> +	if (!rec->thread_masks) {
>> +		pr_err("Failed to allocate thread masks\n");
>> +		return -ENOMEM;
>> +	}
>> +
>> +	for (t = 0; t < nr_threads; t++) {
>> +		ret = record__thread_mask_alloc(&rec->thread_masks[t], nr_bits);
> 
> Usually when we don't manage to allocate all that we need we go on and
> free the partially allocated resources.
> 
>> +		if (ret)
>> +			return ret;
>> +		record__thread_mask_clear(&rec->thread_masks[t]);
>> +	}
>> +
>> +	return 0;
>> +}
>> +static int record__init_thread_default_masks(struct record *rec, struct perf_cpu_map *cpus)
>> +{
>> +	int ret;
>> +
>> +	ret = record__alloc_thread_masks(rec, 1, cpu__max_cpu());
> 
> ditto
> 
>> +	if (ret)
>> +		return ret;
>> +
>> +	record__mmap_cpu_mask_init(&rec->thread_masks->maps, cpus);
>> +
>> +	rec->nr_threads = 1;
>> +
>> +	return 0;
>> +}
>> +
>> +static int record__init_thread_masks(struct record *rec)
>> +{
>> +	struct perf_cpu_map *cpus = rec->evlist->core.cpus;
>> +
>> +	return record__init_thread_default_masks(rec, cpus);
>> +}
>> +
>> +static int record__fini_thread_masks(struct record *rec)
>> +{
>> +	int t;
>> +
>> +	if (rec->thread_masks)
>> +		for (t = 0; t < rec->nr_threads; t++)
>> +			record__thread_mask_free(&rec->thread_masks[t]);
>> +
>> +	zfree(&rec->thread_masks);
>> +
>> +	rec->nr_threads = 0;
>> +
>> +	return 0;
>> +}
>> +
>>  int cmd_record(int argc, const char **argv)
>>  {
>>  	int err;
>> @@ -2912,6 +3032,12 @@ int cmd_record(int argc, const char **argv)
>>  		goto out;
>>  	}
>>  
>> +	err = record__init_thread_masks(rec);
>> +	if (err) {
>> +		pr_err("record__init_thread_masks failed, error %d\n", err);
>> +		goto out;
>> +	}
>> +
>>  	if (rec->opts.nr_cblocks > nr_cblocks_max)
>>  		rec->opts.nr_cblocks = nr_cblocks_max;
>>  	pr_debug("nr_cblocks: %d\n", rec->opts.nr_cblocks);
>> @@ -2930,6 +3056,7 @@ int cmd_record(int argc, const char **argv)
>>  	symbol__exit();
>>  	auxtrace_record__free(rec->itr);
>>  out_opts:
>> +	record__fini_thread_masks(rec);
>>  	evlist__close_control(rec->opts.ctl_fd, rec->opts.ctl_fd_ack, &rec->opts.ctl_fd_close);
>>  	return err;
>>  }
>> -- 
>> 2.19.0
>>
>