From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756503AbbCFLO4 (ORCPT ); Fri, 6 Mar 2015 06:14:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59947 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752858AbbCFLOx (ORCPT ); Fri, 6 Mar 2015 06:14:53 -0500 From: Jiri Olsa To: linux-kernel@vger.kernel.org Cc: Jiri Olsa , Adrian Hunter , Arnaldo Carvalho de Melo , Corey Ashford , David Ahern , Frederic Weisbecker , Ingo Molnar , Namhyung Kim , Paul Mackerras , Peter Zijlstra , Stephane Eranian Subject: [PATCH 13/14] perf tools: Try to lookup kernel module map before creating one Date: Fri, 6 Mar 2015 12:14:01 +0100 Message-Id: <1425640442-16048-14-git-send-email-jolsa@kernel.org> In-Reply-To: <1425640442-16048-1-git-send-email-jolsa@kernel.org> References: <1425640442-16048-1-git-send-email-jolsa@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: Arnaldo Carvalho de Melo Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian --- 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 1de5438ad070..e3353307330c 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; -- 1.9.3