[PATCH mptcp-next 0/3] Squash to "Add mptcp_subflow bpf_iter support"
[PATCH mptcp-next v4 0/5] Squash to "Add mptcp_subflow bpf_iter support"
1
From: Geliang Tang <tanggeliang@kylinos.cn>
1
From: Geliang Tang <tanggeliang@kylinos.cn>
2
2
3
Address Martin's suggestions for v2.
3
v4:
4
- drop sock_owned_by_user_nocheck and spin_is_locked. According to
5
comments from Mat and Martin, in this set mptcp_subflow
6
bpf_iter only used from a cg sockopt bpf prog, no need to add these
7
check at this moment.
4
8
5
Geliang Tang (3):
9
v3:
10
- patch 3, continue to use sock_owned_by_user_nocheck() and spin_is_locked()
11
checks instead of using msk_owned_by_me().
12
- patch 5, drop declaration of bpf_mptcp_subflow_tcp_sock. It's no longer
13
used.
14
- patch 5, update the comment for mptcp_subflow_tcp_sock(), which is a BPF
15
helper, not a kfunc.
16
17
The commit log of "bpf: Register mptcp common kfunc set" doesn't match the
18
code, please update it as:
19
20
'''
21
bpf: Register mptcp common kfunc set
22
23
MPTCP helper mptcp_subflow_ctx() is used to convert struct sock to
24
struct mptcp_subflow_context. It will be used in MPTCP BPF programs.
25
26
This patch defines corresponding wrapper of this helper, and put it
27
into the newly defined mptcp common kfunc set and register this set
28
with the flag BPF_PROG_TYPE_CGROUP_SOCKOPT to let it accessible to
29
the 'cgroup/getsockopt' type of BPF programs.
30
'''
31
32
v2:
33
- Drop bpf_skc_to_mptcp_sock
34
- Check the owner before assigning the msk as Mat suggested.
35
- Use bpf_core_cast() in mptcp_subflow bpf_iter subtest instead of
36
using bpf_skc_to_mptcp_sock().
37
38
Address Martin's suggestions for "Add mptcp_subflow bpf_iter support" v2.
39
40
Geliang Tang (5):
41
Revert "bpf: Extend bpf_skc_to_mptcp_sock to MPTCP sock"
42
Revert "bpf: Allow use of skc_to_mptcp_sock in cg_sockopt"
6
Squash to "bpf: Add mptcp_subflow bpf_iter"
43
Squash to "bpf: Add mptcp_subflow bpf_iter"
7
Revert "bpf: Acquire and release mptcp socket"
44
Revert "bpf: Acquire and release mptcp socket"
8
Squash to "selftests/bpf: Add mptcp_subflow bpf_iter subtest"
45
Squash to "selftests/bpf: Add mptcp_subflow bpf_iter subtest"
9
46
10
net/mptcp/bpf.c | 34 +++++--------------
47
include/net/mptcp.h | 4 +-
48
kernel/bpf/cgroup.c | 2 -
49
net/core/filter.c | 2 +-
50
net/mptcp/bpf.c | 41 ++++---------------
11
.../testing/selftests/bpf/bpf_experimental.h | 2 +-
51
.../testing/selftests/bpf/bpf_experimental.h | 2 +-
12
tools/testing/selftests/bpf/progs/mptcp_bpf.h | 3 --
52
tools/testing/selftests/bpf/progs/mptcp_bpf.h | 5 ---
13
.../selftests/bpf/progs/mptcp_bpf_iters.c | 6 +---
53
.../selftests/bpf/progs/mptcp_bpf_iters.c | 10 ++---
14
4 files changed, 11 insertions(+), 34 deletions(-)
54
7 files changed, 15 insertions(+), 51 deletions(-)
15
55
16
--
56
--
17
2.43.0
57
2.43.0
diff view generated by jsdifflib
New patch
[PATCH mptcp-next v4 1/5] Revert "bpf: Extend bpf_skc_to_mptcp_sock to MPTCP sock"
1
From: Geliang Tang <tanggeliang@kylinos.cn>
1
2
3
bpf_core_cast() can be used in mptcp_subflow bpf_iter selftests to get the
4
msk, instead of using bpf_skc_to_mptcp_sock(). No need to add this patch
5
anymore, revert it.
6
7
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
8
---
9
include/net/mptcp.h | 4 ++--
10
net/core/filter.c | 2 +-
11
net/mptcp/bpf.c | 10 ++--------
12
3 files changed, 5 insertions(+), 11 deletions(-)
13
14
diff --git a/include/net/mptcp.h b/include/net/mptcp.h
15
index XXXXXXX..XXXXXXX 100644
16
--- a/include/net/mptcp.h
17
+++ b/include/net/mptcp.h
18
@@ -XXX,XX +XXX,XX @@ static inline void mptcpv6_handle_mapped(struct sock *sk, bool mapped) { }
19
#endif
20
21
#if defined(CONFIG_MPTCP) && defined(CONFIG_BPF_SYSCALL)
22
-struct mptcp_sock *bpf_mptcp_sock_from_sock(struct sock *sk);
23
+struct mptcp_sock *bpf_mptcp_sock_from_subflow(struct sock *sk);
24
#else
25
-static inline struct mptcp_sock *bpf_mptcp_sock_from_sock(struct sock *sk) { return NULL; }
26
+static inline struct mptcp_sock *bpf_mptcp_sock_from_subflow(struct sock *sk) { return NULL; }
27
#endif
28
29
#if !IS_ENABLED(CONFIG_MPTCP)
30
diff --git a/net/core/filter.c b/net/core/filter.c
31
index XXXXXXX..XXXXXXX 100644
32
--- a/net/core/filter.c
33
+++ b/net/core/filter.c
34
@@ -XXX,XX +XXX,XX @@ const struct bpf_func_proto bpf_skc_to_unix_sock_proto = {
35
BPF_CALL_1(bpf_skc_to_mptcp_sock, struct sock *, sk)
36
{
37
    BTF_TYPE_EMIT(struct mptcp_sock);
38
-    return (unsigned long)bpf_mptcp_sock_from_sock(sk);
39
+    return (unsigned long)bpf_mptcp_sock_from_subflow(sk);
40
}
41
42
const struct bpf_func_proto bpf_skc_to_mptcp_sock_proto = {
43
diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c
44
index XXXXXXX..XXXXXXX 100644
45
--- a/net/mptcp/bpf.c
46
+++ b/net/mptcp/bpf.c
47
@@ -XXX,XX +XXX,XX @@ static struct bpf_struct_ops bpf_mptcp_sched_ops = {
48
};
49
#endif /* CONFIG_BPF_JIT */
50
51
-struct mptcp_sock *bpf_mptcp_sock_from_sock(struct sock *sk)
52
+struct mptcp_sock *bpf_mptcp_sock_from_subflow(struct sock *sk)
53
{
54
-    if (unlikely(!sk || !sk_fullsock(sk)))
55
-        return NULL;
56
-
57
-    if (sk->sk_protocol == IPPROTO_MPTCP)
58
-        return mptcp_sk(sk);
59
-
60
-    if (sk->sk_protocol == IPPROTO_TCP && sk_is_mptcp(sk))
61
+    if (sk && sk_fullsock(sk) && sk->sk_protocol == IPPROTO_TCP && sk_is_mptcp(sk))
62
        return mptcp_sk(mptcp_subflow_ctx(sk)->conn);
63
64
    return NULL;
65
--
66
2.43.0
diff view generated by jsdifflib
New patch
[PATCH mptcp-next v4 2/5] Revert "bpf: Allow use of skc_to_mptcp_sock in cg_sockopt"
1
From: Geliang Tang <tanggeliang@kylinos.cn>
1
2
3
bpf_core_cast() can be used in mptcp_subflow bpf_iter selftests to get the
4
msk, instead of using bpf_skc_to_mptcp_sock(). No need to add this patch
5
anymore, revert it.
6
7
This reverts commit d8d42f5a4542c2dc31e4e00c58508a821c6ab789.
8
---
9
kernel/bpf/cgroup.c | 2 --
10
1 file changed, 2 deletions(-)
11
12
diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c
13
index XXXXXXX..XXXXXXX 100644
14
--- a/kernel/bpf/cgroup.c
15
+++ b/kernel/bpf/cgroup.c
16
@@ -XXX,XX +XXX,XX @@ cg_sockopt_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
17
#ifdef CONFIG_INET
18
    case BPF_FUNC_tcp_sock:
19
        return &bpf_tcp_sock_proto;
20
-    case BPF_FUNC_skc_to_mptcp_sock:
21
-        return &bpf_skc_to_mptcp_sock_proto;
22
#endif
23
    case BPF_FUNC_perf_event_output:
24
        return &bpf_event_output_data_proto;
25
--
26
2.43.0
diff view generated by jsdifflib
[PATCH mptcp-next 1/3] Squash to "bpf: Add mptcp_subflow bpf_iter"
[PATCH mptcp-next v4 3/5] Squash to "bpf: Add mptcp_subflow bpf_iter"
1
From: Geliang Tang <tanggeliang@kylinos.cn>
1
From: Geliang Tang <tanggeliang@kylinos.cn>
2
2
3
Drop the NULL check as Martin suggested.
3
Drop the NULL check for 'msk' as Martin suggested, add more checks
4
for 'sk'.
4
5
5
Use the "struct sock *sk" instead of "struct mptcp-sock *msk" as the
6
Use the "struct sock *sk" instead of "struct mptcp-sock *msk" as the
6
argument in the bpf_iter_mptcp_subflow_new as Martin suggested.
7
argument in the bpf_iter_mptcp_subflow_new as Martin suggested.
7
8
8
Use msk_owned_by_me().
9
v4:
10
- drop sock_owned_by_user_nocheck and spin_is_locked. According to
11
comments from Mat [2] and Martin [1], in this set mptcp_subflow
12
bpf_iter only used from a cg sockopt bpf prog, no need to add these
13
check at this moment.
14
15
[1]
16
https://lore.kernel.org/all/fdf0ddbe-e007-4a5f-bbdf-9a144e8fbe35@linux.dev/
17
[2]
18
https://patchwork.kernel.org/project/mptcp/patch/f6469225598beecbf0bda12a4c33fafa86c0ff15.1739787744.git.tanggeliang@kylinos.cn/
19
20
v3:
21
- continue to use sock_owned_by_user_nocheck and spin_is_locked
22
checks instead of using msk_owned_by_me().
23
24
v2:
25
- check the owner before assigning the msk as Mat suggested.
9
26
10
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
27
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
11
---
28
---
12
net/mptcp/bpf.c | 15 +++++++++------
29
net/mptcp/bpf.c | 12 ++++++------
13
1 file changed, 9 insertions(+), 6 deletions(-)
30
1 file changed, 6 insertions(+), 6 deletions(-)
14
31
15
diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c
32
diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c
16
index XXXXXXX..XXXXXXX 100644
33
index XXXXXXX..XXXXXXX 100644
17
--- a/net/mptcp/bpf.c
34
--- a/net/mptcp/bpf.c
18
+++ b/net/mptcp/bpf.c
35
+++ b/net/mptcp/bpf.c
...
...
42
+    if (sk->sk_protocol != IPPROTO_MPTCP)
59
+    if (sk->sk_protocol != IPPROTO_MPTCP)
43
        return -EINVAL;
60
        return -EINVAL;
44
61
45
+    msk = mptcp_sk(sk);
62
+    msk = mptcp_sk(sk);
46
+    kit->msk = msk;
63
+    kit->msk = msk;
47
+
48
+    msk_owned_by_me(msk);
49
+
50
    kit->pos = &msk->conn_list;
64
    kit->pos = &msk->conn_list;
51
    return 0;
65
    return 0;
52
}
66
}
53
--
67
--
54
2.43.0
68
2.43.0
diff view generated by jsdifflib
[PATCH mptcp-next 2/3] Revert "bpf: Acquire and release mptcp socket"
[PATCH mptcp-next v4 4/5] Revert "bpf: Acquire and release mptcp socket"
1
From: Geliang Tang <tanggeliang@kylinos.cn>
1
From: Geliang Tang <tanggeliang@kylinos.cn>
2
2
3
Drop this patch as Martin suggested.
3
Drop this patch as Martin suggested.
4
5
From Martin's review [1], this mptcp_sock_acquire() helper was a workaround
6
only to please the verifier, but they were not needed.
7
8
[1]
9
https://lore.kernel.org/9b373a23-c093-42d8-b4ae-99f2e62e7681@linux.dev
4
10
5
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
11
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
6
---
12
---
7
net/mptcp/bpf.c | 19 -------------------
13
net/mptcp/bpf.c | 19 -------------------
8
1 file changed, 19 deletions(-)
14
1 file changed, 19 deletions(-)
...
...
diff view generated by jsdifflib
[PATCH mptcp-next 3/3] Squash to "selftests/bpf: Add mptcp_subflow bpf_iter subtest"
[PATCH mptcp-next v4 5/5] Squash to "selftests/bpf: Add mptcp_subflow bpf_iter subtest"
1
From: Geliang Tang <tanggeliang@kylinos.cn>
1
From: Geliang Tang <tanggeliang@kylinos.cn>
2
2
3
Drop bpf_mptcp_sock_acquire/release.
3
Use bpf_core_cast() instead of bpf_skc_to_mptcp_sock().
4
Change the 2nd parameter type of bpf_for_each() as 'struct sock'.
5
Drop use of bpf_mptcp_sock_acquire/release.
6
Drop declaration of bpf_mptcp_subflow_tcp_sock. It's no longer used.
7
Update the comment for mptcp_subflow_tcp_sock(), which is a BPF helper,
8
not a kfunc.
9
10
Please update the commit log as:
11
12
'''
13
This patch adds a "cgroup/getsockopt" program "iters_subflow" to test the
14
newly added mptcp_subflow bpf_iter.
15
16
Export mptcp_subflow helpers bpf_iter_mptcp_subflow_new/_next/_destroy
17
and other helpers into bpf_experimental.h.
18
19
Use bpf_for_each() to walk the subflow list of this msk. MPTCP-specific
20
packet scheduler kfunc can be called in the loop. In this test, just
21
add all subflow ids to local variable local_ids, then invoke the helper
22
mptcp_subflow_tcp_sock() in the loop to pick a subsocket.
23
24
Out of the loop, use bpf_mptcp_subflow_ctx() to get the subflow context
25
of the picked subsocket and do some verification. Finally, assign
26
local_ids to global variable ids so that the application can obtain this
27
value.
28
29
Add a subtest named test_iters_subflow to load and verify the newly added
30
mptcp_subflow type bpf_iter example in test_mptcp. Use the helper
31
endpoint_init() to add 3 new subflow endpoints. Send a byte of message
32
to start the mptcp connection, and wait for new subflows to be added.
33
getsockopt() is invoked to trigger the "cgroup/getsockopt" test program
34
"iters_subflow". Check if skel->bss->ids equals 10 to verify whether this
35
mptcp_subflow bpf_iter loops correctly as expected.
36
'''
4
37
5
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
38
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
6
---
39
---
7
tools/testing/selftests/bpf/bpf_experimental.h | 2 +-
40
tools/testing/selftests/bpf/bpf_experimental.h | 2 +-
8
tools/testing/selftests/bpf/progs/mptcp_bpf.h | 3 ---
41
tools/testing/selftests/bpf/progs/mptcp_bpf.h | 5 -----
9
tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c | 6 +-----
42
tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c | 10 +++-------
10
3 files changed, 2 insertions(+), 9 deletions(-)
43
3 files changed, 4 insertions(+), 13 deletions(-)
11
44
12
diff --git a/tools/testing/selftests/bpf/bpf_experimental.h b/tools/testing/selftests/bpf/bpf_experimental.h
45
diff --git a/tools/testing/selftests/bpf/bpf_experimental.h b/tools/testing/selftests/bpf/bpf_experimental.h
13
index XXXXXXX..XXXXXXX 100644
46
index XXXXXXX..XXXXXXX 100644
14
--- a/tools/testing/selftests/bpf/bpf_experimental.h
47
--- a/tools/testing/selftests/bpf/bpf_experimental.h
15
+++ b/tools/testing/selftests/bpf/bpf_experimental.h
48
+++ b/tools/testing/selftests/bpf/bpf_experimental.h
...
...
33
-extern struct mptcp_sock *bpf_mptcp_sock_acquire(struct mptcp_sock *msk) __ksym;
66
-extern struct mptcp_sock *bpf_mptcp_sock_acquire(struct mptcp_sock *msk) __ksym;
34
-extern void bpf_mptcp_sock_release(struct mptcp_sock *msk) __ksym;
67
-extern void bpf_mptcp_sock_release(struct mptcp_sock *msk) __ksym;
35
-
68
-
36
extern struct mptcp_subflow_context *
69
extern struct mptcp_subflow_context *
37
bpf_mptcp_subflow_ctx(const struct sock *sk) __ksym;
70
bpf_mptcp_subflow_ctx(const struct sock *sk) __ksym;
38
extern struct sock *
71
-extern struct sock *
72
-bpf_mptcp_subflow_tcp_sock(const struct mptcp_subflow_context *subflow) __ksym;
73
74
extern void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subflow,
75
                    bool scheduled) __ksym;
