Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac0e2cd5 authored by Kan Liang's avatar Kan Liang Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Fix PMU term format max value calculation 



Currently the max value of format is calculated by the bits number. It
relies on the continuity of the format.

However, uncore event format is not continuous. E.g. uncore qpi event
format can be 0-7,21.

If bit 21 is set, there is parsing issues as below.

  $ perf stat -a -e uncore_qpi_0/event=0x200002,umask=0x8/
  event syntax error: '..pi_0/event=0x200002,umask=0x8/'
                                    \___ value too big for format, maximum is 511

This patch return the real max value by setting all possible bits to 1.

Signed-off-by: default avatarKan Liang <kan.liang@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/1459365375-14285-1-git-send-email-kan.liang@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent bd0c7a54

tools/perf/util/pmu.c

+6 −7
Original line number Diff line number Diff line
@@ -602,14 +602,13 @@ static void pmu_format_value(unsigned long *format, __u64 value, __u64 *v, 


static __u64 pmu_format_max_value(const unsigned long *format)

{

	int w;

	__u64 w = 0;

	int fbit;



	w = bitmap_weight(format, PERF_PMU_FORMAT_BITS);

	if (!w)

		return 0;

	if (w < 64)

		return (1ULL << w) - 1;

	return -1;

	for_each_set_bit(fbit, format, PERF_PMU_FORMAT_BITS)

		w |= (1ULL << fbit);



	return w;

}



/*