BPF packet scheduler
Subsystems (6)
v4 cover BPF packet scheduler
v4:
- set msk->sched to &mptcp_sched_default when the sched argument is NULL
in mptcp_init_sched().
Depends on the bpf patches queued in the patchwork:
- add skc_to_mptcp_sock, v10
- check more values from mptcp_sock, v2
v3:
- add mptcp_release_sched helper in patch 4.
- rename mptcp_set_sched to mptcp_init_sched in patch 4.
- add mptcp_sched_first_release in patch 7.
- do some cleanups.
v2:
- split into more small patches.
- change all parameters of mptcp_sched_ops from sk to msk:
void (*init)(struct mptcp_sock *msk);
void (*release)(struct mptcp_sock *msk);
struct sock * (*get_subflow)(struct mptcp_sock *msk); - add tests in bpf_tcp_ca.c, instead of adding a new one.
v1:
Addressed to the commends in the RFC version:
https://patchwork.kernel.org/project/mptcp/cover/[email protected]/
Geliang Tang (8):
mptcp: add struct mptcp_sched_ops
mptcp: register default scheduler
mptcp: add a new sysctl scheduler
mptcp: add sched in mptcp_sock
mptcp: add mptcp_get_subflow wrapper
mptcp: add bpf_mptcp_sched_ops
selftests: bpf: add bpf_first scheduler
selftests: bpf: add bpf_first test
Documentation/networking/mptcp-sysctl.rst | 8 ++ include/net/mptcp.h | 13 +++ kernel/bpf/bpf_struct_ops_types.h | 4 + net/mptcp/Makefile | 2 +- net/mptcp/bpf.c | 102 ++++++++++++++++++ net/mptcp/ctrl.c | 14 +++ net/mptcp/protocol.c | 13 ++- net/mptcp/protocol.h | 11 ++ net/mptcp/sched.c | 94 ++++++++++++++++ tools/testing/selftests/bpf/bpf_tcp_helpers.h | 12 +++ .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 42 +++++++- tools/testing/selftests/bpf/progs/bpf_first.c | 30 ++++++ 12 files changed, 336 insertions(+), 9 deletions(-) create mode 100644 net/mptcp/sched.c create mode 100644 tools/testing/selftests/bpf/progs/bpf_first.c
Signature · 1 line
2.34.1
PATCH v4 1/8 mptcp: add struct mptcp_sched_ops
This patch added struct mptcp_sched_ops. And define the scheduler register, unregister and find functions.
--- include/net/mptcp.h | 13 +++++++++++ net/mptcp/Makefile | 2 +- net/mptcp/protocol.h | 3 +++ net/mptcp/sched.c | 55 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 net/mptcp/sched.c
include/net/mptcp.h +13 -0
@@ -95,6 +95,19 @@ struct mptcp_out_options {#endif }; +#define MPTCP_SCHED_NAME_MAX 16 + +struct mptcp_sched_ops { +struct sock * (*get_subflow)(struct mptcp_sock *msk); + +char name[MPTCP_SCHED_NAME_MAX ]; +struct module *owner; +struct list_head list; + +void (*init)(struct mptcp_sock *msk); +void (*release)(struct mptcp_sock *msk); +}____cacheline_aligned_in_smp ; +#ifdef CONFIG_MPTCP extern struct request_sock_ops mptcp_subflow_request_sock_ops;
net/mptcp/Makefile +1 -1
@@ -3,7 +3,7 @@ obj-$(CONFIG_MPTCP) += mptcp.o ccflags-y += -DDEBUG mptcp-y := protocol.o subflow.o options.o token.o crypto.o ctrl.o pm.o diag.o \ - mib.o pm_netlink.o sockopt.o + mib.o pm_netlink.o sockopt.o sched.o obj-$(CONFIG_SYN_COOKIES) += syncookies.o obj-$(CONFIG_INET_MPTCP_DIAG) += mptcp_diag.o
net/mptcp/protocol.h +3 -0
@@ -605,6 +605,9 @@ int mptcp_subflow_create_socket(struct sock *sk, struct socket **new_sock);void mptcp_info2sockaddr (const struct mptcp_addr_info *info,struct sockaddr_storage *addr,unsigned short family); +struct mptcp_sched_ops *mptcp_sched_find (const char *name); +int mptcp_register_scheduler (struct mptcp_sched_ops *sched); +void mptcp_unregister_scheduler (struct mptcp_sched_ops *sched);static inline bool __mptcp_subflow_active (struct mptcp_subflow_context *subflow) {
net/mptcp/sched.c new file +55 -0
55 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH mptcp-next v4 1/8] mptcp: add struct mptcp_sched_ops
Quoted 76 lines · Geliang Tang
This patch added struct
mptcp_sched_ops. And define the scheduler register, unregister and find functions.Signed-off-by Geliang Tang <[email protected]>---
include/net/mptcp.h | 13 +++++++++++ net/mptcp/Makefile | 2 +- net/mptcp/protocol.h | 3 +++ net/mptcp/sched.c | 55 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 1 deletion(-)create mode 100644
net/mptcp/sched.cinclude/net/mptcp.h +13
-0@@ -95,6 +95,19 @@ struct mptcp_out_options {#endif }; +#define MPTCP_SCHED_NAME_MAX 16 + +struct mptcp_sched_ops { +struct sock * (*get_subflow)(struct mptcp_sock *msk); + +char name[MPTCP_SCHED_NAME_MAX ]; +struct module *owner; +struct list_head list; + +void (*init)(struct mptcp_sock *msk); +void (*release)(struct mptcp_sock *msk); +}____cacheline_aligned_in_smp ; +#ifdef CONFIG_MPTCP extern struct request_sock_ops mptcp_subflow_request_sock_ops;net/mptcp/Makefile +0
-0@@ -3,7 +3,7 @@ obj-$(CONFIG_MPTCP) += mptcp.occflags-y += -DDEBUG
mptcp-y := protocol.o subflow.o options.o token.o crypto.o ctrl.o pm.o diag.o \
net/mptcp/Makefile +1
-1- mib.o pm_netlink.o sockopt.o + mib.o pm_netlink.o sockopt.o sched.oobj-$(CONFIG_SYN_COOKIES) += syncookies.o
obj-$(CONFIG_INET_MPTCP_DIAG) += mptcp_diag.onet/mptcp/protocol.h +3
-0@@ -605,6 +605,9 @@ int mptcp_subflow_create_socket(struct sock *sk, struct socket **new_sock);void mptcp_info2sockaddr (const struct mptcp_addr_info *info,struct sockaddr_storage *addr,unsigned short family); +struct mptcp_sched_ops *mptcp_sched_find (const char *name); +int mptcp_register_scheduler (struct mptcp_sched_ops *sched); +void mptcp_unregister_scheduler (struct mptcp_sched_ops *sched);static inline bool __mptcp_subflow_active (struct mptcp_subflow_context *subflow) {net/mptcp/sched.c new file +7
-0@@ -0,0 +1,55 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Multipath TCP +* +* Copyright (c) 2022, SUSE. +*/ + +#define pr_fmt (fmt) "MPTCP: " fmt
net/mptcp/sched.c line 17
Quoted 10 lines
net/mptcp/sched.c new file +10
-0+ +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/list.h> +#include <linux/rculist.h> +#include <linux/spinlock.h> +#include "protocol.h" + +static DEFINE_SPINLOCK (mptcp_sched_list_lock); +static LIST_HEAD (mptcp_sched_list);
Would be better to have this list per-namespace instead of global. Then the pernet lock would also work and mptcp_sched_list_lock would not be needed either.
Quoted 43 lines
net/mptcp/sched.c new file +38
-0+ +struct mptcp_sched_ops *mptcp_sched_find (const char *name) +{ +struct mptcp_sched_ops *ops; + +list_for_each_entry_rcu (ops, &mptcp_sched_list, list) { +if (!strcmp (ops->name, name)) +return ops; + } + +return NULL ; +} + +int mptcp_register_scheduler (struct mptcp_sched_ops *sched) +{ +if (!sched->get_subflow) +return -EINVAL ; + +spin_lock (&mptcp_sched_list_lock); +if (mptcp_sched_find (sched->name)) { +spin_unlock (&mptcp_sched_list_lock); +return -EEXIST ; + } +list_add_tail_rcu (&sched->list, &mptcp_sched_list); +spin_unlock (&mptcp_sched_list_lock); + +pr_debug ("%s registered" , sched->name); +return 0 ; +} + +void mptcp_unregister_scheduler (struct mptcp_sched_ops *sched) +{ +spin_lock (&mptcp_sched_list_lock); +list_del_rcu (&sched->list); +spin_unlock (&mptcp_sched_list_lock); + +synchronize_rcu (); +}Signature · 1 line
2.34.1
--
Mat Martineau
Intel
PATCH v4 2/8 mptcp: register default scheduler
In reply to Geliang TangThis patch defined the default packet scheduler mptcp_sched_default, registered it in mptcp_sched_init().
--- net/mptcp/protocol.c | 3 ++- net/mptcp/protocol.h | 2 ++ net/mptcp/sched.c | 11 +++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-)
net/mptcp/protocol.c +2 -1
@@ -1424,7 +1424,7 @@ bool mptcp_subflow_active(struct mptcp_subflow_context *subflow)* returns the subflow that will transmit the next DSS * additionally updates the rtx timeout */ -static struct sock *mptcp_subflow_get_send (struct mptcp_sock *msk) +struct sock *mptcp_subflow_get_send (struct mptcp_sock *msk) {struct subflow_send_info send_info[SSK_MODE_MAX ];struct mptcp_subflow_context *subflow;
@@ -3743,6 +3743,7 @@ void __init mptcp_proto_init(void)mptcp_subflow_init ();mptcp_pm_init (); +mptcp_sched_init ();mptcp_token_init ();if (proto_register (&mptcp_prot,MPTCP_USE_SLAB ) !=0 )
net/mptcp/protocol.h +2 -0
@@ -608,6 +608,8 @@ void mptcp_info2sockaddr(const struct mptcp_addr_info *info,struct mptcp_sched_ops *mptcp_sched_find (const char *name);int mptcp_register_scheduler (struct mptcp_sched_ops *sched);void mptcp_unregister_scheduler (struct mptcp_sched_ops *sched); +struct sock *mptcp_subflow_get_send (struct mptcp_sock *msk); +void mptcp_sched_init (void );static inline bool __mptcp_subflow_active (struct mptcp_subflow_context *subflow) {
net/mptcp/sched.c +11 -0
@@ -53,3 +53,14 @@ void mptcp_unregister_scheduler(struct mptcp_sched_ops *sched)synchronize_rcu (); } + +static struct mptcp_sched_ops mptcp_sched_default = { + .get_subflow = mptcp_subflow_get_send, + .name ="default" , + .owner =THIS_MODULE , +}; + +void mptcp_sched_init (void ) +{ +mptcp_register_scheduler (&mptcp_sched_default); +}
Signature · 1 line
2.34.1
Re: [PATCH mptcp-next v4 2/8] mptcp: register default scheduler
Quoted 53 lines · Geliang Tang
This patch defined the default packet scheduler
mptcp_sched_default, registered it inmptcp_sched_init().Signed-off-by Geliang Tang <[email protected]>---
net/mptcp/protocol.c | 3 ++- net/mptcp/protocol.h | 2 ++ net/mptcp/sched.c | 11 +++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-)net/mptcp/protocol.c +2
-1@@ -1424,7 +1424,7 @@ bool mptcp_subflow_active(struct mptcp_subflow_context *subflow)* returns the subflow that will transmit the next DSS * additionally updates the rtx timeout */ -static struct sock *mptcp_subflow_get_send (struct mptcp_sock *msk) +struct sock *mptcp_subflow_get_send (struct mptcp_sock *msk) {struct subflow_send_info send_info[SSK_MODE_MAX ];struct mptcp_subflow_context *subflow;@@ -3743,6 +3743,7 @@ void __init mptcp_proto_init(void)mptcp_subflow_init ();mptcp_pm_init (); +mptcp_sched_init ();mptcp_token_init ();if (proto_register (&mptcp_prot,MPTCP_USE_SLAB ) !=0 )net/mptcp/protocol.h +2
-0@@ -608,6 +608,8 @@ void mptcp_info2sockaddr(const struct mptcp_addr_info *info,struct mptcp_sched_ops *mptcp_sched_find (const char *name);int mptcp_register_scheduler (struct mptcp_sched_ops *sched);void mptcp_unregister_scheduler (struct mptcp_sched_ops *sched); +struct sock *mptcp_subflow_get_send (struct mptcp_sock *msk); +void mptcp_sched_init (void );static inline bool __mptcp_subflow_active (struct mptcp_subflow_context *subflow) {net/mptcp/sched.c +1
-0@@ -53,3 +53,14 @@ void mptcp_unregister_scheduler(struct mptcp_sched_ops *sched)synchronize_rcu (); } +
net/mptcp/sched.c void mptcp_unregister_scheduler(struct mptcp_sched_ops *sched) · line 66
Quoted 10 lines
net/mptcp/sched.c +10
-0+static struct mptcp_sched_ops mptcp_sched_default = { + .get_subflow = mptcp_subflow_get_send, + .name ="default" , + .owner =THIS_MODULE , +}; + +void mptcp_sched_init (void ) +{ +mptcp_register_scheduler (&mptcp_sched_default); +}
We don't want the default scheduler to get unregistered (right?), so this patch should enforce that in mptcp_unregister_scheduler().
--
Mat Martineau
Intel
PATCH v4 3/8 mptcp: add a new sysctl scheduler
In reply to Geliang TangThis patch added a new sysctl, named scheduler, to support for selection of different schedulers.
--- Documentation/networking/mptcp-sysctl.rst | 8 ++++++++ net/mptcp/ctrl.c | 14 ++++++++++++++ net/mptcp/protocol.h | 1 + 3 files changed, 23 insertions(+)
Documentation/networking/mptcp-sysctl.rst +8 -0
@@ -75,3 +75,11 @@ stale_loss_cnt - INTEGER This is a per-namespace sysctl. Default: 4 + +scheduler - STRING + Select the scheduler of your choice. + + Support for selection of different schedulers. This is a per-namespace + sysctl. + + Default: "default"
net/mptcp/ctrl.c +14 -0
@@ -32,6 +32,7 @@ struct mptcp_pernet {u8 checksum_enabled;u8 allow_join_initial_addr_port;u8 pm_type; +char scheduler[MPTCP_SCHED_NAME_MAX ]; };static struct mptcp_pernet *mptcp_get_pernet (const struct net *net)
@@ -69,6 +70,11 @@ int mptcp_get_pm_type(const struct net *net)return mptcp_get_pernet (net)->pm_type; } +const char *mptcp_get_scheduler (const struct net *net) +{ +return mptcp_get_pernet (net)->scheduler; +} +static void mptcp_pernet_set_defaults (struct mptcp_pernet *pernet) { pernet->mptcp_enabled =1 ;
@@ -77,6 +83,7 @@ static void mptcp_pernet_set_defaults(struct mptcp_pernet *pernet) pernet->allow_join_initial_addr_port =1 ; pernet->stale_loss_cnt =4 ; pernet->pm_type =MPTCP_PM_TYPE_KERNEL ; +strcpy (pernet->scheduler,"default" ); }#ifdef CONFIG_SYSCTL
@@ -128,6 +135,12 @@ static struct ctl_table mptcp_sysctl_table[] = { .extra1 = SYSCTL_ZERO, .extra2 = &mptcp_pm_type_max }, + { + .procname = "scheduler", + .maxlen = MPTCP_SCHED_NAME_MAX, + .mode = 0644, + .proc_handler = proc_dostring, + }, {} };
@@ -149,6 +162,7 @@ static int mptcp_pernet_new_table(struct net *net, struct mptcp_pernet *pernet) table[3 ].data = &pernet->allow_join_initial_addr_port; table[4 ].data = &pernet->stale_loss_cnt; table[5 ].data = &pernet->pm_type; + table[6 ].data = &pernet->scheduler; hdr =register_net_sysctl (net,MPTCP_SYSCTL_PATH , table);if (!hdr)
net/mptcp/protocol.h +1 -0
@@ -583,6 +583,7 @@ int mptcp_is_checksum_enabled(const struct net *net);int mptcp_allow_join_id0 (const struct net *net);unsigned int mptcp_stale_loss_cnt (const struct net *net);int mptcp_get_pm_type (const struct net *net); +const char *mptcp_get_scheduler (const struct net *net);void mptcp_subflow_fully_established (struct mptcp_subflow_context *subflow,struct mptcp_options_received *mp_opt);bool __mptcp_retransmit_pending_data (struct sock *sk);
Signature · 1 line
2.34.1
PATCH v4 4/8 mptcp: add sched in mptcp_sock
In reply to Geliang TangThis patch added a new struct member sched in struct mptcp_sock. And two helpers mptcp_init_sched() and mptcp_release_sched() to init and release it.
Init it with the sysctl scheduler in mptcp_init_sock(), copy the scheduler from the parent in mptcp_sk_clone(), and release it in __mptcp_destroy_sock().
--- net/mptcp/protocol.c | 4 ++++ net/mptcp/protocol.h | 4 ++++ net/mptcp/sched.c | 21 +++++++++++++++++++++ 3 files changed, 29 insertions(+)
net/mptcp/protocol.c +4 -0
@@ -2609,6 +2609,8 @@ static int mptcp_init_sock(struct sock *sk)* propagate the correct value */ mptcp_ca_reset (sk); +mptcp_init_sched (mptcp_sk (sk), +mptcp_sched_find (mptcp_get_scheduler (net)));sk_sockets_allocated_inc (sk); sk->sk_rcvbuf =sock_net (sk)->ipv4.sysctl_tcp_rmem[1 ];
@@ -2760,6 +2762,7 @@ static void __mptcp_destroy_sock(struct sock *sk)sk_stop_timer (sk, &msk->sk.icsk_retransmit_timer);sk_stop_timer (sk, &sk->sk_timer); msk->pm.status =0 ; +mptcp_release_sched (msk);/* clears msk->subflow, allowing the following loop to close * even the initial subflow
@@ -2933,6 +2936,7 @@ struct sock *mptcp_sk_clone(const struct sock *sk, msk->snd_una = msk->write_seq; msk->wnd_end = msk->snd_nxt + req->rsk_rcv_wnd; msk->setsockopt_seq =mptcp_sk (sk)->setsockopt_seq; +mptcp_init_sched (msk,mptcp_sk (sk)->sched);if (mp_opt->suboptions &OPTIONS_MPTCP_MPC ) { msk->can_ack = true;
net/mptcp/protocol.h +4 -0
@@ -286,6 +286,7 @@ struct mptcp_sock {struct socket *subflow;/* outgoing connect/listener/!mp_capable */ struct sock *first;struct mptcp_pm_data pm; +struct mptcp_sched_ops *sched;struct {u32 space;/* bytes copied in last measurement window */ u32 copied;/* bytes copied in this measurement window */
@@ -611,6 +612,9 @@ int mptcp_register_scheduler(struct mptcp_sched_ops *sched);void mptcp_unregister_scheduler (struct mptcp_sched_ops *sched);struct sock *mptcp_subflow_get_send (struct mptcp_sock *msk);void mptcp_sched_init (void ); +void mptcp_init_sched (struct mptcp_sock *msk, +struct mptcp_sched_ops *sched); +void mptcp_release_sched (struct mptcp_sock *msk);static inline bool __mptcp_subflow_active (struct mptcp_subflow_context *subflow) {
net/mptcp/sched.c +21 -0
@@ -64,3 +64,24 @@ void mptcp_sched_init(void) {mptcp_register_scheduler (&mptcp_sched_default); } + +void mptcp_init_sched (struct mptcp_sock *msk, +struct mptcp_sched_ops *sched) +{ +if (!sched) + msk->sched = &mptcp_sched_default; +else + msk->sched = sched; + +if (msk->sched->init) + msk->sched->init (msk); + +pr_debug ("sched=%s" , msk->sched->name); +} + +void mptcp_release_sched (struct mptcp_sock *msk) +{ +if (msk->sched && msk->sched->release) + msk->sched->release (msk); + msk->sched =NULL ; +}
Signature · 1 line
2.34.1
PATCH v4 5/8 mptcp: add mptcp_get_subflow wrapper
In reply to Geliang TangThis patch defined a new wrapper mptcp_get_subflow(), invoke get_subflow of msk->sched in it. Use the wrapper instead of mptcp_subflow_get_send().
--- net/mptcp/protocol.c | 6 +++--- net/mptcp/protocol.h | 1 + net/mptcp/sched.c | 7 +++++++ 3 files changed, 11 insertions(+), 3 deletions(-)
net/mptcp/protocol.c +3 -3
@@ -1567,7 +1567,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags)int ret =0 ; prev_ssk = ssk; - ssk =mptcp_subflow_get_send (msk); + ssk =mptcp_get_subflow (msk);/* First check. If the ssk has changed since * the last round, release prev_ssk
@@ -1634,7 +1634,7 @@ static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk)* check for a different subflow usage only after * spooling the first chunk of data */ - xmit_ssk = first ? ssk :mptcp_subflow_get_send (mptcp_sk (sk)); + xmit_ssk = first ? ssk :mptcp_get_subflow (mptcp_sk (sk));if (!xmit_ssk) goto out;if (xmit_ssk != ssk) {
@@ -3074,7 +3074,7 @@ void __mptcp_check_push(struct sock *sk, struct sock *ssk)return ;if (!sock_owned_by_user (sk)) { -struct sock *xmit_ssk =mptcp_subflow_get_send (mptcp_sk (sk)); +struct sock *xmit_ssk =mptcp_get_subflow (mptcp_sk (sk));if (xmit_ssk == ssk)__mptcp_subflow_push_pending (sk, ssk);
net/mptcp/protocol.h +1 -0
@@ -615,6 +615,7 @@ void mptcp_sched_init(void);void mptcp_init_sched (struct mptcp_sock *msk,struct mptcp_sched_ops *sched);void mptcp_release_sched (struct mptcp_sock *msk); +struct sock *mptcp_get_subflow (struct mptcp_sock *msk);static inline bool __mptcp_subflow_active (struct mptcp_subflow_context *subflow) {
net/mptcp/sched.c +7 -0
@@ -11,6 +11,7 @@#include <linux/list.h> #include <linux/rculist.h> #include <linux/spinlock.h> +#include <linux/indirect_call_wrapper.h> #include "protocol.h" static DEFINE_SPINLOCK (mptcp_sched_list_lock);
@@ -85,3 +86,9 @@ void mptcp_release_sched(struct mptcp_sock *msk) msk->sched->release (msk); msk->sched =NULL ; } + +struct sock *mptcp_get_subflow (struct mptcp_sock *msk) +{ +return INDIRECT_CALL_INET_1 (msk->sched->get_subflow, + mptcp_subflow_get_send, msk); +}
Signature · 1 line
2.34.1
PATCH v4 6/8 mptcp: add bpf_mptcp_sched_ops
In reply to Geliang TangThis patch implemented a new struct bpf_struct_ops, bpf_mptcp_sched_ops. Register and unregister the mptcp scheduler in .reg and .unreg.
--- kernel/bpf/bpf_struct_ops_types.h | 4 ++ net/mptcp/bpf.c | 102 ++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+)
kernel/bpf/bpf_struct_ops_types.h +4 -0
@@ -8,5 +8,9 @@ BPF_STRUCT_OPS_TYPE(bpf_dummy_ops)#ifdef CONFIG_INET #include <net/tcp.h> BPF_STRUCT_OPS_TYPE(tcp_congestion_ops) +#ifdef CONFIG_MPTCP +#include <net/mptcp.h> +BPF_STRUCT_OPS_TYPE(mptcp_sched_ops) +#endif #endif #endif
net/mptcp/bpf.c +102 -0
110 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v4 7/8 selftests: bpf: add bpf_first scheduler
In reply to Geliang TangThis patch implemented the simplest MPTCP scheduler, named bpf_first, which always picks the first subflow to send data.
--- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 12 ++++++++ tools/testing/selftests/bpf/progs/bpf_first.c | 30 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/bpf_first.c
tools/testing/selftests/bpf/bpf_tcp_helpers.h +12 -0
@@ -197,6 +197,18 @@ struct tcp_congestion_ops {void *owner; }; +#define MPTCP_SCHED_NAME_MAX 16 + +struct mptcp_sched_ops { +char name[MPTCP_SCHED_NAME_MAX ]; + +void (*init)(struct mptcp_sock *msk); +void (*release)(struct mptcp_sock *msk); + +struct sock * (*get_subflow)(struct mptcp_sock *msk); +void *owner; +}; +#define min (a, b) ((a) < (b) ? (a) : (b))#define max (a, b) ((a) > (b) ? (a) : (b))#define min_not_zero (x, y) ({ \
tools/testing/selftests/bpf/progs/bpf_first.c new file +30 -0
@@ -0,0 +1,30 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (c) 2022, SUSE. */ + +#include <linux/bpf.h> +#include "bpf_tcp_helpers.h" + +char _license[] SEC("license") = "GPL"; + +SEC("struct_ops/mptcp_sched_first_init") +void BPF_PROG (mptcp_sched_first_init ,struct mptcp_sock *msk) +{ +} + +SEC("struct_ops/mptcp_sched_first_release") +void BPF_PROG (mptcp_sched_first_release ,struct mptcp_sock *msk) +{ +} + +struct sock *BPF_STRUCT_OPS (bpf_first_get_subflow ,struct mptcp_sock *msk) +{ +return msk->first; +} + +SEC(".struct_ops") +struct mptcp_sched_ops first = { + .init = (void *)mptcp_sched_first_init, + .release = (void *)mptcp_sched_first_release, + .get_subflow = (void *)bpf_first_get_subflow, + .name ="bpf_first" , +};
Signature · 1 line
2.34.1
PATCH v4 8/8 selftests: bpf: add bpf_first test
In reply to Geliang TangThis patch expended the BPF TCP congestion control tests to support MPTCP. Add the bpf_first MPTCP sched test in it. Use sysctl to set net.mptcp.scheduler to use this sched.
--- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 42 +++++++++++++++++-- 1 file changed, 38 insertions(+), 4 deletions(-)
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +38 -4
@@ -9,6 +9,7 @@#include "bpf_cubic.skel.h" #include "bpf_tcp_nogpl.skel.h" #include "bpf_dctcp_release.skel.h" +#include "bpf_first.skel.h" #define min (a, b) ((a) < (b) ? (a) : (b))
@@ -16,6 +17,10 @@#define ENOTSUPP 524#endif +#ifndef IPPROTO_MPTCP +#define IPPROTO_MPTCP 262 +#endif +static const unsigned int total_bytes =10 *1024 *1024 ;static int expected_stg =0xeB9F ;static int stop, duration;
@@ -85,21 +90,26 @@ static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map)socklen_t addrlen =sizeof (sa6);void *thread_ret;char batch[1500 ]; +int proto =0 ;int err;WRITE_ONCE (stop,0 ); - lfd =socket (AF_INET6 ,SOCK_STREAM ,0 ); +if (!strcmp (tcp_ca,"bpf_first" )) + proto =IPPROTO_MPTCP ; + + lfd =socket (AF_INET6 ,SOCK_STREAM , proto);if (CHECK (lfd ==-1 ,"socket" ,"errno:%d\n" , errno))return ; - fd =socket (AF_INET6 ,SOCK_STREAM ,0 ); + fd =socket (AF_INET6 ,SOCK_STREAM , proto);if (CHECK (fd ==-1 ,"socket" ,"errno:%d\n" , errno)) {close (lfd);return ; } -if (settcpca (lfd, tcp_ca) ||settcpca (fd, tcp_ca) || -settimeo (lfd,0 ) ||settimeo (fd,0 )) +if (!proto && + (settcpca (lfd, tcp_ca) ||settcpca (fd, tcp_ca) || +settimeo (lfd,0 ) ||settimeo (fd,0 ))) goto done;/* bind, listen and start server thread to accept */
@@ -324,6 +334,28 @@ static void test_rel_setsockopt(void)bpf_dctcp_release__destroy (rel_skel); } +static void test_first (void ) +{ +struct bpf_first *first_skel; +struct bpf_link *link; + + first_skel =bpf_first__open_and_load (); +if (CHECK (!first_skel,"bpf_first__open_and_load" ,"failed\n" )) +return ; + + link =bpf_map__attach_struct_ops (first_skel->maps.first); +if (!ASSERT_OK_PTR (link,"bpf_map__attach_struct_ops" )) { +bpf_first__destroy (first_skel); +return ; + } + +system ("sysctl -q net.mptcp.scheduler=bpf_first" ); +do_test ("bpf_first" ,NULL ); + +bpf_link__destroy (link); +bpf_first__destroy (first_skel); +} +void test_bpf_tcp_ca (void ) {if (test__start_subtest ("dctcp" ))
@@ -336,4 +368,6 @@ void test_bpf_tcp_ca(void)test_dctcp_fallback ();if (test__start_subtest ("rel_setsockopt" ))test_rel_setsockopt (); +if (test__start_subtest ("first" )) +test_first (); }
Signature · 1 line
2.34.1
Re: [PATCH mptcp-next v4 8/8] selftests: bpf: add bpf_first test
Quoted 5 lines · Geliang Tang
This patch expended the BPF TCP congestion control tests to support MPTCP. Add the
bpf_firstMPTCP sched test in it. Use sysctl to set net.mptcp.scheduler to use this sched.Signed-off-by Geliang Tang <[email protected]>
This should definitely be set up as a separate test from bpf_tcp_ca. Ok to copy the CA tests (explain where it was copied from in the commit message), and then modify for MPTCP scheduler use.
-Mat
Quoted 99 lines
---
.../selftests/bpf/prog_tests/bpf_tcp_ca.c| 42 +++++++++++++++++--1 file changed, 38 insertions(+), 4 deletions(-)tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +38
-4@@ -9,6 +9,7 @@#include "bpf_cubic.skel.h" #include "bpf_tcp_nogpl.skel.h" #include "bpf_dctcp_release.skel.h" +#include "bpf_first.skel.h" #define min (a, b) ((a) < (b) ? (a) : (b))@@ -16,6 +17,10 @@#define ENOTSUPP 524#endif +#ifndef IPPROTO_MPTCP +#define IPPROTO_MPTCP 262 +#endif +static const unsigned int total_bytes =10 *1024 *1024 ;static int expected_stg =0xeB9F ;static int stop, duration;@@ -85,21 +90,26 @@ static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map)socklen_t addrlen =sizeof (sa6);void *thread_ret;char batch[1500 ]; +int proto =0 ;int err;WRITE_ONCE (stop,0 ); - lfd =socket (AF_INET6 ,SOCK_STREAM ,0 ); +if (!strcmp (tcp_ca,"bpf_first" )) + proto =IPPROTO_MPTCP ; + + lfd =socket (AF_INET6 ,SOCK_STREAM , proto);if (CHECK (lfd ==-1 ,"socket" ,"errno:%d\n" , errno))return ; - fd =socket (AF_INET6 ,SOCK_STREAM ,0 ); + fd =socket (AF_INET6 ,SOCK_STREAM , proto);if (CHECK (fd ==-1 ,"socket" ,"errno:%d\n" , errno)) {close (lfd);return ; } -if (settcpca (lfd, tcp_ca) ||settcpca (fd, tcp_ca) || -settimeo (lfd,0 ) ||settimeo (fd,0 )) +if (!proto && + (settcpca (lfd, tcp_ca) ||settcpca (fd, tcp_ca) || +settimeo (lfd,0 ) ||settimeo (fd,0 ))) goto done;/* bind, listen and start server thread to accept */ @@ -324,6 +334,28 @@ static void test_rel_setsockopt(void)bpf_dctcp_release__destroy (rel_skel); } +static void test_first (void ) +{ +struct bpf_first *first_skel; +struct bpf_link *link; + + first_skel =bpf_first__open_and_load (); +if (CHECK (!first_skel,"bpf_first__open_and_load" ,"failed\n" )) +return ; + + link =bpf_map__attach_struct_ops (first_skel->maps.first); +if (!ASSERT_OK_PTR (link,"bpf_map__attach_struct_ops" )) { +bpf_first__destroy (first_skel); +return ; + } + +system ("sysctl -q net.mptcp.scheduler=bpf_first" ); +do_test ("bpf_first" ,NULL ); + +bpf_link__destroy (link); +bpf_first__destroy (first_skel); +} +void test_bpf_tcp_ca (void ) {if (test__start_subtest ("dctcp" ))@@ -336,4 +368,6 @@ void test_bpf_tcp_ca(void)test_dctcp_fallback ();if (test__start_subtest ("rel_setsockopt" ))test_rel_setsockopt (); +if (test__start_subtest ("first" )) +test_first (); }Signature · 1 line
2.34.1
--
Mat Martineau
Intel
Quoted 7 lines · Geliang Tang
v4:
- setmsk->schedto&mptcp_sched_defaultwhen the sched argument is NULL inmptcp_init_sched().Depends on the bpf patches queued in the patchwork:
- addskc_to_mptcp_sock, v10
- check more values frommptcp_sock, v2
Hi Geliang -
I sent a message earlier today about rebasing the above series, can you rebase this one too? It doesn't apply easily on the current export branch or export/20220303T054913, with the above prerequisites.
I'll still post a few comments just based on the email version of the patches.
- Mat
Quoted 45 lines
v3:
- addmptcp_release_schedhelper in patch 4.
- renamemptcp_set_schedtomptcp_init_schedin patch 4.
- addmptcp_sched_first_releasein patch 7.
- do some cleanups.v2:
- split into more small patches.
- change all parameters ofmptcp_sched_opsfrom sk to msk:void (*init)(struct mptcp_sock *msk); void (*release)(struct mptcp_sock *msk); struct sock * (*get_subflow)(struct mptcp_sock *msk);- add tests in
bpf_tcp_ca.c, instead of adding a new one.v1:
Addressed to the commends in the RFC version:
https://patchwork.kernel.org/project/mptcp/cover/[email protected]/Geliang Tang (8):
mptcp: add structmptcp_sched_ops
mptcp: register default scheduler
mptcp: add a new sysctl scheduler
mptcp: add sched inmptcp_sock
mptcp: addmptcp_get_subflowwrapper
mptcp: addbpf_mptcp_sched_ops
selftests: bpf: addbpf_firstscheduler
selftests: bpf: addbpf_firsttestDocumentation/networking/mptcp-sysctl.rst | 8 ++ include/net/mptcp.h | 13 +++ kernel/bpf/bpf_struct_ops_types.h | 4 + net/mptcp/Makefile | 2 +- net/mptcp/bpf.c | 102 ++++++++++++++++++ net/mptcp/ctrl.c | 14 +++ net/mptcp/protocol.c | 13 ++- net/mptcp/protocol.h | 11 ++ net/mptcp/sched.c | 94 ++++++++++++++++ tools/testing/selftests/bpf/bpf_tcp_helpers.h | 12 +++ .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 42 +++++++- tools/testing/selftests/bpf/progs/bpf_first.c | 30 ++++++ 12 files changed, 336 insertions(+), 9 deletions(-)
Quoted 8 lines
create mode 100644
net/mptcp/sched.c
create mode 100644tools/testing/selftests/bpf/progs/bpf_first.cSignature · 1 line
2.34.1
--
Mat Martineau
Intel