mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>, Jiri Olsa <jolsa@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	LKML <linux-kernel@vger.kernel.org>,
	Stephane Eranian <eranian@google.com>,
	Andi Kleen <ak@linux.intel.com>,
	Adrian Hunter <adrian.hunter@intel.com>,
	Ian Rogers <irogers@google.com>, Leo Yan <leo.yan@linaro.org>
Subject: [PATCH 09/11] perf test: Fix a memory leak in thread_map_remove test
Date: Mon,  1 Mar 2021 23:04:07 +0900	[thread overview]
Message-ID: <20210301140409.184570-10-namhyung@kernel.org> (raw)
In-Reply-To: <20210301140409.184570-1-namhyung@kernel.org>

The str should be freed after creating a thread map.  Also change the
open-coded thread map deletion to a call to perf_thread_map__put().

  $ perf test -v 44
  44: Remove thread map                          :
  --- start ---
  test child forked, pid 165536
  2 threads: 165535, 165536
  1 thread: 165536
  0 thread:

  =================================================================
  ==165536==ERROR: LeakSanitizer: detected memory leaks

  Direct leak of 14 byte(s) in 1 object(s) allocated from:
    #0 0x7f54453ffe8f in __interceptor_malloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:145
    #1 0x7f5444f8c6a7 in __vasprintf_internal libio/vasprintf.c:71

  SUMMARY: AddressSanitizer: 14 byte(s) leaked in 1 allocation(s).
  test child finished with 1
  ---- end ----
  Remove thread map: FAILED!

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/tests/thread-map.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tools/perf/tests/thread-map.c b/tools/perf/tests/thread-map.c
index 9e1cf11149ef..d1e208b4a571 100644
--- a/tools/perf/tests/thread-map.c
+++ b/tools/perf/tests/thread-map.c
@@ -110,12 +110,12 @@ int test__thread_map_remove(struct test *test __maybe_unused, int subtest __mayb
 {
 	struct perf_thread_map *threads;
 	char *str;
-	int i;
 
 	TEST_ASSERT_VAL("failed to allocate map string",
 			asprintf(&str, "%d,%d", getpid(), getppid()) >= 0);
 
 	threads = thread_map__new_str(str, NULL, 0, false);
+	free(str);
 
 	TEST_ASSERT_VAL("failed to allocate thread_map",
 			threads);
@@ -142,9 +142,6 @@ int test__thread_map_remove(struct test *test __maybe_unused, int subtest __mayb
 	TEST_ASSERT_VAL("failed to not remove thread",
 			thread_map__remove(threads, 0));
 
-	for (i = 0; i < threads->nr; i++)
-		zfree(&threads->map[i].comm);
-
-	free(threads);
+	perf_thread_map__put(threads);
 	return 0;
 }
-- 
2.30.1.766.gb4fecdf3b7-goog


  parent reply	other threads:[~2021-03-01 14:07 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-01 14:03 [PATCHSET 00/11] perf test: Fix cpu/thread map leaks Namhyung Kim
2021-03-01 14:03 ` [PATCH 01/11] perf test: Fix cpu and thread map leaks in basic mmap test Namhyung Kim
2021-03-01 14:04 ` [PATCH 02/11] perf test: Fix a memory leak in attr test Namhyung Kim
2021-03-01 14:04 ` [PATCH 03/11] perf test: Fix cpu and thread map leaks in task_exit test Namhyung Kim
2021-03-01 14:04 ` [PATCH 04/11] perf test: Fix cpu and thread map leaks in sw_clock_freq test Namhyung Kim
2021-03-01 17:24   ` Jiri Olsa
2021-03-02  1:50     ` Namhyung Kim
2021-03-02 13:03       ` Jiri Olsa
2021-03-03 15:43         ` Arnaldo Carvalho de Melo
2021-03-01 14:04 ` [PATCH 05/11] perf test: Fix cpu and thread map leaks in code_reading test Namhyung Kim
2021-03-01 14:04 ` [PATCH 06/11] perf test: Fix cpu and thread map leaks in keep_tracking test Namhyung Kim
2021-03-01 14:04 ` [PATCH 07/11] perf test: Fix cpu and thread map leaks in switch_tracking test Namhyung Kim
2021-03-01 14:04 ` [PATCH 08/11] perf test: Fix a thread map leak in thread_map_synthesize test Namhyung Kim
2021-03-01 14:04 ` Namhyung Kim [this message]
2021-03-01 14:04 ` [PATCH 10/11] perf test: Fix cpu map leaks in cpu_map_print test Namhyung Kim
2021-03-01 14:04 ` [PATCH 11/11] perf test: Fix cpu and thread map leaks in perf_time_to_tsc test Namhyung Kim

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210301140409.184570-10-namhyung@kernel.org \
    --to=namhyung@kernel.org \
    --cc=acme@kernel.org \
    --cc=adrian.hunter@intel.com \
    --cc=ak@linux.intel.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=eranian@google.com \
    --cc=irogers@google.com \
    --cc=jolsa@redhat.com \
    --cc=leo.yan@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®