Commit 7525daee authored by David Vernet's avatar David Vernet Committed by Daniel Borkmann
Browse files

selftests/bpf: Use __failure macro in task kfunc testsuite 



In commit 537c3f66 ("selftests/bpf: add generic BPF program tester-loader"),
a new mechanism was added to the BPF selftest framework to allow testsuites to
use macros to define expected failing testcases.

This allows any testsuite which tests verification failure to remove a good
amount of boilerplate code. This patch updates the task_kfunc selftest suite
to use these new macros.

Signed-off-by: default avatarDavid Vernet <void@manifault.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20230120021844.3048244-1-void@manifault.com
parent 74d23931

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

+1 −70
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ 
#include "task_kfunc_failure.skel.h"

#include "task_kfunc_success.skel.h"



static size_t log_buf_sz = 1 << 20; /* 1 MB */

static char obj_log_buf[1048576];



static struct task_kfunc_success *open_load_task_kfunc_skel(void)

{

	struct task_kfunc_success *skel;
@@ -83,67 +80,6 @@ static const char * const success_tests[] = { 
	"test_task_from_pid_invalid",

};



static struct {

	const char *prog_name;

	const char *expected_err_msg;

} failure_tests[] = {

	{"task_kfunc_acquire_untrusted", "R1 must be referenced or trusted"},

	{"task_kfunc_acquire_fp", "arg#0 pointer type STRUCT task_struct must point"},

	{"task_kfunc_acquire_unsafe_kretprobe", "reg type unsupported for arg#0 function"},

	{"task_kfunc_acquire_trusted_walked", "R1 must be referenced or trusted"},

	{"task_kfunc_acquire_null", "arg#0 pointer type STRUCT task_struct must point"},

	{"task_kfunc_acquire_unreleased", "Unreleased reference"},

	{"task_kfunc_get_non_kptr_param", "arg#0 expected pointer to map value"},

	{"task_kfunc_get_non_kptr_acquired", "arg#0 expected pointer to map value"},

	{"task_kfunc_get_null", "arg#0 expected pointer to map value"},

	{"task_kfunc_xchg_unreleased", "Unreleased reference"},

	{"task_kfunc_get_unreleased", "Unreleased reference"},

	{"task_kfunc_release_untrusted", "arg#0 is untrusted_ptr_or_null_ expected ptr_ or socket"},

	{"task_kfunc_release_fp", "arg#0 pointer type STRUCT task_struct must point"},

	{"task_kfunc_release_null", "arg#0 is ptr_or_null_ expected ptr_ or socket"},

	{"task_kfunc_release_unacquired", "release kernel function bpf_task_release expects"},

	{"task_kfunc_from_pid_no_null_check", "arg#0 is ptr_or_null_ expected ptr_ or socket"},

	{"task_kfunc_from_lsm_task_free", "reg type unsupported for arg#0 function"},

};



static void verify_fail(const char *prog_name, const char *expected_err_msg)

{

	LIBBPF_OPTS(bpf_object_open_opts, opts);

	struct task_kfunc_failure *skel;

	int err, i;



	opts.kernel_log_buf = obj_log_buf;

	opts.kernel_log_size = log_buf_sz;

	opts.kernel_log_level = 1;



	skel = task_kfunc_failure__open_opts(&opts);

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

		goto cleanup;



	for (i = 0; i < ARRAY_SIZE(failure_tests); i++) {

		struct bpf_program *prog;

		const char *curr_name = failure_tests[i].prog_name;



		prog = bpf_object__find_program_by_name(skel->obj, curr_name);

		if (!ASSERT_OK_PTR(prog, "bpf_object__find_program_by_name"))

			goto cleanup;



		bpf_program__set_autoload(prog, !strcmp(curr_name, prog_name));

	}



	err = task_kfunc_failure__load(skel);

	if (!ASSERT_ERR(err, "unexpected load success"))

		goto cleanup;



	if (!ASSERT_OK_PTR(strstr(obj_log_buf, expected_err_msg), "expected_err_msg")) {

		fprintf(stderr, "Expected err_msg: %s\n", expected_err_msg);

		fprintf(stderr, "Verifier output: %s\n", obj_log_buf);

	}



cleanup:

	task_kfunc_failure__destroy(skel);

}



void test_task_kfunc(void)

{

	int i;
@@ -155,10 +91,5 @@ void test_task_kfunc(void) 
		run_success_test(success_tests[i]);

	}



