Re: [PATCHv2 bpf-next 2/7] selftests/bpf: Move test_progs helpers to testing_helpers object

David Vernet
2023-01-30T15:23:23Z

On Mon, Jan 30, 2023 at 09:55:35AM +0100, Jiri Olsa wrote:
> Moving test_progs helpers to testing_helpers object so they can be
> used from test_verifier in following changes.
>
> Also adding missing ifndef header guard to testing_helpers.h header.
>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/testing/selftests/bpf/test_progs.c | 67 +------------------
> tools/testing/selftests/bpf/test_progs.h | 1 -
> tools/testing/selftests/bpf/testing_helpers.c | 63 +++++++++++++++++
> tools/testing/selftests/bpf/testing_helpers.h | 10 +++
> 4 files changed, 75 insertions(+), 66 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c
> index 6d5e3022c75f..a150c35516ef 100644
> --- a/tools/testing/selftests/bpf/test_progs.c
> +++ b/tools/testing/selftests/bpf/test_progs.c
> @@ -11,7 +11,6 @@
> #include <signal.h>
> #include <string.h>
> #include <execinfo.h> /* backtrace */
> -#include <linux/membarrier.h>
> #include <sys/sysinfo.h> /* get_nprocs */
> #include <netinet/in.h>
> #include <sys/select.h>
> @@ -616,68 +615,6 @@ int extract_build_id(char *build_id, size_t size)
> return -1;
> }
>
> -static int finit_module(int fd, const char *param_values, int flags)
> -{
> - return syscall(__NR_finit_module, fd, param_values, flags);
> -}
> -
> -static int delete_module(const char *name, int flags)
> -{
> - return syscall(__NR_delete_module, name, flags);
> -}
> -
> -/*
> - * Trigger synchronize_rcu() in kernel.
> - */
> -int kern_sync_rcu(void)
> -{
> - return syscall(__NR_membarrier, MEMBARRIER_CMD_SHARED, 0, 0);
> -}
> -
> -static void unload_bpf_testmod(void)
> -{
> - if (kern_sync_rcu())
> - fprintf(env.stderr, "Failed to trigger kernel-side RCU sync!\n");
> - if (delete_module("bpf_testmod", 0)) {
> - if (errno == ENOENT) {
> - if (verbose())
> - fprintf(stdout, "bpf_testmod.ko is already unloaded.\n");
> - return;
> - }
> - fprintf(env.stderr, "Failed to unload bpf_testmod.ko from kernel: %d\n", -errno);
> - return;
> - }
> - if (verbose())
> - fprintf(stdout, "Successfully unloaded bpf_testmod.ko.\n");
> -}
> -
> -static int load_bpf_testmod(void)
> -{
> - int fd;
> -
> - /* ensure previous instance of the module is unloaded */
> - unload_bpf_testmod();
> -
> - if (verbose())
> - fprintf(stdout, "Loading bpf_testmod.ko...\n");
> -
> - fd = open("bpf_testmod.ko", O_RDONLY);
> - if (fd < 0) {
> - fprintf(env.stderr, "Can't find bpf_testmod.ko kernel module: %d\n", -errno);
> - return -ENOENT;
> - }
> - if (finit_module(fd, "", 0)) {
> - fprintf(env.stderr, "Failed to load bpf_testmod.ko into the kernel: %d\n", -errno);
> - close(fd);
> - return -EINVAL;
> - }
> - close(fd);
> -
> - if (verbose())
> - fprintf(stdout, "Successfully loaded bpf_testmod.ko.\n");
> - return 0;
> -}
> -
> /* extern declarations for test funcs */
> #define DEFINE_TEST(name) \
> extern void test_##name(void) __weak; \
> @@ -1655,7 +1592,7 @@ int main(int argc, char **argv)
> env.stderr = stderr;
>
> env.has_testmod = true;
> - if (!env.list_test_names && load_bpf_testmod()) {
> + if (!env.list_test_names && load_bpf_testmod(env.stderr, verbose())) {
> fprintf(env.stderr, "WARNING! Selftests relying on bpf_testmod.ko will be skipped.\n");
> env.has_testmod = false;
> }
> @@ -1754,7 +1691,7 @@ int main(int argc, char **argv)
> close(env.saved_netns_fd);
> out:
> if (!env.list_test_names && env.has_testmod)
> - unload_bpf_testmod();
> + unload_bpf_testmod(env.stderr, verbose());
>
> free_test_selector(&env.test_selector);
> free_test_selector(&env.subtest_selector);
> diff --git a/tools/testing/selftests/bpf/test_progs.h b/tools/testing/selftests/bpf/test_progs.h
> index d5d51ec97ec8..b9dac3c32712 100644
> --- a/tools/testing/selftests/bpf/test_progs.h
> +++ b/tools/testing/selftests/bpf/test_progs.h
> @@ -390,7 +390,6 @@ int bpf_find_map(const char *test, struct bpf_object *obj, const char *name);
> int compare_map_keys(int map1_fd, int map2_fd);
> int compare_stack_ips(int smap_fd, int amap_fd, int stack_trace_len);
> int extract_build_id(char *build_id, size_t size);
> -int kern_sync_rcu(void);
> int trigger_module_test_read(int read_sz);
> int trigger_module_test_write(int write_sz);
> int write_sysctl(const char *sysctl, const char *value);
> diff --git a/tools/testing/selftests/bpf/testing_helpers.c b/tools/testing/selftests/bpf/testing_helpers.c
> index 9695318e8132..c0eb54bf08b3 100644
> --- a/tools/testing/selftests/bpf/testing_helpers.c
> +++ b/tools/testing/selftests/bpf/testing_helpers.c
> @@ -8,6 +8,7 @@
> #include <bpf/libbpf.h>
> #include "test_progs.h"
> #include "testing_helpers.h"
> +#include <linux/membarrier.h>
>
> int parse_num_list(const char *s, bool **num_set, int *num_set_len)
> {
> @@ -229,3 +230,65 @@ int bpf_test_load_program(enum bpf_prog_type type, const struct bpf_insn *insns,
>
> return bpf_prog_load(type, NULL, license, insns, insns_cnt, &opts);
> }
> +
> +static int finit_module(int fd, const char *param_values, int flags)
> +{
> + return syscall(__NR_finit_module, fd, param_values, flags);
> +}
> +
> +static int delete_module(const char *name, int flags)
> +{
> + return syscall(__NR_delete_module, name, flags);
> +}
> +
> +void unload_bpf_testmod(FILE *err, bool verbose)

Maybe you should pass a const struct test_env * here and in
load_bpf_testmod() instead? Technically it also has a FILE *stdout, so
to be consistent we should probably also pass that to the fprintf()
calls on the success path.

> +{
> + if (kern_sync_rcu())
> + fprintf(err, "Failed to trigger kernel-side RCU sync!\n");
> + if (delete_module("bpf_testmod", 0)) {
> + if (errno == ENOENT) {
> + if (verbose)
> + fprintf(stdout, "bpf_testmod.ko is already unloaded.\n");
> + return;
> + }
> + fprintf(err, "Failed to unload bpf_testmod.ko from kernel: %d\n", -errno);
> + return;
> + }
> + if (verbose)
> + fprintf(stdout, "Successfully unloaded bpf_testmod.ko.\n");
> +}
> +
> +int load_bpf_testmod(FILE *err, bool verbose)
> +{
> + int fd;
> +
> + /* ensure previous instance of the module is unloaded */
> + unload_bpf_testmod(err, verbose);
> +
> + if (verbose)
> + fprintf(stdout, "Loading bpf_testmod.ko...\n");
> +
> + fd = open("bpf_testmod.ko", O_RDONLY);
> + if (fd < 0) {
> + fprintf(err, "Can't find bpf_testmod.ko kernel module: %d\n", -errno);
> + return -ENOENT;
> + }
> + if (finit_module(fd, "", 0)) {
> + fprintf(err, "Failed to load bpf_testmod.ko into the kernel: %d\n", -errno);
> + close(fd);
> + return -EINVAL;
> + }
> + close(fd);
> +
> + if (verbose)
> + fprintf(stdout, "Successfully loaded bpf_testmod.ko.\n");
> + return 0;
> +}
> +
> +/*
> + * Trigger synchronize_rcu() in kernel.
> + */
> +int kern_sync_rcu(void)
> +{
> + return syscall(__NR_membarrier, MEMBARRIER_CMD_SHARED, 0, 0);
> +}
> diff --git a/tools/testing/selftests/bpf/testing_helpers.h b/tools/testing/selftests/bpf/testing_helpers.h
> index 6ec00bf79cb5..2f80ca5b5f54 100644
> --- a/tools/testing/selftests/bpf/testing_helpers.h
> +++ b/tools/testing/selftests/bpf/testing_helpers.h
> @@ -1,5 +1,9 @@
> /* SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) */
> /* Copyright (C) 2020 Facebook, Inc. */
> +
> +#ifndef __TRACING_HELPERS_H
> +#define __TRACING_HELPERS_H

s/__TRACING/__TESTING here and below

> +
> #include <stdbool.h>
> #include <bpf/bpf.h>
> #include <bpf/libbpf.h>
> @@ -20,3 +24,9 @@ struct test_filter_set;
> int parse_test_list(const char *s,
> struct test_filter_set *test_set,
> bool is_glob_pattern);
> +
> +int load_bpf_testmod(FILE *err, bool verbose);
> +void unload_bpf_testmod(FILE *err, bool verbose);
> +int kern_sync_rcu(void);
> +
> +#endif /* __TRACING_HELPERS_H */
> --
> 2.39.1
>