net/smc: Introduce smc_ops
Subsystems (11)
D. Wythe
maintainerv4 cover net/smc: Introduce smc_ops
This patches attempt to introduce BPF injection capability for SMC, and add selftest to ensure code stability.
Since the SMC protocol is not suitable for all scenarios, especially for short-lived. For most applications, they cannot guarantee that there are no such scenarios at all. Therefore, apps may need some specific strategies to decide shall we need to use SMC or not, for example, apps can limit the scope of the SMC to a specific IP address or port.
Based on the consideration of transparent replacement, we hope that apps can remain transparent even if they need to formulate some specific strategies for SMC using. That is, do not need to recompile their code.
On the other hand, we need to ensure the scalability of strategies implementation. Although it is simple to use socket options or sysctl, it will bring more complexity to subsequent expansion.
Fortunately, BPF can solve these concerns very well, users can write thire own strategies in eBPF to choose whether to use SMC or not. And it's quite easy for them to modify their strategies in the future.
v2:
1. Rename smc_bpf_ops to smc_ops.
2. Change the scope of smc_ops from global to per netns.
3. Directly pass parameters to ops instead of smc_ops_ctx.
4. Remove struct smc_ops_ctx.
5. Remove exports that are no longer needed.
v3:
1. Remove find_ksym_btf_id_by_prefix_kind.
2. Enhance selftest, introduce a complete ops for filtering smc connections based on ip pairs and a realistic topology test to verify it.
v4:
1. Remove unless func: smc_bpf_ops_check_member()
2. Remove unless inline func: smc_ops_find_by_name()
3. Chnage CONFIG_SMC=y to complete CI testing
4. Change smc_sock to smc_sock___local in test to avoid compiling failed with CONFIG_SMC=y
5. Improve test cases, remove unnecessary timeouts and multi-thread test, using network_helpers to start testing between server and client.
6. Fix issues when the return value of the ops function is neither 0 nor 1.
D. Wythe (5):
bpf: export necessary sympols for modules with struct_ops net/smc: Introduce generic hook smc_ops
net/smc: bpf: register smc_ops info struct_ops
libbpf: fix error when st-prefix_ops and ops from differ btf bpf/selftests: add selftest for bpf_smc_ops
include/net/netns/smc.h | 3 + include/net/smc.h | 51 +++ kernel/bpf/bpf_struct_ops.c | 2 + kernel/bpf/syscall.c | 1 + net/ipv4/tcp_output.c | 15 +- net/smc/Kconfig | 12 + net/smc/Makefile | 1 + net/smc/af_smc.c | 10 + net/smc/smc_ops.c | 130 ++++++ net/smc/smc_ops.h | 30 ++ net/smc/smc_sysctl.c | 95 +++++ tools/lib/bpf/libbpf.c | 25 +- tools/testing/selftests/bpf/config | 4 + .../selftests/bpf/prog_tests/test_bpf_smc.c | 390 ++++++++++++++++++ tools/testing/selftests/bpf/progs/bpf_smc.c | 116 ++++++ 15 files changed, 873 insertions(+), 12 deletions(-) create mode 100644 net/smc/smc_ops.c create mode 100644 net/smc/smc_ops.h create mode 100644 tools/testing/selftests/bpf/prog_tests/test_bpf_smc.c create mode 100644 tools/testing/selftests/bpf/progs/bpf_smc.c
Signature · 1 line
2.45.0
D. Wythe
maintainerPATCH v4 1/5 bpf: export necessary sympols for modules with struct_ops
Exports three necessary symbols for implementing struct_ops with tristate subsystem.
To hold or release refcnt of struct_ops refcnt by inline funcs bpf_try_module_get and bpf_module_put which use bpf_struct_ops_get(put) conditionally.
And to copy obj name from one to the other with effective checks by bpf_obj_name_cpy.
--- kernel/bpf/bpf_struct_ops.c | 2 ++ kernel/bpf/syscall.c | 1 + 2 files changed, 3 insertions(+)
kernel/bpf/bpf_struct_ops.c +2 -0
@@ -1119,6 +1119,7 @@ bool bpf_struct_ops_get(const void *kdata) map =__bpf_map_inc_not_zero (&st_map->map, false);return !IS_ERR (map); } +EXPORT_SYMBOL_GPL (bpf_struct_ops_get);void bpf_struct_ops_put (const void *kdata) {
@@ -1130,6 +1131,7 @@ void bpf_struct_ops_put(const void *kdata)bpf_map_put (&st_map->map); } +EXPORT_SYMBOL_GPL (bpf_struct_ops_put);int bpf_struct_ops_supported (const struct bpf_struct_ops *st_ops,u32 moff) {
kernel/bpf/syscall.c +1 -0
@@ -1167,6 +1167,7 @@ int bpf_obj_name_cpy(char *dst, const char *src, unsigned int size)return src - orig_src; } +EXPORT_SYMBOL_GPL (bpf_obj_name_cpy); int map_check_no_btf(const struct bpf_map *map, const struct btf *btf,
Signature · 1 line
2.45.0
D. Wythe
maintainerPATCH v4 2/5 net/smc: Introduce generic hook smc_ops
In reply to D. WytheThe introduction of IPPROTO_SMC enables eBPF programs to determine whether to use SMC based on the context of socket creation, such as network namespaces, PID and comm name, etc.
As a subsequent enhancement, to introduce a new generic hook that allows decisions on whether to use SMC or not at runtime, including but not limited to local/remote IP address or ports.
Moreover, in the future, we can achieve more complex extensions to the protocol stack by extending this ops.
--- include/net/netns/smc.h | 3 ++ include/net/smc.h | 51 ++++++++++++++++++++++ net/ipv4/tcp_output.c | 15 +++++-- net/smc/Kconfig | 12 ++++++ net/smc/Makefile | 1 + net/smc/smc_ops.c | 51 ++++++++++++++++++++++ net/smc/smc_ops.h | 25 +++++++++++ net/smc/smc_sysctl.c | 95 +++++++++++++++++++++++++++++++++++++++++ 8 files changed, 249 insertions(+), 4 deletions(-) create mode 100644 net/smc/smc_ops.c create mode 100644 net/smc/smc_ops.h
include/net/netns/smc.h +3 -0
@@ -17,6 +17,9 @@ struct netns_smc {#ifdef CONFIG_SYSCTL struct ctl_table_header *smc_hdr;#endif +#if IS_ENABLED (CONFIG_SMC_OPS ) +struct smc_ops __rcu *ops; +#endif /* CONFIG_SMC_OPS */ unsigned int sysctl_autocorking_size;unsigned int sysctl_smcr_buf_type;int sysctl_smcr_testlink_time;
include/net/smc.h +51 -0
61 lines not on this page · raw message
net/ipv4/tcp_output.c +11 -4
@@ -48,6 +48,7 @@#include <linux/skbuff_ref.h> #include <trace/events/tcp.h> +#include <net/smc.h> /* Refresh clocks of a TCP socket, * ensuring monotically increasing values.
@@ -759,14 +760,17 @@ static void tcp_options_write(struct tcphdr *th, struct tcp_sock *tp,mptcp_options_write (th, ptr, tp, opts); } -static void smc_set_option (const struct tcp_sock *tp, +static void smc_set_option (struct tcp_sock *tp,struct tcp_out_options *opts,unsigned int *remaining) {#if IS_ENABLED (CONFIG_SMC )if (static_branch_unlikely (&tcp_have_smc)) {if (tp->syn_smc) { -if (*remaining >=TCPOLEN_EXP_SMC_BASE_ALIGNED ) { + tp->syn_smc =smc_call_retops (1 , &tp->inet_conn.icsk_inet.sk, + set_option, tp); +/* re-check syn_smc */ +if (tp->syn_smc && *remaining >=TCPOLEN_EXP_SMC_BASE_ALIGNED ) { opts->options |=OPTION_SMC ; *remaining -=TCPOLEN_EXP_SMC_BASE_ALIGNED ; }
@@ -776,14 +780,17 @@ static void smc_set_option(const struct tcp_sock *tp, }static void smc_set_option_cond (const struct tcp_sock *tp, -const struct inet_request_sock *ireq, +struct inet_request_sock *ireq,struct tcp_out_options *opts,unsigned int *remaining) {#if IS_ENABLED (CONFIG_SMC )if (static_branch_unlikely (&tcp_have_smc)) {if (tp->syn_smc && ireq->smc_ok) { -if (*remaining >=TCPOLEN_EXP_SMC_BASE_ALIGNED ) { + ireq->smc_ok =smc_call_retops (1 , &tp->inet_conn.icsk_inet.sk, + set_option_cond, tp, ireq); +/* re-check smc_ok */ +if (ireq->smc_ok && *remaining >=TCPOLEN_EXP_SMC_BASE_ALIGNED ) { opts->options |=OPTION_SMC ; *remaining -=TCPOLEN_EXP_SMC_BASE_ALIGNED ; }
net/smc/Kconfig +12 -0
@@ -33,3 +33,15 @@ config SMC_LO of architecture or hardware. if unsure, say N. + +config SMC_OPS + bool "Generic hook for SMC subsystem" + depends on SMC && BPF_SYSCALL + default n + help + SMC_OPS enables support to register genericfor hook via eBPF programs + for SMC subsystem. eBPF programs offer much greater flexibility + in modifying the behavior of the SMC protocol stack compared + to a complete kernel-based approach. + + if unsure, say N.
net/smc/Makefile +1 -0
@@ -7,3 +7,4 @@ smc-y += smc_cdc.o smc_tx.o smc_rx.o smc_close.o smc_ism.o smc_netlink.o smc_sta smc-y += smc_tracepoint.o smc_inet.o smc-$(CONFIG_SYSCTL) += smc_sysctl.o smc-$(CONFIG_SMC_LO) += smc_loopback.o +smc-$(CONFIG_SMC_OPS) += smc_ops.o
net/smc/smc_ops.c new file +51 -0
51 lines not on this page · raw message
net/smc/smc_ops.h new file +25 -0
@@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Shared Memory Communications over RDMA (SMC-R) and RoCE +* +* Generic hook for SMC subsystem. +* +* Copyright IBM Corp. 2016 +* Copyright (c) 2024, Alibaba Inc. +* +* Author: D. Wythe <[email protected]> +*/ + +#ifndef __SMC_OPS +#define __SMC_OPS + +#include <net/smc.h> + +/* Find ops by the target name, which required to be a c-string. +* Return NULL if no such ops was found,otherwise, return a valid ops. +* +* Note: Caller MUST ensure it's was invoked under rcu_read_lock. +*/ +struct smc_ops *smc_ops_find_by_name (const char *name); + +#endif /* __SMC_OPS */
net/smc/smc_sysctl.c +95 -0
131 lines not on this page · raw message
Signature · 1 line
2.45.0
D. Wythe
maintainerPATCH v4 3/5 net/smc: bpf: register smc_ops info struct_ops
In reply to D. WytheTo implement injection capability for smc via struct_ops, so that user can make their own smc_ops to modify the behavior of smc stack.
Currently, user can write their own implememtion to choose whether to use SMC or not before TCP 3rd handshake to be comleted. In the future, users can implement more complex functions on smc by expanding it.
--- net/smc/af_smc.c | 10 ++++++ net/smc/smc_ops.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++ net/smc/smc_ops.h | 5 +++ 3 files changed, 94 insertions(+)
net/smc/af_smc.c +10 -0
@@ -55,6 +55,7 @@#include "smc_sysctl.h" #include "smc_loopback.h" #include "smc_inet.h" +#include "smc_ops.h" static DEFINE_MUTEX (smc_server_lgr_pending);/* serialize link group * creation on server
@@ -3576,8 +3577,17 @@ static int __init smc_init(void)pr_err ("%s: smc_inet_init fails with %d\n" , __func__, rc); goto out_ulp; } + + rc =smc_bpf_struct_ops_init (); +if (rc) { +pr_err ("%s: smc_bpf_struct_ops_init fails with %d\n" , __func__, rc); + goto out_inet; + } +static_branch_enable (&tcp_have_smc);return 0 ; +out_inet: +smc_inet_exit (); out_ulp:tcp_unregister_ulp (&smc_ulp_ops); out_lo:
net/smc/smc_ops.c +79 -0
88 lines not on this page · raw message
net/smc/smc_ops.h +5 -0
@@ -21,5 +21,10 @@* Note: Caller MUST ensure it's was invoked under rcu_read_lock. */ struct smc_ops *smc_ops_find_by_name (const char *name); +#if IS_ENABLED (CONFIG_SMC_OPS ) +int smc_bpf_struct_ops_init (void ); +#else +static inline int smc_bpf_struct_ops_init (void ) {return 0 ; } +#endif #endif /* __SMC_OPS */
Signature · 1 line
2.45.0
D. Wythe
maintainerPATCH v4 4/5 libbpf: fix error when st-prefix_ops and ops from differ btf
In reply to D. WytheWhen a struct_ops named xxx_ops was registered by a module, and it will be used in both built-in modules and the module itself, so that the btf_type of xxx_ops will be present in btf_vmlinux instead of in btf_mod, which means that the btf_type of bpf_struct_ops_xxx_ops and xxx_ops will not be in the same btf.
Here are four possible case:
+--------+-------------+-------------+---------------------------------+ | | st_opx_xxx | xxx | | +--------+-------------+-------------+---------------------------------+ | case 0 | btf_vmlinux | bft_vmlinux | be used and reg only in vmlinux | +--------+-------------+-------------+---------------------------------+ | case 1 | btf_vmlinux | bpf_mod | INVALID | +--------+-------------+-------------+---------------------------------+ | case 2 | btf_mod | btf_vmlinux | reg in mod but be used both in | | | | | vmlinux and mod. | +--------+-------------+-------------+---------------------------------+ | case 3 | btf_mod | btf_mod | be used and reg only in mod | +--------+-------------+-------------+---------------------------------+
At present, cases 0, 1, and 3 can be correctly identified, because st_ops_xxx is searched from the same btf with xxx. In order to handle case 2 correctly without affecting other cases, we cannot simply change the search method for st_ops_xxx from find_btf_by_prefix_kind() to find_ksym_btf_id(), because in this way, case 1 will not be recognized anymore.
To address this issue, if st_ops_xxx cannot be found in the btf with xxx and mod_btf does not exist, do find_ksym_btf_id() again to avoid such issue.
--- tools/lib/bpf/libbpf.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
tools/lib/bpf/libbpf.c +17 -8
@@ -1005,7 +1005,8 @@ find_struct_ops_kern_types(struct bpf_object *obj, const char *tname_raw,const struct btf_member *kern_data_member;struct btf *btf =NULL ;__s32 kern_vtype_id, kern_type_id; -char tname[256 ]; +char tname[256 ], stname[256 ]; +int ret;__u32 i; snprintf(tname, sizeof(tname), "%.*s",
@@ -1020,17 +1021,25 @@ find_struct_ops_kern_types(struct bpf_object *obj, const char *tname_raw, } kern_type =btf__type_by_id (btf, kern_type_id); + ret =snprintf (stname,sizeof (stname),"%s%s" ,STRUCT_OPS_VALUE_PREFIX , tname); +if (ret <0 || ret >=sizeof (stname)) +return -ENAMETOOLONG ; +/* Find the corresponding "map_value" type that will be used * in map_update(BPF_MAP_TYPE_STRUCT_OPS). For example, * find "struct bpf_struct_ops_tcp_congestion_ops" from the * btf_vmlinux. */ - kern_vtype_id =find_btf_by_prefix_kind (btf,STRUCT_OPS_VALUE_PREFIX , - tname,BTF_KIND_STRUCT ); + kern_vtype_id =btf__find_by_name_kind (btf, stname,BTF_KIND_STRUCT );if (kern_vtype_id <0 ) { -pr_warn ("struct_ops init_kern: struct %s%s is not found in kernel BTF\n" , -STRUCT_OPS_VALUE_PREFIX , tname); -return kern_vtype_id; +if (kern_vtype_id == -ENOENT && !*mod_btf) + kern_vtype_id =find_ksym_btf_id (obj, stname,BTF_KIND_STRUCT , + &btf, mod_btf); +if (kern_vtype_id <0 ) { +pr_warn ("struct_ops init_kern: struct %s is not found in kernel BTF\n" , + stname); +return kern_vtype_id; + } } kern_vtype =btf__type_by_id (btf, kern_vtype_id);
@@ -1046,8 +1055,8 @@ find_struct_ops_kern_types(struct bpf_object *obj, const char *tname_raw,break ; }if (i ==btf_vlen (kern_vtype)) { -pr_warn ("struct_ops init_kern: struct %s data is not found in struct %s%s\n" , - tname,STRUCT_OPS_VALUE_PREFIX , tname); +pr_warn ("struct_ops init_kern: struct %s data is not found in struct %s\n" , + tname, stname);return -EINVAL ; }
Signature · 1 line
2.45.0
D. Wythe
maintainerPATCH v4 5/5 bpf/selftests: add selftest for bpf_smc_ops
In reply to D. WytheThis tests introduces a tiny smc_ops for filtering SMC connections based on IP pairs, and also adds a realistic topology model to verify this ops.
Also, we can only use SMC loopback under CI test, so an additional configuration needs to be enabled.
Follow the steps below to run this test.
make -C tools/testing/selftests/bpf
cd tools/testing/selftests/bpf
sudo ./test_progs -t smc
Results shows:
Summary: 1/1 PASSED, 0 SKIPPED, 0 FAILED
--- tools/testing/selftests/bpf/config | 4 + .../selftests/bpf/prog_tests/test_bpf_smc.c | 390 ++++++++++++++++++ tools/testing/selftests/bpf/progs/bpf_smc.c | 116 ++++++ 3 files changed, 510 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/test_bpf_smc.c create mode 100644 tools/testing/selftests/bpf/progs/bpf_smc.c
tools/testing/selftests/bpf/config +4 -0
@@ -113,3 +113,7 @@ CONFIG_XDP_SOCKETS=y CONFIG_XFRM_INTERFACE=y CONFIG_TCP_CONG_DCTCP=y CONFIG_TCP_CONG_BBR=y +CONFIG_INFINIBAND=y +CONFIG_SMC=Y +CONFIG_SMC_OPS=y +CONFIG_SMC_LO=y
tools/testing/selftests/bpf/prog_tests/test_bpf_smc.c new file +390 -0
390 lines not on this page · raw message
tools/testing/selftests/bpf/progs/bpf_smc.c new file +116 -0
116 lines not on this page · raw message
Signature · 1 line
2.45.0