From: David Vernet <void@manifault.com>
To: Jiri Olsa <jolsa@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
bpf@vger.kernel.org, Martin KaFai Lau <kafai@fb.com>,
Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@chromium.org>,
Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>,
Kumar Kartikeya Dwivedi <memxor@gmail.com>,
Artem Savkov <asavkov@redhat.com>
Subject: Re: [PATCHv3 bpf-next 5/9] selftests/bpf: Use un/load_bpf_testmod functions in tests
Date: Tue, 7 Feb 2023 08:45:01 -0600 [thread overview]
Message-ID: <Y+Jj7XLhbz4AacIL@maniforge.lan> (raw)
In-Reply-To: <20230203162336.608323-6-jolsa@kernel.org>
On Fri, Feb 03, 2023 at 05:23:32PM +0100, Jiri Olsa wrote:
> Now that we have un/load_bpf_testmod helpers in testing_helpers.h,
> we can use it in other tests and save some lines.
>
> Acked-by: David Vernet <void@manifault.com>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> .../selftests/bpf/prog_tests/bpf_mod_race.c | 34 +++----------------
> .../selftests/bpf/prog_tests/module_attach.c | 12 +++----
> tools/testing/selftests/bpf/testing_helpers.c | 7 ++--
> tools/testing/selftests/bpf/testing_helpers.h | 2 +-
> 4 files changed, 14 insertions(+), 41 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_mod_race.c b/tools/testing/selftests/bpf/prog_tests/bpf_mod_race.c
> index a4d0cc9d3367..fe2c502e5089 100644
> --- a/tools/testing/selftests/bpf/prog_tests/bpf_mod_race.c
> +++ b/tools/testing/selftests/bpf/prog_tests/bpf_mod_race.c
> @@ -11,6 +11,7 @@
> #include "ksym_race.skel.h"
> #include "bpf_mod_race.skel.h"
> #include "kfunc_call_race.skel.h"
> +#include "testing_helpers.h"
>
> /* This test crafts a race between btf_try_get_module and do_init_module, and
> * checks whether btf_try_get_module handles the invocation for a well-formed
> @@ -44,35 +45,10 @@ enum bpf_test_state {
>
> static _Atomic enum bpf_test_state state = _TS_INVALID;
>
> -static int sys_finit_module(int fd, const char *param_values, int flags)
> -{
> - return syscall(__NR_finit_module, fd, param_values, flags);
> -}
> -
> -static int sys_delete_module(const char *name, unsigned int flags)
> -{
> - return syscall(__NR_delete_module, name, flags);
> -}
> -
> -static int load_module(const char *mod)
> -{
> - int ret, fd;
> -
> - fd = open("bpf_testmod.ko", O_RDONLY);
> - if (fd < 0)
> - return fd;
> -
> - ret = sys_finit_module(fd, "", 0);
> - close(fd);
> - if (ret < 0)
> - return ret;
> - return 0;
> -}
> -
> static void *load_module_thread(void *p)
> {
>
> - if (!ASSERT_NEQ(load_module("bpf_testmod.ko"), 0, "load_module_thread must fail"))
> + if (!ASSERT_NEQ(load_bpf_testmod(false), 0, "load_module_thread must fail"))
> atomic_store(&state, TS_MODULE_LOAD);
> else
> atomic_store(&state, TS_MODULE_LOAD_FAIL);
> @@ -124,7 +100,7 @@ static void test_bpf_mod_race_config(const struct test_config *config)
> if (!ASSERT_NEQ(fault_addr, MAP_FAILED, "mmap for uffd registration"))
> return;
>
> - if (!ASSERT_OK(sys_delete_module("bpf_testmod", 0), "unload bpf_testmod"))
> + if (!ASSERT_OK(unload_bpf_testmod(false), "unload bpf_testmod"))
> goto end_mmap;
>
> skel = bpf_mod_race__open();
> @@ -202,8 +178,8 @@ static void test_bpf_mod_race_config(const struct test_config *config)
> bpf_mod_race__destroy(skel);
> ASSERT_OK(kern_sync_rcu(), "kern_sync_rcu");
> end_module:
> - sys_delete_module("bpf_testmod", 0);
> - ASSERT_OK(load_module("bpf_testmod.ko"), "restore bpf_testmod");
> + unload_bpf_testmod(false);
> + ASSERT_OK(load_bpf_testmod(false), "restore bpf_testmod");
> end_mmap:
> munmap(fault_addr, 4096);
> atomic_store(&state, _TS_INVALID);
> diff --git a/tools/testing/selftests/bpf/prog_tests/module_attach.c b/tools/testing/selftests/bpf/prog_tests/module_attach.c
> index 7fc01ff490db..f53d658ed080 100644
> --- a/tools/testing/selftests/bpf/prog_tests/module_attach.c
> +++ b/tools/testing/selftests/bpf/prog_tests/module_attach.c
> @@ -4,6 +4,7 @@
> #include <test_progs.h>
> #include <stdbool.h>
> #include "test_module_attach.skel.h"
> +#include "testing_helpers.h"
>
> static int duration;
>
> @@ -32,11 +33,6 @@ static int trigger_module_test_writable(int *val)
> return 0;
> }
>
> -static int delete_module(const char *name, int flags)
> -{
> - return syscall(__NR_delete_module, name, flags);
> -}
> -
> void test_module_attach(void)
> {
> const int READ_SZ = 456;
> @@ -93,21 +89,21 @@ void test_module_attach(void)
> if (!ASSERT_OK_PTR(link, "attach_fentry"))
> goto cleanup;
>
> - ASSERT_ERR(delete_module("bpf_testmod", 0), "delete_module");
> + ASSERT_ERR(unload_bpf_testmod(false), "unload_bpf_testmod");
> bpf_link__destroy(link);
>
> link = bpf_program__attach(skel->progs.handle_fexit);
> if (!ASSERT_OK_PTR(link, "attach_fexit"))
> goto cleanup;
>
> - ASSERT_ERR(delete_module("bpf_testmod", 0), "delete_module");
> + ASSERT_ERR(unload_bpf_testmod(false), "unload_bpf_testmod");
> bpf_link__destroy(link);
>
> link = bpf_program__attach(skel->progs.kprobe_multi);
> if (!ASSERT_OK_PTR(link, "attach_kprobe_multi"))
> goto cleanup;
>
> - ASSERT_ERR(delete_module("bpf_testmod", 0), "delete_module");
> + ASSERT_ERR(unload_bpf_testmod(false), "unload_bpf_testmod");
> bpf_link__destroy(link);
>
> cleanup:
> diff --git a/tools/testing/selftests/bpf/testing_helpers.c b/tools/testing/selftests/bpf/testing_helpers.c
> index 3872c36c17d4..030ed157954e 100644
> --- a/tools/testing/selftests/bpf/testing_helpers.c
> +++ b/tools/testing/selftests/bpf/testing_helpers.c
> @@ -241,7 +241,7 @@ static int delete_module(const char *name, int flags)
> return syscall(__NR_delete_module, name, flags);
> }
>
> -void unload_bpf_testmod(bool verbose)
> +int unload_bpf_testmod(bool verbose)
> {
> if (kern_sync_rcu())
> fprintf(stdout, "Failed to trigger kernel-side RCU sync!\n");
Per my question in [0], I'd be curious to know what the deal is with
this synchronize_rcu(). If it's actually important, it seems like we
should also return an error here if it fails. Otherwise, it should
probably just live in bpf_testmod_exit(). A comment explaining why it's
necessary seems useful regardless of where it is as well.
[0]: https://lore.kernel.org/bpf/Y+JiUQFyalc0aV6M@maniforge.lan/
> @@ -249,13 +249,14 @@ void unload_bpf_testmod(bool verbose)
> if (errno == ENOENT) {
> if (verbose)
> fprintf(stdout, "bpf_testmod.ko is already unloaded.\n");
> - return;
> + return -1;
> }
> fprintf(stdout, "Failed to unload bpf_testmod.ko from kernel: %d\n", -errno);
> - return;
> + return -1;
> }
> if (verbose)
> fprintf(stdout, "Successfully unloaded bpf_testmod.ko.\n");
> + return 0;
> }
>
> int load_bpf_testmod(bool verbose)
> diff --git a/tools/testing/selftests/bpf/testing_helpers.h b/tools/testing/selftests/bpf/testing_helpers.h
> index 7356474def27..713f8e37163d 100644
> --- a/tools/testing/selftests/bpf/testing_helpers.h
> +++ b/tools/testing/selftests/bpf/testing_helpers.h
> @@ -26,7 +26,7 @@ int parse_test_list(const char *s,
> bool is_glob_pattern);
>
> int load_bpf_testmod(bool verbose);
> -void unload_bpf_testmod(bool verbose);
> +int unload_bpf_testmod(bool verbose);
> int kern_sync_rcu(void);
>
> #endif /* __TESTING_HELPERS_H */
> --
> 2.39.1
>
next prev parent reply other threads:[~2023-02-07 14:45 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-03 16:23 [PATCHv3 bpf-next 0/9] bpf: Move kernel test kfuncs into bpf_testmod Jiri Olsa
2023-02-03 16:23 ` [PATCHv3 bpf-next 1/9] selftests/bpf: Move kfunc exports to bpf_testmod/bpf_testmod_kfunc.h Jiri Olsa
2023-02-07 14:28 ` David Vernet
2023-02-09 0:20 ` Andrii Nakryiko
2023-02-09 8:45 ` Jiri Olsa
2023-02-03 16:23 ` [PATCHv3 bpf-next 2/9] selftests/bpf: Move test_progs helpers to testing_helpers object Jiri Olsa
2023-02-07 14:38 ` David Vernet
2023-02-08 9:35 ` Jiri Olsa
2023-02-03 16:23 ` [PATCHv3 bpf-next 3/9] selftests/bpf: Use only stdout in un/load_bpf_testmod functions Jiri Olsa
2023-02-07 14:41 ` David Vernet
2023-02-08 9:44 ` Jiri Olsa
2023-02-03 16:23 ` [PATCHv3 bpf-next 4/9] selftests/bpf: Do not unload bpf_testmod in load_bpf_testmod Jiri Olsa
2023-02-03 16:23 ` [PATCHv3 bpf-next 5/9] selftests/bpf: Use un/load_bpf_testmod functions in tests Jiri Olsa
2023-02-07 14:45 ` David Vernet [this message]
2023-02-03 16:23 ` [PATCHv3 bpf-next 6/9] selftests/bpf: Load bpf_testmod for verifier test Jiri Olsa
2023-02-07 14:46 ` David Vernet
2023-02-03 16:23 ` [PATCHv3 bpf-next 7/9] selftests/bpf: Allow to use kfunc from testmod.ko in test_verifier Jiri Olsa
2023-02-07 15:34 ` David Vernet
2023-02-08 10:09 ` Jiri Olsa
2023-02-03 16:23 ` [PATCHv3 bpf-next 8/9] selftests/bpf: Remove extern from kfuncs declarations Jiri Olsa
2023-02-07 15:35 ` David Vernet
2023-02-03 16:23 ` [PATCHv3 bpf-next 9/9] bpf: Move kernel test kfuncs to bpf_testmod Jiri Olsa
2023-02-04 9:21 ` [PATCHv3 bpf-next 0/9] bpf: Move kernel test kfuncs into bpf_testmod Alexei Starovoitov
2023-02-05 18:17 ` Jiri Olsa
2023-02-05 18:36 ` Ilya Leoshkevich
2023-02-06 9:15 ` Jiri Olsa
2023-02-09 8:47 ` Jiri Olsa
2023-02-09 9:38 ` Ilya Leoshkevich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y+Jj7XLhbz4AacIL@maniforge.lan \
--to=void@manifault.com \
--cc=andrii@kernel.org \
--cc=asavkov@redhat.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=memxor@gmail.com \
--cc=sdf@google.com \
--cc=songliubraving@fb.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox