CoreSight

coresight@lists.linaro.org

6 participants
2351 discussions

Re: [PATCH v3 06/48] perf cpumap: Switch cpu_map__build_map to cpu function

by Arnaldo Carvalho de Melo

Em Wed, Dec 29, 2021 at 11:19:48PM -0800, Ian Rogers escreveu: > Avoid error prone cpu_map + idx variant. Remove now unused functions. At this point we need to remove the now unused perf_env__get_cpu(), and then deal with the fallout in the following patches that needlessly modify this unused function. Doing that now. - Arnaldo ⬢[acme@toolbox perf]$ git diff diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 6b985abaa2d22c58..40cb3518f27e2309 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -1477,22 +1477,6 @@ static void perf_stat__exit_aggr_mode(void) stat_config.cpus_aggr_map = NULL; } -static inline int perf_env__get_cpu(void *data, struct perf_cpu_map *map, int idx) -{ - struct perf_env *env = data; - int cpu; - - if (idx > map->nr) - return -1; - - cpu = map->map[idx]; - - if (cpu >= env->nr_cpus_avail) - return -1; - - return cpu; -} - static struct aggr_cpu_id perf_env__get_socket_aggr_by_cpu(int cpu, void *data) { struct perf_env *env = data; > Reviewed-by: James Clark <james.clark(a)arm.com> > Signed-off-by: Ian Rogers <irogers(a)google.com> > --- > tools/perf/builtin-stat.c | 28 ++++------------------------ > tools/perf/util/cpumap.c | 12 ++++++------ > tools/perf/util/cpumap.h | 2 +- > 3 files changed, 11 insertions(+), 31 deletions(-) > > diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c > index 9791ae9b1a53..6b985abaa2d2 100644 > --- a/tools/perf/builtin-stat.c > +++ b/tools/perf/builtin-stat.c > @@ -1504,11 +1504,6 @@ static struct aggr_cpu_id perf_env__get_socket_aggr_by_cpu(int cpu, void *data) > return id; > } > > -static struct aggr_cpu_id perf_env__get_socket(struct perf_cpu_map *map, int idx, void *data) > -{ > - return perf_env__get_socket_aggr_by_cpu(perf_env__get_cpu(data, map, idx), data); > -} > - > static struct aggr_cpu_id perf_env__get_die_aggr_by_cpu(int cpu, void *data) > { > struct perf_env *env = data; > @@ -1527,11 +1522,6 @@ static struct aggr_cpu_id perf_env__get_die_aggr_by_cpu(int cpu, void *data) > return id; > } > > -static struct aggr_cpu_id perf_env__get_die(struct perf_cpu_map *map, int idx, void *data) > -{ > - return perf_env__get_die_aggr_by_cpu(perf_env__get_cpu(data, map, idx), data); > -} > - > static struct aggr_cpu_id perf_env__get_core_aggr_by_cpu(int cpu, void *data) > { > struct perf_env *env = data; > @@ -1551,11 +1541,6 @@ static struct aggr_cpu_id perf_env__get_core_aggr_by_cpu(int cpu, void *data) > return id; > } > > -static struct aggr_cpu_id perf_env__get_core(struct perf_cpu_map *map, int idx, void *data) > -{ > - return perf_env__get_core_aggr_by_cpu(perf_env__get_cpu(data, map, idx), data); > -} > - > static struct aggr_cpu_id perf_env__get_node_aggr_by_cpu(int cpu, void *data) > { > struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id(); > @@ -1564,33 +1549,28 @@ static struct aggr_cpu_id perf_env__get_node_aggr_by_cpu(int cpu, void *data) > return id; > } > > -static struct aggr_cpu_id perf_env__get_node(struct perf_cpu_map *map, int idx, void *data) > -{ > - return perf_env__get_node_aggr_by_cpu(perf_env__get_cpu(data, map, idx), data); > -} > - > static int perf_env__build_socket_map(struct perf_env *env, struct perf_cpu_map *cpus, > struct cpu_aggr_map **sockp) > { > - return cpu_map__build_map(cpus, sockp, perf_env__get_socket, env); > + return cpu_map__build_map(cpus, sockp, perf_env__get_socket_aggr_by_cpu, env); > } > > static int perf_env__build_die_map(struct perf_env *env, struct perf_cpu_map *cpus, > struct cpu_aggr_map **diep) > { > - return cpu_map__build_map(cpus, diep, perf_env__get_die, env); > + return cpu_map__build_map(cpus, diep, perf_env__get_die_aggr_by_cpu, env); > } > > static int perf_env__build_core_map(struct perf_env *env, struct perf_cpu_map *cpus, > struct cpu_aggr_map **corep) > { > - return cpu_map__build_map(cpus, corep, perf_env__get_core, env); > + return cpu_map__build_map(cpus, corep, perf_env__get_core_aggr_by_cpu, env); > } > > static int perf_env__build_node_map(struct perf_env *env, struct perf_cpu_map *cpus, > struct cpu_aggr_map **nodep) > { > - return cpu_map__build_map(cpus, nodep, perf_env__get_node, env); > + return cpu_map__build_map(cpus, nodep, perf_env__get_node_aggr_by_cpu, env); > } > > static struct aggr_cpu_id perf_stat__get_socket_file(struct perf_stat_config *config __maybe_unused, > diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c > index 49fba2c53822..feaf34b25efc 100644 > --- a/tools/perf/util/cpumap.c > +++ b/tools/perf/util/cpumap.c > @@ -163,7 +163,7 @@ static int cmp_aggr_cpu_id(const void *a_pointer, const void *b_pointer) > } > > int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res, > - struct aggr_cpu_id (*f)(struct perf_cpu_map *map, int cpu, void *data), > + struct aggr_cpu_id (*f)(int cpu, void *data), > void *data) > { > int nr = cpus->nr; > @@ -178,7 +178,7 @@ int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res, > c->nr = 0; > > for (cpu = 0; cpu < nr; cpu++) { > - s1 = f(cpus, cpu, data); > + s1 = f(cpu, data); > for (s2 = 0; s2 < c->nr; s2++) { > if (cpu_map__compare_aggr_cpu_id(s1, c->map[s2])) > break; > @@ -290,22 +290,22 @@ struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *da > > int cpu_map__build_socket_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **sockp) > { > - return cpu_map__build_map(cpus, sockp, cpu_map__get_socket, NULL); > + return cpu_map__build_map(cpus, sockp, cpu_map__get_socket_aggr_by_cpu, NULL); > } > > int cpu_map__build_die_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **diep) > { > - return cpu_map__build_map(cpus, diep, cpu_map__get_die, NULL); > + return cpu_map__build_map(cpus, diep, cpu_map__get_die_aggr_by_cpu, NULL); > } > > int cpu_map__build_core_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **corep) > { > - return cpu_map__build_map(cpus, corep, cpu_map__get_core, NULL); > + return cpu_map__build_map(cpus, corep, cpu_map__get_core_aggr_by_cpu, NULL); > } > > int cpu_map__build_node_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **numap) > { > - return cpu_map__build_map(cpus, numap, cpu_map__get_node, NULL); > + return cpu_map__build_map(cpus, numap, cpu_map__get_node_aggr_by_cpu, NULL); > } > > /* setup simple routines to easily access node numbers given a cpu number */ > diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h > index c62d67704425..9648816c4255 100644 > --- a/tools/perf/util/cpumap.h > +++ b/tools/perf/util/cpumap.h > @@ -63,7 +63,7 @@ int cpu__max_present_cpu(void); > int cpu__get_node(int cpu); > > int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res, > - struct aggr_cpu_id (*f)(struct perf_cpu_map *map, int cpu, void *data), > + struct aggr_cpu_id (*f)(int cpu, void *data), > void *data); > > int cpu_map__cpu(struct perf_cpu_map *cpus, int idx); > -- > 2.34.1.448.ga2b2bfdf31-goog -- - Arnaldo

