Commit a1297871 authored by Jiri Olsa's avatar Jiri Olsa Committed by Andrii Nakryiko
Browse files

selftests/bpf: Move ARRAY_SIZE to bpf_misc.h 



ARRAY_SIZE is used on multiple places, move its definition in
bpf_misc.h header.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Reviewed-by: default avatarAlan Maguire <alan.maguire@oracle.com>
Link: https://lore.kernel.org/bpf/20240626134719.3893748-1-jolsa@kernel.org
parent 0f31c2c6

tools/testing/selftests/bpf/progs/bpf_misc.h

+4 −0
Original line number Diff line number Diff line
@@ -140,4 +140,8 @@ 
/* make it look to compiler like value is read and written */

#define __sink(expr) asm volatile("" : "+g"(expr))



#ifndef ARRAY_SIZE

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

#endif



#endif

tools/testing/selftests/bpf/progs/iters.c

+0 −2
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 
#include "bpf_misc.h"

#include "bpf_compiler.h"



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



static volatile int zero = 0;



int my_pid;

tools/testing/selftests/bpf/progs/kprobe_multi_session.c

+1 −2
Original line number Diff line number Diff line
@@ -4,8 +4,7 @@ 
#include <bpf/bpf_tracing.h>

#include <stdbool.h>

#include "bpf_kfuncs.h"



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

#include "bpf_misc.h"



char _license[] SEC("license") = "GPL";

tools/testing/selftests/bpf/progs/linked_list.c

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

#include <bpf/bpf_core_read.h>

#include "bpf_experimental.h"



#ifndef ARRAY_SIZE

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

#endif

#include "bpf_misc.h"



#include "linked_list.h"

tools/testing/selftests/bpf/progs/netif_receive_skb.c

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

#include <bpf/bpf_tracing.h>

#include <bpf/bpf_core_read.h>

#include "bpf_misc.h"



#include <errno.h>
@@ -23,10 +24,6 @@ bool skip = false; 
#define BADPTR			0

#endif



#ifndef ARRAY_SIZE

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

#endif



struct {

	__uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);

	__uint(max_entries, 1);