Commit b308873a authored by Pu Lehui's avatar Pu Lehui
Browse files

Revert "[Backport] selftests/bpf: dummy_st_ops should reject 0 for non-nullable params" 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAIM4R



--------------------------------

This reverts commit 5cefb89808db28e8c339e953b5f67173faa904f9.

This patch depends on commit 980ca8ceeae6 ("bpf: check
bpf_dummy_struct_ops program params for test runs"),
but the commit is not currently merged.

Fixes: 75089d2e ("selftests/bpf: dummy_st_ops should reject 0 for non-nullable params")
Signed-off-by: default avatarPu Lehui <pulehui@huawei.com>
parent f6c27c52

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

+0 −27
Original line number Diff line number Diff line
@@ -147,31 +147,6 @@ static void test_dummy_sleepable(void) 
	dummy_st_ops_success__destroy(skel);

}



/* dummy_st_ops.test_sleepable() parameter is not marked as nullable,

 * thus bpf_prog_test_run_opts() below should be rejected as it tries

 * to pass NULL for this parameter.

 */

static void test_dummy_sleepable_reject_null(void)

{

	__u64 args[1] = {0};

	LIBBPF_OPTS(bpf_test_run_opts, attr,

		.ctx_in = args,

		.ctx_size_in = sizeof(args),

	);

	struct dummy_st_ops_success *skel;

	int fd, err;



	skel = dummy_st_ops_success__open_and_load();

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

		return;



	fd = bpf_program__fd(skel->progs.test_sleepable);

	err = bpf_prog_test_run_opts(fd, &attr);

	ASSERT_EQ(err, -EINVAL, "test_run");



	dummy_st_ops_success__destroy(skel);

}



void test_dummy_st_ops(void)

{

	if (test__start_subtest("dummy_st_ops_attach"))
@@ -184,8 +159,6 @@ void test_dummy_st_ops(void) 
		test_dummy_multiple_args();

	if (test__start_subtest("dummy_sleepable"))

		test_dummy_sleepable();

	if (test__start_subtest("dummy_sleepable_reject_null"))

		test_dummy_sleepable_reject_null();



	RUN_TESTS(dummy_st_ops_fail);

}