Commit 5a047b22 authored by Jordan Rife's avatar Jordan Rife Committed by Alexei Starovoitov

selftests/bpf: Handle ATTACH_REJECT test cases

In preparation to move test cases from bpf/test_sock_addr.c that expect
ATTACH_REJECT, this patch adds BPF_SKEL_FUNCS_RAW to generate load and
destroy functions that use bpf_prog_attach() to control the attach_type.

The normal load functions use bpf_program__attach_cgroup which does not
have the same degree of control over the attach type, as
bpf_program_attach_fd() calls bpf_link_create() with the attach type
extracted from prog using bpf_program__expected_attach_type(). It is
currently not possible to modify the attach type before
bpf_program__attach_cgroup() is called, since
bpf_program__set_expected_attach_type() has no effect after the program
is loaded.
Signed-off-by: default avatarJordan Rife <jrife@google.com>
Link: https://lore.kernel.org/r/20240510190246.3247730-5-jrife@google.comSigned-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 5eff48f3
...@@ -367,6 +367,38 @@ struct sock_addr_test { ...@@ -367,6 +367,38 @@ struct sock_addr_test {
} expected_result; } expected_result;
}; };
#define BPF_SKEL_FUNCS_RAW(skel_name, prog_name) \
static void *prog_name##_load_raw(int cgroup_fd, \
enum bpf_attach_type attach_type, \
bool expect_reject) \
{ \
struct skel_name *skel = skel_name##__open(); \
int prog_fd = -1; \
if (!ASSERT_OK_PTR(skel, "skel_open")) \
goto cleanup; \
if (!ASSERT_OK(skel_name##__load(skel), "load")) \
goto cleanup; \
prog_fd = bpf_program__fd(skel->progs.prog_name); \
if (!ASSERT_GT(prog_fd, 0, "prog_fd")) \
goto cleanup; \
if (bpf_prog_attach(prog_fd, cgroup_fd, attach_type, \
BPF_F_ALLOW_OVERRIDE), "bpf_prog_attach") { \
ASSERT_TRUE(expect_reject, "unexpected rejection"); \
goto cleanup; \
} \
if (!ASSERT_FALSE(expect_reject, "expected rejection")) \
goto cleanup; \
cleanup: \
if (prog_fd > 0) \
bpf_prog_detach(cgroup_fd, attach_type); \
skel_name##__destroy(skel); \
return NULL; \
} \
static void prog_name##_destroy_raw(void *progfd) \
{ \
/* No-op. *_load_raw does all cleanup. */ \
} \
#define BPF_SKEL_FUNCS(skel_name, prog_name) \ #define BPF_SKEL_FUNCS(skel_name, prog_name) \
static void *prog_name##_load(int cgroup_fd, \ static void *prog_name##_load(int cgroup_fd, \
enum bpf_attach_type attach_type, \ enum bpf_attach_type attach_type, \
...@@ -1342,7 +1374,8 @@ void test_sock_addr(void) ...@@ -1342,7 +1374,8 @@ void test_sock_addr(void)
continue; continue;
skel = test->loadfn(cgroup_fd, test->attach_type, skel = test->loadfn(cgroup_fd, test->attach_type,
test->expected_result == LOAD_REJECT); test->expected_result == LOAD_REJECT ||
test->expected_result == ATTACH_REJECT);
if (!skel) if (!skel)
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment