Commit 4d1b6298 authored by Alexei Starovoitov's avatar Alexei Starovoitov Committed by Daniel Borkmann
Browse files

selftests/bpf: Convert few tests to light skeleton. 



Convert few tests that don't use CO-RE to light skeleton.

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20210514003623.28033-19-alexei.starovoitov@gmail.com
parent d510296d

tools/testing/selftests/bpf/.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ test_sysctl 
xdping

test_cpp

*.skel.h

*.lskel.h

/no_alu32

/bpf_gcc

/tools

tools/testing/selftests/bpf/Makefile

+15 −1
Original line number Diff line number Diff line
@@ -312,6 +312,10 @@ SKEL_BLACKLIST := btf__% test_pinning_invalid.c test_sk_assign.c 
LINKED_SKELS := test_static_linked.skel.h linked_funcs.skel.h		\

		linked_vars.skel.h linked_maps.skel.h



LSKELS := kfunc_call_test.c fentry_test.c fexit_test.c fexit_sleep.c \

	test_ksyms_module.c test_ringbuf.c

SKEL_BLACKLIST += $$(LSKELS)



test_static_linked.skel.h-deps := test_static_linked1.o test_static_linked2.o

linked_funcs.skel.h-deps := linked_funcs1.o linked_funcs2.o

linked_vars.skel.h-deps := linked_vars1.o linked_vars2.o
@@ -339,6 +343,7 @@ TRUNNER_BPF_OBJS := $$(patsubst %.c,$$(TRUNNER_OUTPUT)/%.o, $$(TRUNNER_BPF_SRCS) 
TRUNNER_BPF_SKELS := $$(patsubst %.c,$$(TRUNNER_OUTPUT)/%.skel.h,	\

				 $$(filter-out $(SKEL_BLACKLIST) $(LINKED_BPF_SRCS),\

					       $$(TRUNNER_BPF_SRCS)))

TRUNNER_BPF_LSKELS := $$(patsubst %.c,$$(TRUNNER_OUTPUT)/%.lskel.h, $$(LSKELS))

TRUNNER_BPF_SKELS_LINKED := $$(addprefix $$(TRUNNER_OUTPUT)/,$(LINKED_SKELS))

TEST_GEN_FILES += $$(TRUNNER_BPF_OBJS)
@@ -380,6 +385,14 @@ $(TRUNNER_BPF_SKELS): %.skel.h: %.o $(BPFTOOL) | $(TRUNNER_OUTPUT) 
	$(Q)diff $$(<:.o=.linked2.o) $$(<:.o=.linked3.o)

	$(Q)$$(BPFTOOL) gen skeleton $$(<:.o=.linked3.o) name $$(notdir $$(<:.o=)) > $$@



$(TRUNNER_BPF_LSKELS): %.lskel.h: %.o $(BPFTOOL) | $(TRUNNER_OUTPUT)

	$$(call msg,GEN-SKEL,$(TRUNNER_BINARY),$$@)

	$(Q)$$(BPFTOOL) gen object $$(<:.o=.linked1.o) $$<

	$(Q)$$(BPFTOOL) gen object $$(<:.o=.linked2.o) $$(<:.o=.linked1.o)

	$(Q)$$(BPFTOOL) gen object $$(<:.o=.linked3.o) $$(<:.o=.linked2.o)

	$(Q)diff $$(<:.o=.linked2.o) $$(<:.o=.linked3.o)

	$(Q)$$(BPFTOOL) gen skeleton -L $$(<:.o=.linked3.o) name $$(notdir $$(<:.o=)) > $$@



$(TRUNNER_BPF_SKELS_LINKED): $(TRUNNER_BPF_OBJS) $(BPFTOOL) | $(TRUNNER_OUTPUT)

	$$(call msg,LINK-BPF,$(TRUNNER_BINARY),$$(@:.skel.h=.o))

	$(Q)$$(BPFTOOL) gen object $$(@:.skel.h=.linked1.o) $$(addprefix $(TRUNNER_OUTPUT)/,$$($$(@F)-deps))
@@ -409,6 +422,7 @@ $(TRUNNER_TEST_OBJS): $(TRUNNER_OUTPUT)/%.test.o: \ 
		      $(TRUNNER_EXTRA_HDRS)				\

		      $(TRUNNER_BPF_OBJS)				\

		      $(TRUNNER_BPF_SKELS)				\

		      $(TRUNNER_BPF_LSKELS)				\

		      $(TRUNNER_BPF_SKELS_LINKED)			\

		      $$(BPFOBJ) | $(TRUNNER_OUTPUT)

	$$(call msg,TEST-OBJ,$(TRUNNER_BINARY),$$@)
@@ -516,6 +530,6 @@ $(OUTPUT)/bench: $(OUTPUT)/bench.o $(OUTPUT)/testing_helpers.o \ 
EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR) $(HOST_SCRATCH_DIR)	\

	prog_tests/tests.h map_tests/tests.h verifier/tests.h		\

	feature								\

	$(addprefix $(OUTPUT)/,*.o *.skel.h no_alu32 bpf_gcc bpf_testmod.ko)

	$(addprefix $(OUTPUT)/,*.o *.skel.h *.lskel.h no_alu32 bpf_gcc bpf_testmod.ko)



