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

libbpf: Centralize poisoning and poison reallocarray() 



Most of libbpf source files already include libbpf_internal.h, so it's a good
place to centralize identifier poisoning. So move kernel integer type
poisoning there. And also add reallocarray to a poison list to prevent
accidental use of it. libbpf_reallocarray() should be used universally
instead.

Signed-off-by: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200819013607.3607269-4-andriin@fb.com
parent 7084566a

tools/lib/bpf/bpf.c

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

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

+0 −3
Original line number Diff line number Diff line
@@ -21,9 +21,6 @@ 
#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 0x7fffffffU

#define BTF_MAX_STR_OFFSET 0x7fffffffU

tools/lib/bpf/btf_dump.c

+0 −3
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ 
#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
@@ -15,6 +15,9 @@ 
/* make sure libbpf doesn't use kernel-only integer typedefs */

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



/* prevent accidental re-addition of reallocarray() */

#pragma GCC poison reallocarray



/* start with 4 buckets */

#define HASHMAP_MIN_CAP_BITS 2