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

Commit 3f306588 authored by Stanislav Fomichev's avatar Stanislav Fomichev Committed by Alexei Starovoitov
Browse files

selftests: bpf: break up test_progs - preparations 



Add new prog_tests directory where tests are supposed to land.
Each prog_tests/<filename>.c is expected to have a global function
with signature 'void test_<filename>(void)'. Makefile automatically
generates prog_tests/tests.h file with entry for each prog_tests file:

	#ifdef DECLARE
	extern void test_<filename>(void);
	...
	#endif

	#ifdef CALL
	test_<filename>();
	...
	#endif

prog_tests/tests.h is included in test_progs.c in two places with
appropriate defines. This scheme allows us to move each function with
a separate patch without breaking anything.

Compared to the recent verifier split, each separate file here is
a compilation unit and test_progs.[ch] is now used as a place to put
some common routines that might be used by multiple tests.

Signed-off-by: default avatarStanislav Fomichev <sdf@google.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 0d7f6827

tools/testing/selftests/bpf/Makefile

+25 −2
Original line number Diff line number Diff line
@@ -165,7 +165,11 @@ $(ALU32_BUILD_DIR)/urandom_read: $(OUTPUT)/urandom_read 
$(ALU32_BUILD_DIR)/test_progs_32: test_progs.c $(ALU32_BUILD_DIR) \

						$(ALU32_BUILD_DIR)/urandom_read

	$(CC) $(CFLAGS) -o $(ALU32_BUILD_DIR)/test_progs_32 $< \

		trace_helpers.c $(OUTPUT)/libbpf.a $(LDLIBS)

		trace_helpers.c prog_tests/*.c $(OUTPUT)/libbpf.a $(LDLIBS)



$(ALU32_BUILD_DIR)/test_progs_32: $(PROG_TESTS_H)

$(ALU32_BUILD_DIR)/test_progs_32: CFLAGS += -I$(OUTPUT)

$(ALU32_BUILD_DIR)/test_progs_32: prog_tests/*.c



$(ALU32_BUILD_DIR)/%.o: progs/%.c $(ALU32_BUILD_DIR) \

					$(ALU32_BUILD_DIR)/test_progs_32
@@ -196,6 +200,25 @@ ifeq ($(DWARF2BTF),y) 
	$(BTF_PAHOLE) -J $@

endif



PROG_TESTS_H := $(OUTPUT)/prog_tests/tests.h

$(OUTPUT)/test_progs: $(PROG_TESTS_H)

$(OUTPUT)/test_progs: CFLAGS += -I$(OUTPUT)

$(OUTPUT)/test_progs: prog_tests/*.c



PROG_TESTS_FILES := $(wildcard prog_tests/*.c)

$(PROG_TESTS_H): $(PROG_TESTS_FILES)

	$(shell ( cd prog_tests/

		  echo '/* Generated header, do not edit */'; \

		  echo '#ifdef DECLARE'; \

		  ls *.c 2> /dev/null | \

			sed -e 's@\([^\.]*\)\.c@extern void test_\1(void);@'; \

		  echo '#endif'; \

		  echo '#ifdef CALL'; \

		  ls *.c 2> /dev/null | \

			sed -e 's@\([^\.]*\)\.c@test_\1();@'; \

		  echo '#endif' \

		 ) > $(PROG_TESTS_H))



VERIFIER_TESTS_H := $(OUTPUT)/verifier/tests.h

$(OUTPUT)/test_verifier: $(VERIFIER_TESTS_H)

$(OUTPUT)/test_verifier: CFLAGS += -I$(OUTPUT)
@@ -211,4 +234,4 @@ $(OUTPUT)/verifier/tests.h: $(VERIFIER_TEST_FILES) 
		 ) > $(VERIFIER_TESTS_H))



EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(ALU32_BUILD_DIR) \

	$(VERIFIER_TESTS_H)
 
	$(VERIFIER_TESTS_H) $(PROG_TESTS_H)

tools/testing/selftests/bpf/prog_tests/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
tests.h

tools/testing/selftests/bpf/test_progs.c

+13 −74
Original line number Diff line number Diff line
@@ -4,57 +4,13 @@ 
 * modify it under the terms of version 2 of the GNU General Public

 * License as published by the Free Software Foundation.

 */

#include <stdio.h>

#include <unistd.h>

#include <errno.h>

#include <string.h>

#include <assert.h>

#include <stdlib.h>

#include <stdarg.h>

#include <time.h>

#include <signal.h>



#include <linux/types.h>

typedef __u16 __sum16;

#include <arpa/inet.h>

#include <linux/if_ether.h>

#include <linux/if_packet.h>

#include <linux/ip.h>

#include <linux/ipv6.h>

#include <linux/tcp.h>

#include <linux/filter.h>

#include <linux/perf_event.h>

#include <linux/unistd.h>



#include <sys/ioctl.h>

#include <sys/wait.h>

#include <sys/types.h>

#include <sys/time.h>

#include <fcntl.h>

#include <pthread.h>

#include <linux/bpf.h>

#include <linux/err.h>

#include <bpf/bpf.h>

