Re: [RFC PATCH v1 22/37] perf evsel: move test_attr__open to success path in evsel__open_cpu
From: Arnaldo Carvalho de Melo <acme@kernel.org>
Date: 2021-08-31 19:47:47
Also in:
lkml
Em Sat, Aug 21, 2021 at 11:19:28AM +0200, Riccardo Mancini escreveu:
test_attr__open ignores the fd if -1, therefore it is safe to move it to the success path (fd >= 0).
Nicely spotted, applied. - Arnaldo
quoted hunk ↗ jump to hunk
Signed-off-by: Riccardo Mancini <redacted> --- tools/perf/util/evsel.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index a1a88607fd59efcb..d2b0391569286080 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c@@ -2011,11 +2011,6 @@ static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus, bpf_counter__install_pe(evsel, cpu, fd); - if (unlikely(test_attr__enabled)) { - test_attr__open(&evsel->core.attr, pid, cpus->map[cpu], - fd, group_fd, evsel->open_flags); - } - if (fd < 0) { err = -errno;@@ -2024,6 +2019,11 @@ static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus, goto try_fallback; } + if (unlikely(test_attr__enabled)) { + test_attr__open(&evsel->core.attr, pid, cpus->map[cpu], + fd, group_fd, evsel->open_flags); + } + pr_debug2_peo(" = %d\n", fd); if (evsel->bpf_fd >= 0) {-- 2.31.1
-- - Arnaldo