bpftool: Fix skeletons compilation for older kernels
v2 cover bpftool: Fix skeletons compilation for older kernels
At runtime, bpftool may run its own BPF programs to get the pids of processes referencing BPF programs, or to profile programs. The skeletons for these programs rely on a vmlinux.h header and may fail to compile when building bpftool on hosts running older kernels, where some structs or enums are not defined. In this set, we address this issue by using local definitions for struct perf_event, struct bpf_perf_link, BPF_LINK_TYPE_PERF_EVENT (pids.bpf.c) and struct bpf_perf_event_value (profiler.bpf.c).
This set contains patches 1 to 3 from Alexander Lobakin's series, "bpf:
random unpopular userspace fixes (32 bit et al)" (v2) [0], from April 2022. An additional patch defines a local version of BPF_LINK_TYPE_PERF_EVENT in bpftool's pids.bpf.c.
[0] https://lore.kernel.org/bpf/[email protected]/
v2: Fixed description (CO-RE for container_of()) in patch 2.
Alexander Lobakin (3):
bpftool: use a local copy of perf_event to fix accessing ::bpf_cookie
bpftool: define a local bpf_perf_link to fix accessing its fields
bpftool: use a local bpf_perf_event_value to fix accessing its fields
Quentin Monnet (1):
bpftool: Use a local copy of BPF_LINK_TYPE_PERF_EVENT in
pid_iter.bpf.c
tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 26 +++++++++++++++++----- tools/bpf/bpftool/skeleton/profiler.bpf.c | 27 ++++++++++++++--------- 2 files changed, 38 insertions(+), 15 deletions(-)
Signature · 1 line
2.34.1
PATCH v2 1/4 bpftool: use a local copy of perf_event to fix accessing ::bpf_cookie
From: Alexander Lobakin <[email protected]>
When CONFIG_PERF_EVENTS is not set, struct perf_event remains empty. However, the structure is being used by bpftool indirectly via BTF. This leads to:
skeleton/pid_iter.bpf.c:49:30: error: no member named 'bpf_cookie' in 'struct perf_event'
return BPF_CORE_READ(event, bpf_cookie);
~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~...
skeleton/pid_iter.bpf.c:49:9: error: returning 'void' from a function with incompatible result type '__u64' (aka 'unsigned long long')
return BPF_CORE_READ(event, bpf_cookie);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Tools and samples can't use any CONFIG_ definitions, so the fields used there should always be present.
Define struct perf_event___local with the preserve_access_index attribute inside the pid_iter BPF prog to allow compiling on any configs. CO-RE will substitute it with the real struct perf_event accesses later on.
--- tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
tools/bpf/bpftool/skeleton/pid_iter.bpf.c +5 -1
@@ -15,6 +15,10 @@ enum bpf_obj_type { BPF_OBJ_BTF, }; +struct perf_event___local { +u64 bpf_cookie; +} __attribute__((preserve_access_index)); + extern const void bpf_link_fops __ksym; extern const void bpf_map_fops __ksym; extern const void bpf_prog_fops __ksym;
@@ -41,8 +45,8 @@ static __always_inline __u32 get_obj_id(void *ent, enum bpf_obj_type type)/* could be used only with BPF_LINK_TYPE_PERF_EVENT links */ static __u64 get_bpf_cookie (struct bpf_link *link) { +struct perf_event___local *event;struct bpf_perf_link *perf_link; -struct perf_event *event; perf_link = container_of(link, struct bpf_perf_link, link); event =BPF_CORE_READ (perf_link, perf_file, private_data);
Signature · 1 line
2.34.1
PATCH v2 2/4 bpftool: define a local bpf_perf_link to fix accessing its fields
In reply to Quentin MonnetFrom: Alexander Lobakin <[email protected]>
When building bpftool with !CONFIG_PERF_EVENTS:
skeleton/pid_iter.bpf.c:47:14: error: incomplete definition of type 'struct bpf_perf_link'
perf_link = container_of(link, struct bpf_perf_link, link);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/bpf/bpftool/bootstrap/libbpf/include/bpf/bpf_helpers.h:74:22: note: expanded from macro 'container_of'
((type *)(__mptr - offsetof(type, member))); \
^~~~~~~~~~~~~~~~~~~~~~
tools/bpf/bpftool/bootstrap/libbpf/include/bpf/bpf_helpers.h:68:60: note: expanded from macro 'offsetof'
#define offsetof(TYPE, MEMBER) ((unsigned long)&((TYPE *)0)->MEMBER)
~~~~~~~~~~~^
skeleton/pid_iter.bpf.c:44:9: note: forward declaration of 'struct bpf_perf_link'
struct bpf_perf_link *perf_link;
^&bpf_perf_link is being defined and used only under the ifdef. Define struct bpf_perf_link___local with the preserve_access_index attribute inside the pid_iter BPF prog to allow compiling on any configs. CO-RE will substitute it with the real struct bpf_perf_link accesses later on.container_of() uses offsetof(), which does the necessary CO-RE relocation if the field is specified with preserve_access_index - as is the case for struct bpf_perf_link___local.
--- tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
tools/bpf/bpftool/skeleton/pid_iter.bpf.c +7 -2
@@ -15,6 +15,11 @@ enum bpf_obj_type { BPF_OBJ_BTF, }; +struct bpf_perf_link___local { +struct bpf_link link; +struct file *perf_file; +} __attribute__((preserve_access_index)); +struct perf_event___local {u64 bpf_cookie; } __attribute__((preserve_access_index));
@@ -45,10 +50,10 @@ static __always_inline __u32 get_obj_id(void *ent, enum bpf_obj_type type)/* could be used only with BPF_LINK_TYPE_PERF_EVENT links */ static __u64 get_bpf_cookie (struct bpf_link *link) { +struct bpf_perf_link___local *perf_link;struct perf_event___local *event; -struct bpf_perf_link *perf_link; - perf_link = container_of(link, struct bpf_perf_link, link); + perf_link = container_of(link, struct bpf_perf_link___local, link); event =BPF_CORE_READ (perf_link, perf_file, private_data);return BPF_CORE_READ (event, bpf_cookie); }
Signature · 1 line
2.34.1
PATCH v2 3/4 bpftool: Use a local copy of BPF_LINK_TYPE_PERF_EVENT in pid_iter.bpf.c
In reply to Quentin MonnetIn order to allow the BPF program in bpftool's pid_iter.bpf.c to compile correctly on hosts where vmlinux.h does not define BPF_LINK_TYPE_PERF_EVENT (running kernel versions lower than 5.15, for example), define and use a local copy of the enum value. This requires LLVM 12 or newer to build the BPF program.
--- tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
tools/bpf/bpftool/skeleton/pid_iter.bpf.c +9 -2
@@ -24,6 +24,10 @@ struct perf_event___local {u64 bpf_cookie; } __attribute__((preserve_access_index)); +enum bpf_link_type___local { + BPF_LINK_TYPE_PERF_EVENT___local =7 , +}; + extern const void bpf_link_fops __ksym; extern const void bpf_map_fops __ksym; extern const void bpf_prog_fops __ksym;
@@ -93,10 +97,13 @@ int iter(struct bpf_iter__task_file *ctx) e.pid = task->tgid; e.id =get_obj_id (file->private_data, obj_type); -if (obj_type ==BPF_OBJ_LINK ) { +if (obj_type ==BPF_OBJ_LINK && + bpf_core_enum_value_exists(enum bpf_link_type___local, + BPF_LINK_TYPE_PERF_EVENT___local)) {struct bpf_link *link = (struct bpf_link *) file->private_data; -if (BPF_CORE_READ (link, type) ==BPF_LINK_TYPE_PERF_EVENT ) { + if (link->type == bpf_core_enum_value(enum bpf_link_type___local, + BPF_LINK_TYPE_PERF_EVENT___local)) { e.has_bpf_cookie = true; e.bpf_cookie =get_bpf_cookie (link); }
Signature · 1 line
2.34.1
PATCH v2 4/4 bpftool: use a local bpf_perf_event_value to fix accessing its fields
In reply to Quentin MonnetFrom: Alexander Lobakin <[email protected]>
Fix the following error when building bpftool:
CLANG profiler.bpf.o
CLANG pid_iter.bpf.oskeleton/profiler.bpf.c:18:21: error: invalid application of 'sizeof' to an incomplete type 'struct bpf_perf_event_value'
__uint(value_size, sizeof(struct bpf_perf_event_value));
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/bpf/bpftool/bootstrap/libbpf/include/bpf/bpf_helpers.h:13:39: note: expanded from macro '__uint'
tools/bpf/bpftool/bootstrap/libbpf/include/bpf/bpf_helper_defs.h:7:8: note: forward declaration of 'struct bpf_perf_event_value'
struct bpf_perf_event_value;
^struct bpf_perf_event_value is being used in the kernel only when CONFIG_BPF_EVENTS is enabled, so it misses a BTF entry then. Define struct bpf_perf_event_value___local with the preserve_access_index attribute inside the pid_iter BPF prog to allow compiling on any configs. It is a full mirror of a UAPI structure, so is compatible both with and w/o CO-RE. bpf_perf_event_read_value() requires a pointer of the original type, so a cast is needed.
--- tools/bpf/bpftool/skeleton/profiler.bpf.c | 27 ++++++++++++++--------- 1 file changed, 17 insertions(+), 10 deletions(-)
tools/bpf/bpftool/skeleton/profiler.bpf.c +17 -10
@@ -4,6 +4,12 @@#include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h> +struct bpf_perf_event_value___local { +__u64 counter; +__u64 enabled; +__u64 running; +} __attribute__((preserve_access_index)); +/* map of perf event fds, num_cpu * num_metric entries */ struct { __uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY);
@@ -15,14 +21,14 @@ struct {struct { __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY); __uint(key_size, sizeof(u32)); - __uint(value_size, sizeof(struct bpf_perf_event_value)); + __uint(value_size, sizeof(struct bpf_perf_event_value___local)); } fentry_readings SEC(".maps");/* accumulated readings */ struct { __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY); __uint(key_size, sizeof(u32)); - __uint(value_size, sizeof(struct bpf_perf_event_value)); + __uint(value_size, sizeof(struct bpf_perf_event_value___local)); } accum_readings SEC(".maps");/* sample counts, one per cpu */
@@ -39,7 +45,7 @@ const volatile __u32 num_metric = 1; SEC("fentry/XXX")int BPF_PROG (fentry_XXX ) { -struct bpf_perf_event_value *ptrs[MAX_NUM_MATRICS ]; +struct bpf_perf_event_value___local *ptrs[MAX_NUM_MATRICS ];u32 key =bpf_get_smp_processor_id ();u32 i;
@@ -53,10 +59,10 @@ int BPF_PROG(fentry_XXX) }for (i =0 ; i < num_metric && i <MAX_NUM_MATRICS ; i++) { -struct bpf_perf_event_value reading; +struct bpf_perf_event_value___local reading;int err; - err =bpf_perf_event_read_value (&events, key, &reading, + err =bpf_perf_event_read_value (&events, key, (void *)&reading,sizeof (reading));if (err)return 0 ;
@@ -68,14 +74,14 @@ int BPF_PROG(fentry_XXX) }static inline void -fexit_update_maps (u32 id,struct bpf_perf_event_value *after) +fexit_update_maps (u32 id,struct bpf_perf_event_value___local *after) { -struct bpf_perf_event_value *before, diff; +struct bpf_perf_event_value___local *before, diff; before =bpf_map_lookup_elem (&fentry_readings, &id);/* only account samples with a valid fentry_reading */ if (before && before->counter) { -struct bpf_perf_event_value *accum; +struct bpf_perf_event_value___local *accum; diff.counter = after->counter - before->counter; diff.enabled = after->enabled - before->enabled;
@@ -93,7 +99,7 @@ fexit_update_maps(u32 id, struct bpf_perf_event_value *after) SEC("fexit/XXX")int BPF_PROG (fexit_XXX ) { -struct bpf_perf_event_value readings[MAX_NUM_MATRICS ]; +struct bpf_perf_event_value___local readings[MAX_NUM_MATRICS ];u32 cpu =bpf_get_smp_processor_id ();u32 i, zero =0 ;int err;
@@ -102,7 +108,8 @@ int BPF_PROG(fexit_XXX)/* read all events before updating the maps, to reduce error */ for (i =0 ; i < num_metric && i <MAX_NUM_MATRICS ; i++) { err =bpf_perf_event_read_value (&events, cpu + i * num_cpu, - readings + i,sizeof (*readings)); + (void *)(readings + i), +sizeof (*readings));if (err)return 0 ; }
Signature · 1 line
2.34.1
This series was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Quoted 10 lines · On Fri, 7 Jul 2023 10:54:21 +0100 you wrote:
At runtime, bpftool may run its own BPF programs to get the pids of processes referencing BPF programs, or to profile programs. The skeletons for these programs rely on a
vmlinux.hheader and may fail to compile when building bpftool on hosts running older kernels, where some structs or enums are not defined. In this set, we address this issue by using local definitions for structperf_event, structbpf_perf_link,BPF_LINK_TYPE_PERF_EVENT(pids.bpf.c) and structbpf_perf_event_value(profiler.bpf.c).[...]
Here is the summary with links:
- [bpf-next,v2,1/4] bpftool: use a local copy of perf_event to fix accessing ::bpf_cookie
https://git.kernel.org/bpf/bpf-next/c/4cbeeb0dc02f - [bpf-next,v2,2/4] bpftool: define a local bpf_perf_link to fix accessing its fields https://git.kernel.org/bpf/bpf-next/c/67a43462ee24 - [bpf-next,v2,3/4] bpftool: Use a local copy of BPF_LINK_TYPE_PERF_EVENT in pid_iter.bpf.c https://git.kernel.org/bpf/bpf-next/c/44ba7b30e84f - [bpf-next,v2,4/4] bpftool: use a local bpf_perf_event_value to fix accessing its fields https://git.kernel.org/bpf/bpf-next/c/658ac0680131
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html