Commit d85aedac authored by Kumar Kartikeya Dwivedi's avatar Kumar Kartikeya Dwivedi Committed by Alexei Starovoitov
Browse files

selftests/bpf: Update spinlock selftest 



Make updates in preparation for adding more test cases to this selftest:
- Convert from CHECK_ to ASSERT macros.
- Use BPF skeleton
- Fix typo sping -> spin
- Rename spinlock.c -> spin_lock.c

Signed-off-by: default avatarKumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/r/20221118015614.2013203-21-memxor@gmail.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 64069c72

tools/testing/selftests/bpf/prog_tests/spinlock.c→tools/testing/selftests/bpf/prog_tests/spin_lock.c

+49 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
#include <test_progs.h>

#include <network_helpers.h>



#include "test_spin_lock.skel.h"



static void *spin_lock_thread(void *arg)

{

	int err, prog_fd = *(u32 *) arg;
@@ -19,27 +21,29 @@ static void *spin_lock_thread(void *arg) 


void test_spinlock(void)

{

	const char *file = "./test_spin_lock.bpf.o";

	struct test_spin_lock *skel;

	pthread_t thread_id[4];

	struct bpf_object *obj = NULL;

	int prog_fd;

	int err = 0, i;

	int prog_fd, i;

	void *ret;



	err = bpf_prog_test_load(file, BPF_PROG_TYPE_CGROUP_SKB, &obj, &prog_fd);

	if (CHECK_FAIL(err)) {

		printf("test_spin_lock:bpf_prog_test_load errno %d\n", errno);

		goto close_prog;

	skel = test_spin_lock__open_and_load();

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

		return;

	prog_fd = bpf_program__fd(skel->progs.bpf_spin_lock_test);

	for (i = 0; i < 4; i++) {

		int err;



		err = pthread_create(&thread_id[i], NULL, &spin_lock_thread, &prog_fd);

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

			goto end;

	}

	for (i = 0; i < 4; i++)

		if (CHECK_FAIL(pthread_create(&thread_id[i], NULL,

					      &spin_lock_thread, &prog_fd)))

			goto close_prog;



	for (i = 0; i < 4; i++)

		if (CHECK_FAIL(pthread_join(thread_id[i], &ret) ||

			       ret != (void *)&prog_fd))

			goto close_prog;

close_prog:

	bpf_object__close(obj);

	for (i = 0; i < 4; i++) {

		if (!ASSERT_OK(pthread_join(thread_id[i], &ret), "pthread_join"))

			goto end;

		if (!ASSERT_EQ(ret, &prog_fd, "ret == prog_fd"))

			goto end;

	}

end:

	test_spin_lock__destroy(skel);

}

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

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ struct { 


#define CREDIT_PER_NS(delta, rate) (((delta) * rate) >> 20)



SEC("tc")

int bpf_sping_lock_test(struct __sk_buff *skb)

SEC("cgroup_skb/ingress")

int bpf_spin_lock_test(struct __sk_buff *skb)

{

	volatile int credit = 0, max_credit = 100, pkt_len = 64;

	struct hmap_elem zero = {}, *val;