perf tools: Convert legacy map definition to BTF-defined
Subsystems (2)
Jiri Olsa
reviewerPATCH v2 1/1 perf tools: Convert legacy map definition to BTF-defined
The libbpf is switching off support for legacy map definitions [1], which will break the perf llvm tests.
Moving the base source map definition to BTF-defined, so we need to use -g compile option for to add debug/BTF info.
[1] https://lore.kernel.org/bpf/[email protected]/
--- tools/perf/tests/bpf-script-example.c | 35 ++++++++++++++++++--------- tools/perf/util/llvm-utils.c | 2 +- 2 files changed, 24 insertions(+), 13 deletions(-)
v2 changes:
- added comments to macros [Ian]
- removed struct bpf_map_def, it's no longer needed
tools/perf/tests/bpf-script-example.c +23 -12
@@ -17,20 +17,31 @@ static void *(*bpf_map_lookup_elem)(void *map, void *key) =static void *(*bpf_map_update_elem)(void *map,void *key,void *value,int flags) = (void *) BPF_FUNC_map_update_elem; -struct bpf_map_def { -unsigned int type; -unsigned int key_size; -unsigned int value_size; -unsigned int max_entries; -}; +/* +* Following macros are taken from tools/lib/bpf/bpf_helpers.h, +* and are used to create BTF defined maps. It is easier to take +* 2 simple macros, than being able to include above header in +* runtime. +* +* __uint - defines integer attribute of BTF map definition, +* Such attributes are represented using a pointer to an array, +* in which dimensionality of array encodes specified integer +* value. +* +* __type - defines pointer variable with typeof(val) type for +* attributes like key or value, which will be defined by the +* size of the type. +*/ +#define __uint (name, val) int (*name)[val] +#define __type (name, val) typeof(val) *name#define SEC (NAME ) __attribute__((section(NAME), used)) -struct bpf_map_def SEC("maps") flip_table = { - .type = BPF_MAP_TYPE_ARRAY, - .key_size = sizeof(int), - .value_size = sizeof(int), - .max_entries = 1, -}; +struct { + __uint(type, BPF_MAP_TYPE_ARRAY); + __uint(max_entries, 1); + __type(key, int); + __type(value, int); +} flip_table SEC(".maps"); SEC("func=do_epoll_wait")int bpf_func__SyS_epoll_pwait (void *ctx)
tools/perf/util/llvm-utils.c +1 -1
@@ -25,7 +25,7 @@"$CLANG_OPTIONS $PERF_BPF_INC_OPTIONS $KERNEL_INC_OPTIONS " \"-Wno-unused-value -Wno-pointer-sign " \"-working-directory $WORKING_DIR " \ -"-c \"$CLANG_SOURCE\" -target bpf $CLANG_EMIT_LLVM -O2 -o - $LLVM_OPTIONS_PIPE" +"-c \"$CLANG_SOURCE\" -target bpf $CLANG_EMIT_LLVM -g -O2 -o - $LLVM_OPTIONS_PIPE" struct llvm_param llvm_param = { .clang_path = "clang",
Signature · 1 line
2.35.3
Quoted 10 lines · Jiri Olsa
The libbpf is switching off support for legacy map definitions [1], which will break the perf llvm tests.
Moving the base source map definition to BTF-defined, so we need to use -g compile option for to add debug/BTF info.
[1] https://lore.kernel.org/bpf/[email protected]/
Signed-off-by Jiri Olsa <[email protected]>---
LGTM. Thanks for taking care of this!
Quoted 4 lines
tools/perf/tests/bpf-script-example.c | 35 ++++++++++++++++++--------- tools/perf/util/llvm-utils.c | 2 +- 2 files changed, 24 insertions(+), 13 deletions(-)
[...]
Em Tue, Jul 05, 2022 at 10:08:16PM -0700, Andrii Nakryiko escreveu:
Quoted 8 lines · Jiri Olsa
Quoted 7 lines
The libbpf is switching off support for legacy map definitions [1], which will break the perf llvm tests.
Moving the base source map definition to BTF-defined, so we need to use -g compile option for to add debug/BTF info.
Quoted 7 lines
Quoted 3 lines
[1] https://lore.kernel.org/bpf/[email protected]/
Signed-off-by Jiri Olsa <[email protected]>---
LGTM. Thanks for taking care of this!
Acked-by Andrii Nakryiko <[email protected]>
Thanks, applied.
- Arnaldo
Quoted 6 lines
Quoted 4 lines
tools/perf/tests/bpf-script-example.c | 35 ++++++++++++++++++--------- tools/perf/util/llvm-utils.c | 2 +- 2 files changed, 24 insertions(+), 13 deletions(-)[...]
Signature · 1 line
- Arnaldo