Commit af522f13 authored by Jordan Rife's avatar Jordan Rife Committed by Martin KaFai Lau
Browse files

selftests/bpf: Migrate BPF_CGROUP_INET_SOCK_CREATE test cases to prog_tests 



Move the "load w/o expected_attach_type" test case to
prog_tests/sock_create.c and drop the remaining test case, as it is made
redundant with the existing coverage inside prog_tests/sock_create.c.

Signed-off-by: default avatarJordan Rife <jrife@google.com>
Link: https://lore.kernel.org/r/20241022152913.574836-4-jrife@google.com


Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parent c17f9734

tools/testing/selftests/bpf/prog_tests/sock_create.c

+25 −10
Original line number Diff line number Diff line
@@ -237,6 +237,19 @@ static struct sock_create_test { 


		.error = DENY_CREATE,

	},

	{

		.descr = "load w/o expected_attach_type (compat mode)",

		.insns = {

			/* return 1 */

			BPF_MOV64_IMM(BPF_REG_0, 1),

			BPF_EXIT_INSN(),

		},

		.expected_attach_type = 0,

		.attach_type = BPF_CGROUP_INET_SOCK_CREATE,



		.domain = AF_INET,

		.type = SOCK_STREAM,

	},

};



static int load_prog(const struct bpf_insn *insns,
@@ -291,6 +304,7 @@ static int run_test(int cgroup_fd, struct sock_create_test *test) 
		goto detach_prog;

	}



	if (test->optname) {

		err = getsockopt(sock_fd, SOL_SOCKET, test->optname, &optval, &optlen);

		if (err) {

			log_err("Failed to call getsockopt");
@@ -302,6 +316,7 @@ static int run_test(int cgroup_fd, struct sock_create_test *test) 
			log_err("getsockopt returned unexpected optval");

			goto cleanup;

		}

	}



	ret = test->error != OK;

tools/testing/selftests/bpf/test_sock.c

+0 −28
Original line number Diff line number Diff line
@@ -47,34 +47,6 @@ struct sock_test { 
};



static struct sock_test tests[] = {

	{

		.descr = "sock_create load w/o expected_attach_type (compat mode)",

		.insns = {

			BPF_MOV64_IMM(BPF_REG_0, 1),

			BPF_EXIT_INSN(),

		},

		.expected_attach_type = 0,

		.attach_type = BPF_CGROUP_INET_SOCK_CREATE,

		.domain = AF_INET,

		.type = SOCK_STREAM,

		.ip = "127.0.0.1",

		.port = 8097,

		.result = SUCCESS,

	},

	{

		.descr = "sock_create load w/ expected_attach_type",

		.insns = {

			BPF_MOV64_IMM(BPF_REG_0, 1),

			BPF_EXIT_INSN(),

		},

		.expected_attach_type = BPF_CGROUP_INET_SOCK_CREATE,

		.attach_type = BPF_CGROUP_INET_SOCK_CREATE,

		.domain = AF_INET,

		.type = SOCK_STREAM,

		.ip = "127.0.0.1",

		.port = 8097,

		.result = SUCCESS,

	},

};



static size_t probe_prog_length(const struct bpf_insn *fp)