Commit 3218231d authored by Daniel Borkmann's avatar Daniel Borkmann Committed by Alexei Starovoitov
Browse files

bpf: Extend bind v4/v6 selftests for mark/prio/bindtoifindex 



Extend existing cgroup bind4/bind6 tests to add coverage for setting and
retrieving SO_MARK, SO_PRIORITY and SO_BINDTOIFINDEX at the bind hook.

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/384fdc90e5fa83f8335a37aa90fa2f5f3661929c.1610406333.git.daniel@iogearbox.net
parent bcd6f4a8

tools/testing/selftests/bpf/progs/bind4_prog.c

+38 −4
Original line number Diff line number Diff line
@@ -29,16 +29,27 @@ static __inline int bind_to_device(struct bpf_sock_addr *ctx) 
	char veth2[IFNAMSIZ] = "test_sock_addr2";

	char missing[IFNAMSIZ] = "nonexistent_dev";

	char del_bind[IFNAMSIZ] = "";

	int veth1_idx, veth2_idx;



	if (bpf_setsockopt(ctx, SOL_SOCKET, SO_BINDTODEVICE,

			   &veth1, sizeof(veth1)))

		return 1;

	if (bpf_getsockopt(ctx, SOL_SOCKET, SO_BINDTOIFINDEX,

			   &veth1_idx, sizeof(veth1_idx)) || !veth1_idx)

		return 1;

	if (bpf_setsockopt(ctx, SOL_SOCKET, SO_BINDTODEVICE,

			   &veth2, sizeof(veth2)))

		return 1;

	if (bpf_getsockopt(ctx, SOL_SOCKET, SO_BINDTOIFINDEX,

			   &veth2_idx, sizeof(veth2_idx)) || !veth2_idx ||

	    veth1_idx == veth2_idx)

		return 1;

	if (bpf_setsockopt(ctx, SOL_SOCKET, SO_BINDTODEVICE,

			   &missing, sizeof(missing)) != -ENODEV)

		return 1;

	if (bpf_setsockopt(ctx, SOL_SOCKET, SO_BINDTOIFINDEX,

			   &veth1_idx, sizeof(veth1_idx)))

		return 1;

	if (bpf_setsockopt(ctx, SOL_SOCKET, SO_BINDTODEVICE,

			   &del_bind, sizeof(del_bind)))

		return 1;
@@ -46,6 +57,25 @@ static __inline int bind_to_device(struct bpf_sock_addr *ctx) 
	return 0;

}



static __inline int misc_opts(struct bpf_sock_addr *ctx, int opt)

{

	int old, tmp, new = 0xeb9f;



	/* Socket in test case has guarantee that old never equals to new. */

	if (bpf_getsockopt(ctx, SOL_SOCKET, opt, &old, sizeof(old)) ||

	    old == new)

		return 1;

	if (bpf_setsockopt(ctx, SOL_SOCKET, opt, &new, sizeof(new)))

		return 1;

	if (bpf_getsockopt(ctx, SOL_SOCKET, opt, &tmp, sizeof(tmp)) ||

	    tmp != new)

		return 1;

	if (bpf_setsockopt(ctx, SOL_SOCKET, opt, &old, sizeof(old)))

		return 1;



	return 0;

}



SEC("cgroup/bind4")

int bind_v4_prog(struct bpf_sock_addr *ctx)

{
@@ -93,6 +123,10 @@ int bind_v4_prog(struct bpf_sock_addr *ctx) 
	if (bind_to_device(ctx))

		return 0;



	/* Test for misc socket options. */

	if (misc_opts(ctx, SO_MARK) || misc_opts(ctx, SO_PRIORITY))

		return 0;



	ctx->user_ip4 = bpf_htonl(SERV4_REWRITE_IP);

	ctx->user_port = bpf_htons(SERV4_REWRITE_PORT);

tools/testing/selftests/bpf/progs/bind6_prog.c

+38 −4
Original line number Diff line number Diff line
@@ -35,16 +35,27 @@ static __inline int bind_to_device(struct bpf_sock_addr *ctx) 
	char veth2[IFNAMSIZ] = "test_sock_addr2";

	char missing[IFNAMSIZ] = "nonexistent_dev";

	char del_bind[IFNAMSIZ] = "";

	int veth1_idx, veth2_idx;



	if (bpf_setsockopt(ctx, SOL_SOCKET, SO_BINDTODEVICE,

			   &veth1, sizeof(veth1)))

		return 1;

	if (bpf_getsockopt(ctx, SOL_SOCKET, SO_BINDTOIFINDEX,

			   &veth1_idx, sizeof(veth1_idx)) || !veth1_idx)

		return 1;

	if (bpf_setsockopt(ctx, SOL_SOCKET, SO_BINDTODEVICE,

			   &veth2, sizeof(veth2)))

		return 1;

	if (bpf_getsockopt(ctx, SOL_SOCKET, SO_BINDTOIFINDEX,

			   &veth2_idx, sizeof(veth2_idx)) || !veth2_idx ||

	    veth1_idx == veth2_idx)

		return 1;

	if (bpf_setsockopt(ctx, SOL_SOCKET, SO_BINDTODEVICE,

			   &missing, sizeof(missing)) != -ENODEV)

		return 1;

	if (bpf_setsockopt(ctx, SOL_SOCKET, SO_BINDTOIFINDEX,

			   &veth1_idx, sizeof(veth1_idx)))

		return 1;

	if (bpf_setsockopt(ctx, SOL_SOCKET, SO_BINDTODEVICE,

			   &del_bind, sizeof(del_bind)))

		return 1;
@@ -52,6 +63,25 @@ static __inline int bind_to_device(struct bpf_sock_addr *ctx) 
	return 0;

}



static __inline int misc_opts(struct bpf_sock_addr *ctx, int opt)

{

	int old, tmp, new = 0xeb9f;



	/* Socket in test case has guarantee that old never equals to new. */

	if (bpf_getsockopt(ctx, SOL_SOCKET, opt, &old, sizeof(old)) ||

	    old == new)

		return 1;

	if (bpf_setsockopt(ctx, SOL_SOCKET, opt, &new, sizeof(new)))

		return 1;

	if (bpf_getsockopt(ctx, SOL_SOCKET, opt, &tmp, sizeof(tmp)) ||

	    tmp != new)

		return 1;

	if (bpf_setsockopt(ctx, SOL_SOCKET, opt, &old, sizeof(old)))

		return 1;



	return 0;

}



SEC("cgroup/bind6")

int bind_v6_prog(struct bpf_sock_addr *ctx)

{
@@ -107,6 +137,10 @@ int bind_v6_prog(struct bpf_sock_addr *ctx) 
	if (bind_to_device(ctx))

		return 0;



	/* Test for misc socket options. */

	if (misc_opts(ctx, SO_MARK) || misc_opts(ctx, SO_PRIORITY))

		return 0;



	ctx->user_ip6[0] = bpf_htonl(SERV6_REWRITE_IP_0);

	ctx->user_ip6[1] = bpf_htonl(SERV6_REWRITE_IP_1);

	ctx->user_ip6[2] = bpf_htonl(SERV6_REWRITE_IP_2);