diff options
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/atomics.c')
| -rw-r--r-- | tools/testing/selftests/bpf/prog_tests/atomics.c | 149 | 
1 files changed, 50 insertions, 99 deletions
| diff --git a/tools/testing/selftests/bpf/prog_tests/atomics.c b/tools/testing/selftests/bpf/prog_tests/atomics.c index 86b7d5d84eec..13e101f370a1 100644 --- a/tools/testing/selftests/bpf/prog_tests/atomics.c +++ b/tools/testing/selftests/bpf/prog_tests/atomics.c @@ -7,19 +7,15 @@  static void test_add(struct atomics_lskel *skel)  {  	int err, prog_fd; -	__u32 duration = 0, retval; -	int link_fd; - -	link_fd = atomics_lskel__add__attach(skel); -	if (!ASSERT_GT(link_fd, 0, "attach(add)")) -		return; +	LIBBPF_OPTS(bpf_test_run_opts, topts); +	/* No need to attach it, just run it directly */  	prog_fd = skel->progs.add.prog_fd; -	err = bpf_prog_test_run(prog_fd, 1, NULL, 0, -				NULL, NULL, &retval, &duration); -	if (CHECK(err || retval, "test_run add", -		  "err %d errno %d retval %d duration %d\n", err, errno, retval, duration)) -		goto cleanup; +	err = bpf_prog_test_run_opts(prog_fd, &topts); +	if (!ASSERT_OK(err, "test_run_opts err")) +		return; +	if (!ASSERT_OK(topts.retval, "test_run_opts retval")) +		return;  	ASSERT_EQ(skel->data->add64_value, 3, "add64_value");  	ASSERT_EQ(skel->bss->add64_result, 1, "add64_result"); @@ -31,28 +27,20 @@ static void test_add(struct atomics_lskel *skel)  	ASSERT_EQ(skel->bss->add_stack_result, 1, "add_stack_result");  	ASSERT_EQ(skel->data->add_noreturn_value, 3, "add_noreturn_value"); - -cleanup: -	close(link_fd);  }  static void test_sub(struct atomics_lskel *skel)  {  	int err, prog_fd; -	__u32 duration = 0, retval; -	int link_fd; - -	link_fd = atomics_lskel__sub__attach(skel); -	if (!ASSERT_GT(link_fd, 0, "attach(sub)")) -		return; +	LIBBPF_OPTS(bpf_test_run_opts, topts); +	/* No need to attach it, just run it directly */  	prog_fd = skel->progs.sub.prog_fd; -	err = bpf_prog_test_run(prog_fd, 1, NULL, 0, -				NULL, NULL, &retval, &duration); -	if (CHECK(err || retval, "test_run sub", -		  "err %d errno %d retval %d duration %d\n", -		  err, errno, retval, duration)) -		goto cleanup; +	err = bpf_prog_test_run_opts(prog_fd, &topts); +	if (!ASSERT_OK(err, "test_run_opts err")) +		return; +	if (!ASSERT_OK(topts.retval, "test_run_opts retval")) +		return;  	ASSERT_EQ(skel->data->sub64_value, -1, "sub64_value");  	ASSERT_EQ(skel->bss->sub64_result, 1, "sub64_result"); @@ -64,27 +52,20 @@ static void test_sub(struct atomics_lskel *skel)  	ASSERT_EQ(skel->bss->sub_stack_result, 1, "sub_stack_result");  	ASSERT_EQ(skel->data->sub_noreturn_value, -1, "sub_noreturn_value"); - -cleanup: -	close(link_fd);  }  static void test_and(struct atomics_lskel *skel)  {  	int err, prog_fd; -	__u32 duration = 0, retval; -	int link_fd; - -	link_fd = atomics_lskel__and__attach(skel); -	if (!ASSERT_GT(link_fd, 0, "attach(and)")) -		return; +	LIBBPF_OPTS(bpf_test_run_opts, topts); +	/* No need to attach it, just run it directly */  	prog_fd = skel->progs.and.prog_fd; -	err = bpf_prog_test_run(prog_fd, 1, NULL, 0, -				NULL, NULL, &retval, &duration); -	if (CHECK(err || retval, "test_run and", -		  "err %d errno %d retval %d duration %d\n", err, errno, retval, duration)) -		goto cleanup; +	err = bpf_prog_test_run_opts(prog_fd, &topts); +	if (!ASSERT_OK(err, "test_run_opts err")) +		return; +	if (!ASSERT_OK(topts.retval, "test_run_opts retval")) +		return;  	ASSERT_EQ(skel->data->and64_value, 0x010ull << 32, "and64_value");  	ASSERT_EQ(skel->bss->and64_result, 0x110ull << 32, "and64_result"); @@ -93,27 +74,20 @@ static void test_and(struct atomics_lskel *skel)  	ASSERT_EQ(skel->bss->and32_result, 0x110, "and32_result");  	ASSERT_EQ(skel->data->and_noreturn_value, 0x010ull << 32, "and_noreturn_value"); -cleanup: -	close(link_fd);  }  static void test_or(struct atomics_lskel *skel)  {  	int err, prog_fd; -	__u32 duration = 0, retval; -	int link_fd; - -	link_fd = atomics_lskel__or__attach(skel); -	if (!ASSERT_GT(link_fd, 0, "attach(or)")) -		return; +	LIBBPF_OPTS(bpf_test_run_opts, topts); +	/* No need to attach it, just run it directly */  	prog_fd = skel->progs.or.prog_fd; -	err = bpf_prog_test_run(prog_fd, 1, NULL, 0, -				NULL, NULL, &retval, &duration); -	if (CHECK(err || retval, "test_run or", -		  "err %d errno %d retval %d duration %d\n", -		  err, errno, retval, duration)) -		goto cleanup; +	err = bpf_prog_test_run_opts(prog_fd, &topts); +	if (!ASSERT_OK(err, "test_run_opts err")) +		return; +	if (!ASSERT_OK(topts.retval, "test_run_opts retval")) +		return;  	ASSERT_EQ(skel->data->or64_value, 0x111ull << 32, "or64_value");  	ASSERT_EQ(skel->bss->or64_result, 0x110ull << 32, "or64_result"); @@ -122,26 +96,20 @@ static void test_or(struct atomics_lskel *skel)  	ASSERT_EQ(skel->bss->or32_result, 0x110, "or32_result");  	ASSERT_EQ(skel->data->or_noreturn_value, 0x111ull << 32, "or_noreturn_value"); -cleanup: -	close(link_fd);  }  static void test_xor(struct atomics_lskel *skel)  {  	int err, prog_fd; -	__u32 duration = 0, retval; -	int link_fd; - -	link_fd = atomics_lskel__xor__attach(skel); -	if (!ASSERT_GT(link_fd, 0, "attach(xor)")) -		return; +	LIBBPF_OPTS(bpf_test_run_opts, topts); +	/* No need to attach it, just run it directly */  	prog_fd = skel->progs.xor.prog_fd; -	err = bpf_prog_test_run(prog_fd, 1, NULL, 0, -				NULL, NULL, &retval, &duration); -	if (CHECK(err || retval, "test_run xor", -		  "err %d errno %d retval %d duration %d\n", err, errno, retval, duration)) -		goto cleanup; +	err = bpf_prog_test_run_opts(prog_fd, &topts); +	if (!ASSERT_OK(err, "test_run_opts err")) +		return; +	if (!ASSERT_OK(topts.retval, "test_run_opts retval")) +		return;  	ASSERT_EQ(skel->data->xor64_value, 0x101ull << 32, "xor64_value");  	ASSERT_EQ(skel->bss->xor64_result, 0x110ull << 32, "xor64_result"); @@ -150,26 +118,20 @@ static void test_xor(struct atomics_lskel *skel)  	ASSERT_EQ(skel->bss->xor32_result, 0x110, "xor32_result");  	ASSERT_EQ(skel->data->xor_noreturn_value, 0x101ull << 32, "xor_nxoreturn_value"); -cleanup: -	close(link_fd);  }  static void test_cmpxchg(struct atomics_lskel *skel)  {  	int err, prog_fd; -	__u32 duration = 0, retval; -	int link_fd; - -	link_fd = atomics_lskel__cmpxchg__attach(skel); -	if (!ASSERT_GT(link_fd, 0, "attach(cmpxchg)")) -		return; +	LIBBPF_OPTS(bpf_test_run_opts, topts); +	/* No need to attach it, just run it directly */  	prog_fd = skel->progs.cmpxchg.prog_fd; -	err = bpf_prog_test_run(prog_fd, 1, NULL, 0, -				NULL, NULL, &retval, &duration); -	if (CHECK(err || retval, "test_run cmpxchg", -		  "err %d errno %d retval %d duration %d\n", err, errno, retval, duration)) -		goto cleanup; +	err = bpf_prog_test_run_opts(prog_fd, &topts); +	if (!ASSERT_OK(err, "test_run_opts err")) +		return; +	if (!ASSERT_OK(topts.retval, "test_run_opts retval")) +		return;  	ASSERT_EQ(skel->data->cmpxchg64_value, 2, "cmpxchg64_value");  	ASSERT_EQ(skel->bss->cmpxchg64_result_fail, 1, "cmpxchg_result_fail"); @@ -178,45 +140,34 @@ static void test_cmpxchg(struct atomics_lskel *skel)  	ASSERT_EQ(skel->data->cmpxchg32_value, 2, "lcmpxchg32_value");  	ASSERT_EQ(skel->bss->cmpxchg32_result_fail, 1, "cmpxchg_result_fail");  	ASSERT_EQ(skel->bss->cmpxchg32_result_succeed, 1, "cmpxchg_result_succeed"); - -cleanup: -	close(link_fd);  }  static void test_xchg(struct atomics_lskel *skel)  {  	int err, prog_fd; -	__u32 duration = 0, retval; -	int link_fd; - -	link_fd = atomics_lskel__xchg__attach(skel); -	if (!ASSERT_GT(link_fd, 0, "attach(xchg)")) -		return; +	LIBBPF_OPTS(bpf_test_run_opts, topts); +	/* No need to attach it, just run it directly */  	prog_fd = skel->progs.xchg.prog_fd; -	err = bpf_prog_test_run(prog_fd, 1, NULL, 0, -				NULL, NULL, &retval, &duration); -	if (CHECK(err || retval, "test_run xchg", -		  "err %d errno %d retval %d duration %d\n", err, errno, retval, duration)) -		goto cleanup; +	err = bpf_prog_test_run_opts(prog_fd, &topts); +	if (!ASSERT_OK(err, "test_run_opts err")) +		return; +	if (!ASSERT_OK(topts.retval, "test_run_opts retval")) +		return;  	ASSERT_EQ(skel->data->xchg64_value, 2, "xchg64_value");  	ASSERT_EQ(skel->bss->xchg64_result, 1, "xchg64_result");  	ASSERT_EQ(skel->data->xchg32_value, 2, "xchg32_value");  	ASSERT_EQ(skel->bss->xchg32_result, 1, "xchg32_result"); - -cleanup: -	close(link_fd);  }  void test_atomics(void)  {  	struct atomics_lskel *skel; -	__u32 duration = 0;  	skel = atomics_lskel__open_and_load(); -	if (CHECK(!skel, "skel_load", "atomics skeleton failed\n")) +	if (!ASSERT_OK_PTR(skel, "atomics skeleton load"))  		return;  	if (skel->data->skip_tests) { |