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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT 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 AC6FFC04AB3 for ; Mon, 27 May 2019 22:40:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7A99E20859 for ; Mon, 27 May 2019 22:40:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558996844; bh=nDO/XqECbiXtktOst8juycy2+vQdGLrUs6S9KlbjNBA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=x7kzT903UZ3Jxncy4nfGSgxNsjbDe4Y+dduvyFy+3SOr5wKr3y2aotC7a3Qx6Bs/v dhYL4RcujWO5zQ4qZpI7WTFJpflMYfR8EKb3Lkgbr8UfVbeX78xSA6y/gvHlvyY4JT nCBv8Xhmpx41wTXCMjbP5SULlpSQ90axwH4bKCQ8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727696AbfE0Wkn (ORCPT ); Mon, 27 May 2019 18:40:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:46466 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727257AbfE0Wkl (ORCPT ); Mon, 27 May 2019 18:40:41 -0400 Received: from quaco.ghostprotocols.net (179-240-171-7.3g.claro.net.br [179.240.171.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C5E2721473; Mon, 27 May 2019 22:40:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558996841; bh=nDO/XqECbiXtktOst8juycy2+vQdGLrUs6S9KlbjNBA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hmWs0xRQKqjKc+DyiOOsnxrPJEJ0x6kY0G2PM5cGGzFvmLoPKmTN7rIPhSrnwU5wt +Vslhg9OYTQSkOMI/WkvORzrJUGRVmf8LFR3BpDVB8jUokHPShZSxCIvelh1PsFf5Q HslYQy8qIyEx1Olb0L/OAl7ZtMA5wBJT32dlm1Vo= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Song Liu , Adrian Hunter , Alexander Shishkin , Andi Kleen , Peter Zijlstra , Stanislav Fomichev , Arnaldo Carvalho de Melo Subject: [PATCH 36/44] perf machine: Keep zero in pgoff BPF map Date: Mon, 27 May 2019 19:37:22 -0300 Message-Id: <20190527223730.11474-37-acme@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190527223730.11474-1-acme@kernel.org> References: <20190527223730.11474-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiri Olsa With pgoff set to zero, the map__map_ip function will return BPF addresses based from 0, which is what we need when we read the data from a BPF DSO. Adding BPF symbols with mapped IP addresses as well. Signed-off-by: Jiri Olsa Acked-by: Song Liu Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Andi Kleen Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stanislav Fomichev Link: http://lkml.kernel.org/r/20190508132010.14512-7-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/machine.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index dc7aafe45a2b..f5569f005cf3 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -704,12 +704,12 @@ static int machine__process_ksymbol_register(struct machine *machine, return -ENOMEM; map->start = event->ksymbol_event.addr; - map->pgoff = map->start; map->end = map->start + event->ksymbol_event.len; map_groups__insert(&machine->kmaps, map); } - sym = symbol__new(event->ksymbol_event.addr, event->ksymbol_event.len, + sym = symbol__new(map->map_ip(map, map->start), + event->ksymbol_event.len, 0, 0, event->ksymbol_event.name); if (!sym) return -ENOMEM; -- 2.20.1