* [PATCH v2] perf bpf: Fix memory leaks relating to BTF.
@ 2021-08-26 18:48 Ian Rogers
2021-08-27 7:28 ` kajoljain
0 siblings, 1 reply; 3+ messages in thread
From: Ian Rogers @ 2021-08-26 18:48 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
Kajol Jain, linux-perf-users, linux-kernel
Cc: eranian, Ian Rogers
BTF needs to be freed with btf__free.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/annotate.c | 2 +-
tools/perf/util/bpf-event.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index d43f6b5e5169..0bae061b2d6d 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -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;
diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c
index cdecda1ddd36..17a9844e4fbf 100644
--- a/tools/perf/util/bpf-event.c
+++ b/tools/perf/util/bpf-event.c
@@ -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);
}
--
2.33.0.259.gc128427fd7-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] perf bpf: Fix memory leaks relating to BTF.
2021-08-26 18:48 [PATCH v2] perf bpf: Fix memory leaks relating to BTF Ian Rogers
@ 2021-08-27 7:28 ` kajoljain
2021-08-30 21:29 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 3+ messages in thread
From: kajoljain @ 2021-08-27 7:28 UTC (permalink / raw)
To: Ian Rogers, Peter Zijlstra, Ingo Molnar,
Arnaldo Carvalho de Melo, Mark Rutland, Alexander Shishkin,
Jiri Olsa, Namhyung Kim, linux-perf-users, linux-kernel
Cc: eranian
Patch looks good me.
Reviewed-by: Kajol Jain<kjain@linux.ibm.com>
Thanks,
Kajol Jain
On 8/27/21 12:18 AM, Ian Rogers wrote:
> BTF needs to be freed with btf__free.
>
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/perf/util/annotate.c | 2 +-
> tools/perf/util/bpf-event.c | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> index d43f6b5e5169..0bae061b2d6d 100644
> --- a/tools/perf/util/annotate.c
> +++ b/tools/perf/util/annotate.c
> @@ -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;
> diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c
> index cdecda1ddd36..17a9844e4fbf 100644
> --- a/tools/perf/util/bpf-event.c
> +++ b/tools/perf/util/bpf-event.c
> @@ -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);
> }
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] perf bpf: Fix memory leaks relating to BTF.
2021-08-27 7:28 ` kajoljain
@ 2021-08-30 21:29 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 3+ messages in thread
From: Arnaldo Carvalho de Melo @ 2021-08-30 21:29 UTC (permalink / raw)
To: kajoljain
Cc: Ian Rogers, Peter Zijlstra, Ingo Molnar, Mark Rutland,
Alexander Shishkin, Jiri Olsa, Namhyung Kim, linux-perf-users,
linux-kernel, eranian
Em Fri, Aug 27, 2021 at 12:58:09PM +0530, kajoljain escreveu:
> Patch looks good me.
>
> Reviewed-by: Kajol Jain<kjain@linux.ibm.com>
Thanks, applied.
- Arnaldo
> Thanks,
> Kajol Jain
>
> On 8/27/21 12:18 AM, Ian Rogers wrote:
> > BTF needs to be freed with btf__free.
> >
> > Signed-off-by: Ian Rogers <irogers@google.com>
> > ---
> > tools/perf/util/annotate.c | 2 +-
> > tools/perf/util/bpf-event.c | 4 ++--
> > 2 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> > index d43f6b5e5169..0bae061b2d6d 100644
> > --- a/tools/perf/util/annotate.c
> > +++ b/tools/perf/util/annotate.c
> > @@ -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;
> > diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c
> > index cdecda1ddd36..17a9844e4fbf 100644
> > --- a/tools/perf/util/bpf-event.c
> > +++ b/tools/perf/util/bpf-event.c
> > @@ -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);
> > }
> >
> >
--
- Arnaldo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-08-30 21:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-26 18:48 [PATCH v2] perf bpf: Fix memory leaks relating to BTF Ian Rogers
2021-08-27 7:28 ` kajoljain
2021-08-30 21:29 ` Arnaldo Carvalho de Melo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).