bpf: Selftests, sockmap test prog run without setting cgroup (13a5f3ff) · Commits · 戴 / test

Running test_sockmap with arguments to specify a test pattern requires including a cgroup argument. Instead of requiring this if the option is not provided create one This is not used by selftest runs but I use it when I want to test a specific test. Most useful when developing new code and/or tests. Signed-off-by:

John Fastabend <john.fastabend@gmail.com> Signed-off-by:

Daniel Borkmann <daniel@iogearbox.net> Reviewed-by:

Jakub Sitnicki <jakub@cloudflare.com> Link: https://lore.kernel.org/bpf/158939722675.15176.6294210959489131688.stgit@john-Precision-5820-Tower

tools/testing/selftests/bpf/test_sockmap.c

+22 −6

Original line number	Diff line number	Diff line
		@@ -1725,6 +1725,7 @@ int main(int argc, char **argv)
		int opt, longindex, err, cg_fd = 0;
		char *bpf_file = BPF_SOCKMAP_FILENAME;
		int test = PING_PONG;
		bool cg_created = 0;

		if (argc < 2)
		return test_suite(-1);
		@@ -1805,13 +1806,25 @@ int main(int argc, char **argv)
		}
		}

		if (argc <= 3 && cg_fd)
		return test_suite(cg_fd);

		if (!cg_fd) {
		fprintf(stderr, "%s requires cgroup option: --cgroup <path>\n",
		argv[0]);
		return -1;
		if (setup_cgroup_environment()) {
		fprintf(stderr, "ERROR: cgroup env failed\n");
		return -EINVAL;
		}

		cg_fd = create_and_get_cgroup(CG_PATH);
		if (cg_fd < 0) {
		fprintf(stderr,
		"ERROR: (%i) open cg path failed: %s\n",
		cg_fd, strerror(errno));
		return cg_fd;
		}

		if (join_cgroup(CG_PATH)) {
		fprintf(stderr, "ERROR: failed to join cgroup\n");
		return -EINVAL;
		}
		cg_created = 1;
		}

		err = populate_progs(bpf_file);
		@@ -1830,6 +1843,9 @@ int main(int argc, char **argv)
		options.rate = rate;

		err = run_options(&options, cg_fd, test);

		if (cg_created)
		cleanup_cgroup_environment();
		close(cg_fd);
		return err;
		}

Admin message