From: Mat Martineau <mathew.j.martineau@linux.intel.com>
To: netdev@vger.kernel.org, bpf@vger.kernel.org
Cc: Geliang Tang <geliang.tang@suse.com>,
ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org,
mptcp@lists.linux.dev,
Matthieu Baerts <matthieu.baerts@tessares.net>,
Mat Martineau <mathew.j.martineau@linux.intel.com>
Subject: [PATCH bpf-next v3 8/8] selftests: bpf: verify first of struct mptcp_sock
Date: Mon, 2 May 2022 14:12:34 -0700 [thread overview]
Message-ID: <20220502211235.142250-9-mathew.j.martineau@linux.intel.com> (raw)
In-Reply-To: <20220502211235.142250-1-mathew.j.martineau@linux.intel.com>
From: Geliang Tang <geliang.tang@suse.com>
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().
Acked-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
tools/testing/selftests/bpf/bpf_mptcp_helpers.h | 1 +
tools/testing/selftests/bpf/prog_tests/mptcp.c | 8 ++++++++
tools/testing/selftests/bpf/progs/mptcp_sock.c | 5 +++++
3 files changed, 14 insertions(+)
diff --git a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h b/tools/testing/selftests/bpf/bpf_mptcp_helpers.h
index 463e4e061c96..b5a43b108982 100644
--- a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h
+++ b/tools/testing/selftests/bpf/bpf_mptcp_helpers.h
@@ -10,6 +10,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));
diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index f2d22507431c..ed5773c26045 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -12,7 +12,9 @@
struct mptcp_storage {
__u32 invoked;
__u32 is_mptcp;
+ struct sock *sk;
__u32 token;
+ struct sock *first;
char ca_name[TCP_CA_NAME_MAX];
};
@@ -147,6 +149,12 @@ static int verify_msk(int map_fd, int client_fd)
err++;
}
+ if (val.first != val.sk) {
+ log_err("Unexpected mptcp_sock.first %p != %p",
+ val.first, val.sk);
+ err++;
+ }
+
if (strncmp(val.ca_name, ca_name, TCP_CA_NAME_MAX)) {
log_err("Unexpected mptcp_sock.ca_name %s != %s",
val.ca_name, ca_name);
diff --git a/tools/testing/selftests/bpf/progs/mptcp_sock.c b/tools/testing/selftests/bpf/progs/mptcp_sock.c
index 226571673800..b1e7f3b4330a 100644
--- a/tools/testing/selftests/bpf/progs/mptcp_sock.c
+++ b/tools/testing/selftests/bpf/progs/mptcp_sock.c
@@ -13,7 +13,9 @@ extern bool CONFIG_MPTCP __kconfig;
struct mptcp_storage {
__u32 invoked;
__u32 is_mptcp;
+ struct sock *sk;
__u32 token;
+ struct sock *first;
char ca_name[TCP_CA_NAME_MAX];
};
@@ -52,6 +54,7 @@ int _sockops(struct bpf_sock_ops *ctx)
storage->token = 0;
bzero(storage->ca_name, TCP_CA_NAME_MAX);
+ storage->first = NULL;
} else {
if (!CONFIG_MPTCP)
return 1;
@@ -67,9 +70,11 @@ int _sockops(struct bpf_sock_ops *ctx)
storage->token = msk->token;
memcpy(storage->ca_name, msk->ca_name, TCP_CA_NAME_MAX);
+ storage->first = msk->first;
}
storage->invoked++;
storage->is_mptcp = tcp_sk->is_mptcp;
+ storage->sk = (struct sock *)sk;
return 1;
}
--
2.36.0
next prev parent reply other threads:[~2022-05-02 21:12 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-02 21:12 [PATCH bpf-next v3 0/8] bpf: mptcp: Support for mptcp_sock and is_mptcp Mat Martineau
2022-05-02 21:12 ` [PATCH bpf-next v3 1/8] bpf: expose is_mptcp flag to bpf_tcp_sock Mat Martineau
2022-05-11 0:48 ` Martin KaFai Lau
2022-05-11 5:02 ` Andrii Nakryiko
2022-05-11 6:10 ` Geliang Tang
2022-05-02 21:12 ` [PATCH bpf-next v3 2/8] bpf: add bpf_skc_to_mptcp_sock_proto Mat Martineau
2022-05-02 21:12 ` [PATCH bpf-next v3 3/8] selftests: bpf: Enable CONFIG_IKCONFIG_PROC in config Mat Martineau
2022-05-06 22:25 ` Andrii Nakryiko
2022-05-02 21:12 ` [PATCH bpf-next v3 4/8] selftests: bpf: add MPTCP test base Mat Martineau
2022-05-06 22:24 ` Andrii Nakryiko
2022-05-02 21:12 ` [PATCH bpf-next v3 5/8] selftests: bpf: test bpf_skc_to_mptcp_sock Mat Martineau
2022-05-06 22:26 ` Andrii Nakryiko
2022-05-09 9:00 ` Matthieu Baerts
2022-05-09 21:00 ` Andrii Nakryiko
2022-05-10 13:48 ` Matthieu Baerts
2022-05-02 21:12 ` [PATCH bpf-next v3 6/8] selftests: bpf: verify token of struct mptcp_sock Mat Martineau
2022-05-02 22:14 ` Mat Martineau
2022-05-06 22:27 ` Andrii Nakryiko
2022-05-10 21:59 ` Mat Martineau
2022-05-10 23:58 ` Andrii Nakryiko
2022-05-02 21:12 ` [PATCH bpf-next v3 7/8] selftests: bpf: verify ca_name " Mat Martineau
2022-05-02 21:12 ` Mat Martineau [this message]
2022-05-06 22:28 ` [PATCH bpf-next v3 0/8] bpf: mptcp: Support for mptcp_sock and is_mptcp Andrii Nakryiko
2022-05-06 23:06 ` Mat Martineau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220502211235.142250-9-mathew.j.martineau@linux.intel.com \
--to=mathew.j.martineau@linux.intel.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=geliang.tang@suse.com \
--cc=matthieu.baerts@tessares.net \
--cc=mptcp@lists.linux.dev \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox