Commit 1578e63d authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf evsel: Add is_pmu_core inorder to interpret own_cpus 



The behaviour of handling cpu maps varies for core and other PMUs. For
core PMUs the cpu map lists all valid CPUs, whereas for other PMUs the
map is the default CPU. Add a flag in the evsel to indicate if a PMU
is core to help with later interpreting of the cpu maps and populate
it when the evsel is created during parsing. When propagating cpu
maps, core PMUs should intersect the cpu map of the PMU with the user
requested one.

Reviewed-by: default avatarKan Liang <kan.liang@linux.intel.com>
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ali Saidi <alisaidi@amazon.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kang Minchul <tegongkang@gmail.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Ming Wang <wangming01@loongson.cn>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20230527072210.2900565-7-irogers@google.com


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

tools/lib/perf/include/internal/evsel.h

+9 −0
Original line number Diff line number Diff line
@@ -41,7 +41,14 @@ struct perf_sample_id { 
struct perf_evsel {

	struct list_head	 node;

	struct perf_event_attr	 attr;

	/** The commonly used cpu map of CPUs the event should be opened upon, etc. */

	struct perf_cpu_map	*cpus;

	/**

	 * The cpu map read from the PMU. For core PMUs this is the list of all

	 * CPUs the event can be opened upon. For other PMUs this is the default

	 * cpu map for opening the event on, for example, the first CPU on a

	 * socket for an uncore event.

	 */

	struct perf_cpu_map	*own_cpus;

	struct perf_thread_map	*threads;

	struct xyarray		*fd;
@@ -65,6 +72,8 @@ struct perf_evsel { 
	 * i.e. it cannot be the 'any CPU' value of -1.

	 */

	bool			 requires_cpu;

	/** Is the PMU for the event a core one? Effects the handling of own_cpus. */

	bool			 is_pmu_core;

	int			 idx;

};

tools/perf/util/evsel.c

+1 −0
Original line number Diff line number Diff line
@@ -415,6 +415,7 @@ struct evsel *evsel__clone(struct evsel *orig) 
	evsel->core.nr_members = orig->core.nr_members;

	evsel->core.system_wide = orig->core.system_wide;

	evsel->core.requires_cpu = orig->core.requires_cpu;

	evsel->core.is_pmu_core = orig->core.is_pmu_core;



	if (orig->name) {

		evsel->name = strdup(orig->name);

tools/perf/util/parse-events.c

+1 −0
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ __add_event(struct list_head *list, int *idx, 
	evsel->core.cpus = cpus;

	evsel->core.own_cpus = perf_cpu_map__get(cpus);

	evsel->core.requires_cpu = pmu ? pmu->is_uncore : false;

	evsel->core.is_pmu_core = pmu ? pmu->is_core : false;

	evsel->auto_merge_stats = auto_merge_stats;

	evsel->pmu = pmu;

	evsel->pmu_name = pmu && pmu->name ? strdup(pmu->name) : NULL;