BPF packet scheduler
Subsystems (5)
v4 cover BPF packet scheduler
v4:
- merge "mptcp: move is_scheduled into mptcp_subflow_context"
- rename bpf_backup tp bpf_bkup
- full patches of this series: https://github.com/geliangtang/mptcp_net-next
v3:
- use new BPF scheduler API:
- add backup scheduler
- add round-robin scheduler
- check bytes_sent of 'ss' output.
v2:
- Use new BPF scheduler API:
unsigned long (*get_subflow)(const struct mptcp_sock *msk, bool reinject,
struct mptcp_sched_data *data);
Geliang Tang (10):
Squash to "mptcp: add struct mptcp_sched_ops" Squash to "mptcp: add sched in mptcp_sock" Squash to "mptcp: add get_subflow wrappers" Squash to "mptcp: add bpf_mptcp_sched_ops" Squash to "selftests/bpf: add bpf_first scheduler" Squash to "selftests/bpf: add bpf_first test" selftests/bpf: add bpf_bkup scheduler selftests/bpf: add bpf_backup test selftests/bpf: add bpf_rr scheduler selftests/bpf: add bpf_rr test
include/net/mptcp.h | 7 +- net/mptcp/bpf.c | 18 ++-- net/mptcp/protocol.h | 1 + net/mptcp/sched.c | 54 ++++++++--- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 16 +++- .../testing/selftests/bpf/prog_tests/mptcp.c | 89 ++++++++++++++++++- .../selftests/bpf/progs/mptcp_bpf_bkup.c | 43 +++++++++ .../selftests/bpf/progs/mptcp_bpf_first.c | 5 +- .../selftests/bpf/progs/mptcp_bpf_rr.c | 46 ++++++++++ 9 files changed, 247 insertions(+), 32 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c
Signature · 1 line
2.34.1
PATCH v4 1/10 Squash to "mptcp: add struct mptcp_sched_ops"
Use bitmap instead of sock in struct mptcp_sched_data.
Please update the commit log:
'''
This patch defines struct mptcp_sched_ops, which has three struct members, name, owner and list, and three function pointers, init, release and get_subflow.
Add the scheduler registering, unregistering and finding functions to add, delete and find a packet scheduler on the global list mptcp_sched_list.
The BPF scheduler function get_subflow() has a struct mptcp_sched_data parameter, which contains a mptcp_subflow_context array. Add a new member scheduled for mptcp_subflow_context, which will be set in the MPTCP scheduler context when the scheduler picks this subflow to send data. '''
--- include/net/mptcp.h | 7 ++++--- net/mptcp/protocol.h | 1 + tools/testing/selftests/bpf/bpf_tcp_helpers.h | 11 ++++++++--- 3 files changed, 13 insertions(+), 6 deletions(-)
include/net/mptcp.h +4 -3
@@ -97,14 +97,15 @@ struct mptcp_out_options { };#define MPTCP_SCHED_NAME_MAX 16 +#define MPTCP_SUBFLOWS_MAX 8struct mptcp_sched_data { -struct sock *sock; -bool call_again; +bool reinject; +struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX ]; };struct mptcp_sched_ops { -void (*get_subflow)(const struct mptcp_sock *msk,bool reinject, +void (*get_subflow)(const struct mptcp_sock *msk,struct mptcp_sched_data *data);char name[MPTCP_SCHED_NAME_MAX ];
net/mptcp/protocol.h +1 -0
@@ -469,6 +469,7 @@ struct mptcp_subflow_context { valid_csum_seen :1 ;/* at least one csum validated */ enum mptcp_data_avail data_avail;bool mp_fail_response_expect; +bool scheduled;u32 remote_nonce;u64 thmac;u32 local_nonce;
tools/testing/selftests/bpf/bpf_tcp_helpers.h +8 -3
@@ -231,10 +231,15 @@ extern __u32 tcp_slow_start(struct tcp_sock *tp, __u32 acked) __ksym; extern void tcp_cong_avoid_ai(struct tcp_sock *tp, __u32 w, __u32 acked) __ksym;#define MPTCP_SCHED_NAME_MAX 16 +#define MPTCP_SUBFLOWS_MAX 8 + +struct mptcp_subflow_context { +bool scheduled; +} __attribute__((preserve_access_index));struct mptcp_sched_data { -struct sock *sock; -bool call_again; +bool reinject; +struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX ]; };struct mptcp_sched_ops {
@@ -243,7 +248,7 @@ struct mptcp_sched_ops {void (*init)(const struct mptcp_sock *msk);void (*release)(const struct mptcp_sock *msk); -void (*get_subflow)(const struct mptcp_sock *msk,bool reinject, +void (*get_subflow)(const struct mptcp_sock *msk,struct mptcp_sched_data *data);void *owner; };
Signature · 1 line
2.34.1
PATCH v4 2/10 Squash to "mptcp: add sched in mptcp_sock"
In reply to Geliang TangNo need to export sched in bpf_tcp_helpers.h, drop it.
--- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 1 - 1 file changed, 1 deletion(-)
tools/testing/selftests/bpf/bpf_tcp_helpers.h +0 -1
@@ -258,7 +258,6 @@ struct mptcp_sock {__u32 token;struct sock *first; -struct mptcp_sched_ops *sched;char ca_name[TCP_CA_NAME_MAX ]; } __attribute__((preserve_access_index));
Signature · 1 line
2.34.1
PATCH v4 3/10 Squash to "mptcp: add get_subflow wrappers"
In reply to Geliang TangPlease update the commit log:
'''
This patch defines two new wrappers mptcp_sched_get_send() and mptcp_sched_get_retrans(), invoke get_subflow() of msk->sched in them. Use them instead of using mptcp_subflow_get_send() or mptcp_subflow_get_retrans() directly.
Set the subflow pointers array in struct mptcp_sched_data before invoking get_subflow(), then it can be used in get_subflow() in the BPF contexts.
Check the subflow scheduled flags to test which subflow or subflows are picked by the scheduler.
'''
--- net/mptcp/sched.c | 54 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 11 deletions(-)
net/mptcp/sched.c +43 -11
@@ -88,11 +88,25 @@ void mptcp_release_sched(struct mptcp_sock *msk)bpf_module_put (sched, sched->owner); } -static int mptcp_sched_data_init (struct mptcp_sock *msk, +static int mptcp_sched_data_init (struct mptcp_sock *msk,bool reinject,struct mptcp_sched_data *data) { - data->sock =NULL ; - data->call_again =0 ; +struct mptcp_subflow_context *subflow; +int i =0 ; + + data->reinject = reinject; + +mptcp_for_each_subflow (msk, subflow) { +if (i ==MPTCP_SUBFLOWS_MAX ) { +pr_warn_once ("too many subflows" ); +break ; + } +WRITE_ONCE (subflow->scheduled, false); + data->contexts[i++] = subflow; + } + +for (; i <MPTCP_SUBFLOWS_MAX ; i++) + data->contexts[i] =NULL ;return 0 ; }
@@ -100,6 +114,8 @@ static int mptcp_sched_data_init(struct mptcp_sock *msk,struct sock *mptcp_sched_get_send (struct mptcp_sock *msk) {struct mptcp_sched_data data; +struct sock *ssk =NULL ; +int i;sock_owned_by_me ((struct sock *)msk);
@@ -113,16 +129,25 @@ struct sock *mptcp_sched_get_send(struct mptcp_sock *msk)if (!msk->sched)return mptcp_subflow_get_send (msk); -mptcp_sched_data_init (msk, &data); - msk->sched->get_subflow (msk, false, &data); +mptcp_sched_data_init (msk, false, &data); + msk->sched->get_subflow (msk, &data); + +for (i =0 ; i <MPTCP_SUBFLOWS_MAX ; i++) { +if (data.contexts[i] &&READ_ONCE (data.contexts[i]->scheduled)) { + ssk = data.contexts[i]->tcp_sock; + msk->last_snd = ssk; +break ; + } + } - msk->last_snd = data.sock; -return data.sock; +return ssk; }struct sock *mptcp_sched_get_retrans (struct mptcp_sock *msk) {struct mptcp_sched_data data; +struct sock *ssk =NULL ; +int i;sock_owned_by_me ((const struct sock *)msk);
@@ -133,9 +158,16 @@ struct sock *mptcp_sched_get_retrans(struct mptcp_sock *msk)if (!msk->sched)return mptcp_subflow_get_retrans (msk); -mptcp_sched_data_init (msk, &data); - msk->sched->get_subflow (msk, true, &data); +mptcp_sched_data_init (msk, true, &data); + msk->sched->get_subflow (msk, &data); + +for (i =0 ; i <MPTCP_SUBFLOWS_MAX ; i++) { +if (data.contexts[i] &&READ_ONCE (data.contexts[i]->scheduled)) { + ssk = data.contexts[i]->tcp_sock; + msk->last_snd = ssk; +break ; + } + } - msk->last_snd = data.sock; -return data.sock; +return ssk; }
Signature · 1 line
2.34.1
PATCH v4 4/10 Squash to "mptcp: add bpf_mptcp_sched_ops"
In reply to Geliang TangDrop the access code for mptcp_sched_data.
--- net/mptcp/bpf.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
net/mptcp/bpf.c +8 -10
@@ -42,29 +42,27 @@ static int bpf_mptcp_sched_btf_struct_access(struct bpf_verifier_log *log, {size_t end; -if (atype ==BPF_READ ) +if (atype ==BPF_READ ) {return btf_struct_access (log, btf, t, off, size, atype, next_btf_id, flag); + }if (t != mptcp_sched_type) { -bpf_log (log,"only access to mptcp_sched_data is supported\n" ); +bpf_log (log,"only access to mptcp_subflow_context is supported\n" );return -EACCES ; }switch (off) { -case offsetof(struct mptcp_sched_data , sock): - end = offsetofend(struct mptcp_sched_data, sock); -break ; -case offsetof(struct mptcp_sched_data , call_again): - end = offsetofend(struct mptcp_sched_data, call_again); +case offsetof(struct mptcp_subflow_context , scheduled): + end = offsetofend(struct mptcp_subflow_context, scheduled);break ;default : -bpf_log (log,"no write support to mptcp_sched_data at off %d\n" , off); +bpf_log (log,"no write support to mptcp_subflow_context at off %d\n" , off);return -EACCES ; }if (off + size > end) { -bpf_log (log,"access beyond mptcp_sched_data at off %u size %u ended at %zu" , +bpf_log (log,"access beyond mptcp_subflow_context at off %u size %u ended at %zu" , off, size, end);return -EACCES ; }
@@ -144,7 +142,7 @@ static int bpf_mptcp_sched_init(struct btf *btf) {s32 type_id; - type_id =btf_find_by_name_kind (btf,"mptcp_sched_data" , + type_id =btf_find_by_name_kind (btf,"mptcp_subflow_context" ,BTF_KIND_STRUCT );if (type_id <0 )return -EINVAL ;
Signature · 1 line
2.34.1
PATCH v4 5/10 Squash to "selftests/bpf: add bpf_first scheduler"
In reply to Geliang TangUse new get_subflow API.
--- tools/testing/selftests/bpf/progs/mptcp_bpf_first.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/progs/mptcp_bpf_first.c +2 -3
@@ -17,10 +17,9 @@ void BPF_PROG(mptcp_sched_first_release, const struct mptcp_sock *msk) }void BPF_STRUCT_OPS (bpf_first_get_subflow ,const struct mptcp_sock *msk, -bool reinject,struct mptcp_sched_data *data) +struct mptcp_sched_data *data) { - data->sock = msk->first; - data->call_again =0 ; + data->contexts[0 ]->scheduled =1 ; }SEC (".struct_ops" )
Signature · 1 line
2.34.1
PATCH v4 6/10 Squash to "selftests/bpf: add bpf_first test"
In reply to Geliang TangAdd two helpers, add_veth() and cleanup().
--- .../testing/selftests/bpf/prog_tests/mptcp.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/mptcp.c +18 -1
@@ -250,6 +250,20 @@ static void send_data(int lfd, int fd) PTR_ERR(thread_ret)); } +static void add_veth (void ) +{ +system ("ip link add veth1 type veth" ); +system ("ip addr add 10.0.1.1/24 dev veth1" ); +system ("ip link set veth1 up" ); +} + +static void cleanup (void ) +{ +system ("sysctl -qw net.mptcp.scheduler=default" ); +system ("ip mptcp endpoint flush" ); +system ("ip link del veth1" ); +} +static void test_first (void ) {struct mptcp_bpf_first *first_skel;
@@ -266,15 +280,18 @@ static void test_first(void)return ; } +add_veth (); +system ("ip mptcp endpoint add 10.0.1.1 subflow" );system ("sysctl -qw net.mptcp.scheduler=bpf_first" ); server_fd =start_mptcp_server (AF_INET ,NULL ,0 ,0 ); client_fd =connect_to_fd (server_fd,0 );send_data (server_fd, client_fd); +ASSERT_GT (system ("ss -MOenita | grep '10.0.1.1' | grep 'bytes_sent:'" ),0 ,"ss" );close (client_fd);close (server_fd); -system ("sysctl -qw net.mptcp.scheduler=default" ); +cleanup ();bpf_link__destroy (link);mptcp_bpf_first__destroy (first_skel); }
Signature · 1 line
2.34.1
PATCH v4 7/10 selftests/bpf: add bpf_bkup scheduler
In reply to Geliang TangThis patch implements the backup flag test scheduler, named bpf_bkup, which picks the first non-backup subflow to send data.
--- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 2 + .../selftests/bpf/progs/mptcp_bpf_bkup.c | 43 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c
tools/testing/selftests/bpf/bpf_tcp_helpers.h +2 -0
@@ -234,6 +234,8 @@ extern void tcp_cong_avoid_ai(struct tcp_sock *tp, __u32 w, __u32 acked) __ksym;#define MPTCP_SUBFLOWS_MAX 8struct mptcp_subflow_context { +__u32 padding :12 , + backup :1 ;bool scheduled; } __attribute__((preserve_access_index));
tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c new file +43 -0
43 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v4 8/10 selftests/bpf: add bpf_backup test
In reply to Geliang TangThis patch adds the backup BPF MPTCP scheduler test. Use sysctl to set net.mptcp.scheduler to use this sched. Add a veth net device to simulate the multiple addresses case. Use 'ip mptcp endpoint' command to add this new endpoint to PM netlink with backup flag.
--- .../testing/selftests/bpf/prog_tests/mptcp.c | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+)
tools/testing/selftests/bpf/prog_tests/mptcp.c +35 -0
@@ -7,6 +7,7 @@#include "network_helpers.h" #include "mptcp_sock.skel.h" #include "mptcp_bpf_first.skel.h" +#include "mptcp_bpf_bkup.skel.h" #ifndef TCP_CA_NAME_MAX #define TCP_CA_NAME_MAX 16
@@ -296,10 +297,44 @@ static void test_first(void)mptcp_bpf_first__destroy (first_skel); } +static void test_bkup (void ) +{ +struct mptcp_bpf_bkup *bkup_skel; +int server_fd, client_fd; +struct bpf_link *link; + + bkup_skel =mptcp_bpf_bkup__open_and_load (); +if (!ASSERT_OK_PTR (bkup_skel,"bpf_bkup__open_and_load" )) +return ; + + link =bpf_map__attach_struct_ops (bkup_skel->maps.bkup); +if (!ASSERT_OK_PTR (link,"bpf_map__attach_struct_ops" )) { +mptcp_bpf_bkup__destroy (bkup_skel); +return ; + } + +add_veth (); +system ("ip mptcp endpoint add 10.0.1.1 subflow backup" ); +system ("sysctl -qw net.mptcp.scheduler=bpf_bkup" ); + server_fd =start_mptcp_server (AF_INET ,NULL ,0 ,0 ); + client_fd =connect_to_fd (server_fd,0 ); + +send_data (server_fd, client_fd); +ASSERT_GT (system ("ss -MOenita | grep '10.0.1.1' | grep 'bytes_sent:'" ),0 ,"ss" ); + +close (client_fd); +close (server_fd); +cleanup (); +bpf_link__destroy (link); +mptcp_bpf_bkup__destroy (bkup_skel); +} +void test_mptcp (void ) {if (test__start_subtest ("base" ))test_base ();if (test__start_subtest ("first" ))test_first (); +if (test__start_subtest ("bkup" )) +test_bkup (); }
Signature · 1 line
2.34.1
PATCH v4 9/10 selftests/bpf: add bpf_rr scheduler
In reply to Geliang TangThis patch implements the round-robin BPF MPTCP scheduler, named bpf_rr, which always picks the next available subflow to send data. If no such next subflow available, picks the first one.
--- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 2 + .../selftests/bpf/progs/mptcp_bpf_rr.c | 46 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c
tools/testing/selftests/bpf/bpf_tcp_helpers.h +2 -0
@@ -237,6 +237,7 @@ struct mptcp_subflow_context { __u32 padding : 12, backup : 1;bool scheduled; +struct sock *tcp_sock;/* tcp sk backpointer */ } __attribute__((preserve_access_index));struct mptcp_sched_data {
@@ -258,6 +259,7 @@ struct mptcp_sched_ops {struct mptcp_sock {struct inet_connection_sock sk; +struct sock *last_snd;__u32 token;struct sock *first;char ca_name[TCP_CA_NAME_MAX ];
tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c new file +46 -0
46 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v4 10/10 selftests/bpf: add bpf_rr test
In reply to Geliang TangThis patch adds the round-robin BPF MPTCP scheduler test. Use sysctl to set net.mptcp.scheduler to use this sched. Add a veth net device to simulate the multiple addresses case. Use 'ip mptcp endpoint' command to add this new endpoint to PM netlink.
--- .../testing/selftests/bpf/prog_tests/mptcp.c | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+)
tools/testing/selftests/bpf/prog_tests/mptcp.c +35 -0
@@ -8,6 +8,7 @@#include "mptcp_sock.skel.h" #include "mptcp_bpf_first.skel.h" #include "mptcp_bpf_bkup.skel.h" +#include "mptcp_bpf_rr.skel.h" #ifndef TCP_CA_NAME_MAX #define TCP_CA_NAME_MAX 16
@@ -329,6 +330,38 @@ static void test_bkup(void)mptcp_bpf_bkup__destroy (bkup_skel); } +static void test_rr (void ) +{ +struct mptcp_bpf_rr *rr_skel; +int server_fd, client_fd; +struct bpf_link *link; + + rr_skel =mptcp_bpf_rr__open_and_load (); +if (!ASSERT_OK_PTR (rr_skel,"bpf_rr__open_and_load" )) +return ; + + link =bpf_map__attach_struct_ops (rr_skel->maps.rr); +if (!ASSERT_OK_PTR (link,"bpf_map__attach_struct_ops" )) { +mptcp_bpf_rr__destroy (rr_skel); +return ; + } + +add_veth (); +system ("ip mptcp endpoint add 10.0.1.1 subflow" ); +system ("sysctl -qw net.mptcp.scheduler=bpf_rr" ); + server_fd =start_mptcp_server (AF_INET ,NULL ,0 ,0 ); + client_fd =connect_to_fd (server_fd,0 ); + +send_data (server_fd, client_fd); +ASSERT_OK (system ("ss -MOenita | grep '10.0.1.1' | grep -q 'bytes_sent:'" ),"ss" ); + +close (client_fd); +close (server_fd); +cleanup (); +bpf_link__destroy (link); +mptcp_bpf_rr__destroy (rr_skel); +} +void test_mptcp (void ) {if (test__start_subtest ("base" ))
@@ -337,4 +370,6 @@ void test_mptcp(void)test_first ();if (test__start_subtest ("bkup" ))test_bkup (); +if (test__start_subtest ("rr" )) +test_rr (); }
Signature · 1 line
2.34.1
Re: selftests/bpf: add bpf_rr test: Build Failure
Hi Geliang,
Thank you for your modifications, that's great!
But sadly, our CI spotted some issues with it when trying to build it.
You can find more details there:
https://patchwork.kernel.org/project/mptcp/patch/31935db8f3291afbea6e5dc057f63032ed6f259a.1653987929.git.geliang.tang@suse.com/
https://github.com/multipath-tcp/mptcp_net-next/actions/runs/2413917761
Status: failure
Initiator: MPTCPimporter
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/c91606f830c4
Feel free to reply to this email if you cannot access logs, if you need some support to fix the error, if this doesn't seem to be caused by your modifications or if the error is a false positive one.
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (Tessares)
Re: [PATCH mptcp-next v4 08/10] selftests/bpf: add bpf_backup test
In reply to Geliang TangThe subject should be update to "selftests/bpf: add bpf_bkup test".
Re: selftests/bpf: add bpf_rr test: Tests Results
In reply to Geliang TangHi Geliang,
Thank you for your modifications, that's great!
Our CI did some validations and here is its report:
- KVM Validation: normal:
- Unstable: 1 failed test(s): selftest_simult_flows 🔴:
- Task: https://cirrus-ci.com/task/4799661683769344
- Summary: https://api.cirrus-ci.com/v1/artifact/task/4799661683769344/summary/summary.txt
- KVM Validation: debug:
- Unstable: 3 failed test(s): selftest_diag selftest_mptcp_join selftest_simult_flows 🔴:
- Task: https://cirrus-ci.com/task/5925561590611968
- Summary: https://api.cirrus-ci.com/v1/artifact/task/5925561590611968/summary/summary.txt
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/c91606f830c4
If there are some issues, you can reproduce them using the same environment as the one used by the CI thanks to a docker image, e.g.:
$ cd [kernel source code]
$ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
--pull always mptcp/mptcp-upstream-virtme-docker:latest \
auto-debugFor more details:
https://github.com/multipath-tcp/mptcp-upstream-virtme-docker
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)
Re: [PATCH mptcp-next v4 01/10] Squash to "mptcp: add struct mptcp_sched_ops"
In reply to Geliang TangQuoted 30 lines · Geliang Tang
Use bitmap instead of sock in struct
mptcp_sched_data.Please update the commit log:
'''
This patch defines structmptcp_sched_ops, which has three struct members, name, owner and list, and three function pointers, init, release andget_subflow.Add the scheduler registering, unregistering and finding functions to add, delete and find a packet scheduler on the global list
mptcp_sched_list.The BPF scheduler function
get_subflow()has a structmptcp_sched_dataparameter, which contains amptcp_subflow_contextarray. Add a new member scheduled formptcp_subflow_context, which will be set in the MPTCP scheduler context when the scheduler picks this subflow to send data. '''Signed-off-by Geliang Tang <[email protected]>---
include/net/mptcp.h | 7 ++++--- net/mptcp/protocol.h | 1 + tools/testing/selftests/bpf/bpf_tcp_helpers.h | 11 ++++++++--- 3 files changed, 13 insertions(+), 6 deletions(-)include/net/mptcp.h +0
-0
include/net/mptcp.h struct mptcp_out_options { · line 104
Quoted 10 lines
include/net/mptcp.h +3
-2@@ -97,14 +97,15 @@ struct mptcp_out_options { };#define MPTCP_SCHED_NAME_MAX 16 +#define MPTCP_SUBFLOWS_MAX 8struct mptcp_sched_data { -struct sock *sock; -bool call_again; +bool reinject; +struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX ];
Ok - the BPF verifier is able to handle this array? That's good news.
Quoted 25 lines
include/net/mptcp.h +1
-1};struct mptcp_sched_ops { -void (*get_subflow)(const struct mptcp_sock *msk,bool reinject, +void (*get_subflow)(const struct mptcp_sock *msk,struct mptcp_sched_data *data);char name[MPTCP_SCHED_NAME_MAX ];net/mptcp/protocol.h +1
-0@@ -469,6 +469,7 @@ struct mptcp_subflow_context { valid_csum_seen :1 ;/* at least one csum validated */ enum mptcp_data_avail data_avail;bool mp_fail_response_expect; +bool scheduled;u32 remote_nonce;u64 thmac;u32 local_nonce;tools/testing/selftests/bpf/bpf_tcp_helpers.h +0
-0
tools/testing/selftests/bpf/bpf_tcp_helpers.h extern __u32 tcp_slow_start(struct tcp_sock *tp, __u32 acked) __ksym; · line 238
Quoted 8 lines
tools/testing/selftests/bpf/bpf_tcp_helpers.h +5
-0@@ -231,10 +231,15 @@ extern __u32 tcp_slow_start(struct tcp_sock *tp, __u32 acked) __ksym; extern void tcp_cong_avoid_ai(struct tcp_sock *tp, __u32 w, __u32 acked) __ksym;#define MPTCP_SCHED_NAME_MAX 16 +#define MPTCP_SUBFLOWS_MAX 8 + +struct mptcp_subflow_context { +bool scheduled; +} __attribute__((preserve_access_index));
Ah, is this the array "magic"?
Quoted 23 lines
tools/testing/selftests/bpf/bpf_tcp_helpers.h +3
-3struct mptcp_sched_data { -struct sock *sock; -bool call_again; +bool reinject; +struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX ]; };struct mptcp_sched_ops {@@ -243,7 +248,7 @@ struct mptcp_sched_ops {void (*init)(const struct mptcp_sock *msk);void (*release)(const struct mptcp_sock *msk); -void (*get_subflow)(const struct mptcp_sock *msk,bool reinject, +void (*get_subflow)(const struct mptcp_sock *msk,struct mptcp_sched_data *data);void *owner; };Signature · 1 line
2.34.1
--
Mat Martineau
Intel
Re: [PATCH mptcp-next v4 03/10] Squash to "mptcp: add get_subflow wrappers"
In reply to Geliang TangQuoted 35 lines · Geliang Tang
Please update the commit log:
'''
This patch defines two new wrappersmptcp_sched_get_send()andmptcp_sched_get_retrans(), invokeget_subflow()ofmsk->schedin them. Use them instead of usingmptcp_subflow_get_send()ormptcp_subflow_get_retrans()directly.Set the subflow pointers array in struct
mptcp_sched_databefore invokingget_subflow(), then it can be used inget_subflow()in the BPF contexts.Check the subflow scheduled flags to test which subflow or subflows are picked by the scheduler.
'''Signed-off-by Geliang Tang <[email protected]>---
net/mptcp/sched.c| 54 +++++++++++++++++++++++++++++++++++++----------1 file changed, 43 insertions(+), 11 deletions(-)net/mptcp/sched.c +2
-3@@ -88,11 +88,25 @@ void mptcp_release_sched(struct mptcp_sock *msk)bpf_module_put (sched, sched->owner); } -static int mptcp_sched_data_init (struct mptcp_sock *msk, +static int mptcp_sched_data_init (struct mptcp_sock *msk,bool reinject,struct mptcp_sched_data *data) { - data->sock =NULL ; - data->call_again =0 ; +struct mptcp_subflow_context *subflow;
net/mptcp/sched.c void mptcp_release_sched(struct mptcp_sock *msk) · line 104
Quoted 10 lines
net/mptcp/sched.c +10
-0+int i =0 ; + + data->reinject = reinject; + +mptcp_for_each_subflow (msk, subflow) { +if (i ==MPTCP_SUBFLOWS_MAX ) { +pr_warn_once ("too many subflows" ); +break ; + } +WRITE_ONCE (subflow->scheduled, false);
If subflow->scheduled is using READ_ONCE/WRITE_ONCE semantics, then writing it directly from BPF code is going to be a problem. The code in this patch set would work ok since all read and write access is under the msk lock, but I think integrating with all of the transmit and retransmit code (especially transmission in mptcp_subflow_process_delegated()) would make it important to use WRITE_ONCE() to set subflow->scheduled.
I think that requires using a C helper function called from BPF to do WRITE_ONCE(subflow->scheduled), or using a lock to order accesses. The mptcp_data_lock is already used in mptcp_subflow_process_delegated() but we probably don't want to add more locking to mptcp_sendmsg(). That makes me think the helper function might be better - unless there's a generic BPF technique for using WRITE_ONCE.
Quoted 23 lines
net/mptcp/sched.c +7
-2+ data->contexts[i++] = subflow; + } + +for (; i <MPTCP_SUBFLOWS_MAX ; i++) + data->contexts[i] =NULL ;return 0 ; }@@ -100,6 +114,8 @@ static int mptcp_sched_data_init(struct mptcp_sock *msk,struct sock *mptcp_sched_get_send (struct mptcp_sock *msk) {struct mptcp_sched_data data; +struct sock *ssk =NULL ; +int i;sock_owned_by_me ((struct sock *)msk);@@ -113,16 +129,25 @@ struct sock *mptcp_sched_get_send(struct mptcp_sock *msk)if (!msk->sched)return mptcp_subflow_get_send (msk); -mptcp_sched_data_init (msk, &data); - msk->sched->get_subflow (msk, false, &data);
net/mptcp/sched.c struct sock *mptcp_sched_get_send(struct mptcp_sock *msk) · line 141
Quoted 10 lines
net/mptcp/sched.c +10
-0+mptcp_sched_data_init (msk, false, &data); + msk->sched->get_subflow (msk, &data); + +for (i =0 ; i <MPTCP_SUBFLOWS_MAX ; i++) { +if (data.contexts[i] &&READ_ONCE (data.contexts[i]->scheduled)) { + ssk = data.contexts[i]->tcp_sock; + msk->last_snd = ssk; +break ; + } + }
I think this is ok for a placeholder until more of the transmit integration is done.
Quoted 40 lines
net/mptcp/sched.c +14
-6- msk->last_snd = data.sock; -return data.sock; +return ssk; }struct sock *mptcp_sched_get_retrans (struct mptcp_sock *msk) {struct mptcp_sched_data data; +struct sock *ssk =NULL ; +int i;sock_owned_by_me ((const struct sock *)msk);@@ -133,9 +158,16 @@ struct sock *mptcp_sched_get_retrans(struct mptcp_sock *msk)if (!msk->sched)return mptcp_subflow_get_retrans (msk); -mptcp_sched_data_init (msk, &data); - msk->sched->get_subflow (msk, true, &data); +mptcp_sched_data_init (msk, true, &data); + msk->sched->get_subflow (msk, &data); + +for (i =0 ; i <MPTCP_SUBFLOWS_MAX ; i++) { +if (data.contexts[i] &&READ_ONCE (data.contexts[i]->scheduled)) { + ssk = data.contexts[i]->tcp_sock; + msk->last_snd = ssk; +break ; + } + } - msk->last_snd = data.sock; -return data.sock; +return ssk; }Signature · 1 line
2.34.1
--
Mat Martineau
Intel
Re: [PATCH mptcp-next v4 07/10] selftests/bpf: add bpf_bkup scheduler
In reply to Geliang TangQuoted 15 lines · Geliang Tang
This patch implements the backup flag test scheduler, named
bpf_bkup, which picks the first non-backup subflow to send data.Signed-off-by Geliang Tang <[email protected]>---
tools/testing/selftests/bpf/bpf_tcp_helpers.h| 2 +.../selftests/bpf/progs/mptcp_bpf_bkup.c| 43 +++++++++++++++++++2 files changed, 45 insertions(+)create mode 100644
tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.ctools/testing/selftests/bpf/bpf_tcp_helpers.h +0
-0
tools/testing/selftests/bpf/bpf_tcp_helpers.h extern void tcp_cong_avoid_ai(struct tcp_sock *tp, __u32 w, __u32 acked) __ksym; · line 238
Quoted 5 lines
tools/testing/selftests/bpf/bpf_tcp_helpers.h +2
-0@@ -234,6 +234,8 @@ extern void tcp_cong_avoid_ai(struct tcp_sock *tp, __u32 w, __u32 acked) __ksym;#define MPTCP_SUBFLOWS_MAX 8struct mptcp_subflow_context { +__u32 padding :12 , + backup :1 ;
Is the padding required? It looks like the BTF code might know how to handle bitfield members.
- Mat
Quoted 57 lines
tools/testing/selftests/bpf/bpf_tcp_helpers.h +0
-0bool scheduled; } __attribute__((preserve_access_index));tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c new file +43
-0@@ -0,0 +1,43 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022, SUSE. */ + +#include <linux/bpf.h> +#include "bpf_tcp_helpers.h" + +char _license[] SEC("license") = "GPL"; + +SEC("struct_ops/mptcp_sched_bkup_init") +void BPF_PROG (mptcp_sched_bkup_init ,const struct mptcp_sock *msk) +{ +} + +SEC("struct_ops/mptcp_sched_bkup_release") +void BPF_PROG (mptcp_sched_bkup_release ,const struct mptcp_sock *msk) +{ +} + +void BPF_STRUCT_OPS (bpf_bkup_get_subflow ,const struct mptcp_sock *msk, +struct mptcp_sched_data *data) +{ +int nr =0 ; + +for (int i =0 ; i <MPTCP_SUBFLOWS_MAX ; i++) { +if (!data->contexts[i]) +break ; + +if (!data->contexts[i]->backup) { + nr = i; +break ; + } + } + + data->contexts[nr]->scheduled =1 ; +} + +SEC(".struct_ops") +struct mptcp_sched_ops bkup = { + .init = (void *)mptcp_sched_bkup_init, + .release = (void *)mptcp_sched_bkup_release, + .get_subflow = (void *)bpf_bkup_get_subflow, + .name ="bpf_bkup" , +};Signature · 1 line
2.34.1
--
Mat Martineau
Intel