Skip to contentSkip to conversation

perf bpf: return value with unlocking in perf_env__find_btf()

PATCH Applied Bo YU 4 participants 4 messages Apr 22, 2019 – May 3, 2019

Subsystems (4)
lore
Share & tools
lore

Bo YU

author
#0 lore raw

PATCH 1/1 perf bpf: return value with unlocking in perf_env__find_btf()

In perf_env__find_btf(), returning without unlocking "env->bpf_progs.lock". There may be cause lockdep issue.

DEtected by CoversityScan, CID# 1444762:(program hangs(LOCK))

Fixes 2db7b1e0bd49d: (perf bpf: Return NULL when RB tree lookup fails in perf_env__find_btf())
---
 tools/perf/util/env.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/env.c +1 -1
index 9494f9dc61ec..6a3eaf7d9353 100644
@@ -115,8 +115,8 @@ struct btf_node *perf_env__find_btf(struct perf_env *env, __u32 btf_id)
 	}
 	node = NULL;
 
-	up_read(&env->bpf_progs.lock);
 out:
+	up_read(&env->bpf_progs.lock);
 	return node;
 }
 
Signature · 1 line
2.11.0
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Bo YU

In perf_env__find_btf(), returning without unlocking "env->bpf_progs.lock". There may be cause lockdep issue.

DEtected by CoversityScan, CID# 1444762:(program hangs(LOCK))

Fixes 2db7b1e0bd49d: (perf bpf: Return NULL when RB tree lookup fails in perf_env__find_btf())

ugh, sry about that

thanks,
jirka

Quoted 22 lines
---
 tools/perf/util/env.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/env.c +1 -1
index 9494f9dc61ec..6a3eaf7d9353 100644
@@ -115,8 +115,8 @@ struct btf_node *perf_env__find_btf(struct perf_env *env, __u32 btf_id)
 	}
 	node = NULL;
 
-	up_read(&env->bpf_progs.lock);
 out:
+	up_read(&env->bpf_progs.lock);
 	return node;
 }
 
Signature · 1 line
2.11.0
#2 lore raw

Em Mon, Apr 22, 2019 at 11:36:29AM +0200, Jiri Olsa escreveu:

Quoted 9 lines · Bo YU
Quoted 6 lines

In perf_env__find_btf(), returning without unlocking "env->bpf_progs.lock". There may be cause lockdep issue.

DEtected by CoversityScan, CID# 1444762:(program hangs(LOCK))

Fixes 2db7b1e0bd49d: (perf bpf: Return NULL when RB tree lookup fails in perf_env__find_btf())

ugh, sry about that

Brown paper bag on the part of everybody involved indeed :-\

Quoted 1 line

Applied.

Thanks,

- Arnaldo

Quoted 25 lines

thanks,
jirka

Quoted 22 lines
---
 tools/perf/util/env.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/env.c +1 -1
index 9494f9dc61ec..6a3eaf7d9353 100644
@@ -115,8 +115,8 @@ struct btf_node *perf_env__find_btf(struct perf_env *env, __u32 btf_id)
 	}
 	node = NULL;
 
-	up_read(&env->bpf_progs.lock);
 out:
+	up_read(&env->bpf_progs.lock);
 	return node;
 }
 
Signature · 1 line
2.11.0
Signature · 1 line
- Arnaldo
#3 lore raw

[tip:perf/urgent] perf bpf: Return value with unlocking in perf_env__find_btf()

In reply to Bo YU
perf bpf: Return value with unlocking in perf_env__find_btf()
Commit-ID:  2e712675ffd1331bb527dfc851b0e98cd684c2f1
Gitweb:     https://git.kernel.org/tip/2e712675ffd1331bb527dfc851b0e98cd684c2f1
Author:     Bo YU <[email protected]>
AuthorDate: Mon, 22 Apr 2019 04:01:38 -0400
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 2 May 2019 16:00:19 -0400

perf bpf: Return value with unlocking in perf_env__find_btf()

In perf_env__find_btf(), we're returning without unlocking "env->bpf_progs.lock". There may be cause lockdep issue.

Detected by CoversityScan, CID# 1444762:(program hangs(LOCK))

Cc Adrian Hunter <[email protected]>
Cc Alexander Shishkin <[email protected]>
Cc Alexei Starovoitov <[email protected]>
Cc Daniel Borkmann <[email protected]>
Cc Martin KaFai Lau <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Song Liu <[email protected]>
Cc Yonghong Song <[email protected]>
Fixes 2db7b1e0bd49d: (perf bpf: Return NULL when RB tree lookup fails in perf_env__find_btf())
---
 tools/perf/util/env.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/env.c +1 -1
index 9494f9dc61ec..6a3eaf7d9353 100644
@@ -115,8 +115,8 @@ struct btf_node *perf_env__find_btf(struct perf_env *env, __u32 btf_id)
 	}
 	node = NULL;
 
-	up_read(&env->bpf_progs.lock);
 out:
+	up_read(&env->bpf_progs.lock);
 	return node;
 }