Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf mem: Add mem_events into the supported perf_pmu

With the mem_events, perf doesn't need to read sysfs for each PMU to
find the mem-events-supported PMU. The patch also makes it possible to
clean up the related __weak functions later.

The patch is only to add the mem_events into the perf_pmu for all ARCHs.
It will be used in the later cleanup patches.

Reviewed-by: Ian Rogers <irogers@google.com>
Reviewed-by: Kajol Jain <kjain@linux.ibm.com>
Tested-by: Ravi Bangoria <ravi.bangoria@amd.com>
Tested-by: Leo Yan <leo.yan@linaro.org>
Tested-by: Kajol Jain <kjain@linux.ibm.com>
Suggested-by: Leo Yan <leo.yan@linaro.org>
Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Cc: will@kernel.org
Cc: mike.leach@linaro.org
Cc: renyu.zj@linux.alibaba.com
Cc: yuhaixin.yhx@linux.alibaba.com
Cc: tmricht@linux.ibm.com
Cc: atrajeev@linux.vnet.ibm.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: john.g.garry@oracle.com
Link: https://lore.kernel.org/r/20240123185036.3461837-2-kan.liang@linux.intel.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

authored by

Kan Liang and committed by
Namhyung Kim
bb65acdc 68f87f24

+44 -7
+3
tools/perf/arch/arm/util/pmu.c
··· 13 13 #include "hisi-ptt.h" 14 14 #include "../../../util/pmu.h" 15 15 #include "../../../util/cs-etm.h" 16 + #include "../../arm64/util/mem-events.h" 16 17 17 18 void perf_pmu__arch_init(struct perf_pmu *pmu __maybe_unused) 18 19 { ··· 27 26 pmu->selectable = true; 28 27 pmu->is_uncore = false; 29 28 pmu->perf_event_attr_init_default = arm_spe_pmu_default_config; 29 + if (!strcmp(pmu->name, "arm_spe_0")) 30 + pmu->mem_events = perf_mem_events_arm; 30 31 } else if (strstarts(pmu->name, HISI_PTT_PMU_NAME)) { 31 32 pmu->selectable = true; 32 33 #endif
+4 -3
tools/perf/arch/arm64/util/mem-events.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 - #include "map_symbol.h" 2 + #include "util/map_symbol.h" 3 + #include "util/mem-events.h" 3 4 #include "mem-events.h" 4 5 5 6 #define E(t, n, s) { .tag = t, .name = n, .sysfs_name = s } 6 7 7 - static struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX] = { 8 + struct perf_mem_event perf_mem_events_arm[PERF_MEM_EVENTS__MAX] = { 8 9 E("spe-load", "arm_spe_0/ts_enable=1,pa_enable=1,load_filter=1,store_filter=0,min_latency=%u/", "arm_spe_0"), 9 10 E("spe-store", "arm_spe_0/ts_enable=1,pa_enable=1,load_filter=0,store_filter=1/", "arm_spe_0"), 10 11 E("spe-ldst", "arm_spe_0/ts_enable=1,pa_enable=1,load_filter=1,store_filter=1,min_latency=%u/", "arm_spe_0"), ··· 18 17 if (i >= PERF_MEM_EVENTS__MAX) 19 18 return NULL; 20 19 21 - return &perf_mem_events[i]; 20 + return &perf_mem_events_arm[i]; 22 21 } 23 22 24 23 const char *perf_mem_events__name(int i, const char *pmu_name __maybe_unused)
+7
tools/perf/arch/arm64/util/mem-events.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 + #ifndef _ARM64_MEM_EVENTS_H 3 + #define _ARM64_MEM_EVENTS_H 4 + 5 + extern struct perf_mem_event perf_mem_events_arm[PERF_MEM_EVENTS__MAX]; 6 + 7 + #endif /* _ARM64_MEM_EVENTS_H */
+2 -2
tools/perf/arch/x86/util/mem-events.c
··· 16 16 17 17 #define E(t, n, s) { .tag = t, .name = n, .sysfs_name = s } 18 18 19 - static struct perf_mem_event perf_mem_events_intel[PERF_MEM_EVENTS__MAX] = { 19 + struct perf_mem_event perf_mem_events_intel[PERF_MEM_EVENTS__MAX] = { 20 20 E("ldlat-loads", "%s/mem-loads,ldlat=%u/P", "%s/events/mem-loads"), 21 21 E("ldlat-stores", "%s/mem-stores/P", "%s/events/mem-stores"), 22 22 E(NULL, NULL, NULL), 23 23 }; 24 24 25 - static struct perf_mem_event perf_mem_events_amd[PERF_MEM_EVENTS__MAX] = { 25 + struct perf_mem_event perf_mem_events_amd[PERF_MEM_EVENTS__MAX] = { 26 26 E(NULL, NULL, NULL), 27 27 E(NULL, NULL, NULL), 28 28 E("mem-ldst", "ibs_op//", "ibs_op"),
+9
tools/perf/arch/x86/util/mem-events.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 + #ifndef _X86_MEM_EVENTS_H 3 + #define _X86_MEM_EVENTS_H 4 + 5 + extern struct perf_mem_event perf_mem_events_intel[PERF_MEM_EVENTS__MAX]; 6 + 7 + extern struct perf_mem_event perf_mem_events_amd[PERF_MEM_EVENTS__MAX]; 8 + 9 + #endif /* _X86_MEM_EVENTS_H */
+7
tools/perf/arch/x86/util/pmu.c
··· 15 15 #include "../../../util/pmu.h" 16 16 #include "../../../util/fncache.h" 17 17 #include "../../../util/pmus.h" 18 + #include "mem-events.h" 18 19 #include "env.h" 19 20 20 21 void perf_pmu__arch_init(struct perf_pmu *pmu __maybe_unused) ··· 31 30 pmu->selectable = true; 32 31 } 33 32 #endif 33 + 34 + if (x86__is_amd_cpu()) { 35 + if (!strcmp(pmu->name, "ibs_op")) 36 + pmu->mem_events = perf_mem_events_amd; 37 + } else if (pmu->is_core) 38 + pmu->mem_events = perf_mem_events_intel; 34 39 } 35 40 36 41 int perf_pmus__num_mem_pmus(void)
+1 -1
tools/perf/util/mem-events.c
··· 19 19 20 20 #define E(t, n, s) { .tag = t, .name = n, .sysfs_name = s } 21 21 22 - static struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX] = { 22 + struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX] = { 23 23 E("ldlat-loads", "cpu/mem-loads,ldlat=%u/P", "cpu/events/mem-loads"), 24 24 E("ldlat-stores", "cpu/mem-stores/P", "cpu/events/mem-stores"), 25 25 E(NULL, NULL, NULL),
+1
tools/perf/util/mem-events.h
··· 34 34 }; 35 35 36 36 extern unsigned int perf_mem_events__loads_ldlat; 37 + extern struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX]; 37 38 38 39 int perf_mem_events__parse(const char *str); 39 40 int perf_mem_events__init(void);
+3 -1
tools/perf/util/pmu.c
··· 986 986 } 987 987 988 988 void __weak 989 - perf_pmu__arch_init(struct perf_pmu *pmu __maybe_unused) 989 + perf_pmu__arch_init(struct perf_pmu *pmu) 990 990 { 991 + if (pmu->is_core) 992 + pmu->mem_events = perf_mem_events; 991 993 } 992 994 993 995 struct perf_pmu *perf_pmu__lookup(struct list_head *pmus, int dirfd, const char *name)
+7
tools/perf/util/pmu.h
··· 10 10 #include <stdio.h> 11 11 #include "parse-events.h" 12 12 #include "pmu-events/pmu-events.h" 13 + #include "map_symbol.h" 14 + #include "mem-events.h" 13 15 14 16 struct evsel_config_term; 15 17 struct perf_cpu_map; ··· 164 162 */ 165 163 bool exclude_guest; 166 164 } missing_features; 165 + 166 + /** 167 + * @mem_events: List of the supported mem events 168 + */ 169 + struct perf_mem_event *mem_events; 167 170 }; 168 171 169 172 /** @perf_pmu__fake: A special global PMU used for testing. */