Skip to contentSkip to conversation

perf bpf: Fix memory leaks relating to BTF.

PATCH Applied Ian Rogers 3 participants 3 messages Aug 26, 2021 – Aug 30, 2021 perf events

lore
Share & tools
lore

Ian Rogers

author reviewer
#0 lore raw

PATCH v2 1/1 perf bpf: Fix memory leaks relating to BTF.

BTF needs to be freed with btf__free.

---
 tools/perf/util/annotate.c  | 2 +-
 tools/perf/util/bpf-event.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
tools/perf/util/annotate.c +1 -1
index d43f6b5e5169..0bae061b2d6d 100644
@@ -1833,7 +1833,7 @@ static int symbol__disassemble_bpf(struct symbol *sym,
 	ret = 0;
 out:
 	free(prog_linfo);
-	free(btf);
+	btf__free(btf);
 	fclose(s);
 	bfd_close(bfdf);
 	return ret;
tools/perf/util/bpf-event.c +2 -2
index cdecda1ddd36..17a9844e4fbf 100644
@@ -296,7 +296,7 @@ static int perf_event__synthesize_one_bpf_prog(struct perf_session *session,
 
 out:
 	free(info_linear);
-	free(btf);
+	btf__free(btf);
 	return err ? -1 : 0;
 }
 
@@ -486,7 +486,7 @@ static void perf_env__add_bpf_info(struct perf_env *env, u32 id)
 	perf_env__fetch_btf(env, btf_id, btf);
 
 out:
-	free(btf);
+	btf__free(btf);
 	close(fd);
 }
 
Signature · 1 line
2.33.0.259.gc128427fd7-goog
Reviewed-by on v2 1/1
#1 lore raw

Patch looks good me.

Thanks,
Kajol Jain

Quoted 44 lines · Ian Rogers

BTF needs to be freed with btf__free.

---
 tools/perf/util/annotate.c  | 2 +-
 tools/perf/util/bpf-event.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
tools/perf/util/annotate.c +1 -1
index d43f6b5e5169..0bae061b2d6d 100644
@@ -1833,7 +1833,7 @@ static int symbol__disassemble_bpf(struct symbol *sym,
 	ret = 0;
 out:
 	free(prog_linfo);
-	free(btf);
+	btf__free(btf);
 	fclose(s);
 	bfd_close(bfdf);
 	return ret;
tools/perf/util/bpf-event.c +2 -2
index cdecda1ddd36..17a9844e4fbf 100644
@@ -296,7 +296,7 @@ static int perf_event__synthesize_one_bpf_prog(struct perf_session *session,
 
 out:
 	free(info_linear);
-	free(btf);
+	btf__free(btf);
 	return err ? -1 : 0;
 }
 
@@ -486,7 +486,7 @@ static void perf_env__add_bpf_info(struct perf_env *env, u32 id)
 	perf_env__fetch_btf(env, btf_id, btf);
 
 out:
-	free(btf);
+	btf__free(btf);
 	close(fd);
 }
 
maintainer Applied
#2 lore raw

Em Fri, Aug 27, 2021 at 12:58:09PM +0530, kajoljain escreveu:

Quoted 3 lines

Patch looks good me.

Thanks, applied.

- Arnaldo

Quoted 48 lines

Thanks,
Kajol Jain

Quoted 44 lines · Ian Rogers

BTF needs to be freed with btf__free.

---
 tools/perf/util/annotate.c  | 2 +-
 tools/perf/util/bpf-event.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
tools/perf/util/annotate.c +1 -1
index d43f6b5e5169..0bae061b2d6d 100644
@@ -1833,7 +1833,7 @@ static int symbol__disassemble_bpf(struct symbol *sym,
 	ret = 0;
 out:
 	free(prog_linfo);
-	free(btf);
+	btf__free(btf);
 	fclose(s);
 	bfd_close(bfdf);
 	return ret;
tools/perf/util/bpf-event.c +2 -2
index cdecda1ddd36..17a9844e4fbf 100644
@@ -296,7 +296,7 @@ static int perf_event__synthesize_one_bpf_prog(struct perf_session *session,
 
 out:
 	free(info_linear);
-	free(btf);
+	btf__free(btf);
 	return err ? -1 : 0;
 }
 
@@ -486,7 +486,7 @@ static void perf_env__add_bpf_info(struct perf_env *env, u32 id)
 	perf_env__fetch_btf(env, btf_id, btf);
 
 out:
-	free(btf);
+	btf__free(btf);
 	close(fd);
 }
 
Signature · 1 line
- Arnaldo