3 years, 4 months

Re: [PATCH v4 00/48] Refactor perf cpumap

by Arnaldo Carvalho de Melo

Em Tue, Jan 04, 2022 at 10:13:03PM -0800, Ian Rogers escreveu: > Perf cpu map has various functions where a cpumap and index are passed > in order to load the cpu. A problem with this is that the wrong index > may be passed for the cpumap, causing problems like aggregation on the > wrong CPU: > https://lore.kernel.org/lkml/20211204023409.969668-1-irogers@google.com/ > > This patch set refactors the cpu map API, reducing it and explicitly > passing the cpu (rather than the pair) to functions that need > it. Comments are added at the same time. Changes modify the same > file/function more than once as refactoring and fixes are broken apart > for the sake of bisection. > > v2. Incorproates fixes suggested Jiri Olsa, rewrites the evlist CPU > iterator in part in a way suggested by Riccardo Mancini. The new > fixes start at patch 23. The final change was suggested by John > Garry to make the CPUs have their own struct wrapper. > > v3. Incorporates fixes suggested by Namhyung Kim. > > v4. Rebases and incorporates fixes suggested by Jiri Olsa. Did fixes in places where BUILD_BPF_SKEL=1 was failing, now, at the end of the series: ⬢[acme@toolbox perf]$ git log --oneline -1 ; time make -C tools/perf build-test 462aafa8fcbdc78f (HEAD -> perf/core) perf cpumap: Give CPUs their own type make: Entering directory '/var/home/acme/git/perf/tools/perf' - tarpkg: ./tests/perf-targz-src-pkg . make_static: cd . && make LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 NO_JVMTI=1 -j32 DESTDIR=/tmp/tmp.lFrqVcqiRY make_with_gtk2: cd . && make GTK2=1 -j32 DESTDIR=/tmp/tmp.KvHmTqUGmD - /var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP: cd . && make FEATURE_DUMP_COPY=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP feature-dump cd . && make FEATURE_DUMP_COPY=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP feature-dump make_no_libelf_O: cd . && make NO_LIBELF=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.xz3LYy7WpA DESTDIR=/tmp/tmp.zVjIMpvQMM make_no_libbpf_DEBUG_O: cd . && make NO_LIBBPF=1 DEBUG=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.0gxAOSjb1j DESTDIR=/tmp/tmp.kYTk1WjWWz make_no_libaudit_O: cd . && make NO_LIBAUDIT=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.6hArTG9Dth DESTDIR=/tmp/tmp.hCNdYeDRCr make_no_backtrace_O: cd . && make NO_BACKTRACE=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.VtoPI58z3t DESTDIR=/tmp/tmp.SYyBBMSHSL make_no_libcrypto_O: cd . && make NO_LIBCRYPTO=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.SO1qtxJwvE DESTDIR=/tmp/tmp.AqrPw1oZfx make_with_clangllvm_O: cd . && make LIBCLANGLLVM=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.G9KVEaDv2B DESTDIR=/tmp/tmp.6CSqj0wPqJ make_with_coresight_O: cd . && make CORESIGHT=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.PnVTJNHy1E DESTDIR=/tmp/tmp.k7Arerg778 make_no_libpython_O: cd . && make NO_LIBPYTHON=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.cKjvFagVL3 DESTDIR=/tmp/tmp.aCaD0hbP3O make_no_sdt_O: cd . && make NO_SDT=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.EKoWnoZtl4 DESTDIR=/tmp/tmp.1gGYetcptB make_libbpf_dynamic_O: cd . && make LIBBPF_DYNAMIC=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.Nked5O10EK DESTDIR=/tmp/tmp.eo6YAEOfZO make_minimal_O: cd . && make NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1 NO_DEMANGLE=1 NO_LIBELF=1 NO_LIBUNWIND=1 NO_BACKTRACE=1 NO_LIBNUMA=1 NO_LIBAUDIT=1 NO_LIBBIONIC=1 NO_LIBDW_DWARF_UNWIND=1 NO_AUXTRACE=1 NO_LIBBPF=1 NO_LIBCRYPTO=1 NO_SDT=1 NO_JVMTI=1 NO_LIBZSTD=1 NO_LIBCAP=1 NO_SYSCALL_TABLE=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.Z6dSqYBXfU DESTDIR=/tmp/tmp.Y4iRu634of make_install_prefix_slash_O: cd . && make install prefix=/tmp/krava/ FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.BgipDyNu70 DESTDIR=/tmp/tmp.pOwrdDYBqf make_util_pmu_bison_o_O: cd . && make util/pmu-bison.o FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.XeO82Ajmv6 DESTDIR=/tmp/tmp.dxQKNNBM6W make_install_O: cd . && make install FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.KuCyqzLwnA DESTDIR=/tmp/tmp.KYvqoiOKzW make_install_prefix_O: cd . && make install prefix=/tmp/krava FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.rJNNPELdri DESTDIR=/tmp/tmp.g52i9CcmnU make_install_bin_O: cd . && make install-bin FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.i118vbQuo0 DESTDIR=/tmp/tmp.90tKcjOWD8 make_perf_o_O: cd . && make perf.o FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.kEZMTvh3wf DESTDIR=/tmp/tmp.JYvQLdkPsp make_no_slang_O: cd . && make NO_SLANG=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.WDNGH0DpdW DESTDIR=/tmp/tmp.Zfa804wClJ make_no_ui_O: cd . && make NO_NEWT=1 NO_SLANG=1 NO_GTK2=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.P4nTBNqkP4 DESTDIR=/tmp/tmp.iCLqOyrh4o make_no_newt_O: cd . && make NO_NEWT=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.EdjjHoqODV DESTDIR=/tmp/tmp.jKfYRizWtm make_with_libpfm4_O: cd . && make LIBPFM4=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.r3hPAOgfId DESTDIR=/tmp/tmp.GvMmEZUc2B make_no_demangle_O: cd . && make NO_DEMANGLE=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.wG9f40LzG3 DESTDIR=/tmp/tmp.i76sPjSg1m make_no_libunwind_O: cd . && make NO_LIBUNWIND=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.SmFfmmB9KQ DESTDIR=/tmp/tmp.9tjMdCWMxG make_no_libbpf_O: cd . && make NO_LIBBPF=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.7jH21oP9n7 DESTDIR=/tmp/tmp.taUqTgY37S make_no_syscall_tbl_O: cd . && make NO_SYSCALL_TABLE=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.L2v7vi1AQl DESTDIR=/tmp/tmp.wHEA4jEpw9 make_no_libnuma_O: cd . && make NO_LIBNUMA=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.9N5pQYuRbO DESTDIR=/tmp/tmp.B0Yptb7xP6 make_util_map_o_O: cd . && make util/map.o FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.B8oe4jnWwB DESTDIR=/tmp/tmp.m0APlsli14 make_with_babeltrace_O: cd . && make LIBBABELTRACE=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.3G1kLTJLJx DESTDIR=/tmp/tmp.ahuDENSMsz make_debug_O: cd . && make DEBUG=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.KpsvOj0KHD DESTDIR=/tmp/tmp.f2Yv9Lrorg make_no_libperl_O: cd . && make NO_LIBPERL=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.7tIufwAi4O DESTDIR=/tmp/tmp.vcBv7UYjuw make_no_libbionic_O: cd . && make NO_LIBBIONIC=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.HCJA7xCDxq DESTDIR=/tmp/tmp.us5CDSPqyO make_pure_O: cd . && make FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.eg2wCpydvg DESTDIR=/tmp/tmp.MmD1xESO2A make_doc_O: cd . && make doc FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.TqkyGrzRut DESTDIR=/tmp/tmp.ap34IVxoM9 make_no_scripts_O: cd . && make NO_LIBPYTHON=1 NO_LIBPERL=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.pRWHKzpPhv DESTDIR=/tmp/tmp.dUNhAp2rLt make_clean_all_O: cd . && make clean all FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.YnzNLLk9ID DESTDIR=/tmp/tmp.7kXr5obkmA make_no_libdw_dwarf_unwind_O: cd . && make NO_LIBDW_DWARF_UNWIND=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.GzZCxuYLwR DESTDIR=/tmp/tmp.n3YS9a9DcU make_help_O: cd . && make help FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.t7QwWVHsod DESTDIR=/tmp/tmp.NG5uSWCZzi make_no_auxtrace_O: cd . && make NO_AUXTRACE=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.wiDZkJzs8R DESTDIR=/tmp/tmp.ITtPlX0usX make_no_gtk2_O: cd . && make NO_GTK2=1 FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.xd1x5QIckJ DESTDIR=/tmp/tmp.f6KzsHHkZH make_tags_O: cd . && make tags FEATURES_DUMP=/var/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP -j32 O=/tmp/tmp.e8oSaBuFUb DESTDIR=/tmp/tmp.4czd6ovlSB OK make: Leaving directory '/var/home/acme/git/perf/tools/perf' real 4m29.388s user 59m6.060s sys 12m19.581s ⬢[acme@toolbox perf]$ alias m='perf stat -e cycles:u,instructions:u make -k BUILD_BPF_SKEL=1 CORESIGHT=1 PYTHON=python3 O=/tmp/build/perf -C tools/perf install-bin && git status && perf test python' So 'perf test python' is done after every build, no problems with that as well. I'm now making it go thru the container builds. - Arnaldo

