From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752971AbbGJIOG (ORCPT ); Fri, 10 Jul 2015 04:14:06 -0400 Received: from terminus.zytor.com ([198.137.202.10]:47703 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753680AbbGJINr (ORCPT ); Fri, 10 Jul 2015 04:13:47 -0400 Date: Fri, 10 Jul 2015 01:13:19 -0700 From: tip-bot for Adrian Hunter Message-ID: Cc: adrian.hunter@intel.com, jolsa@redhat.com, mingo@kernel.org, hpa@zytor.com, acme@redhat.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, tglx@linutronix.de Reply-To: namhyung@kernel.org, dsahern@gmail.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org, acme@redhat.com, hpa@zytor.com, adrian.hunter@intel.com, jolsa@redhat.com In-Reply-To: <1436267618-20521-1-git-send-email-adrian.hunter@intel.com> References: <1436267618-20521-1-git-send-email-adrian.hunter@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tools: Fix lockup using 32-bit compat vdso Git-Commit-ID: 6d545a632fbbce79492ba535b15ea0142aa3e80d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 6d545a632fbbce79492ba535b15ea0142aa3e80d Gitweb: http://git.kernel.org/tip/6d545a632fbbce79492ba535b15ea0142aa3e80d Author: Adrian Hunter AuthorDate: Tue, 7 Jul 2015 14:13:38 +0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 7 Jul 2015 11:05:08 -0300 perf tools: Fix lockup using 32-bit compat vdso The __machine__findnew_compat() function is called only from __machine__findnew_vdso_compat() which is called only from machine__findnew_vdso() which already holds machine->dsos.lock, so remove locking from __machine__findnew_compat(). This manifests itself tracing 32-bit programs with a 64-bit perf. Signed-off-by: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Link: http://lkml.kernel.org/r/1436267618-20521-1-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/vdso.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/vdso.c b/tools/perf/util/vdso.c index 4b89118..44d440d 100644 --- a/tools/perf/util/vdso.c +++ b/tools/perf/util/vdso.c @@ -236,18 +236,16 @@ static struct dso *__machine__findnew_compat(struct machine *machine, const char *file_name; struct dso *dso; - pthread_rwlock_wrlock(&machine->dsos.lock); dso = __dsos__find(&machine->dsos, vdso_file->dso_name, true); if (dso) - goto out_unlock; + goto out; file_name = vdso__get_compat_file(vdso_file); if (!file_name) - goto out_unlock; + goto out; dso = __machine__addnew_vdso(machine, vdso_file->dso_name, file_name); -out_unlock: - pthread_rwlock_unlock(&machine->dsos.lock); +out: return dso; }