| Message ID | AM6PR03MB50809E5CD1B8DE0225A85B6B99202@AM6PR03MB5080.eurprd03.prod.outlook.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | bpf: Add open-coded style process file iterator and bpf_fget_task() kfunc | expand |
On Tue, Nov 19, 2024 at 05:53:59PM +0000, Juntong Deng wrote: SNIP > +static void subtest_task_file_iters(void) > +{ > + int prog_fd, child_pid, wstatus, err = 0; > + const int stack_size = 1024 * 1024; > + struct iters_task_file *skel; > + struct files_test_args args; > + struct bpf_program *prog; > + bool setup_end, test_end; > + char *stack; > + > + skel = iters_task_file__open_and_load(); > + if (!ASSERT_OK_PTR(skel, "open_and_load")) > + return; > + > + if (!ASSERT_OK(skel->bss->err, "pre_test_err")) > + goto cleanup_skel; > + > + prog = bpf_object__find_program_by_name(skel->obj, "test_bpf_iter_task_file"); > + if (!ASSERT_OK_PTR(prog, "find_program_by_name")) > + goto cleanup_skel; > + > + prog_fd = bpf_program__fd(prog); > + if (!ASSERT_GT(prog_fd, -1, "bpf_program__fd")) > + goto cleanup_skel; I don't think you need to check on this once we did iters_task_file__open_and_load > + > + stack = (char *)malloc(stack_size); > + if (!ASSERT_OK_PTR(stack, "clone_stack")) > + goto cleanup_skel; > + > + setup_end = false; > + test_end = false; > + > + args.setup_end = &setup_end; > + args.test_end = &test_end; > + > + /* Note that there is no CLONE_FILES */ > + child_pid = clone(task_file_test_process, stack + stack_size, CLONE_VM | SIGCHLD, &args); > + if (!ASSERT_GT(child_pid, -1, "child_pid")) > + goto cleanup_stack; > + > + while (!setup_end) > + ; I thin kthe preferred way is to synchronize through pipe, you can check prog_tests/uprobe_multi_test.c > + > + skel->bss->pid = child_pid; > + > + err = bpf_prog_test_run_opts(prog_fd, NULL); > + if (!ASSERT_OK(err, "prog_test_run")) > + goto cleanup_stack; > + > + test_end = true; > + > + if (!ASSERT_GT(waitpid(child_pid, &wstatus, 0), -1, "waitpid")) > + goto cleanup_stack; > + > + if (!ASSERT_OK(WEXITSTATUS(wstatus), "run_task_file_iters_test_err")) > + goto cleanup_stack; > + > + ASSERT_OK(skel->bss->err, "run_task_file_iters_test_failure"); could the test check on that the iterated files were (or contained) the ones we expected? thanks, jirka > +cleanup_stack: > + free(stack); > +cleanup_skel: > + iters_task_file__destroy(skel); > +} > + > void test_iters(void) > { > RUN_TESTS(iters_state_safety); > @@ -315,5 +417,8 @@ void test_iters(void) > subtest_css_task_iters(); > if (test__start_subtest("css")) > subtest_css_iters(); > + if (test__start_subtest("task_file")) > + subtest_task_file_iters(); > RUN_TESTS(iters_task_failure); > + RUN_TESTS(iters_task_file_failure); > } > diff --git a/tools/testing/selftests/bpf/progs/iters_task_file.c b/tools/testing/selftests/bpf/progs/iters_task_file.c > new file mode 100644 > index 000000000000..f14b473936c7 > --- /dev/null > +++ b/tools/testing/selftests/bpf/progs/iters_task_file.c > @@ -0,0 +1,71 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +#include "vmlinux.h" > +#include <bpf/bpf_tracing.h> > +#include <bpf/bpf_helpers.h> > +#include "bpf_misc.h" > +#include "bpf_experimental.h" > +#include "task_kfunc_common.h" > + > +char _license[] SEC("license") = "GPL"; > + > +int err, pid; > + > +SEC("syscall") > +int test_bpf_iter_task_file(void *ctx) > +{ > + struct bpf_iter_task_file task_file_it; > + struct bpf_iter_task_file_item *item; > + struct task_struct *task; > + > + task = bpf_task_from_vpid(pid); > + if (task == NULL) { > + err = 1; > + return 0; > + } > + > + bpf_rcu_read_lock(); > + bpf_iter_task_file_new(&task_file_it, task); > + > + item = bpf_iter_task_file_next(&task_file_it); > + if (item == NULL) { > + err = 2; > + goto cleanup; > + } > + > + if (item->fd != 0) { > + err = 3; > + goto cleanup; > + } > + > + item = bpf_iter_task_file_next(&task_file_it); > + if (item == NULL) { > + err = 4; > + goto cleanup; > + } > + > + if (item->fd != 1) { > + err = 5; > + goto cleanup; > + } > + > + item = bpf_iter_task_file_next(&task_file_it); > + if (item == NULL) { > + err = 6; > + goto cleanup; > + } > + > + if (item->fd != 2) { > + err = 7; > + goto cleanup; > + } > + > + item = bpf_iter_task_file_next(&task_file_it); > + if (item != NULL) > + err = 8; > +cleanup: > + bpf_iter_task_file_destroy(&task_file_it); > + bpf_rcu_read_unlock(); > + bpf_task_release(task); > + return 0; > +} > diff --git a/tools/testing/selftests/bpf/progs/iters_task_file_failure.c b/tools/testing/selftests/bpf/progs/iters_task_file_failure.c > new file mode 100644 > index 000000000000..c3de9235b888 > --- /dev/null > +++ b/tools/testing/selftests/bpf/progs/iters_task_file_failure.c > @@ -0,0 +1,114 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +#include "vmlinux.h" > +#include <bpf/bpf_tracing.h> > +#include <bpf/bpf_helpers.h> > +#include "bpf_misc.h" > +#include "bpf_experimental.h" > +#include "task_kfunc_common.h" > + > +char _license[] SEC("license") = "GPL"; > + > +SEC("syscall") > +__failure __msg("expected an RCU CS when using bpf_iter_task_file") > +int bpf_iter_task_file_new_without_rcu_lock(void *ctx) > +{ > + struct bpf_iter_task_file task_file_it; > + struct task_struct *task; > + > + task = bpf_get_current_task_btf(); > + > + bpf_iter_task_file_new(&task_file_it, task); > + > + bpf_iter_task_file_destroy(&task_file_it); > + return 0; > +} > + > +SEC("syscall") > +__failure __msg("expected uninitialized iter_task_file as arg #1") > +int bpf_iter_task_file_new_inited_iter(void *ctx) > +{ > + struct bpf_iter_task_file task_file_it; > + struct task_struct *task; > + > + task = bpf_get_current_task_btf(); > + > + bpf_rcu_read_lock(); > + bpf_iter_task_file_new(&task_file_it, task); > + > + bpf_iter_task_file_new(&task_file_it, task); > + > + bpf_iter_task_file_destroy(&task_file_it); > + bpf_rcu_read_unlock(); > + return 0; > +} > + > +SEC("syscall") > +__failure __msg("Possibly NULL pointer passed to trusted arg1") > +int bpf_iter_task_file_new_null_task(void *ctx) > +{ > + struct bpf_iter_task_file task_file_it; > + struct task_struct *task = NULL; > + > + bpf_rcu_read_lock(); > + bpf_iter_task_file_new(&task_file_it, task); > + > + bpf_iter_task_file_destroy(&task_file_it); > + bpf_rcu_read_unlock(); > + return 0; > +} > + > +SEC("syscall") > +__failure __msg("R2 must be referenced or trusted") > +int bpf_iter_task_file_new_untrusted_task(void *ctx) > +{ > + struct bpf_iter_task_file task_file_it; > + struct task_struct *task; > + > + task = bpf_get_current_task_btf()->parent; > + > + bpf_rcu_read_lock(); > + bpf_iter_task_file_new(&task_file_it, task); > + > + bpf_iter_task_file_destroy(&task_file_it); > + bpf_rcu_read_unlock(); > + return 0; > +} > + > +SEC("syscall") > +__failure __msg("Unreleased reference") > +int bpf_iter_task_file_no_destory(void *ctx) > +{ > + struct bpf_iter_task_file task_file_it; > + struct task_struct *task; > + > + task = bpf_get_current_task_btf(); > + > + bpf_rcu_read_lock(); > + bpf_iter_task_file_new(&task_file_it, task); > + > + bpf_rcu_read_unlock(); > + return 0; > +} > + > +SEC("syscall") > +__failure __msg("expected an initialized iter_task_file as arg #1") > +int bpf_iter_task_file_next_uninit_iter(void *ctx) > +{ > + struct bpf_iter_task_file task_file_it; > + > + bpf_iter_task_file_next(&task_file_it); > + > + return 0; > +} > + > +SEC("syscall") > +__failure __msg("expected an initialized iter_task_file as arg #1") > +int bpf_iter_task_file_destroy_uninit_iter(void *ctx) > +{ > + struct bpf_iter_task_file task_file_it; > + > + bpf_iter_task_file_destroy(&task_file_it); > + > + return 0; > +} > -- > 2.39.5 >
diff --git a/tools/testing/selftests/bpf/bpf_experimental.h b/tools/testing/selftests/bpf/bpf_experimental.h index cd8ecd39c3f3..ce1520c56b55 100644 --- a/tools/testing/selftests/bpf/bpf_experimental.h +++ b/tools/testing/selftests/bpf/bpf_experimental.h @@ -588,4 +588,11 @@ extern int bpf_iter_kmem_cache_new(struct bpf_iter_kmem_cache *it) __weak __ksym extern struct kmem_cache *bpf_iter_kmem_cache_next(struct bpf_iter_kmem_cache *it) __weak __ksym; extern void bpf_iter_kmem_cache_destroy(struct bpf_iter_kmem_cache *it) __weak __ksym; +struct bpf_iter_task_file; +struct bpf_iter_task_file_item; +extern int bpf_iter_task_file_new(struct bpf_iter_task_file *it, struct task_struct *task) __ksym; +extern struct bpf_iter_task_file_item * +bpf_iter_task_file_next(struct bpf_iter_task_file *it) __ksym; +extern void bpf_iter_task_file_destroy(struct bpf_iter_task_file *it) __ksym; + #endif diff --git a/tools/testing/selftests/bpf/prog_tests/iters.c b/tools/testing/selftests/bpf/prog_tests/iters.c index 3cea71f9c500..4944810e9b2f 100644 --- a/tools/testing/selftests/bpf/prog_tests/iters.c +++ b/tools/testing/selftests/bpf/prog_tests/iters.c @@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2023 Meta Platforms, Inc. and affiliates. */ +#define _GNU_SOURCE +#include <sys/socket.h> #include <sys/syscall.h> #include <sys/mman.h> #include <sys/wait.h> @@ -16,11 +18,13 @@ #include "iters_num.skel.h" #include "iters_testmod.skel.h" #include "iters_testmod_seq.skel.h" +#include "iters_task_file.skel.h" #include "iters_task_vma.skel.h" #include "iters_task.skel.h" #include "iters_css_task.skel.h" #include "iters_css.skel.h" #include "iters_task_failure.skel.h" +#include "iters_task_file_failure.skel.h" static void subtest_num_iters(void) { @@ -291,6 +295,104 @@ static void subtest_css_iters(void) iters_css__destroy(skel); } +struct files_test_args { + bool *setup_end; + bool *test_end; +}; + +static int task_file_test_process(void *args) +{ + struct files_test_args *test_args = (struct files_test_args *)args; + int pipefd[2], sockfd, err = 0; + + /* Create a clean file descriptor table for the test process */ + close_range(0, ~0U, 0); + + if (pipe(pipefd) < 0) + return 1; + + sockfd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + if (sockfd < 0) { + err = 2; + goto cleanup_pipe; + } + + *test_args->setup_end = true; + + while (!*test_args->test_end) + ; + + close(sockfd); +cleanup_pipe: + close(pipefd[0]); + close(pipefd[1]); + return err; +} + +static void subtest_task_file_iters(void) +{ + int prog_fd, child_pid, wstatus, err = 0; + const int stack_size = 1024 * 1024; + struct iters_task_file *skel; + struct files_test_args args; + struct bpf_program *prog; + bool setup_end, test_end; + char *stack; + + skel = iters_task_file__open_and_load(); + if (!ASSERT_OK_PTR(skel, "open_and_load")) + return; + + if (!ASSERT_OK(skel->bss->err, "pre_test_err")) + goto cleanup_skel; + + prog = bpf_object__find_program_by_name(skel->obj, "test_bpf_iter_task_file"); + if (!ASSERT_OK_PTR(prog, "find_program_by_name")) + goto cleanup_skel; + + prog_fd = bpf_program__fd(prog); + if (!ASSERT_GT(prog_fd, -1, "bpf_program__fd")) + goto cleanup_skel; + + stack = (char *)malloc(stack_size); + if (!ASSERT_OK_PTR(stack, "clone_stack")) + goto cleanup_skel; + + setup_end = false; + test_end = false; + + args.setup_end = &setup_end; + args.test_end = &test_end; + + /* Note that there is no CLONE_FILES */ + child_pid = clone(task_file_test_process, stack + stack_size, CLONE_VM | SIGCHLD, &args); + if (!ASSERT_GT(child_pid, -1, "child_pid")) + goto cleanup_stack; + + while (!setup_end) + ; + + skel->bss->pid = child_pid; + + err = bpf_prog_test_run_opts(prog_fd, NULL); + if (!ASSERT_OK(err, "prog_test_run")) + goto cleanup_stack; + + test_end = true; + + if (!ASSERT_GT(waitpid(child_pid, &wstatus, 0), -1, "waitpid")) + goto cleanup_stack; + + if (!ASSERT_OK(WEXITSTATUS(wstatus), "run_task_file_iters_test_err")) + goto cleanup_stack; + + ASSERT_OK(skel->bss->err, "run_task_file_iters_test_failure"); +cleanup_stack: + free(stack); +cleanup_skel: + iters_task_file__destroy(skel); +} + void test_iters(void) { RUN_TESTS(iters_state_safety); @@ -315,5 +417,8 @@ void test_iters(void) subtest_css_task_iters(); if (test__start_subtest("css")) subtest_css_iters(); + if (test__start_subtest("task_file")) + subtest_task_file_iters(); RUN_TESTS(iters_task_failure); + RUN_TESTS(iters_task_file_failure); } diff --git a/tools/testing/selftests/bpf/progs/iters_task_file.c b/tools/testing/selftests/bpf/progs/iters_task_file.c new file mode 100644 index 000000000000..f14b473936c7 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/iters_task_file.c @@ -0,0 +1,71 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include "vmlinux.h" +#include <bpf/bpf_tracing.h> +#include <bpf/bpf_helpers.h> +#include "bpf_misc.h" +#include "bpf_experimental.h" +#include "task_kfunc_common.h" + +char _license[] SEC("license") = "GPL"; + +int err, pid; + +SEC("syscall") +int test_bpf_iter_task_file(void *ctx) +{ + struct bpf_iter_task_file task_file_it; + struct bpf_iter_task_file_item *item; + struct task_struct *task; + + task = bpf_task_from_vpid(pid); + if (task == NULL) { + err = 1; + return 0; + } + + bpf_rcu_read_lock(); + bpf_iter_task_file_new(&task_file_it, task); + + item = bpf_iter_task_file_next(&task_file_it); + if (item == NULL) { + err = 2; + goto cleanup; + } + + if (item->fd != 0) { + err = 3; + goto cleanup; + } + + item = bpf_iter_task_file_next(&task_file_it); + if (item == NULL) { + err = 4; + goto cleanup; + } + + if (item->fd != 1) { + err = 5; + goto cleanup; + } + + item = bpf_iter_task_file_next(&task_file_it); + if (item == NULL) { + err = 6; + goto cleanup; + } + + if (item->fd != 2) { + err = 7; + goto cleanup; + } + + item = bpf_iter_task_file_next(&task_file_it); + if (item != NULL) + err = 8; +cleanup: + bpf_iter_task_file_destroy(&task_file_it); + bpf_rcu_read_unlock(); + bpf_task_release(task); + return 0; +} diff --git a/tools/testing/selftests/bpf/progs/iters_task_file_failure.c b/tools/testing/selftests/bpf/progs/iters_task_file_failure.c new file mode 100644 index 000000000000..c3de9235b888 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/iters_task_file_failure.c @@ -0,0 +1,114 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include "vmlinux.h" +#include <bpf/bpf_tracing.h> +#include <bpf/bpf_helpers.h> +#include "bpf_misc.h" +#include "bpf_experimental.h" +#include "task_kfunc_common.h" + +char _license[] SEC("license") = "GPL"; + +SEC("syscall") +__failure __msg("expected an RCU CS when using bpf_iter_task_file") +int bpf_iter_task_file_new_without_rcu_lock(void *ctx) +{ + struct bpf_iter_task_file task_file_it; + struct task_struct *task; + + task = bpf_get_current_task_btf(); + + bpf_iter_task_file_new(&task_file_it, task); + + bpf_iter_task_file_destroy(&task_file_it); + return 0; +} + +SEC("syscall") +__failure __msg("expected uninitialized iter_task_file as arg #1") +int bpf_iter_task_file_new_inited_iter(void *ctx) +{ + struct bpf_iter_task_file task_file_it; + struct task_struct *task; + + task = bpf_get_current_task_btf(); + + bpf_rcu_read_lock(); + bpf_iter_task_file_new(&task_file_it, task); + + bpf_iter_task_file_new(&task_file_it, task); + + bpf_iter_task_file_destroy(&task_file_it); + bpf_rcu_read_unlock(); + return 0; +} + +SEC("syscall") +__failure __msg("Possibly NULL pointer passed to trusted arg1") +int bpf_iter_task_file_new_null_task(void *ctx) +{ + struct bpf_iter_task_file task_file_it; + struct task_struct *task = NULL; + + bpf_rcu_read_lock(); + bpf_iter_task_file_new(&task_file_it, task); + + bpf_iter_task_file_destroy(&task_file_it); + bpf_rcu_read_unlock(); + return 0; +} + +SEC("syscall") +__failure __msg("R2 must be referenced or trusted") +int bpf_iter_task_file_new_untrusted_task(void *ctx) +{ + struct bpf_iter_task_file task_file_it; + struct task_struct *task; + + task = bpf_get_current_task_btf()->parent; + + bpf_rcu_read_lock(); + bpf_iter_task_file_new(&task_file_it, task); + + bpf_iter_task_file_destroy(&task_file_it); + bpf_rcu_read_unlock(); + return 0; +} + +SEC("syscall") +__failure __msg("Unreleased reference") +int bpf_iter_task_file_no_destory(void *ctx) +{ + struct bpf_iter_task_file task_file_it; + struct task_struct *task; + + task = bpf_get_current_task_btf(); + + bpf_rcu_read_lock(); + bpf_iter_task_file_new(&task_file_it, task); + + bpf_rcu_read_unlock(); + return 0; +} + +SEC("syscall") +__failure __msg("expected an initialized iter_task_file as arg #1") +int bpf_iter_task_file_next_uninit_iter(void *ctx) +{ + struct bpf_iter_task_file task_file_it; + + bpf_iter_task_file_next(&task_file_it); + + return 0; +} + +SEC("syscall") +__failure __msg("expected an initialized iter_task_file as arg #1") +int bpf_iter_task_file_destroy_uninit_iter(void *ctx) +{ + struct bpf_iter_task_file task_file_it; + + bpf_iter_task_file_destroy(&task_file_it); + + return 0; +}
This patch adds test cases for open-coded style process file iterator. Test cases related to process files are run in the newly created child process. Close all opened files inherited from the parent process in the child process to avoid the files opened by the parent process affecting the test results. In addition, this patch adds failure test cases where bpf programs cannot pass the verifier due to uninitialized or untrusted arguments, or not in RCU CS, etc. Signed-off-by: Juntong Deng <juntong.deng@outlook.com> --- .../testing/selftests/bpf/bpf_experimental.h | 7 ++ .../testing/selftests/bpf/prog_tests/iters.c | 105 ++++++++++++++++ .../selftests/bpf/progs/iters_task_file.c | 71 +++++++++++ .../bpf/progs/iters_task_file_failure.c | 114 ++++++++++++++++++ 4 files changed, 297 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/iters_task_file.c create mode 100644 tools/testing/selftests/bpf/progs/iters_task_file_failure.c