3 years, 4 months

Re: [PATCH v4 48/48] perf cpumap: Give CPUs their own type.

by Arnaldo Carvalho de Melo

Em Tue, Jan 04, 2022 at 10:13:51PM -0800, Ian Rogers escreveu: > A common problem is confusing CPU map indices with the CPU, by wrapping > the CPU with a struct then this is avoided. This approach is similar to > atomic_t. This one needed this to build with BUILD_BPF_SKEL=1, please check, I'll soon push this to tmp.perf/perf_cpu so that you can take a look and test it. - Arnaldo diff --git a/tools/perf/util/bpf_counter.c b/tools/perf/util/bpf_counter.c index 80d1a3a31052fe55..328479df5e16a638 100644 --- a/tools/perf/util/bpf_counter.c +++ b/tools/perf/util/bpf_counter.c @@ -540,7 +540,7 @@ static int bperf__load(struct evsel *evsel, struct target *target) filter_type == BPERF_FILTER_TGID) key = evsel->core.threads->map[i].pid; else if (filter_type == BPERF_FILTER_CPU) - key = evsel->core.cpus->map[i]; + key = evsel->core.cpus->map[i].cpu; else break; @@ -584,7 +584,7 @@ static int bperf_sync_counters(struct evsel *evsel) num_cpu = all_cpu_map->nr; for (i = 0; i < num_cpu; i++) { - cpu = all_cpu_map->map[i]; + cpu = all_cpu_map->map[i].cpu; bperf_trigger_reading(evsel->bperf_leader_prog_fd, cpu); } return 0; @@ -605,7 +605,7 @@ static int bperf__disable(struct evsel *evsel) static int bperf__read(struct evsel *evsel) { struct bperf_follower_bpf *skel = evsel->follower_skel; - __u32 num_cpu_bpf = cpu__max_cpu(); + __u32 num_cpu_bpf = cpu__max_cpu().cpu; struct bpf_perf_event_value values[num_cpu_bpf]; int reading_map_fd, err = 0; __u32 i; @@ -615,6 +615,7 @@ static int bperf__read(struct evsel *evsel) reading_map_fd = bpf_map__fd(skel->maps.accum_readings); for (i = 0; i < bpf_map__max_entries(skel->maps.accum_readings); i++) { + struct perf_cpu entry; __u32 cpu; err = bpf_map_lookup_elem(reading_map_fd, &i, values); @@ -624,14 +625,15 @@ static int bperf__read(struct evsel *evsel) case BPERF_FILTER_GLOBAL: assert(i == 0); - perf_cpu_map__for_each_cpu(cpu, j, all_cpu_map) { + perf_cpu_map__for_each_cpu(entry, j, all_cpu_map) { + cpu = entry.cpu; perf_counts(evsel->counts, cpu, 0)->val = values[cpu].counter; perf_counts(evsel->counts, cpu, 0)->ena = values[cpu].enabled; perf_counts(evsel->counts, cpu, 0)->run = values[cpu].running; } break; case BPERF_FILTER_CPU: - cpu = evsel->core.cpus->map[i]; + cpu = evsel->core.cpus->map[i].cpu; perf_counts(evsel->counts, i, 0)->val = values[cpu].counter; perf_counts(evsel->counts, i, 0)->ena = values[cpu].enabled; perf_counts(evsel->counts, i, 0)->run = values[cpu].running; diff --git a/tools/perf/util/bpf_counter_cgroup.c b/tools/perf/util/bpf_counter_cgroup.c index cbc6c2bca488f6bf..631e34a0b66ff084 100644 --- a/tools/perf/util/bpf_counter_cgroup.c +++ b/tools/perf/util/bpf_counter_cgroup.c @@ -48,7 +48,7 @@ static int bperf_load_program(struct evlist *evlist) struct cgroup *cgrp, *leader_cgrp; __u32 i, cpu; __u32 nr_cpus = evlist->core.all_cpus->nr; - int total_cpus = cpu__max_cpu(); + int total_cpus = cpu__max_cpu().cpu; int map_size, map_fd; int prog_fd, err; @@ -125,7 +125,7 @@ static int bperf_load_program(struct evlist *evlist) for (cpu = 0; cpu < nr_cpus; cpu++) { int fd = FD(evsel, cpu); __u32 idx = evsel->core.idx * total_cpus + - evlist->core.all_cpus->map[cpu]; + evlist->core.all_cpus->map[cpu].cpu; err = bpf_map_update_elem(map_fd, &idx, &fd, BPF_ANY); @@ -212,7 +212,7 @@ static int bperf_cgrp__sync_counters(struct evlist *evlist) int prog_fd = bpf_program__fd(skel->progs.trigger_read); for (i = 0; i < nr_cpus; i++) { - cpu = evlist->core.all_cpus->map[i]; + cpu = evlist->core.all_cpus->map[i].cpu; bperf_trigger_reading(prog_fd, cpu); } @@ -245,7 +245,7 @@ static int bperf_cgrp__read(struct evsel *evsel) { struct evlist *evlist = evsel->evlist; int i, cpu, nr_cpus = evlist->core.all_cpus->nr; - int total_cpus = cpu__max_cpu(); + int total_cpus = cpu__max_cpu().cpu; struct perf_counts_values *counts; struct bpf_perf_event_value *values; int reading_map_fd, err = 0; @@ -272,7 +272,7 @@ static int bperf_cgrp__read(struct evsel *evsel) } for (i = 0; i < nr_cpus; i++) { - cpu = evlist->core.all_cpus->map[i]; + cpu = evlist->core.all_cpus->map[i].cpu; counts = perf_counts(evsel->counts, i, 0); counts->val = values[cpu].counter; diff --git a/tools/perf/util/bpf_ftrace.c b/tools/perf/util/bpf_ftrace.c index 28dc4c60c7884818..d756cc66eef32ae8 100644 --- a/tools/perf/util/bpf_ftrace.c +++ b/tools/perf/util/bpf_ftrace.c @@ -63,7 +63,7 @@ int perf_ftrace__latency_prepare_bpf(struct perf_ftrace *ftrace) fd = bpf_map__fd(skel->maps.cpu_filter); for (i = 0; i < ncpus; i++) { - cpu = perf_cpu_map__cpu(ftrace->evlist->core.cpus, i); + cpu = perf_cpu_map__cpu(ftrace->evlist->core.cpus, i).cpu; bpf_map_update_elem(fd, &cpu, &val, BPF_ANY); } } @@ -122,7 +122,7 @@ int perf_ftrace__latency_read_bpf(struct perf_ftrace *ftrace __maybe_unused, int i, fd, err; u32 idx; u64 *hist; - int ncpus = cpu__max_cpu(); + int ncpus = cpu__max_cpu().cpu; fd = bpf_map__fd(skel->maps.latency);

