Skip to content

Commit 67a4346

Browse files
solbjornanakryiko
authored andcommitted
bpftool: Define a local bpf_perf_link to fix accessing its fields
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. Fixes: cbdaf71 ("bpftool: Add bpf_cookie to link output") Suggested-by: Andrii Nakryiko <andrii@kernel.org> Signed-off-by: Alexander Lobakin <alobakin@pm.me> Signed-off-by: Quentin Monnet <quentin@isovalent.com> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/bpf/20230707095425.168126-3-quentin@isovalent.com
1 parent 4cbeeb0 commit 67a4346

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

tools/bpf/bpftool/skeleton/pid_iter.bpf.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ enum bpf_obj_type {
1515
BPF_OBJ_BTF,
1616
};
1717

18+
struct bpf_perf_link___local {
19+
struct bpf_link link;
20+
struct file *perf_file;
21+
} __attribute__((preserve_access_index));
22+
1823
struct perf_event___local {
1924
u64 bpf_cookie;
2025
} __attribute__((preserve_access_index));
@@ -45,10 +50,10 @@ static __always_inline __u32 get_obj_id(void *ent, enum bpf_obj_type type)
4550
/* could be used only with BPF_LINK_TYPE_PERF_EVENT links */
4651
static __u64 get_bpf_cookie(struct bpf_link *link)
4752
{
53+
struct bpf_perf_link___local *perf_link;
4854
struct perf_event___local *event;
49-
struct bpf_perf_link *perf_link;
5055

51-
perf_link = container_of(link, struct bpf_perf_link, link);
56+
perf_link = container_of(link, struct bpf_perf_link___local, link);
5257
event = BPF_CORE_READ(perf_link, perf_file, private_data);
5358
return BPF_CORE_READ(event, bpf_cookie);
5459
}

0 commit comments

Comments
 (0)