Commit b58f3f0e authored May 15, 2023 by Jiri Olsa Committed by Alexei Starovoitov May 16, 2023

selftests/bpf: Do not unload bpf_testmod in load_bpf_testmod



Do not unload bpf_testmod in load_bpf_testmod, instead call
unload_bpf_testmod separatelly.

This way we will be able use un/load_bpf_testmod functions
in other tests that un/load bpf_testmod module.

Acked-by: David Vernet <void@manifault.com>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Link: https://lore.kernel.org/r/20230515133756.1658301-6-jolsa@kernel.org


Signed-off-by: Alexei Starovoitov <ast@kernel.org>

parent d18decca

tools/testing/selftests/bpf/test_progs.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -1657,10 +1657,15 @@ int main(int argc, char **argv)
		env.stderr = stderr;

		env.has_testmod = true;
		if (!env.list_test_names && load_bpf_testmod(verbose())) {
		if (!env.list_test_names) {
		/* ensure previous instance of the module is unloaded */
		unload_bpf_testmod(verbose());

		if (load_bpf_testmod(verbose())) {
		fprintf(env.stderr, "WARNING! Selftests relying on bpf_testmod.ko will be skipped.\n");
		env.has_testmod = false;
		}
		}

		/* initializing tests */
		for (i = 0; i < prog_test_cnt; i++) {

tools/testing/selftests/bpf/testing_helpers.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -359,9 +359,6 @@ int load_bpf_testmod(bool verbose)
		{
		int fd;

		/* ensure previous instance of the module is unloaded */
		unload_bpf_testmod(verbose);

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