Commit a0964f52 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

selftests/bpf: Add multi-file statically linked BPF object file test 



Add Makefile infra to specify multi-file BPF object files (and derivative
skeletons). Add first selftest validating BPF static linker can merge together
successfully two independent BPF object files and resulting object and
skeleton are correct and usable.

Use the same F(F(F(X))) = F(F(X)) identity test on linked object files as for
the case of single BPF object files.

Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210318194036.3521577-13-andrii@kernel.org
parent 14137f3c

tools/testing/selftests/bpf/Makefile

+18 −3
Original line number Diff line number Diff line
@@ -303,6 +303,10 @@ endef 


SKEL_BLACKLIST := btf__% test_pinning_invalid.c test_sk_assign.c



LINKED_SKELS := test_static_linked.skel.h



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



# Set up extra TRUNNER_XXX "temporary" variables in the environment (relies on

# $eval()) and pass control to DEFINE_TEST_RUNNER_RULES.

# Parameters:
@@ -323,6 +327,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),	\

					       $$(TRUNNER_BPF_SRCS)))

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

TEST_GEN_FILES += $$(TRUNNER_BPF_OBJS)



# Evaluate rules now with extra TRUNNER_XXX variables above already defined
@@ -357,11 +362,20 @@ $(TRUNNER_BPF_OBJS): $(TRUNNER_OUTPUT)/%.o: \ 


$(TRUNNER_BPF_SKELS): %.skel.h: %.o $(BPFTOOL) | $(TRUNNER_OUTPUT)

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

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

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

	$(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 $$(<:.o=.linked.o) name $$(notdir $$(<:.o=)) > $$@

	$(Q)$$(BPFTOOL) gen skeleton $$(<:.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))

	$(Q)$$(BPFTOOL) gen object $$(@:.skel.h=.linked2.o) $$(@:.skel.h=.linked1.o)

	$(Q)$$(BPFTOOL) gen object $$(@:.skel.h=.linked3.o) $$(@:.skel.h=.linked2.o)

	$(Q)diff $$(@:.skel.h=.linked2.o) $$(@:.skel.h=.linked3.o)

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

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

endif



# ensure we set up tests.h header generation rule just once
@@ -383,6 +397,7 @@ $(TRUNNER_TEST_OBJS): $(TRUNNER_OUTPUT)/%.test.o: \ 
		      $(TRUNNER_EXTRA_HDRS)				\

		      $(TRUNNER_BPF_OBJS)				\

		      $(TRUNNER_BPF_SKELS)				\

		      $(TRUNNER_BPF_SKELS_LINKED)			\

		      $$(BPFOBJ) | $(TRUNNER_OUTPUT)

	$$(call msg,TEST-OBJ,$(TRUNNER_BINARY),$$@)

	$(Q)cd $$(@D) && $$(CC) -I. $$(CFLAGS) -c $(CURDIR)/$$< $$(LDLIBS) -o $$(@F)

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

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

/* Copyright (c) 2019 Facebook */



#include <test_progs.h>

#include "test_static_linked.skel.h"



void test_static_linked(void)

{

	int err;

	struct test_static_linked* skel;



	skel = test_static_linked__open();

	if (!ASSERT_OK_PTR(skel, "skel_open"))

		return;



	skel->rodata->rovar1 = 1;

	skel->bss->static_var1 = 2;

	skel->bss->static_var11 = 3;



	skel->rodata->rovar2 = 4;

	skel->bss->static_var2 = 5;

	skel->bss->static_var22 = 6;



	err = test_static_linked__load(skel);

	if (!ASSERT_OK(err, "skel_load"))

		goto cleanup;



	err = test_static_linked__attach(skel);

	if (!ASSERT_OK(err, "skel_attach"))

		goto cleanup;



	/* trigger */

	usleep(1);



	ASSERT_EQ(skel->bss->var1, 1 * 2 + 2 + 3, "var1");

	ASSERT_EQ(skel->bss->var2, 4 * 3 + 5 + 6, "var2");



cleanup:

	test_static_linked__destroy(skel);

}

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

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

/* Copyright (c) 2021 Facebook */



#include <linux/bpf.h>

#include <bpf/bpf_helpers.h>



/* 8-byte aligned .bss */

static volatile long static_var1;

static volatile int static_var11;

int var1 = 0;

/* 4-byte aligned .rodata */

const volatile int rovar1;



/* same "subprog" name in both files */

static __noinline int subprog(int x)

{

	/* but different formula */

	return x * 2;

}



SEC("raw_tp/sys_enter")

int handler1(const void *ctx)

{

	var1 = subprog(rovar1) + static_var1 + static_var11;



	return 0;

}



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

int VERSION SEC("version") = 1;

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

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

/* Copyright (c) 2021 Facebook */



#include <linux/bpf.h>

#include <bpf/bpf_helpers.h>



/* 4-byte aligned .bss */

static volatile int static_var2;

static volatile int static_var22;

int var2 = 0;

/* 8-byte aligned .rodata */

const volatile long rovar2;



/* same "subprog" name in both files */

static __noinline int subprog(int x)

{

	/* but different formula */

	return x * 3;

}



SEC("raw_tp/sys_enter")

int handler2(const void *ctx)

{

	var2 = subprog(rovar2) + static_var2 + static_var22;



	return 0;

}



/* different name and/or type of the variable doesn't matter */

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

int _version SEC("version") = 1;