xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libbpf: Poison kernel-only integer types

Browse Source 
It's been a recurring issue with types like u32 slipping into libbpf source
code accidentally. This is not detected during builds inside kernel source
tree, but becomes a compilation error in libbpf's Github repo. Libbpf is
supposed to use only __{s,u}{8,16,32,64} typedefs, so poison {s,u}{8,16,32,64}
explicitly in every .c file. Doing that in a bit more centralized way, e.g.,
inside libbpf_internal.h breaks selftests, which are both using kernel u32 and
libbpf_internal.h.

This patch also fixes a new u32 occurence in libbpf.c, added recently.

Fixes: 590a008882 ("bpf: libbpf: Add STRUCT_OPS support")
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/20200110181916.271446-1-andriin@fb.com
This commit is contained in:
Andrii Nakryiko
2020-01-10 10:19:16 -08:00
committed by Alexei Starovoitov
parent 7a2d070f91
commit 1d1a3bcffe
12 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/lib/bpf/libbpf.c
View File

@@ -55,6 +55,9 @@
#include "libbpf_internal.h"
#include "hashmap.h"
/* make sure libbpf doesn't use kernel-only integer typedefs */
#pragma GCC poison u8 u16 u32 u64 s8 s16 s32 s64
#ifndef EM_BPF
#define EM_BPF 247
#endif
@@ -6475,7 +6478,7 @@ static int bpf_object__collect_struct_ops_map_reloc(struct bpf_object *obj,
Elf_Data *symbols;
unsigned int moff;
const char *name;
u32 member_idx;
__u32 member_idx;
GElf_Sym sym;
GElf_Rel rel;
int i, nrels;