Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa5f0c96 authored by Martin KaFai Lau's avatar Martin KaFai Lau Committed by Daniel Borkmann
Browse files

bpf: Refactor ARRAY_SIZE macro to bpf_util.h 



This patch refactors the ARRAY_SIZE macro to bpf_util.h.

Signed-off-by: default avatarMartin KaFai Lau <kafai@fb.com>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 8217ca65

tools/testing/selftests/bpf/bpf_util.h

+4 −0
Original line number Diff line number Diff line
@@ -44,4 +44,8 @@ static inline unsigned int bpf_num_possible_cpus(void) 
		name[bpf_num_possible_cpus()]

#define bpf_percpu(name, cpu) name[(cpu)].v



#ifndef ARRAY_SIZE

# define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))

#endif



#endif /* __BPF_UTIL__ */

tools/testing/selftests/bpf/test_align.c

+1 −4
Original line number Diff line number Diff line
@@ -18,10 +18,7 @@ 


#include "../../../include/linux/filter.h"

#include "bpf_rlimit.h"



#ifndef ARRAY_SIZE

# define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))

#endif

#include "bpf_util.h"



#define MAX_INSNS	512

#define MAX_MATCHES	16

tools/testing/selftests/bpf/test_btf.c

+1 −4
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <bpf/btf.h>



#include "bpf_rlimit.h"

#include "bpf_util.h"



static uint32_t pass_cnt;

static uint32_t error_cnt;
@@ -93,10 +94,6 @@ static int __base_pr(const char *format, ...) 
#define MAX_NR_RAW_TYPES 1024

#define BTF_LOG_BUF_SIZE 65535



#ifndef ARRAY_SIZE

# define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))

#endif



static struct args {

	unsigned int raw_test_num;

	unsigned int file_test_num;

tools/testing/selftests/bpf/test_sock.c

+1 −4
Original line number Diff line number Diff line
@@ -14,10 +14,7 @@ 


#include "cgroup_helpers.h"

#include "bpf_rlimit.h"



#ifndef ARRAY_SIZE

# define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))

#endif

#include "bpf_util.h"



#define CG_PATH		"/foo"

#define MAX_INSNS	512

tools/testing/selftests/bpf/test_sock_addr.c

+1 −4
Original line number Diff line number Diff line
@@ -20,15 +20,12 @@ 


#include "cgroup_helpers.h"

#include "bpf_rlimit.h"

#include "bpf_util.h"



#ifndef ENOTSUPP

# define ENOTSUPP 524

#endif



#ifndef ARRAY_SIZE

# define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))

#endif



#define CG_PATH	"/foo"

#define CONNECT4_PROG_PATH	"./connect4_prog.o"

#define CONNECT6_PROG_PATH	"./connect6_prog.o"