#include <bpf/libbpf.h>



#include "test_iptunnel_common.h"

#include "bpf_util.h"

#include "bpf_endian.h"

#include "test_progs.h"

#include "bpf_rlimit.h"

#include "trace_helpers.h"

#include "flow_dissector_load.h"



static int error_cnt, pass_cnt;

static bool jit_enabled;

int error_cnt, pass_cnt;

bool jit_enabled;



#define MAGIC_BYTES 123



/* ipv4 test vector */

static struct {

	struct ethhdr eth;

	struct iphdr iph;

	struct tcphdr tcp;

} __packed pkt_v4 = {

struct ipv4_packet pkt_v4 = {

	.eth.h_proto = __bpf_constant_htons(ETH_P_IP),

	.iph.ihl = 5,

	.iph.protocol = IPPROTO_TCP,
@@ -63,12 +19,7 @@ static struct { 
	.tcp.doff = 5,

};



/* ipv6 test vector */

static struct {

	struct ethhdr eth;

	struct ipv6hdr iph;

	struct tcphdr tcp;

} __packed pkt_v6 = {

struct ipv6_packet pkt_v6 = {

	.eth.h_proto = __bpf_constant_htons(ETH_P_IPV6),

	.iph.nexthdr = IPPROTO_TCP,

	.iph.payload_len = __bpf_constant_htons(MAGIC_BYTES),
@@ -76,26 +27,7 @@ static struct { 
	.tcp.doff = 5,

};



#define _CHECK(condition, tag, duration, format...) ({			\

	int __ret = !!(condition);					\

	if (__ret) {							\

		error_cnt++;						\

		printf("%s:FAIL:%s ", __func__, tag);			\

		printf(format);						\

	} else {							\

		pass_cnt++;						\

		printf("%s:PASS:%s %d nsec\n", __func__, tag, duration);\

	}								\

	__ret;								\

})



#define CHECK(condition, tag, format...) \

	_CHECK(condition, tag, duration, format)

#define CHECK_ATTR(condition, tag, format...) \

	_CHECK(condition, tag, tattr.duration, format)



static int bpf_find_map(const char *test, struct bpf_object *obj,

			const char *name)

int bpf_find_map(const char *test, struct bpf_object *obj, const char *name)

{

	struct bpf_map *map;
@@ -2150,12 +2082,19 @@ static void test_signal_pending(enum bpf_prog_type prog_type) 
	signal(SIGALRM, SIG_DFL);

}



#define DECLARE

#include <prog_tests/tests.h>

#undef DECLARE



int main(void)

{

	srand(time(NULL));



	jit_enabled = is_jit_enabled();



#define CALL

#include <prog_tests/tests.h>

#undef CALL

	test_pkt_access();

	test_prog_run_xattr();

	test_xdp();

tools/testing/selftests/bpf/test_progs.h

0 → 100644
+80 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#include <stdio.h>

#include <unistd.h>

#include <errno.h>

#include <string.h>

#include <assert.h>

#include <stdlib.h>

#include <stdarg.h>

#include <time.h>

#include <signal.h>



#include <linux/types.h>

typedef __u16 __sum16;

#include <arpa/inet.h>

#include <linux/if_ether.h>

#include <linux/if_packet.h>

#include <linux/ip.h>

#include <linux/ipv6.h>

#include <linux/tcp.h>

#include <linux/filter.h>

#include <linux/perf_event.h>

#include <linux/unistd.h>



#include <sys/ioctl.h>

#include <sys/wait.h>

#include <sys/types.h>

#include <sys/time.h>

#include <fcntl.h>

#include <pthread.h>

#include <linux/bpf.h>

#include <linux/err.h>

#include <bpf/bpf.h>

#include <bpf/libbpf.h>



#include "test_iptunnel_common.h"

#include "bpf_util.h"

#include "bpf_endian.h"

#include "trace_helpers.h"

#include "flow_dissector_load.h"



extern int error_cnt, pass_cnt;

extern bool jit_enabled;



#define MAGIC_BYTES 123



/* ipv4 test vector */

struct ipv4_packet {

	struct ethhdr eth;

	struct iphdr iph;

	struct tcphdr tcp;

} __packed;

extern struct ipv4_packet pkt_v4;



/* ipv6 test vector */

struct ipv6_packet {

	struct ethhdr eth;

	struct ipv6hdr iph;

	struct tcphdr tcp;

} __packed;

extern struct ipv6_packet pkt_v6;



#define _CHECK(condition, tag, duration, format...) ({			\

	int __ret = !!(condition);					\

	if (__ret) {							\

		error_cnt++;						\

		printf("%s:FAIL:%s ", __func__, tag);			\

		printf(format);						\

	} else {							\

		pass_cnt++;						\

		printf("%s:PASS:%s %d nsec\n", __func__, tag, duration);\

	}								\

	__ret;								\

})



#define CHECK(condition, tag, format...) \

	_CHECK(condition, tag, duration, format)

#define CHECK_ATTR(condition, tag, format...) \

	_CHECK(condition, tag, tattr.duration, format)



int bpf_find_map(const char *test, struct bpf_object *obj, const char *name);