Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1225297

[PATCH 07/15] perf evlist: Fix missing thread_map__put in propagate_maps()

Show all headers | View raw

From: Adrian Hunter <adrian.hunter@intel.com>

perf_evlist__propagate_maps() incorrectly assumes evsel->threads is NULL
before reassigning it, but it won't be NULL when perf_evlist__set_maps()
is used to set different (or NULL) maps.  Thus thread_map__put must be
used, which works even if evsel->threads is NULL.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@intel.com>
Link: http://lkml.kernel.org/r/1441699142-18905-7-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/evlist.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 961560b2046b..79056c6ae507 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1116,6 +1116,7 @@ static void perf_evlist__propagate_maps(struct perf_evlist *evlist)
 			evsel->cpus = cpu_map__get(evlist->cpus);
 		}
 
+		thread_map__put(evsel->threads);
 		evsel->threads = thread_map__get(evlist->threads);
 	}
 }
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL 00/15] perf/urgent fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-15 17:20 +0200
  [PATCH 04/15] perf evlist: Remove redundant validation from propagate_maps() Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-15 17:20 +0200
  [PATCH 11/15] perf evlist: Factor out a function to propagate maps for a single evsel Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-15 17:20 +0200
  [PATCH 03/15] perf evlist: Simplify set_maps() logic Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-15 17:20 +0200
  [PATCH 09/15] perf evlist: Make set_maps() more resilient Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-15 17:20 +0200
  [PATCH 12/15] perf evlist: Fix add() not propagating maps Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-15 17:20 +0200
  [PATCH 05/15] perf evlist: Add has_user_cpus member Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-15 17:20 +0200
  [PATCH 06/15] perf evlist: Fix splice_list_tail() not setting evlist Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-15 17:20 +0200
  [PATCH 01/15] perf top: Fix segfault pressing -> with no hist entries Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-15 17:20 +0200
  [PATCH 13/15] perf evlist: Fix create_syswide_maps() not propagating maps Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-15 17:20 +0200
  [PATCH 07/15] perf evlist: Fix missing thread_map__put in propagate_maps() Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-15 17:20 +0200
  Re: [GIT PULL 00/15] perf/urgent fixes Ingo Molnar <mingo@kernel.org> - 2015-09-16 09:20 +0200

csiph-web