Commit 1d1a3bcf authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

libbpf: Poison kernel-only integer types 



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: 590a0088 ("bpf: libbpf: Add STRUCT_OPS support")
Signed-off-by: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/20200110181916.271446-1-andriin@fb.com
parent 7a2d070f

tools/lib/bpf/bpf.c

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ 
#include "libbpf.h"

#include "libbpf_internal.h"



/* make sure libbpf doesn't use kernel-only integer typedefs */

#pragma GCC poison u8 u16 u32 u64 s8 s16 s32 s64



/*

 * When building perf, unistd.h is overridden. __NR_bpf is

 * required to be defined explicitly.

tools/lib/bpf/bpf_prog_linfo.c

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ 
#include "libbpf.h"

#include "libbpf_internal.h"



/* make sure libbpf doesn't use kernel-only integer typedefs */

#pragma GCC poison u8 u16 u32 u64 s8 s16 s32 s64



struct bpf_prog_linfo {

	void *raw_linfo;

	void *raw_jited_linfo;

tools/lib/bpf/btf.c

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,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



#define BTF_MAX_NR_TYPES 0x7fffffff

#define BTF_MAX_STR_OFFSET 0x7fffffff

tools/lib/bpf/btf_dump.c

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ 
#include "libbpf.h"

#include "libbpf_internal.h"



/* make sure libbpf doesn't use kernel-only integer typedefs */

#pragma GCC poison u8 u16 u32 u64 s8 s16 s32 s64



static const char PREFIXES[] = "\t\t\t\t\t\t\t\t\t\t\t\t\t";

static const size_t PREFIX_CNT = sizeof(PREFIXES) - 1;

tools/lib/bpf/hashmap.c

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ 
#include <linux/err.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



/* start with 4 buckets */

#define HASHMAP_MIN_CAP_BITS 2

CRA Git | Maintained and supported by SUSTech CRA and CCSE