perf annotate: Fix build on 32 bit for BPF annotation
PATCH 1/1 perf annotate: Fix build on 32 bit for BPF annotation
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.
--- tools/perf/util/annotate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/perf/util/annotate.c +4 -4
@@ -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)
Signature · 1 line
2.20.1
Quoted 9 lines · Thadeu Lima de Souza Cascardo
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.Fixes 6987561c9e86 ("perf annotate: Enable annotation of BPF programs")Signed-off-by Thadeu Lima de Souza Cascardo <[email protected]>
Thanks for the fix!
Song
Quoted 40 lines
---
tools/perf/util/annotate.c| 8 ++++----1 file changed, 4 insertions(+), 4 deletions(-)tools/perf/util/annotate.c +4
-4@@ -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)Signature · 1 line
2.20.1
PING: Re: [PATCH] perf annotate: Fix build on 32 bit for BPF annotation
Quoted 7 lines · Song Liu
Quoted 7 lines · Thadeu Lima de Souza Cascardo
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.
Quoted 8 lines
Quoted 2 lines
Fixes 6987561c9e86 ("perf annotate: Enable annotation of BPF programs")Signed-off-by Thadeu Lima de Souza Cascardo <[email protected]>Acked-by Song Liu <[email protected]>Thanks for the fix!
Song
Thanks for the ack.
Pinging for getting this applied, as this is a build failure on i386.
Thanks.
Cascardo.
Quoted 41 lines
Quoted 40 lines
---
tools/perf/util/annotate.c| 8 ++++----1 file changed, 4 insertions(+), 4 deletions(-)tools/perf/util/annotate.c +4
-4@@ -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)Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
AppliedRe: PING: Re: [PATCH] perf annotate: Fix build on 32 bit for BPF annotation
Em Tue, Apr 23, 2019 at 11:58:48AM -0300, Thadeu Lima de Souza Cascardo escreveu:
Quoted 13 lines · Song Liu
Quoted 12 lines
Quoted 9 lines · Thadeu Lima de Souza Cascardo
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.Fixes 6987561c9e86 ("perf annotate: Enable annotation of BPF programs")Signed-off-by Thadeu Lima de Souza Cascardo <[email protected]>Acked-by Song Liu <[email protected]>
Quoted 7 lines
Quoted 3 lines
Thanks for the fix!
SongThanks for the ack.
Pinging for getting this applied, as this is a build failure on i386.
Thanks, applied to perf/urgent.
- Arnaldo
perf annotate: Fix build on 32 bit for BPF annotation
Commit-ID: 01e985e900d3e602e9b1a55372a8e5274012a417 Gitweb: https://git.kernel.org/tip/01e985e900d3e602e9b1a55372a8e5274012a417 Author: Thadeu Lima de Souza Cascardo <[email protected]> AuthorDate: Wed, 3 Apr 2019 16:44:52 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 2 May 2019 16:00:19 -0400
perf annotate: Fix build on 32 bit for BPF annotation
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.
--- tools/perf/util/annotate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/perf/util/annotate.c +4 -4
@@ -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)