From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932611AbbCXQar (ORCPT ); Tue, 24 Mar 2015 12:30:47 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56777 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752205AbbCXQai (ORCPT ); Tue, 24 Mar 2015 12:30:38 -0400 Date: Tue, 24 Mar 2015 09:30:02 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: paulus@samba.org, jolsa@kernel.org, tglx@linutronix.de, a.p.zijlstra@chello.nl, adrian.hunter@intel.com, eranian@google.com, cjashfor@linux.vnet.ibm.com, hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org, dsahern@gmail.com, acme@redhat.com, fweisbec@gmail.com, namhyung@kernel.org Reply-To: fweisbec@gmail.com, namhyung@kernel.org, cjashfor@linux.vnet.ibm.com, hpa@zytor.com, linux-kernel@vger.kernel.org, dsahern@gmail.com, mingo@kernel.org, acme@redhat.com, tglx@linutronix.de, jolsa@kernel.org, paulus@samba.org, a.p.zijlstra@chello.nl, adrian.hunter@intel.com, eranian@google.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Try to lookup kernel module map before creating one Git-Commit-ID: bc84f464862489e687c98dea1a8ff20dc4413f93 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: bc84f464862489e687c98dea1a8ff20dc4413f93 Gitweb: http://git.kernel.org/tip/bc84f464862489e687c98dea1a8ff20dc4413f93 Author: Jiri Olsa AuthorDate: Tue, 17 Feb 2015 17:31:18 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 23 Mar 2015 12:46:51 -0300 perf tools: Try to lookup kernel module map before creating one Currently we assume machine__new_module is called only once for each module so we create its map&dso unconditionally. However it's possible that it's called multiple times for same module. Like for perf record: 1) via machine__create_module during machine init 2) via kernel MMAP event processing Trying to lookup kernel module map before creating one. Signed-off-by: Jiri Olsa Acked-by: Namhyung Kim Cc: Adrian Hunter Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-kx76xfqpnrpho5hdaapbqm09@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/machine.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 1de5438..e335330 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -498,6 +498,11 @@ struct map *machine__new_module(struct machine *machine, u64 start, if (kmod_path__parse_name(&m, filename)) return NULL; + map = map_groups__find_by_name(&machine->kmaps, MAP__FUNCTION, + m.name); + if (map) + goto out; + dso = machine__module_dso(machine, &m, filename); if (dso == NULL) goto out;