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

selftests/bpf: Use non-autoloaded programs in few tests 



Take advantage of new libbpf feature for declarative non-autoloaded BPF
program SEC() definitions in few test that test single program at a time
out of many available programs within the single BPF object.

Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20220419002452.632125-2-andrii@kernel.org
parent a3820c48

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

+4 −6
Original line number Diff line number Diff line
@@ -6,11 +6,10 @@ 
void test_helper_restricted(void)

{

	int prog_i = 0, prog_cnt;

	int duration = 0;



	do {

		struct test_helper_restricted *test;

		int maybeOK;

		int err;



		test = test_helper_restricted__open();

		if (!ASSERT_OK_PTR(test, "open"))
@@ -21,12 +20,11 @@ void test_helper_restricted(void) 
		for (int j = 0; j < prog_cnt; ++j) {

			struct bpf_program *prog = *test->skeleton->progs[j].prog;



			maybeOK = bpf_program__set_autoload(prog, prog_i == j);

			ASSERT_OK(maybeOK, "set autoload");

			bpf_program__set_autoload(prog, true);

		}



		maybeOK = test_helper_restricted__load(test);

		CHECK(!maybeOK, test->skeleton->progs[prog_i].name, "helper isn't restricted");

		err = test_helper_restricted__load(test);

		ASSERT_ERR(err, "load_should_fail");



		test_helper_restricted__destroy(test);

	} while (++prog_i < prog_cnt);

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

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

#include <test_progs.h>



static void toggle_object_autoload_progs(const struct bpf_object *obj,

					 const char *name_load)

{

	struct bpf_program *prog;



	bpf_object__for_each_program(prog, obj) {

		const char *name = bpf_program__name(prog);



		if (!strcmp(name_load, name))

			bpf_program__set_autoload(prog, true);

		else

			bpf_program__set_autoload(prog, false);

	}

}



void test_reference_tracking(void)

{

	const char *file = "test_sk_lookup_kern.o";
@@ -39,6 +24,7 @@ void test_reference_tracking(void) 
		goto cleanup;



	bpf_object__for_each_program(prog, obj_iter) {

		struct bpf_program *p;

		const char *name;



		name = bpf_program__name(prog);
@@ -49,7 +35,12 @@ void test_reference_tracking(void) 
		if (!ASSERT_OK_PTR(obj, "obj_open_file"))

			goto cleanup;



		toggle_object_autoload_progs(obj, name);

		/* all programs are not loaded by default, so just set

		 * autoload to true for the single prog under test

		 */

		p = bpf_object__find_program_by_name(obj, name);

		bpf_program__set_autoload(p, true);



		/* Expect verifier failure if test name has 'err' */

		if (strncmp(name, "err_", sizeof("err_") - 1) == 0) {

			libbpf_print_fn_t old_print_fn;

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

+3 −22
Original line number Diff line number Diff line
@@ -44,16 +44,12 @@ static void strncmp_full_str_cmp(struct strncmp_test *skel, const char *name, 
static void test_strncmp_ret(void)

{

	struct strncmp_test *skel;

	struct bpf_program *prog;

	int err, got;



	skel = strncmp_test__open();

	if (!ASSERT_OK_PTR(skel, "strncmp_test open"))

		return;



	bpf_object__for_each_program(prog, skel->obj)

		bpf_program__set_autoload(prog, false);



	bpf_program__set_autoload(skel->progs.do_strncmp, true);



	err = strncmp_test__load(skel);
@@ -91,18 +87,13 @@ static void test_strncmp_ret(void) 
static void test_strncmp_bad_not_const_str_size(void)

{

	struct strncmp_test *skel;

	struct bpf_program *prog;

	int err;



	skel = strncmp_test__open();

	if (!ASSERT_OK_PTR(skel, "strncmp_test open"))

		return;



	bpf_object__for_each_program(prog, skel->obj)

		bpf_program__set_autoload(prog, false);



	bpf_program__set_autoload(skel->progs.strncmp_bad_not_const_str_size,

				  true);

	bpf_program__set_autoload(skel->progs.strncmp_bad_not_const_str_size, true);



	err = strncmp_test__load(skel);

	ASSERT_ERR(err, "strncmp_test load bad_not_const_str_size");
@@ -113,18 +104,13 @@ static void test_strncmp_bad_not_const_str_size(void) 
static void test_strncmp_bad_writable_target(void)

{

	struct strncmp_test *skel;

	struct bpf_program *prog;

	int err;



	skel = strncmp_test__open();

	if (!ASSERT_OK_PTR(skel, "strncmp_test open"))

		return;



	bpf_object__for_each_program(prog, skel->obj)

		bpf_program__set_autoload(prog, false);



	bpf_program__set_autoload(skel->progs.strncmp_bad_writable_target,

				  true);

	bpf_program__set_autoload(skel->progs.strncmp_bad_writable_target, true);



	err = strncmp_test__load(skel);

	ASSERT_ERR(err, "strncmp_test load bad_writable_target");
@@ -135,18 +121,13 @@ static void test_strncmp_bad_writable_target(void) 
static void test_strncmp_bad_not_null_term_target(void)

{

	struct strncmp_test *skel;

	struct bpf_program *prog;

	int err;



	skel = strncmp_test__open();

	if (!ASSERT_OK_PTR(skel, "strncmp_test open"))

		return;



	bpf_object__for_each_program(prog, skel->obj)

		bpf_program__set_autoload(prog, false);



	bpf_program__set_autoload(skel->progs.strncmp_bad_not_null_term_target,

				  true);

	bpf_program__set_autoload(skel->progs.strncmp_bad_not_null_term_target, true);



	err = strncmp_test__load(skel);

	ASSERT_ERR(err, "strncmp_test load bad_not_null_term_target");

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

+4 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ unsigned int no_const_str_size = STRNCMP_STR_SZ; 


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



SEC("tp/syscalls/sys_enter_nanosleep")

SEC("?tp/syscalls/sys_enter_nanosleep")

int do_strncmp(void *ctx)

{

	if ((bpf_get_current_pid_tgid() >> 32) != target_pid)
@@ -29,7 +29,7 @@ int do_strncmp(void *ctx) 
	return 0;

}



SEC("tp/syscalls/sys_enter_nanosleep")

SEC("?tp/syscalls/sys_enter_nanosleep")

int strncmp_bad_not_const_str_size(void *ctx)

{

	/* The value of string size is not const, so will fail */
@@ -37,7 +37,7 @@ int strncmp_bad_not_const_str_size(void *ctx) 
	return 0;

}



SEC("tp/syscalls/sys_enter_nanosleep")

SEC("?tp/syscalls/sys_enter_nanosleep")

int strncmp_bad_writable_target(void *ctx)

{

	/* Compared target is not read-only, so will fail */
@@ -45,7 +45,7 @@ int strncmp_bad_writable_target(void *ctx) 
	return 0;

}



SEC("tp/syscalls/sys_enter_nanosleep")

SEC("?tp/syscalls/sys_enter_nanosleep")

int strncmp_bad_not_null_term_target(void *ctx)

{

	/* Compared target is not null-terminated, so will fail */

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

+8 −8
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static void spin_lock_work(void) 
	}

}



SEC("raw_tp/sys_enter")

SEC("?raw_tp/sys_enter")

int raw_tp_timer(void *ctx)

{

	timer_work();
@@ -64,7 +64,7 @@ int raw_tp_timer(void *ctx) 
	return 0;

}



SEC("tp/syscalls/sys_enter_nanosleep")

SEC("?tp/syscalls/sys_enter_nanosleep")

int tp_timer(void *ctx)

{

	timer_work();
@@ -72,7 +72,7 @@ int tp_timer(void *ctx) 
	return 0;

}



SEC("kprobe/sys_nanosleep")

SEC("?kprobe/sys_nanosleep")

int kprobe_timer(void *ctx)

{

	timer_work();
@@ -80,7 +80,7 @@ int kprobe_timer(void *ctx) 
	return 0;

}



SEC("perf_event")

SEC("?perf_event")

int perf_event_timer(void *ctx)

{

	timer_work();
@@ -88,7 +88,7 @@ int perf_event_timer(void *ctx) 
	return 0;

}



SEC("raw_tp/sys_enter")

SEC("?raw_tp/sys_enter")

int raw_tp_spin_lock(void *ctx)

{

	spin_lock_work();
@@ -96,7 +96,7 @@ int raw_tp_spin_lock(void *ctx) 
	return 0;

}



SEC("tp/syscalls/sys_enter_nanosleep")

SEC("?tp/syscalls/sys_enter_nanosleep")

int tp_spin_lock(void *ctx)

{

	spin_lock_work();
@@ -104,7 +104,7 @@ int tp_spin_lock(void *ctx) 
	return 0;

}



SEC("kprobe/sys_nanosleep")

SEC("?kprobe/sys_nanosleep")

int kprobe_spin_lock(void *ctx)

{

	spin_lock_work();
@@ -112,7 +112,7 @@ int kprobe_spin_lock(void *ctx) 
	return 0;

}



SEC("perf_event")

SEC("?perf_event")

int perf_event_spin_lock(void *ctx)

{

	spin_lock_work();