From f3514a5d67403f803eadd39cf61986638101e755 Mon Sep 17 00:00:00 2001
From: Dave Marchevsky <davemarchevsky@fb.com>
Date: Tue, 18 Jul 2023 01:38:12 -0700
Subject: [PATCH] selftests/bpf: Disable newly-added 'owner' field test until
refcount re-enabled
The test added in previous patch will fail with bpf_refcount_acquire
disabled. Until all races are fixed and bpf_refcount_acquire is
re-enabled on bpf-next, disable the test so CI doesn't complain.
Signed-off-by: Dave Marchevsky <davemarchevsky@fb.com>
Link: https://lore.kernel.org/r/20230718083813.3416104-6-davemarchevsky@fb.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
---
.../bpf/prog_tests/refcounted_kptr.c | 24 -------------------
1 file changed, 24 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/refcounted_kptr.c b/tools/testing/selftests/bpf/prog_tests/refcounted_kptr.c
index 1cb5c657dc38e..7423983472c7c 100644
--- a/tools/testing/selftests/bpf/prog_tests/refcounted_kptr.c
+++ b/tools/testing/selftests/bpf/prog_tests/refcounted_kptr.c
@@ -17,28 +17,4 @@ void test_refcounted_kptr_fail(void)
void test_refcounted_kptr_wrong_owner(void)
{
- LIBBPF_OPTS(bpf_test_run_opts, opts,
- .data_in = &pkt_v4,
- .data_size_in = sizeof(pkt_v4),
- .repeat = 1,
- );
- struct refcounted_kptr *skel;
- int ret;
-
- skel = refcounted_kptr__open_and_load();
- if (!ASSERT_OK_PTR(skel, "refcounted_kptr__open_and_load"))
- return;
-
- ret = bpf_prog_test_run_opts(bpf_program__fd(skel->progs.rbtree_wrong_owner_remove_fail_a1), &opts);
- ASSERT_OK(ret, "rbtree_wrong_owner_remove_fail_a1");
- ASSERT_OK(opts.retval, "rbtree_wrong_owner_remove_fail_a1 retval");
-
- ret = bpf_prog_test_run_opts(bpf_program__fd(skel->progs.rbtree_wrong_owner_remove_fail_b), &opts);
- ASSERT_OK(ret, "rbtree_wrong_owner_remove_fail_b");
- ASSERT_OK(opts.retval, "rbtree_wrong_owner_remove_fail_b retval");
-
- ret = bpf_prog_test_run_opts(bpf_program__fd(skel->progs.rbtree_wrong_owner_remove_fail_a2), &opts);
- ASSERT_OK(ret, "rbtree_wrong_owner_remove_fail_a2");
- ASSERT_OK(opts.retval, "rbtree_wrong_owner_remove_fail_a2 retval");
- refcounted_kptr__destroy(skel);
}
--
2.30.2