korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-27 22:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

selftests/bpf: Handle ATTACH_REJECT test cases

Browse Source 
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: Jordan Rife <jrife@google.com>
Link: https://lore.kernel.org/r/20240510190246.3247730-5-jrife@google.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
Jordan Rife 2024-05-10 14:02:21 -05:00 committed by Alexei Starovoitov
parent 5eff48f33f
commit 5a047b2226
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tools/testing/selftests/bpf/prog_tests/sock_addr.c
View File

@ -367,6 +367,38 @@ struct sock_addr_test {
} 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) \
static void *prog_name##_load(int cgroup_fd, \
enum bpf_attach_type attach_type, \
@ -1342,7 +1374,8 @@ void test_sock_addr(void)
continue;
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)
continue;