| Message ID | 20210726153834.463666741@linuxfoundation.org |
|---|---|
| State | New |
| Headers | show |
| Series | None | expand |
On Mon, 26 Jul 2021 at 21:28, Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > > From: Riccardo Mancini <rickyman7@gmail.com> > > [ Upstream commit 233f2dc1c284337286f9a64c0152236779a42f6c ] > > ASan reports a memory leak related to session->evlist while running: > > # perf test "41: Session topology". > > When perf_data is in write mode, session->evlist is owned by the caller, > which should also take care of deleting it. > > This patch adds the missing evlist__delete(). > > Signed-off-by: Riccardo Mancini <rickyman7@gmail.com> > Fixes: c84974ed9fb67293 ("perf test: Add entry to test cpu topology") > Cc: Ian Rogers <irogers@google.com> > Cc: Jiri Olsa <jolsa@redhat.com> > Cc: Kan Liang <kan.liang@intel.com> > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Namhyung Kim <namhyung@kernel.org> > Cc: Peter Zijlstra <peterz@infradead.org> > Link: http://lore.kernel.org/lkml/822f741f06eb25250fb60686cf30a35f447e9e91.1626343282.git.rickyman7@gmail.com > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> > Signed-off-by: Sasha Levin <sashal@kernel.org> perf build failed on 4.19, 4.14, 4.9 and 4.4 due to these warnings / errors for all the architectures. > tools/perf/tests/topology.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c > index 9497d02f69e6..bed53ed82af7 100644 > --- a/tools/perf/tests/topology.c > +++ b/tools/perf/tests/topology.c > @@ -52,6 +52,7 @@ static int session_write_header(char *path) > TEST_ASSERT_VAL("failed to write header", > !perf_session__write_header(session, session->evlist, data.file.fd, true)); > > + evlist__delete(session->evlist); perf-in.o: In function `session_write_header': tools/perf/tests/topology.c:55: undefined reference to `evlist__delete' collect2: error: ld returned 1 exit status Reported-by: Linux Kernel Functional Testing <lkft@linaro.org> ref: https://ci.linaro.org/view/lkft/job/openembedded-lkft-linux-stable-rc-4.19/DISTRO=lkft,MACHINE=intel-corei7-64,label=docker-buster-lkft/893/console -- Linaro LKFT https://lkft.linaro.org
On Tue, Jul 27, 2021 at 09:14:44AM +0530, Naresh Kamboju wrote: > On Mon, 26 Jul 2021 at 21:28, Greg Kroah-Hartman > <gregkh@linuxfoundation.org> wrote: > > > > From: Riccardo Mancini <rickyman7@gmail.com> > > > > [ Upstream commit 233f2dc1c284337286f9a64c0152236779a42f6c ] > > > > ASan reports a memory leak related to session->evlist while running: > > > > # perf test "41: Session topology". > > > > When perf_data is in write mode, session->evlist is owned by the caller, > > which should also take care of deleting it. > > > > This patch adds the missing evlist__delete(). > > > > Signed-off-by: Riccardo Mancini <rickyman7@gmail.com> > > Fixes: c84974ed9fb67293 ("perf test: Add entry to test cpu topology") > > Cc: Ian Rogers <irogers@google.com> > > Cc: Jiri Olsa <jolsa@redhat.com> > > Cc: Kan Liang <kan.liang@intel.com> > > Cc: Mark Rutland <mark.rutland@arm.com> > > Cc: Namhyung Kim <namhyung@kernel.org> > > Cc: Peter Zijlstra <peterz@infradead.org> > > Link: http://lore.kernel.org/lkml/822f741f06eb25250fb60686cf30a35f447e9e91.1626343282.git.rickyman7@gmail.com > > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> > > Signed-off-by: Sasha Levin <sashal@kernel.org> > > > perf build failed on 4.19, 4.14, 4.9 and 4.4 due to these warnings / errors > for all the architectures. Now dropped from all of these trees. Let me go push out -rc2 for all of them as well... thanks, greg k-h
diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c index 9497d02f69e6..bed53ed82af7 100644 --- a/tools/perf/tests/topology.c +++ b/tools/perf/tests/topology.c @@ -52,6 +52,7 @@ static int session_write_header(char *path) TEST_ASSERT_VAL("failed to write header", !perf_session__write_header(session, session->evlist, data.file.fd, true)); + evlist__delete(session->evlist); perf_session__delete(session); return 0;