From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de>
Cc: Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Clark Williams <williams@redhat.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
Thadeu Lima de Souza Cascardo <cascardo@canonical.com>,
Song Liu <songliubraving@fb.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 03/11] perf annotate: Fix build on 32 bit for BPF annotation
Date: Thu, 2 May 2019 20:25:25 -0400 [thread overview]
Message-ID: <20190503002533.29359-4-acme@kernel.org> (raw)
In-Reply-To: <20190503002533.29359-1-acme@kernel.org>
From: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Commit 6987561c9e86 ("perf annotate: Enable annotation of BPF programs") adds
support for BPF programs annotations but the new code does not build on 32-bit.
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Acked-by: Song Liu <songliubraving@fb.com>
Fixes: 6987561c9e86 ("perf annotate: Enable annotation of BPF programs")
Link: http://lkml.kernel.org/r/20190403194452.10845-1-cascardo@canonical.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/annotate.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index c8b01176c9e1..09762985c713 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1714,8 +1714,8 @@ static int symbol__disassemble_bpf(struct symbol *sym,
if (dso->binary_type != DSO_BINARY_TYPE__BPF_PROG_INFO)
return -1;
- pr_debug("%s: handling sym %s addr %lx len %lx\n", __func__,
- sym->name, sym->start, sym->end - sym->start);
+ pr_debug("%s: handling sym %s addr %" PRIx64 " len %" PRIx64 "\n", __func__,
+ sym->name, sym->start, sym->end - sym->start);
memset(tpath, 0, sizeof(tpath));
perf_exe(tpath, sizeof(tpath));
@@ -1740,7 +1740,7 @@ static int symbol__disassemble_bpf(struct symbol *sym,
info_linear = info_node->info_linear;
sub_id = dso->bpf_prog.sub_id;
- info.buffer = (void *)(info_linear->info.jited_prog_insns);
+ info.buffer = (void *)(uintptr_t)(info_linear->info.jited_prog_insns);
info.buffer_length = info_linear->info.jited_prog_len;
if (info_linear->info.nr_line_info)
@@ -1776,7 +1776,7 @@ static int symbol__disassemble_bpf(struct symbol *sym,
const char *srcline;
u64 addr;
- addr = pc + ((u64 *)(info_linear->info.jited_ksyms))[sub_id];
+ addr = pc + ((u64 *)(uintptr_t)(info_linear->info.jited_ksyms))[sub_id];
count = disassemble(pc, &info);
if (prog_linfo)
--
2.20.1
next prev parent reply other threads:[~2019-05-03 0:25 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-03 0:25 [GIT PULL 00/11] perf/urgent fixes Arnaldo Carvalho de Melo
2019-05-03 0:25 ` [PATCH 01/11] perf bpf: Return value with unlocking in perf_env__find_btf() Arnaldo Carvalho de Melo
2019-05-03 0:25 ` [PATCH 02/11] tools uapi x86: Sync vmx.h with the kernel Arnaldo Carvalho de Melo
2019-05-03 0:25 ` Arnaldo Carvalho de Melo [this message]
2019-05-03 0:25 ` [PATCH 04/11] tools lib traceevent: Change tag string for error Arnaldo Carvalho de Melo
2019-05-03 0:25 ` [PATCH 05/11] perf bench numa: Add define for RUSAGE_THREAD if not present Arnaldo Carvalho de Melo
2019-05-03 0:25 ` [PATCH 06/11] perf report: Report OOM in status line in the GTK UI Arnaldo Carvalho de Melo
2019-05-03 0:25 ` [PATCH 07/11] perf cs-etm: Don't check cs_etm_queue::prev_packet validity Arnaldo Carvalho de Melo
2019-05-03 0:25 ` [PATCH 08/11] perf cs-etm: Always allocate memory for cs_etm_queue::prev_packet Arnaldo Carvalho de Melo
2019-05-03 0:25 ` [PATCH 09/11] tools build: Add -ldl to the disassembler-four-args feature test Arnaldo Carvalho de Melo
2019-05-03 0:25 ` [PATCH 10/11] tools arch uapi: Copy missing unistd.h headers for arc, hexagon and riscv Arnaldo Carvalho de Melo
2019-05-03 0:25 ` [PATCH 11/11] perf tools: Remove needless asm/unistd.h include fixing build in some places Arnaldo Carvalho de Melo
2019-05-03 5:49 ` [GIT PULL 00/11] perf/urgent fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190503002533.29359-4-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=cascardo@canonical.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=songliubraving@fb.com \
--cc=tglx@linutronix.de \
--cc=williams@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).