39
diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c
76
diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c
40
index XXXXXXX..XXXXXXX 100644
77
index XXXXXXX..XXXXXXX 100644
41
--- a/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c
78
--- a/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c
42
+++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c
79
+++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c
43
@@ -XXX,XX +XXX,XX @@ int iters_subflow(struct bpf_sockopt *ctx)
80
@@ -XXX,XX +XXX,XX @@ int iters_subflow(struct bpf_sockopt *ctx)
81
    if (ctx->level != SOL_TCP || ctx->optname != TCP_IS_MPTCP)
82
        return 1;
83
84
-    msk = bpf_skc_to_mptcp_sock(sk);
85
+    msk = bpf_core_cast(sk, struct mptcp_sock);
44
    if (!msk || msk->pm.server_side || !msk->pm.subflows)
86
    if (!msk || msk->pm.server_side || !msk->pm.subflows)
45
        return 1;
87
        return 1;
46
88
47
-    msk = bpf_mptcp_sock_acquire(msk);
89
-    msk = bpf_mptcp_sock_acquire(msk);
48
-    if (!msk)
90
-    if (!msk)
...
...
51
+    bpf_for_each(mptcp_subflow, subflow, (struct sock *)sk) {
93
+    bpf_for_each(mptcp_subflow, subflow, (struct sock *)sk) {
52
        /* Here MPTCP-specific packet scheduler kfunc can be called:
94
        /* Here MPTCP-specific packet scheduler kfunc can be called:
53
         * this test is not doing anything really useful, only to
95
         * this test is not doing anything really useful, only to
54
         * verify the iteration works.
96
         * verify the iteration works.
55
@@ -XXX,XX +XXX,XX @@ int iters_subflow(struct bpf_sockopt *ctx)
97
@@ -XXX,XX +XXX,XX @@ int iters_subflow(struct bpf_sockopt *ctx)
98
99
        local_ids += subflow->subflow_id;
100
101
-        /* only to check the following kfunc works */
102
+        /* only to check the following helper works */
103
        ssk = mptcp_subflow_tcp_sock(subflow);
104
    }
105
106
@@ -XXX,XX +XXX,XX @@ int iters_subflow(struct bpf_sockopt *ctx)
56
    ids = local_ids;
107
    ids = local_ids;
57
108
58
out:
109
out:
59
-    bpf_mptcp_sock_release(msk);
110
-    bpf_mptcp_sock_release(msk);
60
    return 1;
111
    return 1;
61
}
112
}
62
--
113
--
63
2.43.0
114
2.43.0
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.