From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6F18C10F09 for ; Fri, 8 Mar 2019 14:39:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3EDA820868 for ; Fri, 8 Mar 2019 14:39:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WhYTVLS9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726787AbfCHOjc (ORCPT ); Fri, 8 Mar 2019 09:39:32 -0500 Received: from mail-qk1-f193.google.com ([209.85.222.193]:33025 "EHLO mail-qk1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726508AbfCHOjc (ORCPT ); Fri, 8 Mar 2019 09:39:32 -0500 Received: by mail-qk1-f193.google.com with SMTP id x9so11292573qkf.0 for ; Fri, 08 Mar 2019 06:39:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=i1POeuV6FZITxTAGW4IZUlBNpnMfWOtIF6lLlEeC7iQ=; b=WhYTVLS9tgDlKkI7D5y8082vIJE6RYRtjN3/f0JqKdX1lvdITF5Bn3nVztg1PS5roZ accCjnjjdbXJM2eJQXXadiRLliuMJpL9zIlGidCcxMHjeox6vZsbX/bpmkUYiPAx9Ucv tajnRlKAwyP0Iz9CO7/hdGJJ3HUCykTZ3FdNBvwsn0y2pMKpw7hmrcKbC/MCSmUVD9eR +WaY1pz/mLQMXIgpnO0MFPODrgb3kTjZ3huNXPQfY24GgPLPbKnwmFp6f2iYMn4/p5Ss ombTxsVteY/Y9bA1COutSQrqtoXwxvtdg3VJHHuCz1DjHzTK+q5YfkrFfdbwD0HgOWUq G6iA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=i1POeuV6FZITxTAGW4IZUlBNpnMfWOtIF6lLlEeC7iQ=; b=LnQgEuTKyFm9MkN/yGv+jGJoxX7vvZh3ixqHX68TzDp1NukMVWr9w54rTBeNUBOH9M wsmXDgwnAs6ePSBfj0aaKt0tsCeJZtt4QkFi5V4BFr5bKzpsZdUbEumgwWSlIIeG8pI6 sNGKoFodlEJLwkAYgBUsLcEVi98SUIGnG+TVbA4ydCx0zc72HoXWB0ZEv9ESMbmDSs71 fWMgk2aWEG0KJbuYpshnWGj7FzFEaC3rV9zd/5arPA5+nGJ2OVK7wX3q44iuUmIOQCvQ s4lFxf+96LxZTh2aAyBE19tzYift3LuH5uwJ25psM4rWiMzU6FhMW7aQh5MRzZSZgf5s t/2Q== X-Gm-Message-State: APjAAAUUVdFYVincf7ebRD7YecK7juTi9/UmgbHc0OHcBcGJZarCIWaf qMHasKuuG3WnB8Rwq0xwhm8= X-Google-Smtp-Source: APXvYqwOfrHkJ6vstvr+Fmt03DIgMTb8FF8ztmFySTz1WPIWhwJ8fApSyxQqi4dJY8BHbStwpeYWgg== X-Received: by 2002:a05:620a:124c:: with SMTP id a12mr14264212qkl.103.1552055970991; Fri, 08 Mar 2019 06:39:30 -0800 (PST) Received: from quaco.ghostprotocols.net (177-59-154-188.3g.claro.net.br. [177.59.154.188]) by smtp.gmail.com with ESMTPSA id p64sm4128318qkc.62.2019.03.08.06.39.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Mar 2019 06:39:30 -0800 (PST) From: Arnaldo Carvalho de Melo X-Google-Original-From: Arnaldo Carvalho de Melo Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id A29E94039C; Fri, 8 Mar 2019 11:39:26 -0300 (-03) Date: Fri, 8 Mar 2019 11:39:26 -0300 To: Adrian Hunter , Masami Hiramatsu Cc: Joseph Qi , Arnaldo Carvalho de Melo , Alexander Shishkin , Greg KH , "linux-kernel@vger.kernel.org" , luto@kernel.org, Jiufei Xue , Xu Yu , peterz@infradead.org, mingo@redhat.com Subject: Re: [PATCH] perf probe: Fix getting the kernel map Message-ID: <20190308143926.GB19877@kernel.org> References: <1a4240a8-288b-45d0-073d-d5cb8f0c63eb@linux.alibaba.com> <20190226090505.GA24409@kroah.com> <20190226130802.GA10343@kroah.com> <20190226142009.GC26786@kernel.org> <3b233ff2-e87a-1c61-d516-6c4cdecb4f01@intel.com> <8e798942-0e71-c88f-866f-88e55177e286@linux.alibaba.com> <2ed432de-e904-85d2-5c36-5897ddc5b23b@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2ed432de-e904-85d2-5c36-5897ddc5b23b@intel.com> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Mon, Mar 04, 2019 at 03:13:21PM +0200, Adrian Hunter escreveu: > Since commit 4d99e4136580 ("perf machine: Workaround missing maps for x86 > PTI entry trampolines"), perf tools has been creating more than one kernel > map, however 'perf probe' assumed there could be only one. > > Fix by using machine__kernel_map() to get the main kernel map. Masami, can I get your Acked-by? - Arnaldo > Signed-off-by: Adrian Hunter > Fixes: 4d99e4136580 ("perf machine: Workaround missing maps for x86 PTI entry trampolines") > Fixes: d83212d5dd67 ("kallsyms, x86: Export addresses of PTI entry trampolines") > Tested-by: Joseph Qi > Cc: stable@vger.kernel.org > --- > tools/perf/util/probe-event.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c > index e86f8be89157..6cd96f9b346d 100644 > --- a/tools/perf/util/probe-event.c > +++ b/tools/perf/util/probe-event.c > @@ -157,8 +157,10 @@ static struct map *kernel_get_module_map(const char *module) > if (module && strchr(module, '/')) > return dso__new_map(module); > > - if (!module) > - module = "kernel"; > + if (!module) { > + pos = machine__kernel_map(host_machine); > + return map__get(pos); > + } > > for (pos = maps__first(maps); pos; pos = map__next(pos)) { > /* short_name is "[module]" */ > -- > 2.19.1 -- - Arnaldo