	for (i = 0; i < ARRAY_SIZE(failure_tests); i++) {

		if (!test__start_subtest(failure_tests[i].prog_name))

			continue;



		verify_fail(failure_tests[i].prog_name, failure_tests[i].expected_err_msg);

	}

	RUN_TESTS(task_kfunc_failure);

}

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

+18 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <bpf/bpf_tracing.h>

#include <bpf/bpf_helpers.h>



#include "bpf_misc.h"

#include "task_kfunc_common.h"



char _license[] SEC("license") = "GPL";
@@ -27,6 +28,7 @@ static struct __tasks_kfunc_map_value *insert_lookup_task(struct task_struct *ta 
}



SEC("tp_btf/task_newtask")

__failure __msg("R1 must be referenced or trusted")

int BPF_PROG(task_kfunc_acquire_untrusted, struct task_struct *task, u64 clone_flags)

{

	struct task_struct *acquired;
@@ -44,6 +46,7 @@ int BPF_PROG(task_kfunc_acquire_untrusted, struct task_struct *task, u64 clone_f 
}



SEC("tp_btf/task_newtask")

__failure __msg("arg#0 pointer type STRUCT task_struct must point")

int BPF_PROG(task_kfunc_acquire_fp, struct task_struct *task, u64 clone_flags)

{

	struct task_struct *acquired, *stack_task = (struct task_struct *)&clone_flags;
@@ -56,6 +59,7 @@ int BPF_PROG(task_kfunc_acquire_fp, struct task_struct *task, u64 clone_flags) 
}



SEC("kretprobe/free_task")

__failure __msg("reg type unsupported for arg#0 function")

int BPF_PROG(task_kfunc_acquire_unsafe_kretprobe, struct task_struct *task, u64 clone_flags)

{

	struct task_struct *acquired;
@@ -68,6 +72,7 @@ int BPF_PROG(task_kfunc_acquire_unsafe_kretprobe, struct task_struct *task, u64 
}



SEC("tp_btf/task_newtask")

__failure __msg("R1 must be referenced or trusted")

int BPF_PROG(task_kfunc_acquire_trusted_walked, struct task_struct *task, u64 clone_flags)

{

	struct task_struct *acquired;
@@ -81,6 +86,7 @@ int BPF_PROG(task_kfunc_acquire_trusted_walked, struct task_struct *task, u64 cl 




SEC("tp_btf/task_newtask")

__failure __msg("arg#0 pointer type STRUCT task_struct must point")

int BPF_PROG(task_kfunc_acquire_null, struct task_struct *task, u64 clone_flags)

{

	struct task_struct *acquired;
@@ -95,6 +101,7 @@ int BPF_PROG(task_kfunc_acquire_null, struct task_struct *task, u64 clone_flags) 
}



SEC("tp_btf/task_newtask")

__failure __msg("Unreleased reference")

int BPF_PROG(task_kfunc_acquire_unreleased, struct task_struct *task, u64 clone_flags)

{

	struct task_struct *acquired;
@@ -107,6 +114,7 @@ int BPF_PROG(task_kfunc_acquire_unreleased, struct task_struct *task, u64 clone_ 
}



SEC("tp_btf/task_newtask")

__failure __msg("arg#0 expected pointer to map value")

int BPF_PROG(task_kfunc_get_non_kptr_param, struct task_struct *task, u64 clone_flags)

{

	struct task_struct *kptr;
@@ -122,6 +130,7 @@ int BPF_PROG(task_kfunc_get_non_kptr_param, struct task_struct *task, u64 clone_ 
}



SEC("tp_btf/task_newtask")

__failure __msg("arg#0 expected pointer to map value")

int BPF_PROG(task_kfunc_get_non_kptr_acquired, struct task_struct *task, u64 clone_flags)

{

	struct task_struct *kptr, *acquired;
@@ -140,6 +149,7 @@ int BPF_PROG(task_kfunc_get_non_kptr_acquired, struct task_struct *task, u64 clo 
}



SEC("tp_btf/task_newtask")

__failure __msg("arg#0 expected pointer to map value")

int BPF_PROG(task_kfunc_get_null, struct task_struct *task, u64 clone_flags)

{

	struct task_struct *kptr;
@@ -155,6 +165,7 @@ int BPF_PROG(task_kfunc_get_null, struct task_struct *task, u64 clone_flags) 
}



SEC("tp_btf/task_newtask")

__failure __msg("Unreleased reference")

int BPF_PROG(task_kfunc_xchg_unreleased, struct task_struct *task, u64 clone_flags)

{

	struct task_struct *kptr;
@@ -174,6 +185,7 @@ int BPF_PROG(task_kfunc_xchg_unreleased, struct task_struct *task, u64 clone_fla 
}



SEC("tp_btf/task_newtask")

__failure __msg("Unreleased reference")

int BPF_PROG(task_kfunc_get_unreleased, struct task_struct *task, u64 clone_flags)

{

	struct task_struct *kptr;
@@ -193,6 +205,7 @@ int BPF_PROG(task_kfunc_get_unreleased, struct task_struct *task, u64 clone_flag 
}



SEC("tp_btf/task_newtask")

__failure __msg("arg#0 is untrusted_ptr_or_null_ expected ptr_ or socket")

int BPF_PROG(task_kfunc_release_untrusted, struct task_struct *task, u64 clone_flags)

{

	struct __tasks_kfunc_map_value *v;
@@ -208,6 +221,7 @@ int BPF_PROG(task_kfunc_release_untrusted, struct task_struct *task, u64 clone_f 
}



SEC("tp_btf/task_newtask")

__failure __msg("arg#0 pointer type STRUCT task_struct must point")

int BPF_PROG(task_kfunc_release_fp, struct task_struct *task, u64 clone_flags)

{

	struct task_struct *acquired = (struct task_struct *)&clone_flags;
@@ -219,6 +233,7 @@ int BPF_PROG(task_kfunc_release_fp, struct task_struct *task, u64 clone_flags) 
}



SEC("tp_btf/task_newtask")

__failure __msg("arg#0 is ptr_or_null_ expected ptr_ or socket")

int BPF_PROG(task_kfunc_release_null, struct task_struct *task, u64 clone_flags)

{

	struct __tasks_kfunc_map_value local, *v;
@@ -251,6 +266,7 @@ int BPF_PROG(task_kfunc_release_null, struct task_struct *task, u64 clone_flags) 
}



SEC("tp_btf/task_newtask")

__failure __msg("release kernel function bpf_task_release expects")

int BPF_PROG(task_kfunc_release_unacquired, struct task_struct *task, u64 clone_flags)

{

	/* Cannot release trusted task pointer which was not acquired. */
@@ -260,6 +276,7 @@ int BPF_PROG(task_kfunc_release_unacquired, struct task_struct *task, u64 clone_ 
}



SEC("tp_btf/task_newtask")

__failure __msg("arg#0 is ptr_or_null_ expected ptr_ or socket")

int BPF_PROG(task_kfunc_from_pid_no_null_check, struct task_struct *task, u64 clone_flags)

{

	struct task_struct *acquired;
@@ -273,6 +290,7 @@ int BPF_PROG(task_kfunc_from_pid_no_null_check, struct task_struct *task, u64 cl 
}



SEC("lsm/task_free")

__failure __msg("reg type unsupported for arg#0 function")

int BPF_PROG(task_kfunc_from_lsm_task_free, struct task_struct *task)

{

	struct task_struct *acquired;