Commit 4f90d034 authored by Geliang Tang's avatar Geliang Tang Committed by Andrii Nakryiko
Browse files

selftests/bpf: Verify first of struct mptcp_sock 



This patch verifies the 'first' struct member of struct mptcp_sock, which
points to the first subflow of msk. Save 'sk' in mptcp_storage, and verify
it with 'first' in verify_msk().

v5:
 - Use ASSERT_EQ() instead of a manual comparison + log (Andrii).

Signed-off-by: default avatarGeliang Tang <geliang.tang@suse.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Link: https://lore.kernel.org/bpf/20220519233016.105670-8-mathew.j.martineau@linux.intel.com
parent ccc090f4

tools/testing/selftests/bpf/bpf_tcp_helpers.h

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ struct mptcp_sock { 
	struct inet_connection_sock	sk;



	__u32		token;

	struct sock	*first;

	char		ca_name[TCP_CA_NAME_MAX];

} __attribute__((preserve_access_index));

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

+5 −0
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ 
struct mptcp_storage {

	__u32 invoked;

	__u32 is_mptcp;

	struct sock *sk;

	__u32 token;

	struct sock *first;

	char ca_name[TCP_CA_NAME_MAX];

};
@@ -80,6 +82,9 @@ static int verify_msk(int map_fd, int client_fd, __u32 token) 
	if (!ASSERT_EQ(val.token, token, "unexpected token"))

		err++;



	if (!ASSERT_EQ(val.first, val.sk, "unexpected first"))

		err++;



	if (!ASSERT_STRNEQ(val.ca_name, ca_name, TCP_CA_NAME_MAX, "unexpected ca_name"))

		err++;

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

+5 −0
Original line number Diff line number Diff line
@@ -12,7 +12,9 @@ __u32 token = 0; 
struct mptcp_storage {

	__u32 invoked;

	__u32 is_mptcp;

	struct sock *sk;

	__u32 token;

	struct sock *first;

	char ca_name[TCP_CA_NAME_MAX];

};
@@ -53,6 +55,7 @@ int _sockops(struct bpf_sock_ops *ctx) 


		storage->token = 0;

		__builtin_memset(storage->ca_name, 0, TCP_CA_NAME_MAX);

		storage->first = NULL;

	} else {

		msk = bpf_skc_to_mptcp_sock(sk);

		if (!msk)
@@ -65,9 +68,11 @@ int _sockops(struct bpf_sock_ops *ctx) 


		storage->token = msk->token;

		__builtin_memcpy(storage->ca_name, msk->ca_name, TCP_CA_NAME_MAX);

		storage->first = msk->first;

	}

	storage->invoked++;

	storage->is_mptcp = is_mptcp;

	storage->sk = (struct sock *)sk;



	return 1;

}