Skip to content

Commit c86853d

Browse files
Geliang Tangintel-lab-lkp
authored andcommitted
selftests/bpf: Add getsockopt to inspect mptcp subflow
This patch adds a "cgroup/getsockopt" way to inspect the subflows of a mptcp socket. mptcp_for_each_stubflow() and other helpers related to list_dentry are added into progs/mptcp_bpf.h. Add an extra "cgroup/getsockopt" prog to walk the msk->conn_list and use bpf_core_cast to cast a pointer to tcp_sock for readonly. It will allow to inspect all the fields in a tcp_sock. Suggested-by: Martin KaFai Lau <[email protected]> Signed-off-by: Geliang Tang <[email protected]>
1 parent 15e1b4b commit c86853d

File tree

3 files changed

+105
-0
lines changed

3 files changed

+105
-0
lines changed

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,7 @@ static void run_subflow(char *new)
383383
{
384384
int server_fd, client_fd, err;
385385
char cc[TCP_CA_NAME_MAX];
386+
unsigned int mark;
386387
socklen_t len;
387388

388389
server_fd = start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0);
@@ -405,6 +406,15 @@ static void run_subflow(char *new)
405406
ASSERT_OK(ss_search(ADDR_1, new), "ss_search new cc");
406407
ASSERT_OK(ss_search(ADDR_2, cc), "ss_search default cc");
407408

409+
len = sizeof(mark);
410+
err = getsockopt(client_fd, SOL_SOCKET, SO_MARK, &mark, &len);
411+
if (!ASSERT_OK(err, "getsockopt(client_fd, SO_MARK)"))
412+
goto close_client;
413+
414+
len = sizeof(cc);
415+
err = getsockopt(client_fd, SOL_TCP, TCP_CONGESTION, cc, &len);
416+
ASSERT_OK(err, "getsockopt(client_fd, TCP_CONGESTION)");
417+
408418
close_client:
409419
close(client_fd);
410420
close_server:
@@ -416,6 +426,7 @@ static void test_subflow(void)
416426
int cgroup_fd, prog_fd, err;
417427
struct mptcp_subflow *skel;
418428
struct nstoken *nstoken;
429+
struct bpf_link *link;
419430

420431
cgroup_fd = test__join_cgroup("/mptcp_subflow");
421432
if (!ASSERT_GE(cgroup_fd, 0, "join_cgroup: mptcp_subflow"))
@@ -441,6 +452,11 @@ static void test_subflow(void)
441452
if (endpoint_init("subflow") < 0)
442453
goto close_netns;
443454

455+
link = bpf_program__attach_cgroup(skel->progs._getsockopt_subflow,
456+
cgroup_fd);
457+
if (!ASSERT_OK_PTR(link, "getsockopt prog"))
458+
goto close_netns;
459+
444460
run_subflow(skel->data->cc);
445461

446462
close_netns:
@@ -449,6 +465,7 @@ static void test_subflow(void)
449465
mptcp_subflow__destroy(skel);
450466
close_cgroup:
451467
close(cgroup_fd);
468+
bpf_link__destroy(link);
452469
}
453470

454471
static struct nstoken *sched_init(char *flags, char *sched)

tools/testing/selftests/bpf/progs/mptcp_bpf.h

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,34 @@
77

88
#define MPTCP_SUBFLOWS_MAX 8
99

10+
static inline int list_is_head(const struct list_head *list,
11+
const struct list_head *head)
12+
{
13+
return list == head;
14+
}
15+
16+
#define list_entry(ptr, type, member) \
17+
container_of(ptr, type, member)
18+
19+
#define list_first_entry(ptr, type, member) \
20+
list_entry((ptr)->next, type, member)
21+
22+
#define list_next_entry(pos, member) \
23+
list_entry((pos)->member.next, typeof(*(pos)), member)
24+
25+
#define list_entry_is_head(pos, head, member) \
26+
list_is_head(&pos->member, (head))
27+
28+
#define list_for_each_entry(pos, head, member) \
29+
for (pos = list_first_entry(head, typeof(*pos), member); \
30+
!list_entry_is_head(pos, head, member); \
31+
pos = list_next_entry(pos, member))
32+
33+
#define mptcp_for_each_subflow(__msk, __subflow) \
34+
list_for_each_entry(__subflow, &((__msk)->conn_list), node)
35+
#define mptcp_for_each_subflow_safe(__msk, __subflow, __tmp) \
36+
list_for_each_entry_safe(__subflow, __tmp, &((__msk)->conn_list), node)
37+
1038
extern void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subflow,
1139
bool scheduled) __ksym;
1240

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

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
/* vmlinux.h, bpf_helpers.h and other 'define' */
66
#include "bpf_tracing_net.h"
7+
#include "bpf_experimental.h"
8+
#include "mptcp_bpf.h"
79

810
char _license[] SEC("license") = "GPL";
911

@@ -57,3 +59,61 @@ int mptcp_subflow(struct bpf_sock_ops *skops)
5759

5860
return 1;
5961
}
62+
63+
static int _check_getsockopt_subflows_mark(struct mptcp_sock *msk, struct bpf_sockopt *ctx)
64+
{
65+
struct mptcp_subflow_context *subflow;
66+
int i = 0;
67+
68+
mptcp_for_each_subflow(msk, subflow) {
69+
struct sock *ssk;
70+
71+
ssk = mptcp_subflow_tcp_sock(bpf_core_cast(subflow,
72+
struct mptcp_subflow_context));
73+
74+
if (ssk->sk_mark != ++i)
75+
ctx->retval = -1;
76+
77+
cond_break;
78+
}
79+
80+
return 1;
81+
}
82+
83+
static int _check_getsockopt_subflow_cc(struct mptcp_sock *msk, struct bpf_sockopt *ctx)
84+
{
85+
struct mptcp_subflow_context *subflow;
86+
87+
mptcp_for_each_subflow(msk, subflow) {
88+
struct inet_connection_sock *icsk;
89+
struct sock *ssk;
90+
91+
ssk = mptcp_subflow_tcp_sock(bpf_core_cast(subflow,
92+
struct mptcp_subflow_context));
93+
icsk = bpf_core_cast(ssk, struct inet_connection_sock);
94+
95+
if (ssk->sk_mark == 1 &&
96+
__builtin_memcmp(icsk->icsk_ca_ops->name, cc, TCP_CA_NAME_MAX))
97+
ctx->retval = -1;
98+
99+
cond_break;
100+
}
101+
102+
return 1;
103+
}
104+
105+
SEC("cgroup/getsockopt")
106+
int _getsockopt_subflow(struct bpf_sockopt *ctx)
107+
{
108+
struct mptcp_sock *msk = bpf_core_cast(ctx->sk, struct mptcp_sock);
109+
110+
if (!msk || !msk->token)
111+
return 1;
112+
113+
if (ctx->level == SOL_SOCKET && ctx->optname == SO_MARK)
114+
return _check_getsockopt_subflows_mark(msk, ctx);
115+
if (ctx->level == SOL_TCP && ctx->optname == TCP_CONGESTION)
116+
return _check_getsockopt_subflow_cc(msk, ctx);
117+
118+
return 1;
119+
}

0 commit comments

Comments
 (0)