3 years, 4 months

Re: [PATCH v4 44/48] perf bpf: Rename cpu to cpu_map_idx

by Arnaldo Carvalho de Melo

Em Tue, Jan 04, 2022 at 10:13:47PM -0800, Ian Rogers escreveu: > Synchronize the caller in evsel with the called function. > Shorten 3 lines of code in bperf_read by using > perf_cpu_map__for_each_cpu. > This code is frequently using variables named cpu as cpu map indices, > which doesn't matter as all CPUs are in the CPU map. It is strange in > some cases the cpumap is used at all. CC /tmp/build/perf/builtin-stat.o INSTALL trace_plugins CC /tmp/build/perf/util/evlist.o CC /tmp/build/perf/util/evsel.o CC /tmp/build/perf/util/header.o CC /tmp/build/perf/util/bpf_counter.o CC /tmp/build/perf/util/bpf_counter_cgroup.o CC /tmp/build/perf/util/bpf_ftrace.o In file included from util/cpumap.h:8, from util/bpf_counter.c:23: util/bpf_counter.c: In function ‘bperf__read’: /var/home/acme/git/perf/tools/lib/perf/include/perf/cpumap.h:27:20: error: comparison of integer expressions of different signedness: ‘__u32’ {aka ‘unsigned int’} and ‘int’ [-Werror=sign-compare] 27 | (idx) < perf_cpu_map__nr(cpus); \ | ^ util/bpf_counter.c:626:25: note: in expansion of macro ‘perf_cpu_map__for_each_cpu’ 626 | perf_cpu_map__for_each_cpu(cpu, j, all_cpu_map) { | ^~~~~~~~~~~~~~~~~~~~~~~~~~ util/bpf_counter.c:611:21: error: unused variable ‘num_cpu’ [-Werror=unused-variable] 611 | __u32 i, j, num_cpu; | ^~~~~~~ cc1: all warnings being treated as errors make[4]: *** [/var/home/acme/git/perf/tools/build/Makefile.build:96: /tmp/build/perf/util/bpf_counter.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/var/home/acme/git/perf/tools/build/Makefile.build:139: util] Error 2 make[2]: *** [Makefile.perf:665: /tmp/build/perf/perf-in.o] Error 2 make[1]: *** [Makefile.perf:240: sub-make] Error 2 make: *** [Makefile:113: install-bin] Error 2 make: Leaving directory '/var/home/acme/git/perf/tools/perf' Performance counter stats for 'make -k BUILD_BPF_SKEL=1 CORESIGHT=1 PYTHON=python3 O=/tmp/build/perf -C tools/perf install-bin': 15,589,752,360 cycles:u 28,227,862,710 instructions:u # 1.81 insn per cycle 1.996638375 seconds time elapsed 3.567457000 seconds user 0.934840000 seconds sys ⬢[acme@toolbox perf]$ git log --oneline -1 0083ba4c6a931fd0 (HEAD) perf bpf: Rename cpu to cpu_map_idx ⬢[acme@toolbox perf]$ Trying to fix... > Signed-off-by: Ian Rogers <irogers(a)google.com> > --- > tools/perf/util/bpf_counter.c | 16 +++++++--------- > tools/perf/util/bpf_counter.h | 4 ++-- > 2 files changed, 9 insertions(+), 11 deletions(-) > > diff --git a/tools/perf/util/bpf_counter.c b/tools/perf/util/bpf_counter.c > index c17d4a43ce06..ae5bd87ff020 100644 > --- a/tools/perf/util/bpf_counter.c > +++ b/tools/perf/util/bpf_counter.c > @@ -265,7 +265,7 @@ static int bpf_program_profiler__read(struct evsel *evsel) > return 0; > } > > -static int bpf_program_profiler__install_pe(struct evsel *evsel, int cpu, > +static int bpf_program_profiler__install_pe(struct evsel *evsel, int cpu_map_idx, > int fd) > { > struct bpf_prog_profiler_bpf *skel; > @@ -277,7 +277,7 @@ static int bpf_program_profiler__install_pe(struct evsel *evsel, int cpu, > assert(skel != NULL); > > ret = bpf_map_update_elem(bpf_map__fd(skel->maps.events), > - &cpu, &fd, BPF_ANY); > + &cpu_map_idx, &fd, BPF_ANY); > if (ret) > return ret; > } > @@ -566,12 +566,12 @@ static int bperf__load(struct evsel *evsel, struct target *target) > return err; > } > > -static int bperf__install_pe(struct evsel *evsel, int cpu, int fd) > +static int bperf__install_pe(struct evsel *evsel, int cpu_map_idx, int fd) > { > struct bperf_leader_bpf *skel = evsel->leader_skel; > > return bpf_map_update_elem(bpf_map__fd(skel->maps.events), > - &cpu, &fd, BPF_ANY); > + &cpu_map_idx, &fd, BPF_ANY); > } > > /* > @@ -623,9 +623,7 @@ static int bperf__read(struct evsel *evsel) > case BPERF_FILTER_GLOBAL: > assert(i == 0); > > - num_cpu = all_cpu_map->nr; > - for (j = 0; j < num_cpu; j++) { > - cpu = all_cpu_map->map[j]; > + perf_cpu_map__for_each_cpu(cpu, j, all_cpu_map) { > perf_counts(evsel->counts, cpu, 0)->val = values[cpu].counter; > perf_counts(evsel->counts, cpu, 0)->ena = values[cpu].enabled; > perf_counts(evsel->counts, cpu, 0)->run = values[cpu].running; > @@ -757,11 +755,11 @@ static inline bool bpf_counter_skip(struct evsel *evsel) > evsel->follower_skel == NULL; > } > > -int bpf_counter__install_pe(struct evsel *evsel, int cpu, int fd) > +int bpf_counter__install_pe(struct evsel *evsel, int cpu_map_idx, int fd) > { > if (bpf_counter_skip(evsel)) > return 0; > - return evsel->bpf_counter_ops->install_pe(evsel, cpu, fd); > + return evsel->bpf_counter_ops->install_pe(evsel, cpu_map_idx, fd); > } > > int bpf_counter__load(struct evsel *evsel, struct target *target) > diff --git a/tools/perf/util/bpf_counter.h b/tools/perf/util/bpf_counter.h > index 65ebaa6694fb..4dbf26408b69 100644 > --- a/tools/perf/util/bpf_counter.h > +++ b/tools/perf/util/bpf_counter.h > @@ -16,7 +16,7 @@ typedef int (*bpf_counter_evsel_op)(struct evsel *evsel); > typedef int (*bpf_counter_evsel_target_op)(struct evsel *evsel, > struct target *target); > typedef int (*bpf_counter_evsel_install_pe_op)(struct evsel *evsel, > - int cpu, > + int cpu_map_idx, > int fd); > > struct bpf_counter_ops { > @@ -40,7 +40,7 @@ int bpf_counter__enable(struct evsel *evsel); > int bpf_counter__disable(struct evsel *evsel); > int bpf_counter__read(struct evsel *evsel); > void bpf_counter__destroy(struct evsel *evsel); > -int bpf_counter__install_pe(struct evsel *evsel, int cpu, int fd); > +int bpf_counter__install_pe(struct evsel *evsel, int cpu_map_idx, int fd); > > #else /* HAVE_BPF_SKEL */ > > -- > 2.34.1.448.ga2b2bfdf31-goog -- - Arnaldo

