Thread (5 messages) 5 messages, 2 authors, 2021-06-02

Re: [PATCH] perf stat: Fix error return code in bperf__load()

From: yukuai (C) <hidden>
Date: 2021-05-29 09:10:43
Also in: bpf, lkml, netdev

ping ...

On 2021/05/17 16:12, Yu Kuai wrote:
quoted hunk ↗ jump to hunk
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Reported-by: Hulk Robot <redacted>
Signed-off-by: Yu Kuai <redacted>
---
  tools/perf/util/bpf_counter.c | 2 ++
  1 file changed, 2 insertions(+)
diff --git a/tools/perf/util/bpf_counter.c b/tools/perf/util/bpf_counter.c
index ddb52f748c8e..843b20aa6688 100644
--- a/tools/perf/util/bpf_counter.c
+++ b/tools/perf/util/bpf_counter.c
@@ -522,6 +522,7 @@ 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 &&
  	    bperf_reload_leader_program(evsel, attr_map_fd, &entry))
+		err = -1;
  		goto out;
  
  	/*
@@ -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) {
+		err = -1;
  		pr_err("Failed to open follower skeleton\n");
  		goto out;
  	}
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help