add add skc_to_mptcp_sock
Subsystems (7)
v10 cover add add skc_to_mptcp_sock
v10:
- merge the squash-to patch.
- update patch 3 as Matt suggested.
- add sync() in get_msk_token() before read().
- add a comment for get_msk_token().
- update subjects and commit logs.
v9:
- update progs/mptcp.c in patch 4 and 5
v8:
- update as Matt suggested.
v7:
- parse msk token from the output of 'ip mptcp monitor'.
- add Nicolas and Matt's SoB tags.
v6:
- add skc_to_mptcp_sock helper and test
RESEND:
- fix the CI Build Failure.
v5:
- fix incorrect token value
- verify the token in selftest
v4:
- define bpf_mptcp_sock_proto as a static function, no longer export it in linux/bpf.h
v3:
- use RET_PTR_TO_BTF_ID_OR_NULL instead of RET_PTR_TO_MPTCP_SOCK_OR_NULL
- add a new bpf_id BTF_SOCK_TYPE_MPTCP
v2:
- keep RET_PTR_TO_MPTCP_SOCK_OR_NULL. If we use RET_PTR_TO_BTF_ID_OR_NULL
instead of RET_PTR_TO_MPTCP_SOCK_OR_NULL as Alexei suggested, the "userspace" tests developed by Nicolas will break.
Geliang Tang (5):
Revert "selftests: bpf: add bpf_mptcp_sock() verifier tests" Revert "bpf: add 'bpf_mptcp_sock' structure and helper"
bpf: add bpf_skc_to_mptcp_sock_proto
Squash to "selftests: bpf: add MPTCP test base"
selftests: bpf: test bpf_skc_to_mptcp_sock
include/linux/bpf.h | 31 +---- include/linux/btf_ids.h | 3 +- include/uapi/linux/bpf.h | 14 +-- kernel/bpf/verifier.c | 20 --- net/core/filter.c | 22 +++- net/mptcp/bpf.c | 62 +--------- scripts/bpf_doc.py | 4 +- tools/include/uapi/linux/bpf.h | 14 +-- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 6 + .../testing/selftests/bpf/prog_tests/mptcp.c | 116 +++++++++++++++--- tools/testing/selftests/bpf/progs/mptcp.c | 36 ++++-- tools/testing/selftests/bpf/verifier/sock.c | 63 ---------- 12 files changed, 172 insertions(+), 219 deletions(-)
Signature · 1 line
2.34.1
PATCH v10 1/5 Revert "selftests: bpf: add bpf_mptcp_sock() verifier tests"
This reverts commit f48f0143286db0d8dbded9542d9a2535533dd3b9.
--- tools/testing/selftests/bpf/verifier/sock.c | 63 --------------------- 1 file changed, 63 deletions(-)
tools/testing/selftests/bpf/verifier/sock.c +0 -63
@@ -731,66 +731,3 @@ .result_unpriv = REJECT, .errstr_unpriv = "unknown func", }, -{ - "bpf_mptcp_sock(skops->sk): no !skops->sk check", - .insns = { -BPF_LDX_MEM (BPF_DW ,BPF_REG_1 ,BPF_REG_1 , offsetof(struct bpf_sock_ops , sk)), -BPF_EMIT_CALL (BPF_FUNC_mptcp_sock), -BPF_MOV64_IMM (BPF_REG_0 ,0 ), - BPF_EXIT_INSN(), - }, - .prog_type =BPF_PROG_TYPE_SOCK_OPS , - .result = REJECT, - .errstr = "type=sock_or_null expected=sock_common", -}, -{ -"bpf_mptcp_sock(skops->sk): no NULL check on ret" , - .insns = { -BPF_LDX_MEM (BPF_DW ,BPF_REG_1 ,BPF_REG_1 , offsetof(struct bpf_sock_ops , sk)), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_1 ,0 ,2 ), -BPF_MOV64_IMM (BPF_REG_0 ,0 ), -BPF_EXIT_INSN (), -BPF_EMIT_CALL (BPF_FUNC_mptcp_sock), -BPF_LDX_MEM (BPF_W ,BPF_REG_0 ,BPF_REG_0 , offsetof(struct bpf_mptcp_sock , token)), -BPF_MOV64_IMM (BPF_REG_0 ,0 ), - BPF_EXIT_INSN(), - }, - .prog_type =BPF_PROG_TYPE_SOCK_OPS , - .result = REJECT, - .errstr = "invalid mem access 'mptcp_sock_or_null'", -}, -{ -"bpf_mptcp_sock(skops->sk): msk->token" , - .insns = { -BPF_LDX_MEM (BPF_DW ,BPF_REG_1 ,BPF_REG_1 , offsetof(struct bpf_sock_ops , sk)), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_1 ,0 ,2 ), -BPF_MOV64_IMM (BPF_REG_0 ,0 ), -BPF_EXIT_INSN (), -BPF_EMIT_CALL (BPF_FUNC_mptcp_sock), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_0 ,0 ,1 ), -BPF_EXIT_INSN (), -BPF_LDX_MEM (BPF_W ,BPF_REG_0 ,BPF_REG_0 , offsetof(struct bpf_mptcp_sock , token)), -BPF_MOV64_IMM (BPF_REG_0 ,0 ), - BPF_EXIT_INSN(), - }, - .prog_type =BPF_PROG_TYPE_SOCK_OPS , - .result = ACCEPT, -}, -{ -"bpf_mptcp_sock(skops->sk): msk->token cannot be modified" , - .insns = { -BPF_LDX_MEM (BPF_DW ,BPF_REG_1 ,BPF_REG_1 , offsetof(struct bpf_sock_ops , sk)), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_1 ,0 ,2 ), -BPF_MOV64_IMM (BPF_REG_0 ,0 ), -BPF_EXIT_INSN (), -BPF_EMIT_CALL (BPF_FUNC_mptcp_sock), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_0 ,0 ,1 ), -BPF_EXIT_INSN (), -BPF_ST_MEM (BPF_W ,BPF_REG_0 , offsetof(struct bpf_mptcp_sock , token),0x2a ), -BPF_MOV64_IMM (BPF_REG_0 ,0 ), - BPF_EXIT_INSN(), - }, - .prog_type =BPF_PROG_TYPE_SOCK_OPS , - .result = REJECT, - .errstr = "cannot write into mptcp_sock", -},
Signature · 1 line
2.34.1
PATCH v10 2/5 Revert "bpf: add 'bpf_mptcp_sock' structure and helper"
In reply to Geliang TangThis reverts commit 2ee22ce38ed4c7a416ce887eb6379aaf157634f9.
--- include/linux/bpf.h | 34 ---------------- include/uapi/linux/bpf.h | 13 ------ kernel/bpf/verifier.c | 20 ---------- net/core/filter.c | 4 -- net/mptcp/Makefile | 2 - net/mptcp/bpf.c | 72 ---------------------------------- scripts/bpf_doc.py | 2 - tools/include/uapi/linux/bpf.h | 13 ------ 8 files changed, 160 deletions(-) delete mode 100644 net/mptcp/bpf.c
include/linux/bpf.h +0 -34
@@ -407,7 +407,6 @@ enum bpf_return_type {RET_PTR_TO_MAP_VALUE ,/* returns a pointer to map elem value */ RET_PTR_TO_SOCKET ,/* returns a pointer to a socket */ RET_PTR_TO_TCP_SOCK ,/* returns a pointer to a tcp_sock */ -RET_PTR_TO_MPTCP_SOCK ,/* returns a pointer to mptcp_sock */ RET_PTR_TO_SOCK_COMMON ,/* returns a pointer to a sock_common */ RET_PTR_TO_ALLOC_MEM ,/* returns a pointer to dynamically allocated memory */ RET_PTR_TO_MEM_OR_BTF_ID, /* returns a pointer to a valid memory or a btf_id */
@@ -418,7 +417,6 @@ enum bpf_return_type {RET_PTR_TO_MAP_VALUE_OR_NULL =PTR_MAYBE_NULL |RET_PTR_TO_MAP_VALUE ,RET_PTR_TO_SOCKET_OR_NULL =PTR_MAYBE_NULL |RET_PTR_TO_SOCKET ,RET_PTR_TO_TCP_SOCK_OR_NULL =PTR_MAYBE_NULL |RET_PTR_TO_TCP_SOCK , -RET_PTR_TO_MPTCP_SOCK_OR_NULL =PTR_MAYBE_NULL |RET_PTR_TO_MPTCP_SOCK ,RET_PTR_TO_SOCK_COMMON_OR_NULL =PTR_MAYBE_NULL |RET_PTR_TO_SOCK_COMMON ,RET_PTR_TO_ALLOC_MEM_OR_NULL =PTR_MAYBE_NULL |MEM_ALLOC |RET_PTR_TO_ALLOC_MEM , RET_PTR_TO_BTF_ID_OR_NULL = PTR_MAYBE_NULL | RET_PTR_TO_BTF_ID,
@@ -499,7 +497,6 @@ enum bpf_reg_type {PTR_TO_SOCKET ,/* reg points to struct bpf_sock */ PTR_TO_SOCK_COMMON ,/* reg points to sock_common */ PTR_TO_TCP_SOCK ,/* reg points to struct tcp_sock */ -PTR_TO_MPTCP_SOCK ,/* reg points to struct mptcp_sock */ PTR_TO_TP_BUFFER ,/* reg points to a writable raw tp's buffer */ PTR_TO_XDP_SOCK, /* reg points to struct xdp_sock *//* PTR_TO_BTF_ID points to a kernel struct that does not need
@@ -528,7 +525,6 @@ enum bpf_reg_type {PTR_TO_SOCKET_OR_NULL =PTR_MAYBE_NULL |PTR_TO_SOCKET ,PTR_TO_SOCK_COMMON_OR_NULL =PTR_MAYBE_NULL |PTR_TO_SOCK_COMMON ,PTR_TO_TCP_SOCK_OR_NULL =PTR_MAYBE_NULL |PTR_TO_TCP_SOCK , -PTR_TO_MPTCP_SOCK_OR_NULL =PTR_MAYBE_NULL |PTR_TO_MPTCP_SOCK , PTR_TO_BTF_ID_OR_NULL = PTR_MAYBE_NULL | PTR_TO_BTF_ID,/* This must be the last entry. Its purpose is to ensure the enum is
@@ -2221,7 +2217,6 @@ extern const struct bpf_func_proto bpf_get_local_storage_proto;extern const struct bpf_func_proto bpf_strtol_proto;extern const struct bpf_func_proto bpf_strtoul_proto;extern const struct bpf_func_proto bpf_tcp_sock_proto; -extern const struct bpf_func_proto bpf_mptcp_sock_proto;extern const struct bpf_func_proto bpf_jiffies64_proto;extern const struct bpf_func_proto bpf_get_ns_current_pid_tgid_proto;extern const struct bpf_func_proto bpf_event_output_data_proto;
@@ -2309,7 +2304,6 @@ struct sk_reuseport_kern {u32 reuseport_id;bool bind_inany; }; -bool bpf_tcp_sock_is_valid_access (int off,int size,enum bpf_access_type type,struct bpf_insn_access_aux *info);
@@ -2360,34 +2354,6 @@ static inline u32 bpf_xdp_sock_convert_ctx_access(enum bpf_access_type type, }#endif /* CONFIG_INET */ -#ifdef CONFIG_MPTCP -bool bpf_mptcp_sock_is_valid_access (int off,int size, -enum bpf_access_type type, -struct bpf_insn_access_aux *info); - -u32 bpf_mptcp_sock_convert_ctx_access (enum bpf_access_type type, -const struct bpf_insn *si, -struct bpf_insn *insn_buf, -struct bpf_prog *prog, -u32 *target_size); -#else /* CONFIG_MPTCP */ -static inline bool bpf_mptcp_sock_is_valid_access (int off,int size, -enum bpf_access_type type, -struct bpf_insn_access_aux *info) -{ -return false; -} - -static inline u32 bpf_mptcp_sock_convert_ctx_access (enum bpf_access_type type, -const struct bpf_insn *si, -struct bpf_insn *insn_buf, -struct bpf_prog *prog, -u32 *target_size) -{ -return 0 ; -} -#endif /* CONFIG_MPTCP */ -enum bpf_text_poke_type {BPF_MOD_CALL ,BPF_MOD_JUMP ,
include/uapi/linux/bpf.h +0 -13
@@ -5086,14 +5086,6 @@ union bpf_attr {* Return * 0 on success, or a negative error in case of failure. On error * *dst* buffer is zeroed out. -* -* struct bpf_mptcp_sock *bpf_mptcp_sock(struct bpf_sock *sk) -* Description -* This helper gets a **struct bpf_mptcp_sock** pointer from a -* **struct bpf_sock** pointer. -* Return -* A **struct bpf_mptcp_sock** pointer on success, or **NULL** in -* case of failure. */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -5288,7 +5280,6 @@ union bpf_attr {FN (xdp_load_bytes), \FN (xdp_store_bytes ), \FN (copy_from_user_task ), \ -FN (mptcp_sock), \/* */ /* integer value in 'imm' field of BPF_CALL instruction selects which helper
@@ -5637,10 +5628,6 @@ struct bpf_tcp_sock {__u32 is_mptcp;/* Is MPTCP subflow? */ }; -struct bpf_mptcp_sock { -__u32 token;/* msk token */ -}; - struct bpf_sock_tuple { union { struct {
kernel/bpf/verifier.c +0 -20
@@ -430,7 +430,6 @@ static bool type_is_sk_pointer(enum bpf_reg_type type)return type ==PTR_TO_SOCKET || type ==PTR_TO_SOCK_COMMON || type ==PTR_TO_TCP_SOCK || - type ==PTR_TO_MPTCP_SOCK || type ==PTR_TO_XDP_SOCK ; }
@@ -438,7 +437,6 @@ static bool reg_type_not_null(enum bpf_reg_type type) {return type ==PTR_TO_SOCKET || type ==PTR_TO_TCP_SOCK || - type ==PTR_TO_MPTCP_SOCK || type ==PTR_TO_MAP_VALUE || type ==PTR_TO_MAP_KEY || type ==PTR_TO_SOCK_COMMON ;
@@ -454,7 +452,6 @@ static bool reg_type_may_be_refcounted_or_null(enum bpf_reg_type type) {return base_type (type) ==PTR_TO_SOCKET ||base_type (type) ==PTR_TO_TCP_SOCK || -base_type (type) ==PTR_TO_MPTCP_SOCK ||base_type (type) ==PTR_TO_MEM ||base_type (type) ==PTR_TO_BTF_ID ; }
@@ -554,7 +551,6 @@ static const char *reg_type_str(struct bpf_verifier_env *env, [PTR_TO_SOCKET] = "sock", [PTR_TO_SOCK_COMMON] = "sock_common", [PTR_TO_TCP_SOCK] = "tcp_sock", - [PTR_TO_MPTCP_SOCK] = "mptcp_sock", [PTR_TO_TP_BUFFER] = "tp_buffer", [PTR_TO_XDP_SOCK] = "xdp_sock", [PTR_TO_BTF_ID] = "ptr_",
@@ -2778,7 +2774,6 @@ static bool is_spillable_regtype(enum bpf_reg_type type)case PTR_TO_SOCKET :case PTR_TO_SOCK_COMMON :case PTR_TO_TCP_SOCK : -case PTR_TO_MPTCP_SOCK :case PTR_TO_XDP_SOCK :case PTR_TO_BTF_ID :case PTR_TO_BUF :
@@ -3671,9 +3666,6 @@ static int check_sock_access(struct bpf_verifier_env *env, int insn_idx,case PTR_TO_TCP_SOCK : valid =bpf_tcp_sock_is_valid_access (off, size, t, &info);break ; -case PTR_TO_MPTCP_SOCK : - valid =bpf_mptcp_sock_is_valid_access (off, size, t, &info); -break ;case PTR_TO_XDP_SOCK : valid =bpf_xdp_sock_is_valid_access (off, size, t, &info);break ;
@@ -3830,9 +3822,6 @@ static int check_ptr_alignment(struct bpf_verifier_env *env,case PTR_TO_TCP_SOCK : pointer_desc ="tcp_sock " ;break ; -case PTR_TO_MPTCP_SOCK : - pointer_desc ="mptcp_sock " ; -break ;case PTR_TO_XDP_SOCK : pointer_desc ="xdp_sock " ;break ;
@@ -6762,9 +6751,6 @@ static int check_helper_call(struct bpf_verifier_env *env, struct bpf_insn *insn }else if (base_type (ret_type) ==RET_PTR_TO_TCP_SOCK ) {mark_reg_known_zero (env, regs,BPF_REG_0 ); regs[BPF_REG_0 ].type =PTR_TO_TCP_SOCK | ret_flag; - }else if (base_type (ret_type) ==RET_PTR_TO_MPTCP_SOCK ) { -mark_reg_known_zero (env, regs,BPF_REG_0 ); - regs[BPF_REG_0 ].type =PTR_TO_MPTCP_SOCK | ret_flag; }else if (base_type (ret_type) ==RET_PTR_TO_ALLOC_MEM ) {mark_reg_known_zero (env, regs,BPF_REG_0 ); regs[BPF_REG_0 ].type =PTR_TO_MEM | ret_flag;
@@ -7479,7 +7465,6 @@ static int adjust_ptr_min_max_vals(struct bpf_verifier_env *env,case PTR_TO_SOCKET :case PTR_TO_SOCK_COMMON :case PTR_TO_TCP_SOCK : -case PTR_TO_MPTCP_SOCK :case PTR_TO_XDP_SOCK :verbose (env,"R%d pointer arithmetic on %s prohibited\n" , dst,reg_type_str (env, ptr_reg->type));
@@ -10854,7 +10839,6 @@ static bool regsafe(struct bpf_verifier_env *env, struct bpf_reg_state *rold,case PTR_TO_SOCKET :case PTR_TO_SOCK_COMMON :case PTR_TO_TCP_SOCK : -case PTR_TO_MPTCP_SOCK :case PTR_TO_XDP_SOCK :/* Only valid matches are exact, which memcmp() above * would have accepted
@@ -11385,7 +11369,6 @@ static bool reg_type_mismatch_ok(enum bpf_reg_type type)case PTR_TO_SOCKET :case PTR_TO_SOCK_COMMON :case PTR_TO_TCP_SOCK : -case PTR_TO_MPTCP_SOCK :case PTR_TO_XDP_SOCK :case PTR_TO_BTF_ID :return false;
@@ -12810,9 +12793,6 @@ static int convert_ctx_accesses(struct bpf_verifier_env *env)case PTR_TO_TCP_SOCK : convert_ctx_access = bpf_tcp_sock_convert_ctx_access;break ; -case PTR_TO_MPTCP_SOCK : - convert_ctx_access = bpf_mptcp_sock_convert_ctx_access; -break ;case PTR_TO_XDP_SOCK : convert_ctx_access = bpf_xdp_sock_convert_ctx_access;break ;
net/core/filter.c +0 -4
@@ -7850,10 +7850,6 @@ sock_ops_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)case BPF_FUNC_tcp_sock:return &bpf_tcp_sock_proto;#endif /* CONFIG_INET */ -#ifdef CONFIG_MPTCP -case BPF_FUNC_mptcp_sock: -return &bpf_mptcp_sock_proto; -#endif /* CONFIG_MPTCP */ default :return bpf_sk_base_func_proto (func_id); }
net/mptcp/Makefile +0 -2
@@ -11,5 +11,3 @@ obj-$(CONFIG_INET_MPTCP_DIAG) += mptcp_diag.o mptcp_crypto_test-objs := crypto_test.o mptcp_token_test-objs := token_test.o obj-$(CONFIG_MPTCP_KUNIT_TEST) += mptcp_crypto_test.o mptcp_token_test.o - -obj-$(CONFIG_BPF) += bpf.o
net/mptcp/bpf.c deleted +0 -72
72 lines not on this page · raw message
scripts/bpf_doc.py +0 -2
@@ -623,7 +623,6 @@ class PrinterHelpers(Printer): 'struct udp6_sock', 'struct unix_sock', 'struct task_struct', - 'struct bpf_mptcp_sock', 'struct __sk_buff', 'struct sk_msg_md',
@@ -683,7 +682,6 @@ class PrinterHelpers(Printer): 'struct socket', 'struct file', 'struct bpf_timer', - 'struct bpf_mptcp_sock', } mapped_types = { 'u8': '__u8',
tools/include/uapi/linux/bpf.h +0 -13
@@ -5086,14 +5086,6 @@ union bpf_attr {* Return * 0 on success, or a negative error in case of failure. On error * *dst* buffer is zeroed out. -* -* struct bpf_mptcp_sock *bpf_mptcp_sock(struct bpf_sock *sk) -* Description -* This helper gets a **struct bpf_mptcp_sock** pointer from a -* **struct bpf_sock** pointer. -* Return -* A **struct bpf_mptcp_sock** pointer on success, or **NULL** in -* case of failure. */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -5288,7 +5280,6 @@ union bpf_attr {FN (xdp_load_bytes), \FN (xdp_store_bytes ), \FN (copy_from_user_task ), \ -FN (mptcp_sock), \/* */ /* integer value in 'imm' field of BPF_CALL instruction selects which helper
@@ -5637,10 +5628,6 @@ struct bpf_tcp_sock {__u32 is_mptcp;/* Is MPTCP subflow? */ }; -struct bpf_mptcp_sock { -__u32 token;/* msk token */ -}; - struct bpf_sock_tuple { union { struct {
Signature · 1 line
2.34.1
PATCH v10 3/5 bpf: add bpf_skc_to_mptcp_sock_proto
In reply to Geliang TangThis patch implemented a new bpf_func_proto bpf_skc_to_mptcp_sock_proto. Defined a new bpf_id BTF_SOCK_TYPE_MPTCP, implemented the helper bpf_skc_to_mptcp_sock, and added a new helper bpf_mptcp_sock_from_subflow to get struct mptcp_sock from a given subflow socket.
--- include/linux/bpf.h | 9 +++++++++ include/linux/btf_ids.h | 3 ++- include/uapi/linux/bpf.h | 7 +++++++ net/core/filter.c | 18 ++++++++++++++++++ net/mptcp/Makefile | 2 ++ net/mptcp/bpf.c | 20 ++++++++++++++++++++ scripts/bpf_doc.py | 2 ++ tools/include/uapi/linux/bpf.h | 7 +++++++ 8 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 net/mptcp/bpf.c
include/linux/bpf.h +9 -0
@@ -2354,6 +2354,15 @@ static inline u32 bpf_xdp_sock_convert_ctx_access(enum bpf_access_type type, }#endif /* CONFIG_INET */ +#ifdef CONFIG_MPTCP +struct mptcp_sock *bpf_mptcp_sock_from_subflow (struct sock *sk); +#else /* CONFIG_MPTCP */ +static inline struct mptcp_sock *bpf_mptcp_sock_from_subflow (struct sock *sk) +{ +return NULL ; +} +#endif /* CONFIG_MPTCP */ +enum bpf_text_poke_type {BPF_MOD_CALL ,BPF_MOD_JUMP ,
include/linux/btf_ids.h +2 -1
@@ -178,7 +178,8 @@ extern struct btf_id_set name; BTF_SOCK_TYPE(BTF_SOCK_TYPE_TCP6, tcp6_sock) \ BTF_SOCK_TYPE(BTF_SOCK_TYPE_UDP, udp_sock) \ BTF_SOCK_TYPE(BTF_SOCK_TYPE_UDP6, udp6_sock) \ - BTF_SOCK_TYPE(BTF_SOCK_TYPE_UNIX, unix_sock) + BTF_SOCK_TYPE(BTF_SOCK_TYPE_UNIX, unix_sock) \ + BTF_SOCK_TYPE(BTF_SOCK_TYPE_MPTCP, mptcp_sock) enum {#define BTF_SOCK_TYPE (name, str) name,
include/uapi/linux/bpf.h +7 -0
@@ -5086,6 +5086,12 @@ union bpf_attr {* Return * 0 on success, or a negative error in case of failure. On error * *dst* buffer is zeroed out. +* +* struct mptcp_sock *bpf_skc_to_mptcp_sock(void *sk) +* Description +* Dynamically cast a *sk* pointer to a *mptcp_sock* pointer. +* Return +* *sk* if casting is valid, or **NULL** otherwise. */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -5280,6 +5286,7 @@ union bpf_attr {FN (xdp_load_bytes), \FN (xdp_store_bytes), \FN (copy_from_user_task), \ +FN (skc_to_mptcp_sock), \/* */ /* integer value in 'imm' field of BPF_CALL instruction selects which helper
net/core/filter.c +18 -0
@@ -11121,6 +11121,19 @@ const struct bpf_func_proto bpf_skc_to_unix_sock_proto = { .ret_btf_id = &btf_sock_ids[BTF_SOCK_TYPE_UNIX], }; +BPF_CALL_1(bpf_skc_to_mptcp_sock, struct sock *, sk) +{ +return (unsigned long )bpf_mptcp_sock_from_subflow (sk); +} + +static const struct bpf_func_proto bpf_skc_to_mptcp_sock_proto = { + .func = bpf_skc_to_mptcp_sock, + .gpl_only = false, + .ret_type =RET_PTR_TO_BTF_ID_OR_NULL , + .arg1_type =ARG_PTR_TO_SOCK_COMMON , + .ret_btf_id = &btf_sock_ids[BTF_SOCK_TYPE_MPTCP ], +}; + BPF_CALL_1(bpf_sock_from_file, struct file *, file) {return (unsigned long )sock_from_file (file);
@@ -11163,6 +11176,11 @@ bpf_sk_base_func_proto(enum bpf_func_id func_id)case BPF_FUNC_skc_to_unix_sock: func = &bpf_skc_to_unix_sock_proto;break ; +#ifdef CONFIG_MPTCP +case BPF_FUNC_skc_to_mptcp_sock: + func = &bpf_skc_to_mptcp_sock_proto; +break ; +#endif /* CONFIG_MPTCP */ case BPF_FUNC_ktime_get_coarse_ns:return &bpf_ktime_get_coarse_ns_proto;default :
net/mptcp/Makefile +2 -0
@@ -11,3 +11,5 @@ obj-$(CONFIG_INET_MPTCP_DIAG) += mptcp_diag.o mptcp_crypto_test-objs := crypto_test.o mptcp_token_test-objs := token_test.o obj-$(CONFIG_MPTCP_KUNIT_TEST) += mptcp_crypto_test.o mptcp_token_test.o + +obj-$(CONFIG_BPF) += bpf.o
net/mptcp/bpf.c new file +20 -0
@@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Multipath TCP +* +* Copyright (c) 2020, Tessares SA. +* +* Author: Nicolas Rybowski <[email protected]> +* +*/ + +#include <linux/bpf.h> +#include "protocol.h" + +struct mptcp_sock *bpf_mptcp_sock_from_subflow (struct sock *sk) +{ +if (sk &&sk_fullsock (sk) && sk->sk_protocol ==IPPROTO_TCP &&sk_is_mptcp (sk)) +return mptcp_sk (mptcp_subflow_ctx (sk)->conn); + +return NULL ; +} +EXPORT_SYMBOL (bpf_mptcp_sock_from_subflow);
scripts/bpf_doc.py +2 -0
@@ -623,6 +623,7 @@ class PrinterHelpers(Printer): 'struct udp6_sock', 'struct unix_sock', 'struct task_struct', + 'struct mptcp_sock', 'struct __sk_buff', 'struct sk_msg_md',
@@ -682,6 +683,7 @@ class PrinterHelpers(Printer): 'struct socket', 'struct file', 'struct bpf_timer', + 'struct mptcp_sock', } mapped_types = { 'u8': '__u8',
tools/include/uapi/linux/bpf.h +7 -0
@@ -5086,6 +5086,12 @@ union bpf_attr {* Return * 0 on success, or a negative error in case of failure. On error * *dst* buffer is zeroed out. +* +* struct mptcp_sock *bpf_skc_to_mptcp_sock(void *sk) +* Description +* Dynamically cast a *sk* pointer to a *mptcp_sock* pointer. +* Return +* *sk* if casting is valid, or **NULL** otherwise. */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -5280,6 +5286,7 @@ union bpf_attr {FN (xdp_load_bytes), \FN (xdp_store_bytes), \FN (copy_from_user_task), \ +FN (skc_to_mptcp_sock), \/* */ /* integer value in 'imm' field of BPF_CALL instruction selects which helper
Signature · 1 line
2.34.1
PATCH v10 4/5 Squash to "selftests: bpf: add MPTCP test base"
In reply to Geliang TangSome cleanups.
--- tools/testing/selftests/bpf/prog_tests/mptcp.c | 16 +++++----------- tools/testing/selftests/bpf/progs/mptcp.c | 14 +++++++------- 2 files changed, 12 insertions(+), 18 deletions(-)
tools/testing/selftests/bpf/prog_tests/mptcp.c +5 -11
@@ -13,12 +13,6 @@ static int verify_sk(int map_fd, int client_fd, const char *msg, __u32 is_mptcp)int err =0 , cfd = client_fd;struct mptcp_storage val; -/* Currently there is no easy way to get back the subflow sk from the MPTCP -* sk, thus we cannot access here the sk_storage associated to the subflow -* sk. Also, there is no sk_storage associated with the MPTCP sk since it -* does not trigger sockops events. -* We silently pass this situation at the moment. -*/ if (is_mptcp ==1 )return 0 ;
@@ -28,14 +22,14 @@ static int verify_sk(int map_fd, int client_fd, const char *msg, __u32 is_mptcp) }if (val.invoked !=1 ) { -log_err ("%s: unexpected invoked count %d != %d" , - msg, val.invoked,1 ); +log_err ("%s: unexpected invoked count %d != 1" , + msg, val.invoked); err++; } -if (val.is_mptcp != is_mptcp) { -log_err ("%s: unexpected bpf_tcp_sock.is_mptcp %d != %d" , - msg, val.is_mptcp, is_mptcp); +if (val.is_mptcp !=0 ) { +log_err ("%s: unexpected bpf_tcp_sock.is_mptcp %d != 0" , + msg, val.is_mptcp); err++; }
tools/testing/selftests/bpf/progs/mptcp.c +7 -7
@@ -25,22 +25,22 @@ int _sockops(struct bpf_sock_ops *ctx)int op = (int )ctx->op;struct bpf_sock *sk; +if (op !=BPF_SOCK_OPS_TCP_CONNECT_CB ) +return 1 ; + sk = ctx->sk;if (!sk)return 1 ; + tcp_sk =bpf_tcp_sock (sk); +if (!tcp_sk) +return 1 ; + storage =bpf_sk_storage_get (&socket_storage_map, sk,0 ,BPF_SK_STORAGE_GET_F_CREATE );if (!storage)return 1 ; -if (op !=BPF_SOCK_OPS_TCP_CONNECT_CB ) -return 1 ; - - tcp_sk =bpf_tcp_sock (sk); -if (!tcp_sk) -return 1 ; - storage->invoked++; storage->is_mptcp = tcp_sk->is_mptcp;
Signature · 1 line
2.34.1
PATCH v10 5/5 selftests: bpf: test bpf_skc_to_mptcp_sock
In reply to Geliang TangThis patch extended the MPTCP test base, to test the new helper bpf_skc_to_mptcp_sock().
Added a new function verify_msk() to verify the msk token, and a new function get_msk_token() to parse the msk token from the output of the command 'ip mptcp monitor'.
--- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 6 ++ .../testing/selftests/bpf/prog_tests/mptcp.c | 102 ++++++++++++++++-- tools/testing/selftests/bpf/progs/mptcp.c | 28 ++++- 3 files changed, 126 insertions(+), 10 deletions(-)
tools/testing/selftests/bpf/bpf_tcp_helpers.h +6 -0
@@ -83,6 +83,12 @@ struct tcp_sock {__u64 tcp_mstamp;/* most recent packet received/sent */ } __attribute__((preserve_access_index)); +struct mptcp_sock { +struct inet_connection_sock sk; + +__u32 token; +} __attribute__((preserve_access_index)); + static __always_inline struct inet_connection_sock *inet_csk(const struct sock *sk) {return (struct inet_connection_sock *)sk;
tools/testing/selftests/bpf/prog_tests/mptcp.c +96 -6
147 lines not on this page · raw message
tools/testing/selftests/bpf/progs/mptcp.c +24 -4
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/bpf.h> #include <bpf/bpf_helpers.h> +#include "bpf_tcp_helpers.h" char _license[] SEC("license") = "GPL"; __u32 _version SEC("version") = 1;
@@ -8,6 +9,7 @@ __u32 _version SEC("version") = 1;struct mptcp_storage {__u32 invoked;__u32 is_mptcp; +__u32 token; };struct {
@@ -20,8 +22,10 @@ struct { SEC("sockops")int _sockops (struct bpf_sock_ops *ctx) { +char fmt[] ="invoked=%u is_mptcp=%u token=%x" ;struct mptcp_storage *storage;struct bpf_tcp_sock *tcp_sk; +struct mptcp_sock *msk;int op = (int )ctx->op;struct bpf_sock *sk;
@@ -36,13 +40,29 @@ int _sockops(struct bpf_sock_ops *ctx)if (!tcp_sk)return 1 ; - storage =bpf_sk_storage_get (&socket_storage_map, sk,0 , -BPF_SK_STORAGE_GET_F_CREATE ); -if (!storage) -return 1 ; +if (!tcp_sk->is_mptcp) { + storage =bpf_sk_storage_get (&socket_storage_map, sk,0 , +BPF_SK_STORAGE_GET_F_CREATE ); +if (!storage) +return 1 ; + + storage->token =0 ; + }else { + msk =bpf_skc_to_mptcp_sock (sk); +if (!msk) +return 1 ; + + storage =bpf_sk_storage_get (&socket_storage_map, msk,0 , +BPF_SK_STORAGE_GET_F_CREATE ); +if (!storage) +return 1 ; + storage->token = msk->token; + } storage->invoked++; storage->is_mptcp = tcp_sk->is_mptcp; +bpf_trace_printk (fmt,sizeof (fmt), + storage->invoked, storage->is_mptcp, storage->token);return 1 ; }
Signature · 1 line
2.34.1
Re: selftests: bpf: test bpf_skc_to_mptcp_sock: Tests Results
Hi Geliang,
Thank you for your modifications, that's great!
Our CI did some validations and here is its report:
- KVM Validation: normal:
- Success! ✅:
- Task: https://cirrus-ci.com/task/5808597534769152
- Summary: https://api.cirrus-ci.com/v1/artifact/task/5808597534769152/summary/summary.txt
- KVM Validation: debug:
- Success! ✅:
- Task: https://cirrus-ci.com/task/5245647581347840
- Summary: https://api.cirrus-ci.com/v1/artifact/task/5245647581347840/summary/summary.txt
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/62f24fe03084
Please note that despite all the efforts that have been already done to have a stable tests suite when executed on a public CI like here, it is possible some reported issues are not due to your modifications. Still, do not hesitate to help us improve that ;-)
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (Tessares)
Hi Geliang,
Quoted 6 lines · Geliang Tang
v10:
- merge the squash-to patch.
- update patch 3 as Matt suggested.
- addsync()inget_msk_token()beforeread().
- add a comment forget_msk_token().
- update subjects and commit logs.
Thank you for this new version! It looks good to me!
I'm looking at rebuilding the TopGit tree. I will apply this just after.
Cheers,
Matt
Signature · 2 lines
Tessares | Belgium | Hybrid Access Solutions www.tessares.net
Mat Martineau
Acked-byQuoted 10 lines · Matthieu Baerts
Hi Geliang,
Quoted 6 lines · Geliang Tang
v10:
- merge the squash-to patch.
- update patch 3 as Matt suggested.
- addsync()inget_msk_token()beforeread().
- add a comment forget_msk_token().
- update subjects and commit logs.
Quoted 6 lines
Thank you for this new version! It looks good to me!
Acked-by Matthieu Baerts <[email protected]>I'm looking at rebuilding the TopGit tree. I will apply this just after.
Thank you both for iterating on this. Builds and runs fine for me (although I didn't try !CONFIG_MPTCP).
--
Mat Martineau
Intel