3 years, 4 months

Re: [PATCH v4 17/48] perf cpumap: Remove cpu_map__cpu, use libperf function.

by Arnaldo Carvalho de Melo

Em Tue, Jan 04, 2022 at 10:13:20PM -0800, Ian Rogers escreveu: > Switch the remaining few users of cpu_map__cpu to perf_cpu_map__cpu and > remove the function. > > Reviewed-by: James Clark <james.clark(a)arm.com> > Signed-off-by: Ian Rogers <irogers(a)google.com> util/bpf_ftrace.c: In function ‘perf_ftrace__latency_prepare_bpf’: util/bpf_ftrace.c:66:31: error: implicit declaration of function ‘cpu_map__cpu’; did you mean ‘cpu_map__has’? [-Werror=implicit-function-declaration] 66 | cpu = cpu_map__cpu(ftrace->evlist->core.cpus, i); | ^~~~~~~~~~~~ | cpu_map__has cc1: all warnings being treated as errors make[4]: *** [/var/home/acme/git/perf/tools/build/Makefile.build:96: /tmp/build/perf/util/bpf_ftrace.o] Error 1 make[4]: *** Waiting for unfinished jobs.... LD /tmp/build/perf/ui/browsers/perf-in.o LD /tmp/build/perf/ui/perf-in.o LD /tmp/build/perf/util/scripting-engines/perf-in.o make[3]: *** [/var/home/acme/git/perf/tools/build/Makefile.build:139: util] Error 2 make[2]: *** [Makefile.perf:665: /tmp/build/perf/perf-in.o] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [Makefile.perf:240: sub-make] Error 2 make: *** [Makefile:113: install-bin] Error 2 make: Leaving directory '/var/home/acme/git/perf/tools/perf' Performance counter stats for 'make -k BUILD_BPF_SKEL=1 CORESIGHT=1 PYTHON=python3 O=/tmp/build/perf -C tools/perf install-bin': 163,635,422,196 cycles:u 213,602,262,800 instructions:u # 1.31 insn per cycle 3.804738555 seconds time elapsed 40.622581000 seconds user 6.589980000 seconds sys ⬢[acme@toolbox perf]$ git log --oneline -1 dfe103e757aeff79 (HEAD) perf cpumap: Remove cpu_map__cpu, use libperf function. This is the first breakage, trying to fix now. > --- > tools/perf/builtin-ftrace.c | 2 +- > tools/perf/util/cpumap.c | 9 ++------- > tools/perf/util/cpumap.h | 1 - > 3 files changed, 3 insertions(+), 9 deletions(-) > > diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c > index 2b54e2ddc80a..f16c39a37a52 100644 > --- a/tools/perf/builtin-ftrace.c > +++ b/tools/perf/builtin-ftrace.c > @@ -281,7 +281,7 @@ static int set_tracing_cpumask(struct perf_cpu_map *cpumap) > int ret; > int last_cpu; > > - last_cpu = cpu_map__cpu(cpumap, cpumap->nr - 1); > + last_cpu = perf_cpu_map__cpu(cpumap, cpumap->nr - 1); > mask_size = last_cpu / 4 + 2; /* one more byte for EOS */ > mask_size += last_cpu / 32; /* ',' is needed for every 32th cpus */ > > diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c > index e0d7f1da5858..32f9fc2dd389 100644 > --- a/tools/perf/util/cpumap.c > +++ b/tools/perf/util/cpumap.c > @@ -485,11 +485,6 @@ bool cpu_map__has(struct perf_cpu_map *cpus, int cpu) > return perf_cpu_map__idx(cpus, cpu) != -1; > } > > -int cpu_map__cpu(struct perf_cpu_map *cpus, int idx) > -{ > - return cpus->map[idx]; > -} > - > size_t cpu_map__snprint(struct perf_cpu_map *map, char *buf, size_t size) > { > int i, cpu, start = -1; > @@ -547,7 +542,7 @@ size_t cpu_map__snprint_mask(struct perf_cpu_map *map, char *buf, size_t size) > int i, cpu; > char *ptr = buf; > unsigned char *bitmap; > - int last_cpu = cpu_map__cpu(map, map->nr - 1); > + int last_cpu = perf_cpu_map__cpu(map, map->nr - 1); > > if (buf == NULL) > return 0; > @@ -559,7 +554,7 @@ size_t cpu_map__snprint_mask(struct perf_cpu_map *map, char *buf, size_t size) > } > > for (i = 0; i < map->nr; i++) { > - cpu = cpu_map__cpu(map, i); > + cpu = perf_cpu_map__cpu(map, i); > bitmap[cpu / 8] |= 1 << (cpu % 8); > } > > diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h > index a053bf31a3f0..87545bcd461d 100644 > --- a/tools/perf/util/cpumap.h > +++ b/tools/perf/util/cpumap.h > @@ -80,7 +80,6 @@ int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res, > struct aggr_cpu_id (*f)(int cpu, void *data), > void *data); > > -int cpu_map__cpu(struct perf_cpu_map *cpus, int idx); > bool cpu_map__has(struct perf_cpu_map *cpus, int cpu); > > bool aggr_cpu_id__equal(const struct aggr_cpu_id *a, const struct aggr_cpu_id *b); > -- > 2.34.1.448.ga2b2bfdf31-goog -- - Arnaldo

