Commit 6fd92c7f authored by Menglong Dong's avatar Menglong Dong Committed by Alexei Starovoitov
Browse files

bpf: selftests: Use C99 initializers in test_sock.c 



Use C99 initializers for the initialization of 'tests' in test_sock.c.

Signed-off-by: default avatarMenglong Dong <imagedong@tencent.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20220106132022.3470772-3-imagedong@tencent.com
parent 91a760b2

tools/testing/selftests/bpf/test_sock.c

+92 −128
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ struct sock_test { 


static struct sock_test tests[] = {

	{

		"bind4 load with invalid access: src_ip6",

		.descr = "bind4 load with invalid access: src_ip6",

		.insns = {

			BPF_MOV64_REG(BPF_REG_6, BPF_REG_1),

			BPF_LDX_MEM(BPF_W, BPF_REG_7, BPF_REG_6,
@@ -54,16 +54,12 @@ static struct sock_test tests[] = { 
			BPF_MOV64_IMM(BPF_REG_0, 1),

			BPF_EXIT_INSN(),

		},

		BPF_CGROUP_INET4_POST_BIND,

		BPF_CGROUP_INET4_POST_BIND,

		0,

		0,

		NULL,

		0,

		LOAD_REJECT,

		.expected_attach_type = BPF_CGROUP_INET4_POST_BIND,

		.attach_type = BPF_CGROUP_INET4_POST_BIND,

		.result = LOAD_REJECT,

	},

	{

		"bind4 load with invalid access: mark",

		.descr = "bind4 load with invalid access: mark",

		.insns = {

			BPF_MOV64_REG(BPF_REG_6, BPF_REG_1),

			BPF_LDX_MEM(BPF_W, BPF_REG_7, BPF_REG_6,
@@ -71,16 +67,12 @@ static struct sock_test tests[] = { 
			BPF_MOV64_IMM(BPF_REG_0, 1),

			BPF_EXIT_INSN(),

		},

		BPF_CGROUP_INET4_POST_BIND,

		BPF_CGROUP_INET4_POST_BIND,

		0,

		0,

		NULL,

		0,

		LOAD_REJECT,

		.expected_attach_type = BPF_CGROUP_INET4_POST_BIND,

		.attach_type = BPF_CGROUP_INET4_POST_BIND,

		.result = LOAD_REJECT,

	},

	{

		"bind6 load with invalid access: src_ip4",

		.descr = "bind6 load with invalid access: src_ip4",

		.insns = {

			BPF_MOV64_REG(BPF_REG_6, BPF_REG_1),

			BPF_LDX_MEM(BPF_W, BPF_REG_7, BPF_REG_6,
@@ -88,16 +80,12 @@ static struct sock_test tests[] = { 
			BPF_MOV64_IMM(BPF_REG_0, 1),

			BPF_EXIT_INSN(),

		},

		BPF_CGROUP_INET6_POST_BIND,

		BPF_CGROUP_INET6_POST_BIND,

		0,

		0,

		NULL,

		0,

		LOAD_REJECT,

		.expected_attach_type = BPF_CGROUP_INET6_POST_BIND,

		.attach_type = BPF_CGROUP_INET6_POST_BIND,

		.result = LOAD_REJECT,

	},

	{

		"sock_create load with invalid access: src_port",

		.descr = "sock_create load with invalid access: src_port",

		.insns = {

			BPF_MOV64_REG(BPF_REG_6, BPF_REG_1),

			BPF_LDX_MEM(BPF_W, BPF_REG_7, BPF_REG_6,
@@ -105,128 +93,106 @@ static struct sock_test tests[] = { 
			BPF_MOV64_IMM(BPF_REG_0, 1),

			BPF_EXIT_INSN(),

		},

		BPF_CGROUP_INET_SOCK_CREATE,

		BPF_CGROUP_INET_SOCK_CREATE,

		0,

		0,

		NULL,

		0,

		LOAD_REJECT,

		.expected_attach_type = BPF_CGROUP_INET_SOCK_CREATE,

		.attach_type = BPF_CGROUP_INET_SOCK_CREATE,

		.result = LOAD_REJECT,

	},

	{

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

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

		.insns = {

			BPF_MOV64_IMM(BPF_REG_0, 1),

			BPF_EXIT_INSN(),

		},

		0,

		BPF_CGROUP_INET_SOCK_CREATE,

		AF_INET,

		SOCK_STREAM,

		"127.0.0.1",

		8097,

		SUCCESS,

		.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,

	},

	{

		"sock_create load w/ expected_attach_type",

		.descr = "sock_create load w/ expected_attach_type",

		.insns = {

			BPF_MOV64_IMM(BPF_REG_0, 1),

			BPF_EXIT_INSN(),

		},

		BPF_CGROUP_INET_SOCK_CREATE,

		BPF_CGROUP_INET_SOCK_CREATE,

		AF_INET,

		SOCK_STREAM,

		"127.0.0.1",

		8097,

		SUCCESS,

		.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,

	},

	{

		"attach type mismatch bind4 vs bind6",

		.descr = "attach type mismatch bind4 vs bind6",

		.insns = {

			BPF_MOV64_IMM(BPF_REG_0, 1),

			BPF_EXIT_INSN(),

		},

		BPF_CGROUP_INET4_POST_BIND,

		BPF_CGROUP_INET6_POST_BIND,

		0,

		0,

		NULL,

		0,

		ATTACH_REJECT,

		.expected_attach_type = BPF_CGROUP_INET4_POST_BIND,

		.attach_type = BPF_CGROUP_INET6_POST_BIND,

		.result = ATTACH_REJECT,

	},

	{

		"attach type mismatch bind6 vs bind4",

		.descr = "attach type mismatch bind6 vs bind4",

		.insns = {

			BPF_MOV64_IMM(BPF_REG_0, 1),

			BPF_EXIT_INSN(),

		},

		BPF_CGROUP_INET6_POST_BIND,

		BPF_CGROUP_INET4_POST_BIND,

		0,

		0,

		NULL,

		0,

		ATTACH_REJECT,

		.expected_attach_type = BPF_CGROUP_INET6_POST_BIND,

		.attach_type = BPF_CGROUP_INET4_POST_BIND,

		.result = ATTACH_REJECT,

	},

	{

		"attach type mismatch default vs bind4",

		.descr = "attach type mismatch default vs bind4",

		.insns = {

			BPF_MOV64_IMM(BPF_REG_0, 1),

			BPF_EXIT_INSN(),

		},

		0,

		BPF_CGROUP_INET4_POST_BIND,

		0,

		0,

		NULL,

		0,

		ATTACH_REJECT,

		.expected_attach_type = 0,

		.attach_type = BPF_CGROUP_INET4_POST_BIND,

		.result = ATTACH_REJECT,

	},

	{

		"attach type mismatch bind6 vs sock_create",

		.descr = "attach type mismatch bind6 vs sock_create",

		.insns = {

			BPF_MOV64_IMM(BPF_REG_0, 1),

			BPF_EXIT_INSN(),

		},

		BPF_CGROUP_INET6_POST_BIND,

		BPF_CGROUP_INET_SOCK_CREATE,

		0,

		0,

		NULL,

		0,

		ATTACH_REJECT,

		.expected_attach_type = BPF_CGROUP_INET6_POST_BIND,

		.attach_type = BPF_CGROUP_INET_SOCK_CREATE,

		.result = ATTACH_REJECT,

	},

	{

		"bind4 reject all",

		.descr = "bind4 reject all",

		.insns = {

			BPF_MOV64_IMM(BPF_REG_0, 0),

			BPF_EXIT_INSN(),

		},

		BPF_CGROUP_INET4_POST_BIND,

		BPF_CGROUP_INET4_POST_BIND,

		AF_INET,

		SOCK_STREAM,

		"0.0.0.0",

		0,

		BIND_REJECT,

		.expected_attach_type = BPF_CGROUP_INET4_POST_BIND,

		.attach_type = BPF_CGROUP_INET4_POST_BIND,

		.domain = AF_INET,

		.type = SOCK_STREAM,

		.ip = "0.0.0.0",

		.result = BIND_REJECT,

	},

	{

		"bind6 reject all",

		.descr = "bind6 reject all",

		.insns = {

			BPF_MOV64_IMM(BPF_REG_0, 0),

			BPF_EXIT_INSN(),

		},

		BPF_CGROUP_INET6_POST_BIND,

		BPF_CGROUP_INET6_POST_BIND,

		AF_INET6,

		SOCK_STREAM,

		"::",

		0,

		BIND_REJECT,

		.expected_attach_type = BPF_CGROUP_INET6_POST_BIND,

		.attach_type = BPF_CGROUP_INET6_POST_BIND,

		.domain = AF_INET6,

		.type = SOCK_STREAM,

		.ip = "::",

		.result = BIND_REJECT,

	},

	{

		"bind6 deny specific IP & port",

		.descr = "bind6 deny specific IP & port",

		.insns = {

			BPF_MOV64_REG(BPF_REG_6, BPF_REG_1),
@@ -247,16 +213,16 @@ static struct sock_test tests[] = { 
			BPF_MOV64_IMM(BPF_REG_0, 1),

			BPF_EXIT_INSN(),

		},

		BPF_CGROUP_INET6_POST_BIND,

		BPF_CGROUP_INET6_POST_BIND,

		AF_INET6,

		SOCK_STREAM,

		"::1",

		8193,

		BIND_REJECT,

		.expected_attach_type = BPF_CGROUP_INET6_POST_BIND,

		.attach_type = BPF_CGROUP_INET6_POST_BIND,

		.domain = AF_INET6,

		.type = SOCK_STREAM,

		.ip = "::1",

		.port = 8193,

		.result = BIND_REJECT,

	},

	{

		"bind4 allow specific IP & port",

		.descr = "bind4 allow specific IP & port",

		.insns = {

			BPF_MOV64_REG(BPF_REG_6, BPF_REG_1),
@@ -277,41 +243,39 @@ static struct sock_test tests[] = { 
			BPF_MOV64_IMM(BPF_REG_0, 0),

			BPF_EXIT_INSN(),

		},

		BPF_CGROUP_INET4_POST_BIND,

		BPF_CGROUP_INET4_POST_BIND,

		AF_INET,

		SOCK_STREAM,

		"127.0.0.1",

		4098,

		SUCCESS,

		.expected_attach_type = BPF_CGROUP_INET4_POST_BIND,

		.attach_type = BPF_CGROUP_INET4_POST_BIND,

		.domain = AF_INET,

		.type = SOCK_STREAM,

		.ip = "127.0.0.1",

		.port = 4098,

		.result = SUCCESS,

	},

	{

		"bind4 allow all",

		.descr = "bind4 allow all",

		.insns = {

			BPF_MOV64_IMM(BPF_REG_0, 1),

			BPF_EXIT_INSN(),

		},

		BPF_CGROUP_INET4_POST_BIND,

		BPF_CGROUP_INET4_POST_BIND,

		AF_INET,

		SOCK_STREAM,

		"0.0.0.0",

		0,

		SUCCESS,

		.expected_attach_type = BPF_CGROUP_INET4_POST_BIND,

		.attach_type = BPF_CGROUP_INET4_POST_BIND,

		.domain = AF_INET,

		.type = SOCK_STREAM,

		.ip = "0.0.0.0",

		.result = SUCCESS,

	},

	{

		"bind6 allow all",

		.descr = "bind6 allow all",

		.insns = {

			BPF_MOV64_IMM(BPF_REG_0, 1),

			BPF_EXIT_INSN(),

		},

		BPF_CGROUP_INET6_POST_BIND,

		BPF_CGROUP_INET6_POST_BIND,

		AF_INET6,

		SOCK_STREAM,

		"::",

		0,

		SUCCESS,

		.expected_attach_type = BPF_CGROUP_INET6_POST_BIND,

		.attach_type = BPF_CGROUP_INET6_POST_BIND,

		.domain = AF_INET6,

		.type = SOCK_STREAM,

		.ip = "::",

		.result = SUCCESS,

	},

};