Skip to content

Commit 62c4c77

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_rdonly_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 538622b commit 62c4c77

File tree

3 files changed

+69
-0
lines changed

3 files changed

+69
-0
lines changed

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

Lines changed: 11 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);
@@ -407,6 +408,10 @@ static void run_subflow(char *new)
407408
ASSERT_OK(ss_search(ADDR_1, new), "ss_search new cc");
408409
ASSERT_OK(ss_search(ADDR_2, cc), "ss_search default cc");
409410

411+
len = sizeof(mark);
412+
err = getsockopt(client_fd, SOL_SOCKET, SO_MARK, &mark, &len);
413+
ASSERT_OK(err, "getsockopt(client_fd, SO_MARK)");
414+
410415
close(client_fd);
411416
fail:
412417
close(server_fd);
@@ -417,6 +422,7 @@ static void test_subflow(void)
417422
int cgroup_fd, prog_fd, err;
418423
struct mptcp_subflow *skel;
419424
struct nstoken *nstoken;
425+
struct bpf_link *link;
420426

421427
cgroup_fd = test__join_cgroup("/mptcp_subflow");
422428
if (!ASSERT_GE(cgroup_fd, 0, "join_cgroup: mptcp_subflow"))
@@ -442,6 +448,10 @@ static void test_subflow(void)
442448
if (endpoint_init("subflow") < 0)
443449
goto close_netns;
444450

451+
link = bpf_program__attach_cgroup(skel->progs._getsockopt, cgroup_fd);
452+
if (!ASSERT_OK_PTR(link, "getsockopt prog"))
453+
goto close_netns;
454+
445455
run_subflow(skel->data->cc);
446456

447457
close_netns:
@@ -450,6 +460,7 @@ static void test_subflow(void)
450460
mptcp_subflow__destroy(skel);
451461
close_cgroup:
452462
close(cgroup_fd);
463+
bpf_link__destroy(link);
453464
}
454465

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

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,32 @@
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+
1036
extern void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subflow,
1137
bool scheduled) __ksym;
1238

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

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

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

89
char _license[] SEC("license") = "GPL";
910

@@ -57,3 +58,34 @@ int mptcp_subflow(struct bpf_sock_ops *skops)
5758

5859
return 1;
5960
}
61+
62+
SEC("cgroup/getsockopt")
63+
int _getsockopt(struct bpf_sockopt *ctx)
64+
{
65+
struct mptcp_sock *msk = bpf_core_cast(ctx->sk, struct mptcp_sock);
66+
struct mptcp_subflow_context *subflow;
67+
int i = 0;
68+
69+
if (!msk || ctx->level != SOL_SOCKET || ctx->optname != SO_MARK)
70+
return 1;
71+
72+
mptcp_for_each_subflow(msk, subflow) {
73+
struct inet_connection_sock *icsk;
74+
struct sock *ssk;
75+
76+
ssk = mptcp_subflow_tcp_sock(bpf_core_cast(subflow,
77+
struct mptcp_subflow_context));
78+
icsk = bpf_core_cast(ssk, struct inet_connection_sock);
79+
80+
if (ssk->sk_mark != i + 1)
81+
ctx->retval = -1;
82+
if (ssk->sk_mark == 1 &&
83+
__builtin_memcmp(icsk->icsk_ca_ops->name, cc, TCP_CA_NAME_MAX))
84+
ctx->retval = -1;
85+
86+
if (i++ >= MPTCP_SUBFLOWS_MAX)
87+
break;
88+
}
89+
90+
return 1;
91+
}

0 commit comments

Comments
 (0)