.PHONY: docs docs-clean

tools/testing/selftests/bpf/prog_tests/fentry_fexit.c

+3 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright (c) 2019 Facebook */

#include <test_progs.h>

#include "fentry_test.skel.h"

#include "fexit_test.skel.h"

#include "fentry_test.lskel.h"

#include "fexit_test.lskel.h"



void test_fentry_fexit(void)

{
@@ -26,7 +26,7 @@ void test_fentry_fexit(void) 
	if (CHECK(err, "fexit_attach", "fexit attach failed: %d\n", err))

		goto close_prog;



	prog_fd = bpf_program__fd(fexit_skel->progs.test1);

	prog_fd = fexit_skel->progs.test1.prog_fd;

	err = bpf_prog_test_run(prog_fd, 1, NULL, 0,

				NULL, NULL, &retval, &duration);

	CHECK(err || retval, "ipv6",

tools/testing/selftests/bpf/prog_tests/fentry_test.c

+5 −5
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright (c) 2019 Facebook */

#include <test_progs.h>

#include "fentry_test.skel.h"

#include "fentry_test.lskel.h"



static int fentry_test(struct fentry_test *fentry_skel)

{

	int err, prog_fd, i;

	__u32 duration = 0, retval;

	struct bpf_link *link;

	int link_fd;

	__u64 *result;



	err = fentry_test__attach(fentry_skel);
@@ -15,11 +15,11 @@ static int fentry_test(struct fentry_test *fentry_skel) 
		return err;



	/* Check that already linked program can't be attached again. */

	link = bpf_program__attach(fentry_skel->progs.test1);

	if (!ASSERT_ERR_PTR(link, "fentry_attach_link"))

	link_fd = fentry_test__test1__attach(fentry_skel);

	if (!ASSERT_LT(link_fd, 0, "fentry_attach_link"))

		return -1;



	prog_fd = bpf_program__fd(fentry_skel->progs.test1);

	prog_fd = fentry_skel->progs.test1.prog_fd;

	err = bpf_prog_test_run(prog_fd, 1, NULL, 0,

				NULL, NULL, &retval, &duration);

	ASSERT_OK(err, "test_run");

tools/testing/selftests/bpf/prog_tests/fexit_sleep.c

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#include <time.h>

#include <sys/mman.h>

#include <sys/syscall.h>

#include "fexit_sleep.skel.h"

#include "fexit_sleep.lskel.h"



static int do_sleep(void *skel)

{
@@ -58,8 +58,8 @@ void test_fexit_sleep(void) 
	 * waiting for percpu_ref_kill to confirm). The other one

	 * will be freed quickly.

	 */

	close(bpf_program__fd(fexit_skel->progs.nanosleep_fentry));

	close(bpf_program__fd(fexit_skel->progs.nanosleep_fexit));

	close(fexit_skel->progs.nanosleep_fentry.prog_fd);

	close(fexit_skel->progs.nanosleep_fexit.prog_fd);

	fexit_sleep__detach(fexit_skel);



	/* kill the thread to unwind sys_nanosleep stack through the trampoline */