diff options
| author | Riccardo Mancini <rickyman7@gmail.com> | 2021-08-21 11:19:28 +0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-08-31 16:45:30 -0300 |
| commit | ebfb045a417415d8ac3f588e443f001b1278c01c (patch) | |
| tree | 982ce9eba393fe3555e78e295de7c8cf515de0cf /tools/perf | |
| parent | da7c3b462293431ea2558765a977a55007a26379 (diff) | |
| download | linux-ebfb045a417415d8ac3f588e443f001b1278c01c.tar.gz linux-ebfb045a417415d8ac3f588e443f001b1278c01c.tar.bz2 linux-ebfb045a417415d8ac3f588e443f001b1278c01c.zip | |
perf evsel: Move test_attr__open() to success path in evsel__open_cpu()
test_attr__open() ignores the fd if -1, therefore it is safe to move it to
the success path (fd >= 0).
Signed-off-by: Riccardo Mancini <rickyman7@gmail.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/b3baf11360ca96541c9631730614fd7d217496fc.1629490974.git.rickyman7@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/util/evsel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index f691f9ee30ea..8dc70dd045f3 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -2011,11 +2011,6 @@ retry_open: 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 @@ retry_open: 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) { |