Commit d55c765a authored by Kui-Feng Lee's avatar Kui-Feng Lee Committed by Alexei Starovoitov
Browse files

selftests/bpf: Test global bpf_rb_root arrays and fields in nested struct types. 



Make sure global arrays of bpf_rb_root and fields of bpf_rb_root in nested
struct types work correctly.

Signed-off-by: default avatarKui-Feng Lee <thinker.li@gmail.com>
Link: https://lore.kernel.org/r/20240523174202.461236-9-thinker.li@gmail.com


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

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

+47 −0
Original line number Diff line number Diff line
@@ -31,6 +31,28 @@ static void test_rbtree_add_nodes(void) 
	rbtree__destroy(skel);

}



static void test_rbtree_add_nodes_nested(void)

{

	LIBBPF_OPTS(bpf_test_run_opts, opts,

		    .data_in = &pkt_v4,

		    .data_size_in = sizeof(pkt_v4),

		    .repeat = 1,

	);

	struct rbtree *skel;

	int ret;



	skel = rbtree__open_and_load();

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

		return;



	ret = bpf_prog_test_run_opts(bpf_program__fd(skel->progs.rbtree_add_nodes_nested), &opts);

	ASSERT_OK(ret, "rbtree_add_nodes_nested run");

	ASSERT_OK(opts.retval, "rbtree_add_nodes_nested retval");

	ASSERT_EQ(skel->data->less_callback_ran, 1, "rbtree_add_nodes_nested less_callback_ran");



	rbtree__destroy(skel);

}



static void test_rbtree_add_and_remove(void)

{

	LIBBPF_OPTS(bpf_test_run_opts, opts,
@@ -53,6 +75,27 @@ static void test_rbtree_add_and_remove(void) 
	rbtree__destroy(skel);

}



static void test_rbtree_add_and_remove_array(void)

{

	LIBBPF_OPTS(bpf_test_run_opts, opts,

		    .data_in = &pkt_v4,

		    .data_size_in = sizeof(pkt_v4),

		    .repeat = 1,

	);

	struct rbtree *skel;

	int ret;



	skel = rbtree__open_and_load();

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

		return;



	ret = bpf_prog_test_run_opts(bpf_program__fd(skel->progs.rbtree_add_and_remove_array), &opts);

	ASSERT_OK(ret, "rbtree_add_and_remove_array");

	ASSERT_OK(opts.retval, "rbtree_add_and_remove_array retval");



	rbtree__destroy(skel);

}



static void test_rbtree_first_and_remove(void)

{

	LIBBPF_OPTS(bpf_test_run_opts, opts,
@@ -104,8 +147,12 @@ void test_rbtree_success(void) 
{

	if (test__start_subtest("rbtree_add_nodes"))

		test_rbtree_add_nodes();

	if (test__start_subtest("rbtree_add_nodes_nested"))

		test_rbtree_add_nodes_nested();

	if (test__start_subtest("rbtree_add_and_remove"))

		test_rbtree_add_and_remove();

	if (test__start_subtest("rbtree_add_and_remove_array"))

		test_rbtree_add_and_remove_array();

	if (test__start_subtest("rbtree_first_and_remove"))

		test_rbtree_first_and_remove();

	if (test__start_subtest("rbtree_api_release_aliasing"))

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

+77 −0
Original line number Diff line number Diff line
@@ -13,6 +13,15 @@ struct node_data { 
	struct bpf_rb_node node;

};



struct root_nested_inner {

	struct bpf_spin_lock glock;

	struct bpf_rb_root root __contains(node_data, node);

};



struct root_nested {

	struct root_nested_inner inner;

};



long less_callback_ran = -1;

long removed_key = -1;

long first_data[2] = {-1, -1};
@@ -20,6 +29,9 @@ long first_data[2] = {-1, -1}; 
#define private(name) SEC(".data." #name) __hidden __attribute__((aligned(8)))

private(A) struct bpf_spin_lock glock;

private(A) struct bpf_rb_root groot __contains(node_data, node);

private(A) struct bpf_rb_root groot_array[2] __contains(node_data, node);

private(A) struct bpf_rb_root groot_array_one[1] __contains(node_data, node);

private(B) struct root_nested groot_nested;



static bool less(struct bpf_rb_node *a, const struct bpf_rb_node *b)

{
@@ -71,6 +83,12 @@ long rbtree_add_nodes(void *ctx) 
	return __add_three(&groot, &glock);

}



SEC("tc")

long rbtree_add_nodes_nested(void *ctx)

{

	return __add_three(&groot_nested.inner.root, &groot_nested.inner.glock);

}



SEC("tc")

long rbtree_add_and_remove(void *ctx)

{
@@ -109,6 +127,65 @@ long rbtree_add_and_remove(void *ctx) 
	return 1;

}



SEC("tc")

long rbtree_add_and_remove_array(void *ctx)

{

	struct bpf_rb_node *res1 = NULL, *res2 = NULL, *res3 = NULL;

	struct node_data *nodes[3][2] = {{NULL, NULL}, {NULL, NULL}, {NULL, NULL}};

	struct node_data *n;

	long k1 = -1, k2 = -1, k3 = -1;

	int i, j;



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

		for (j = 0; j < 2; j++) {

			nodes[i][j] = bpf_obj_new(typeof(*nodes[i][j]));

			if (!nodes[i][j])

				goto err_out;

			nodes[i][j]->key = i * 2 + j;

		}

	}



	bpf_spin_lock(&glock);

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

		for (j = 0; j < 2; j++)

			bpf_rbtree_add(&groot_array[i], &nodes[i][j]->node, less);

	for (j = 0; j < 2; j++)

		bpf_rbtree_add(&groot_array_one[0], &nodes[2][j]->node, less);

	res1 = bpf_rbtree_remove(&groot_array[0], &nodes[0][0]->node);

	res2 = bpf_rbtree_remove(&groot_array[1], &nodes[1][0]->node);

	res3 = bpf_rbtree_remove(&groot_array_one[0], &nodes[2][0]->node);

	bpf_spin_unlock(&glock);



	if (res1) {

		n = container_of(res1, struct node_data, node);

		k1 = n->key;

		bpf_obj_drop(n);

	}

	if (res2) {

		n = container_of(res2, struct node_data, node);

		k2 = n->key;

		bpf_obj_drop(n);

	}

	if (res3) {

		n = container_of(res3, struct node_data, node);

		k3 = n->key;

		bpf_obj_drop(n);

	}

	if (k1 != 0 || k2 != 2 || k3 != 4)

		return 2;



	return 0;



err_out:

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

		for (j = 0; j < 2; j++) {

			if (nodes[i][j])

				bpf_obj_drop(nodes[i][j]);

		}

	}

	return 1;

}



SEC("tc")

long rbtree_first_and_remove(void *ctx)

{