perf top: Fix error code in cmd_top()
There are three error paths which return success: 1. Propagate the errno from evlist__create_maps() if it failed. 2. Return -EINVAL if top.sb_evlist is NULL. 3. Return -EINVAL if evlist__add_bpf_sb_event() failed. Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: https://lore.kernel.org/r/20220922141438.22487-4-shangxiaojing@huawei.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
cdd3b15d68
commit
dc64641c8f
|
@ -1707,6 +1707,7 @@ int cmd_top(int argc, const char **argv)
|
||||||
if (evlist__create_maps(top.evlist, target) < 0) {
|
if (evlist__create_maps(top.evlist, target) < 0) {
|
||||||
ui__error("Couldn't create thread/CPU maps: %s\n",
|
ui__error("Couldn't create thread/CPU maps: %s\n",
|
||||||
errno == ENOENT ? "No such process" : str_error_r(errno, errbuf, sizeof(errbuf)));
|
errno == ENOENT ? "No such process" : str_error_r(errno, errbuf, sizeof(errbuf)));
|
||||||
|
status = -errno;
|
||||||
goto out_delete_evlist;
|
goto out_delete_evlist;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1759,11 +1760,13 @@ int cmd_top(int argc, const char **argv)
|
||||||
|
|
||||||
if (top.sb_evlist == NULL) {
|
if (top.sb_evlist == NULL) {
|
||||||
pr_err("Couldn't create side band evlist.\n.");
|
pr_err("Couldn't create side band evlist.\n.");
|
||||||
|
status = -EINVAL;
|
||||||
goto out_delete_evlist;
|
goto out_delete_evlist;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (evlist__add_bpf_sb_event(top.sb_evlist, &perf_env)) {
|
if (evlist__add_bpf_sb_event(top.sb_evlist, &perf_env)) {
|
||||||
pr_err("Couldn't ask for PERF_RECORD_BPF_EVENT side band events.\n.");
|
pr_err("Couldn't ask for PERF_RECORD_BPF_EVENT side band events.\n.");
|
||||||
|
status = -EINVAL;
|
||||||
goto out_delete_evlist;
|
goto out_delete_evlist;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue