projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[linux-2.6-microblaze.git]
/
tools
/
perf
/
util
/
bpf_counter.c
diff --git
a/tools/perf/util/bpf_counter.c
b/tools/perf/util/bpf_counter.c
index
ddb52f7
..
5ed674a
100644
(file)
--- a/
tools/perf/util/bpf_counter.c
+++ b/
tools/perf/util/bpf_counter.c
@@
-451,10
+451,10
@@
static int bperf_reload_leader_program(struct evsel *evsel, int attr_map_fd,
goto out;
}
goto out;
}
- err = -1;
link = bpf_program__attach(skel->progs.on_switch);
link = bpf_program__attach(skel->progs.on_switch);
- if (
!link
) {
+ if (
IS_ERR(link)
) {
pr_err("Failed to attach leader program\n");
pr_err("Failed to attach leader program\n");
+ err = PTR_ERR(link);
goto out;
}
goto out;
}
@@
-521,9
+521,10
@@
static int bperf__load(struct evsel *evsel, struct target *target)
evsel->bperf_leader_link_fd = bpf_link_get_fd_by_id(entry.link_id);
if (evsel->bperf_leader_link_fd < 0 &&
evsel->bperf_leader_link_fd = bpf_link_get_fd_by_id(entry.link_id);
if (evsel->bperf_leader_link_fd < 0 &&
- bperf_reload_leader_program(evsel, attr_map_fd, &entry))
+ bperf_reload_leader_program(evsel, attr_map_fd, &entry)) {
+ err = -1;
goto out;
goto out;
-
+ }
/*
* The bpf_link holds reference to the leader program, and the
* leader program holds reference to the maps. Therefore, if
/*
* The bpf_link holds reference to the leader program, and the
* leader program holds reference to the maps. Therefore, if
@@
-550,6
+551,7
@@
static int bperf__load(struct evsel *evsel, struct target *target)
/* Step 2: load the follower skeleton */
evsel->follower_skel = bperf_follower_bpf__open();
if (!evsel->follower_skel) {
/* Step 2: load the follower skeleton */
evsel->follower_skel = bperf_follower_bpf__open();
if (!evsel->follower_skel) {
+ err = -1;
pr_err("Failed to open follower skeleton\n");
goto out;
}
pr_err("Failed to open follower skeleton\n");
goto out;
}