Commit 6a06cb86 authored by Ian Rogers's avatar Ian Rogers Committed by Yushan Wang
Browse files

perf pmu: Add CPU map for "cpu" PMUs 

mainline inclusion
from mainline-v6.5-rc1
commit a0c41cae
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IAWKCP
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a0c41caebab2fa224454d50dd4e29ae008ead25f



----------------------------------------------------------------------

A typical "cpu" PMU has no "cpus" or "cpumask" file meaning the CPU
map is set to NULL, which also encodes an empty CPU map. Update
pmu_cpumask so that if the "cpu" PMU fails to load a CPU map, use a
default of all online PMUs.

Remove const from cpu_map__online for the sake of reference counting.

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-8-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarzhangqizhi <zhangqizhi3@h-partners.com>
parent 40663f76

tools/perf/util/cpumap.c

+2 −2
Original line number Diff line number Diff line
@@ -577,9 +577,9 @@ size_t cpu_map__snprint_mask(struct perf_cpu_map *map, char *buf, size_t size) 
	return ptr - buf;

}



const struct perf_cpu_map *cpu_map__online(void) /* thread unsafe */

struct perf_cpu_map *cpu_map__online(void) /* thread unsafe */

{

	static const struct perf_cpu_map *online = NULL;

	static struct perf_cpu_map *online;



	if (!online)

		online = perf_cpu_map__new(NULL); /* from /sys/devices/system/cpu/online */

tools/perf/util/cpumap.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ int cpu_map__build_socket_map(struct perf_cpu_map *cpus, struct perf_cpu_map **s 
int cpu_map__build_die_map(struct perf_cpu_map *cpus, struct perf_cpu_map **diep);

int cpu_map__build_core_map(struct perf_cpu_map *cpus, struct perf_cpu_map **corep);

int cpu_map__build_node_map(struct perf_cpu_map *cpus, struct perf_cpu_map **nodep);

const struct perf_cpu_map *cpu_map__online(void); /* thread unsafe */

struct perf_cpu_map *cpu_map__online(void); /* thread unsafe */



static inline int cpu_map__socket(struct perf_cpu_map *sock, int s)

{