Commit 7c60f6e4 authored by Paul Chaignon's avatar Paul Chaignon Committed by Daniel Borkmann
Browse files

selftests/bpf: Move macros to bpf_misc.h 



Move the sizeof_field and offsetofend macros from individual test files
to the common bpf_misc.h to avoid duplication.

Signed-off-by: default avatarPaul Chaignon <paul.chaignon@gmail.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarEduard Zingerman <eddyz87@gmail.com>
Acked-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/97a3f3788bd3aec309100bc073a5c77130e371fd.1758094761.git.paul.chaignon@gmail.com
parent 6fabca2f

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

+4 −0
Original line number Diff line number Diff line
@@ -167,6 +167,10 @@ 
#define __imm_ptr(name) [name]"r"(&name)

#define __imm_insn(name, expr) [name]"i"(*(long *)&(expr))



#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER))

#define offsetofend(TYPE, MEMBER) \

	(offsetof(TYPE, MEMBER) + sizeof_field(TYPE, MEMBER))



/* Magic constants used with __retval() */

#define POINTER_VALUE	0xbadcafe

#define TEST_DATA_LEN	64

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

+1 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 


#include "bpf_compiler.h"

#include "test_cls_redirect.h"

#include "bpf_misc.h"



#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
@@ -31,9 +32,6 @@ 
#define INLINING __always_inline

#endif



#define offsetofend(TYPE, MEMBER) \

	(offsetof(TYPE, MEMBER) + sizeof((((TYPE *)0)->MEMBER)))



#define IP_OFFSET_MASK (0x1FFF)

#define IP_MF (0x2000)

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

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

#define BPF_PROG_TEST_TCP_HDR_OPTIONS

#include "test_tcp_hdr_options.h"



#ifndef sizeof_field

#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER))

#endif

#include "bpf_misc.h"



__u8 test_kind = TCPOPT_EXP;

__u16 test_magic = 0xeB9F;

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

+0 −2
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ 
#include <bpf/bpf_helpers.h>

#include "bpf_misc.h"



#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER))



SEC("tc")

__description("context stores via BPF_ATOMIC")

__failure __msg("BPF_ATOMIC stores into R1 ctx is not allowed")

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

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

#include "bpf_misc.h"



#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER))

#define offsetofend(TYPE, MEMBER) \

	(offsetof(TYPE, MEMBER)	+ sizeof_field(TYPE, MEMBER))



struct {

	__uint(type, BPF_MAP_TYPE_REUSEPORT_SOCKARRAY);

	__uint(max_entries, 1);