Commit 4192bb29 authored by Simon Sundberg's avatar Simon Sundberg Committed by Alexei Starovoitov
Browse files

selftests/bpf: Provide a generic [un]load_module helper 



Generalize the previous [un]load_bpf_testmod() helpers (in
testing_helpers.c) to the more generic [un]load_module(), which can
load an arbitrary kernel module by name. This allows future selftests
to more easily load custom kernel modules other than bpf_testmod.ko.
Refactor [un]load_bpf_testmod() to wrap this new helper.

Signed-off-by: default avatarSimon Sundberg <simon.sundberg@kau.se>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarKumar Kartikeya Dwivedi <memxor@gmail.com>
Signed-off-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Link: https://lore.kernel.org/r/20241010-fix-kfunc-btf-caching-for-modules-v2-2-745af6c1af98@redhat.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 6cb86a0f

tools/testing/selftests/bpf/testing_helpers.c

+22 −12
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ int delete_module(const char *name, int flags) 
	return syscall(__NR_delete_module, name, flags);

}



int unload_bpf_testmod(bool verbose)

int unload_module(const char *name, bool verbose)

{

	int ret, cnt = 0;
@@ -375,11 +375,11 @@ int unload_bpf_testmod(bool verbose) 
		fprintf(stdout, "Failed to trigger kernel-side RCU sync!\n");



	for (;;) {

		ret = delete_module("bpf_testmod", 0);

		ret = delete_module(name, 0);

		if (!ret || errno != EAGAIN)

			break;

		if (++cnt > 10000) {

			fprintf(stdout, "Unload of bpf_testmod timed out\n");

			fprintf(stdout, "Unload of %s timed out\n", name);

			break;

		}

		usleep(100);
@@ -388,41 +388,51 @@ int unload_bpf_testmod(bool verbose) 
	if (ret) {

		if (errno == ENOENT) {

			if (verbose)

				fprintf(stdout, "bpf_testmod.ko is already unloaded.\n");

				fprintf(stdout, "%s.ko is already unloaded.\n", name);

			return -1;

		}

		fprintf(stdout, "Failed to unload bpf_testmod.ko from kernel: %d\n", -errno);

		fprintf(stdout, "Failed to unload %s.ko from kernel: %d\n", name, -errno);

		return -1;

	}

	if (verbose)

		fprintf(stdout, "Successfully unloaded bpf_testmod.ko.\n");

		fprintf(stdout, "Successfully unloaded %s.ko.\n", name);

	return 0;

}



int load_bpf_testmod(bool verbose)

int load_module(const char *path, bool verbose)

{

	int fd;



	if (verbose)

		fprintf(stdout, "Loading bpf_testmod.ko...\n");

		fprintf(stdout, "Loading %s...\n", path);



	fd = open("bpf_testmod.ko", O_RDONLY);

	fd = open(path, O_RDONLY);

	if (fd < 0) {

		fprintf(stdout, "Can't find bpf_testmod.ko kernel module: %d\n", -errno);

		fprintf(stdout, "Can't find %s kernel module: %d\n", path, -errno);

		return -ENOENT;

	}

	if (finit_module(fd, "", 0)) {

		fprintf(stdout, "Failed to load bpf_testmod.ko into the kernel: %d\n", -errno);

		fprintf(stdout, "Failed to load %s into the kernel: %d\n", path, -errno);

		close(fd);

		return -EINVAL;

	}

	close(fd);



	if (verbose)

		fprintf(stdout, "Successfully loaded bpf_testmod.ko.\n");

		fprintf(stdout, "Successfully loaded %s.\n", path);

	return 0;

}



int unload_bpf_testmod(bool verbose)

{

	return unload_module("bpf_testmod", verbose);

}



int load_bpf_testmod(bool verbose)

{

	return load_module("bpf_testmod.ko", verbose);

}



/*

 * Trigger synchronize_rcu() in kernel.

 */

tools/testing/selftests/bpf/testing_helpers.h

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ int unload_bpf_testmod(bool verbose); 
int kern_sync_rcu(void);

int finit_module(int fd, const char *param_values, int flags);

int delete_module(const char *name, int flags);

int load_module(const char *path, bool verbose);

int unload_module(const char *name, bool verbose);



static inline __u64 get_time_ns(void)

{