3 years, 4 months

Re: [PATCH v4 02/48] perf stat: Add aggr creators that are passed a cpu.

by Arnaldo Carvalho de Melo

Em Mon, Jan 10, 2022 at 09:36:49AM -0800, Ian Rogers escreveu: > On Mon, Jan 10, 2022 at 9:10 AM John Garry <john.garry(a)huawei.com> wrote: > > > > On 05/01/2022 06:13, Ian Rogers wrote: > > > > > > +struct aggr_cpu_id cpu_map__get_socket(struct perf_cpu_map *map, int idx, > > > + void *data) > > > +{ > > > + if (idx < 0 || idx > map->nr) > > > + return cpu_map__empty_aggr_cpu_id(); > > > + > > > + return cpu_map__get_socket_aggr_by_cpu(map->map[idx], data); > > > +} > > > + > > > > > > This is later deleted in the series. Can the series be reworked so that > > we don't add stuff and then later delete it? One reason for that > > approach is that we don't spend time reviewing something which will be > > deleted, especially in such a big series... > > Hi John, > > I think you are asking to squash: > https://lore.kernel.org/lkml/20220105061351.120843-8-irogers@google.com/ > into this change. There are other similar related changes that may > also be squashed. The changes are trying to introduce a new API and > then add changes to switch over to using it. This is with a view to > making bisection easier, have each change only do 1 thing and so on. I > believe the format of the patches is house style, but it is fine to > squash changes together too. Having sent patches to Arnaldo and having > had them split I'm reluctant to do a v5 with them squashed without him > expressing a preference. Right, sometimes this is needed, I'm getting the patchkit now to test build it in my containers and will go patch by patch reviewing. - Arnaldo > Thanks, > Ian > > > If it really makes sense to do it this way then fine. > > > > Thanks, > > John -- - Arnaldo

3 years, 4 months

Re: [PATCH V2 7/7] coresight: trbe: Work around the trace data corruption

by Suzuki K Poulose

On 07/01/2022 01:10, Anshuman Khandual wrote: > TRBE implementations affected by Arm erratum #1902691 might corrupt trace > data or deadlock, when it's being written into the memory. Workaround this > problem in the driver, by preventing TRBE initialization on affected cpus. > The firmware must have disabled the access to TRBE for the kernel on such > implementations. This will cover the kernel for any firmware that doesn't > do this already. This just updates the TRBE driver as required. > > Cc: Catalin Marinas <catalin.marinas(a)arm.com> > Cc: Will Deacon <will(a)kernel.org> > Cc: Mathieu Poirier <mathieu.poirier(a)linaro.org> > Cc: Suzuki Poulose <suzuki.poulose(a)arm.com> > Cc: coresight(a)lists.linaro.org > Cc: linux-doc(a)vger.kernel.org > Cc: linux-arm-kernel(a)lists.infradead.org > Cc: linux-kernel(a)vger.kernel.org > Signed-off-by: Anshuman Khandual <anshuman.khandual(a)arm.com> > --- > arch/arm64/Kconfig | 2 +- > drivers/hwtracing/coresight/coresight-trbe.c | 12 ++++++++++++ > 2 files changed, 13 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index 209e481acf0d..8a2245c3e857 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -821,7 +821,7 @@ config ARM64_ERRATUM_2038923 > > config ARM64_ERRATUM_1902691 > bool "Cortex-A510: 1902691: workaround TRBE trace corruption" > - depends on COMPILE_TEST # Until the CoreSight TRBE driver changes are in > + depends on CORESIGHT_TRBE > default y > help > This option adds the workaround for ARM Cortex-A510 erratum 1902691. > diff --git a/drivers/hwtracing/coresight/coresight-trbe.c b/drivers/hwtracing/coresight/coresight-trbe.c > index c4cc529749f8..d2f1c68e589c 100644 > --- a/drivers/hwtracing/coresight/coresight-trbe.c > +++ b/drivers/hwtracing/coresight/coresight-trbe.c > @@ -93,12 +93,14 @@ struct trbe_buf { > #define TRBE_WORKAROUND_WRITE_OUT_OF_RANGE 1 > #define TRBE_NEEDS_DRAIN_AFTER_DISABLE 2 > #define TRBE_NEEDS_CTXT_SYNC_AFTER_ENABLE 3 > +#define TRBE_IS_BROKEN 4 > > static int trbe_errata_cpucaps[] = { > [TRBE_WORKAROUND_OVERWRITE_FILL_MODE] = ARM64_WORKAROUND_TRBE_OVERWRITE_FILL_MODE, > [TRBE_WORKAROUND_WRITE_OUT_OF_RANGE] = ARM64_WORKAROUND_TRBE_WRITE_OUT_OF_RANGE, > [TRBE_NEEDS_DRAIN_AFTER_DISABLE] = ARM64_WORKAROUND_2064142, > [TRBE_NEEDS_CTXT_SYNC_AFTER_ENABLE] = ARM64_WORKAROUND_2038923, > + [TRBE_IS_BROKEN] = ARM64_WORKAROUND_1902691, > -1, /* Sentinel, must be the last entry */ > }; > > @@ -181,6 +183,11 @@ static inline bool trbe_needs_ctxt_sync_after_enable(struct trbe_cpudata *cpudat > return trbe_has_erratum(cpudata, TRBE_NEEDS_CTXT_SYNC_AFTER_ENABLE); > } > > +static inline bool trbe_is_broken(struct trbe_cpudata *cpudata) > +{ > + return trbe_has_erratum(cpudata, TRBE_IS_BROKEN); > +} > + > static int trbe_alloc_node(struct perf_event *event) > { > if (event->cpu == -1) > @@ -1288,6 +1295,11 @@ static void arm_trbe_probe_cpu(void *info) > */ > trbe_check_errata(cpudata); > > + if (trbe_is_broken(cpudata)) { > + pr_err("Disabling TRBE on cpu%d due to erratum\n", cpu); > + goto cpu_clear; > + } > + > /* > * If the TRBE is affected by erratum TRBE_WORKAROUND_OVERWRITE_FILL_MODE, > * we must always program the TBRPTR_EL1, 256bytes from a page Reviewed-by: Suzuki K Poulose <suzuki.poulose(a)arm.com>

