Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf tools: Avoid deadlock when map_groups are broken

Attempting to clone map groups onto themselves will deadlock.

It only happens because of other bugs, but the code should protect
itself anyway.

Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Tested-by: Jiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/1439994561-27436-2-git-send-email-adrian.hunter@intel.com
[ Use pr_debug() instead of dump_fprintf() ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Adrian Hunter and committed by
Arnaldo Carvalho de Melo
0d7e7acc d7a702f0

+6
+6
tools/perf/util/thread.c
··· 191 191 if (thread->pid_ == parent->pid_) 192 192 return 0; 193 193 194 + if (thread->mg == parent->mg) { 195 + pr_debug("broken map groups on thread %d/%d parent %d/%d\n", 196 + thread->pid_, thread->tid, parent->pid_, parent->tid); 197 + return 0; 198 + } 199 + 194 200 /* But this one is new process, copy maps. */ 195 201 for (i = 0; i < MAP__NR_TYPES; ++i) 196 202 if (map_groups__clone(thread->mg, parent->mg, i) < 0)