From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753508AbbHSOcM (ORCPT ); Wed, 19 Aug 2015 10:32:12 -0400 Received: from mga09.intel.com ([134.134.136.24]:10402 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932234AbbHSOcK (ORCPT ); Wed, 19 Aug 2015 10:32:10 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,710,1432623600"; d="scan'208";a="544778923" From: Adrian Hunter To: Arnaldo Carvalho de Melo , Arnaldo Carvalho de Melo , Jiri Olsa , Jiri Olsa Cc: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, mingo@kernel.org Subject: [PATCH 1/3] perf tools: Avoid deadlock when map_groups are broken Date: Wed, 19 Aug 2015 17:29:19 +0300 Message-Id: <1439994561-27436-2-git-send-email-adrian.hunter@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1439994561-27436-1-git-send-email-adrian.hunter@intel.com> References: <1439994561-27436-1-git-send-email-adrian.hunter@intel.com> Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Attempting to clone map groups onto themselves will deadlock. It only happens because of other bugs, but the code should protect itself anyway. Signed-off-by: Adrian Hunter --- tools/perf/util/thread.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c index 28c4b746baa1..471102554a78 100644 --- a/tools/perf/util/thread.c +++ b/tools/perf/util/thread.c @@ -191,6 +191,12 @@ static int thread__clone_map_groups(struct thread *thread, if (thread->pid_ == parent->pid_) return 0; + if (thread->mg == parent->mg) { + dump_printf("broken map groups on thread %d/%d parent %d/%d\n", + thread->pid_, thread->tid, parent->pid_, parent->tid); + return 0; + } + /* But this one is new process, copy maps. */ for (i = 0; i < MAP__NR_TYPES; ++i) if (map_groups__clone(thread->mg, parent->mg, i) < 0) -- 1.9.1