3 years, 4 months

Re: [PATCH V2 6/7] coresight: trbe: Work around the invalid prohibited states

by Suzuki K Poulose

On 07/01/2022 01:10, Anshuman Khandual wrote: > TRBE implementations affected by Arm erratum #2038923 might get TRBE into > an inconsistent view on whether trace is prohibited within the CPU. As a > result, the trace buffer or trace buffer state might be corrupted. This > happens after TRBE buffer has been enabled by setting TRBLIMITR_EL1.E, > followed by just a single context synchronization event before execution > changes from a context, in which trace is prohibited to one where it isn't, > or vice versa. In these mentioned conditions, the view of whether trace is > prohibited is inconsistent between parts of the CPU, and the trace buffer > or the trace buffer state might be corrupted. > > Work around this problem in the TRBE driver by preventing an inconsistent > view of whether the trace is prohibited or not based on TRBLIMITR_EL1.E by > immediately following a change to TRBLIMITR_EL1.E with at least one ISB > instruction before an ERET, or two ISB instructions if no ERET is to take > place. This just updates the TRBE driver as required. > > Cc: Catalin Marinas <catalin.marinas(a)arm.com> > Cc: Will Deacon <will(a)kernel.org> > Cc: Mathieu Poirier <mathieu.poirier(a)linaro.org> > Cc: Suzuki Poulose <suzuki.poulose(a)arm.com> > Cc: coresight(a)lists.linaro.org > Cc: linux-doc(a)vger.kernel.org > Cc: linux-arm-kernel(a)lists.infradead.org > Cc: linux-kernel(a)vger.kernel.org > Signed-off-by: Anshuman Khandual <anshuman.khandual(a)arm.com> > --- > arch/arm64/Kconfig | 2 +- > drivers/hwtracing/coresight/coresight-trbe.c | 48 +++++++++++++++----- > 2 files changed, 37 insertions(+), 13 deletions(-) > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index b6d62672bf7d..209e481acf0d 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -798,7 +798,7 @@ config ARM64_ERRATUM_2064142 > > config ARM64_ERRATUM_2038923 > bool "Cortex-A510: 2038923: workaround TRBE corruption with enable" > - depends on COMPILE_TEST # Until the CoreSight TRBE driver changes are in > + depends on CORESIGHT_TRBE > default y > help > This option adds the workaround for ARM Cortex-A510 erratum 2038923. > diff --git a/drivers/hwtracing/coresight/coresight-trbe.c b/drivers/hwtracing/coresight/coresight-trbe.c > index 850e9fca6847..c4cc529749f8 100644 > --- a/drivers/hwtracing/coresight/coresight-trbe.c > +++ b/drivers/hwtracing/coresight/coresight-trbe.c > @@ -92,11 +92,13 @@ struct trbe_buf { > #define TRBE_WORKAROUND_OVERWRITE_FILL_MODE 0 > #define TRBE_WORKAROUND_WRITE_OUT_OF_RANGE 1 > #define TRBE_NEEDS_DRAIN_AFTER_DISABLE 2 > +#define TRBE_NEEDS_CTXT_SYNC_AFTER_ENABLE 3 > > static int trbe_errata_cpucaps[] = { > [TRBE_WORKAROUND_OVERWRITE_FILL_MODE] = ARM64_WORKAROUND_TRBE_OVERWRITE_FILL_MODE, > [TRBE_WORKAROUND_WRITE_OUT_OF_RANGE] = ARM64_WORKAROUND_TRBE_WRITE_OUT_OF_RANGE, > [TRBE_NEEDS_DRAIN_AFTER_DISABLE] = ARM64_WORKAROUND_2064142, > + [TRBE_NEEDS_CTXT_SYNC_AFTER_ENABLE] = ARM64_WORKAROUND_2038923, > -1, /* Sentinel, must be the last entry */ > }; > > @@ -174,6 +176,11 @@ static inline bool trbe_needs_drain_after_disable(struct trbe_cpudata *cpudata) > return trbe_has_erratum(cpudata, TRBE_NEEDS_DRAIN_AFTER_DISABLE); > } > > +static inline bool trbe_needs_ctxt_sync_after_enable(struct trbe_cpudata *cpudata) > +{ > + return trbe_has_erratum(cpudata, TRBE_NEEDS_CTXT_SYNC_AFTER_ENABLE); > +} > + > static int trbe_alloc_node(struct perf_event *event) > { > if (event->cpu == -1) > @@ -187,6 +194,28 @@ static inline void trbe_drain_buffer(void) > dsb(nsh); > } > > +static inline void set_trbe_enabled(struct trbe_cpudata *cpudata, u64 trblimitr) > +{ > + /* > + * Enable the TRBE without clearing LIMITPTR which > + * might be required for fetching the buffer limits. > + */ > + trblimitr |= TRBLIMITR_ENABLE; > + write_sysreg_s(trblimitr, SYS_TRBLIMITR_EL1); > + > + /* Synchronize the TRBE enable event */ > + isb(); > + > + /* > + * Errata affected TRBE implementation will need an additional > + * context synchronization in order to prevent an inconsistent > + * TRBE prohibited region view on the CPU which could possibly > + * corrupt the TRBE buffer or the TRBE state. > + */ > + if (trbe_needs_ctxt_sync_after_enable(cpudata)) > + isb(); > +} Similar to the previous patch, we may move the comment to the function where it is defined. Either ways: Reviewed-by: Suzuki K Poulose <suzuki.poulose(a)arm.com>

3 years, 4 months

Re: [PATCH V2 5/7] coresight: trbe: Work around the ignored system register writes

by Suzuki K Poulose

On 07/01/2022 01:10, Anshuman Khandual wrote: > TRBE implementations affected by Arm erratum #2064142 might fail to write > into certain system registers after the TRBE has been disabled. Under some > conditions after TRBE has been disabled, writes into certain TRBE registers > TRBLIMITR_EL1, TRBPTR_EL1, TRBBASER_EL1, TRBSR_EL1 and TRBTRG_EL1 will be > ignored and not be effected. > > Work around this problem in the TRBE driver by executing TSB CSYNC and DSB > just after the trace collection has stopped and before performing a system > register write to one of the affected registers. This just updates the TRBE > driver as required. > > Cc: Catalin Marinas <catalin.marinas(a)arm.com> > Cc: Will Deacon <will(a)kernel.org> > Cc: Mathieu Poirier <mathieu.poirier(a)linaro.org> > Cc: Suzuki Poulose <suzuki.poulose(a)arm.com> > Cc: coresight(a)lists.linaro.org > Cc: linux-doc(a)vger.kernel.org > Cc: linux-arm-kernel(a)lists.infradead.org > Cc: linux-kernel(a)vger.kernel.org > Signed-off-by: Anshuman Khandual <anshuman.khandual(a)arm.com> > --- > arch/arm64/Kconfig | 2 +- > drivers/hwtracing/coresight/coresight-trbe.c | 54 ++++++++++++++------ > drivers/hwtracing/coresight/coresight-trbe.h | 8 --- > 3 files changed, 39 insertions(+), 25 deletions(-) > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index f1651cb71ef3..b6d62672bf7d 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -780,7 +780,7 @@ config ARM64_ERRATUM_2224489 > > config ARM64_ERRATUM_2064142 > bool "Cortex-A510: 2064142: workaround TRBE register writes while disabled" > - depends on COMPILE_TEST # Until the CoreSight TRBE driver changes are in > + depends on CORESIGHT_TRBE > default y > help > This option adds the workaround for ARM Cortex-A510 erratum 2064142. > diff --git a/drivers/hwtracing/coresight/coresight-trbe.c b/drivers/hwtracing/coresight/coresight-trbe.c > index 276862c07e32..850e9fca6847 100644 > --- a/drivers/hwtracing/coresight/coresight-trbe.c > +++ b/drivers/hwtracing/coresight/coresight-trbe.c > @@ -91,10 +91,12 @@ struct trbe_buf { > */ > #define TRBE_WORKAROUND_OVERWRITE_FILL_MODE 0 > #define TRBE_WORKAROUND_WRITE_OUT_OF_RANGE 1 > +#define TRBE_NEEDS_DRAIN_AFTER_DISABLE 2 > > static int trbe_errata_cpucaps[] = { > [TRBE_WORKAROUND_OVERWRITE_FILL_MODE] = ARM64_WORKAROUND_TRBE_OVERWRITE_FILL_MODE, > [TRBE_WORKAROUND_WRITE_OUT_OF_RANGE] = ARM64_WORKAROUND_TRBE_WRITE_OUT_OF_RANGE, > + [TRBE_NEEDS_DRAIN_AFTER_DISABLE] = ARM64_WORKAROUND_2064142, > -1, /* Sentinel, must be the last entry */ > }; > > @@ -167,6 +169,11 @@ static inline bool trbe_may_write_out_of_range(struct trbe_cpudata *cpudata) > return trbe_has_erratum(cpudata, TRBE_WORKAROUND_WRITE_OUT_OF_RANGE); > } > > +static inline bool trbe_needs_drain_after_disable(struct trbe_cpudata *cpudata) > +{ > + return trbe_has_erratum(cpudata, TRBE_NEEDS_DRAIN_AFTER_DISABLE); > +} > + > static int trbe_alloc_node(struct perf_event *event) > { > if (event->cpu == -1) > @@ -174,30 +181,42 @@ static int trbe_alloc_node(struct perf_event *event) > return cpu_to_node(event->cpu); > } > > -static void trbe_drain_buffer(void) > +static inline void trbe_drain_buffer(void) > { > tsb_csync(); > dsb(nsh); > } > > -static void trbe_drain_and_disable_local(void) > +static inline void set_trbe_disabled(struct trbe_cpudata *cpudata) > { > u64 trblimitr = read_sysreg_s(SYS_TRBLIMITR_EL1); > > - trbe_drain_buffer(); > - > /* > * Disable the TRBE without clearing LIMITPTR which > * might be required for fetching the buffer limits. > */ > trblimitr &= ~TRBLIMITR_ENABLE; > write_sysreg_s(trblimitr, SYS_TRBLIMITR_EL1); > + > + /* > + * Errata affected TRBE implementation will need TSB CSYNC and > + * DSB in order to prevent subsequent writes into certain TRBE > + * system registers from being ignored and not effected. > + */ minor nit: This comment could be moved to the definition of the function "trbe_needs_drain_after_disable()" to make more sense. The name is implicit here indicating, why we are doing a drain. Either ways: Reviewed-by: Suzuki K Poulose <suzuki.poulose(a)arm.com>

3 years, 4 months

Re: [PATCH V2 4/7] arm64: errata: Add detection for TRBE trace data corruption

by Suzuki K Poulose

On 07/01/2022 01:10, Anshuman Khandual wrote: > TRBE implementations affected by Arm erratum #1902691 might corrupt trace > data or deadlock, when it's being written into the memory. So effectively > TRBE is broken and hence cannot be used to capture trace data. This adds > a new errata ARM64_ERRATUM_1902691 in arm64 errata framework. > > Cc: Catalin Marinas <catalin.marinas(a)arm.com> > Cc: Will Deacon <will(a)kernel.org> > Cc: Mathieu Poirier <mathieu.poirier(a)linaro.org> > Cc: Suzuki Poulose <suzuki.poulose(a)arm.com> > Cc: coresight(a)lists.linaro.org > Cc: linux-doc(a)vger.kernel.org > Cc: linux-arm-kernel(a)lists.infradead.org > Cc: linux-kernel(a)vger.kernel.org > Signed-off-by: Anshuman Khandual <anshuman.khandual(a)arm.com> > --- > Documentation/arm64/silicon-errata.rst | 2 ++ > arch/arm64/Kconfig | 18 ++++++++++++++++++ > arch/arm64/kernel/cpu_errata.c | 9 +++++++++ > arch/arm64/tools/cpucaps | 1 + > 4 files changed, 30 insertions(+) Reviewed-by: Suzuki K Poulose <suzuki.poulose(a)arm.com>

3 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

CoreSight