save sched_data at mptcp_sock
Subsystems (2)
v3 cover save sched_data at mptcp_sock
v3:
- address Florian's comments in v2.
- split into three more patches.
v2:
- fix this error reported by CI:
KASAN: slab-use-after-free in __mptcp_close_ssk (net/mptcp/protocol.c:2461) - add bpf burst scheduler.
This patchset adds sched_data pointer into mptcp_sock to to save some data at MPTCP and subflows levels.
With these changes, the old patch "mptcp: register default scheduler" in
[1] now works.
https://patchwork.kernel.org/project/mptcp/cover/[email protected]/ [1]
Geliang Tang (15):
Squash to "mptcp: add struct mptcp_sched_ops" Squash to "mptcp: add sched in mptcp_sock" Squash to "mptcp: add scheduler wrappers"
mptcp: add last_snd in sched_data
mptcp: add snd_burst in sched_data
mptcp: register default scheduler
mptcp: rename __mptcp_set_timeout for bpf_burst
mptcp: add two wrappers for bpf_burst
mptcp: add three helpers for bpf_burst Squash to "bpf: Add bpf_mptcp_sched_ops" Squash to "bpf: Add bpf_mptcp_sched_kfunc_set" Squash to "selftests/bpf: Add mptcp sched structs" Squash to "selftests/bpf: Add bpf_rr scheduler" selftests/bpf: Add bpf_burst scheduler selftests/bpf: Add bpf_burst test
include/net/mptcp.h | 4 +- net/mptcp/bpf.c | 42 +++- net/mptcp/protocol.c | 73 +++++-- net/mptcp/protocol.h | 12 +- net/mptcp/sched.c | 67 ++++-- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 7 +- .../testing/selftests/bpf/prog_tests/mptcp.c | 38 ++++ .../selftests/bpf/progs/mptcp_bpf_burst.c | 195 ++++++++++++++++++ .../selftests/bpf/progs/mptcp_bpf_rr.c | 4 +- 9 files changed, 392 insertions(+), 50 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c
Signature · 1 line
2.35.3
PATCH v3 1/15 Squash to "mptcp: add struct mptcp_sched_ops"
Use two tabs.
--- include/net/mptcp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/mptcp.h +1 -1
@@ -100,7 +100,7 @@ struct mptcp_out_options {#define MPTCP_SUBFLOWS_MAX 8struct mptcp_sched_data { -bool reinject; +bool reinject;struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX ]; };
Signature · 1 line
2.35.3
PATCH v3 2/15 Squash to "mptcp: add sched in mptcp_sock"
In reply to Geliang TangAdd sched_data pointer into mptcp_sock too.
--- net/mptcp/protocol.c | 5 +++-- net/mptcp/protocol.h | 4 +++- net/mptcp/sched.c | 13 ++++++++++++- 3 files changed, 18 insertions(+), 4 deletions(-)
net/mptcp/protocol.c +3 -2
@@ -2813,7 +2813,8 @@ static int mptcp_init_sock(struct sock *sk)return -ENOMEM ; ret =mptcp_init_sched (mptcp_sk (sk), -mptcp_sched_find (mptcp_get_scheduler (net))); +mptcp_sched_find (mptcp_get_scheduler (net)), +GFP_KERNEL );if (ret)return ret;
@@ -3204,7 +3205,7 @@ struct sock *mptcp_sk_clone_init(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); +mptcp_init_sched (msk,mptcp_sk (sk)->sched,GFP_ATOMIC );sock_reset_flag (nsk,SOCK_RCU_FREE );security_inet_csk_clone (nsk, req);
net/mptcp/protocol.h +3 -1
@@ -311,6 +311,7 @@ struct mptcp_sock {*/ struct sock *first;struct mptcp_pm_data pm; +struct mptcp_sched_data *sched_data;struct mptcp_sched_ops *sched;struct {u32 space;/* bytes copied in last measurement window */
@@ -653,7 +654,8 @@ 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);int mptcp_init_sched (struct mptcp_sock *msk, -struct mptcp_sched_ops *sched); +struct mptcp_sched_ops *sched, +gfp_t gfp);void mptcp_release_sched (struct mptcp_sock *msk);void mptcp_subflow_set_scheduled (struct mptcp_subflow_context *subflow,bool scheduled);
net/mptcp/sched.c +12 -1
@@ -56,7 +56,8 @@ void mptcp_unregister_scheduler(struct mptcp_sched_ops *sched) }int mptcp_init_sched (struct mptcp_sock *msk, -struct mptcp_sched_ops *sched) +struct mptcp_sched_ops *sched, +gfp_t gfp) {if (!sched) goto out;
@@ -64,6 +65,12 @@ int mptcp_init_sched(struct mptcp_sock *msk,if (!bpf_try_module_get (sched, sched->owner))return -EBUSY ; + msk->sched_data =kzalloc (sizeof (struct mptcp_sched_data ), gfp); +if (!msk->sched_data) { +bpf_module_put (sched, sched->owner); +return -ENOMEM ; + } + msk->sched = sched;if (msk->sched->init) msk->sched->init (msk);
@@ -81,6 +88,10 @@ void mptcp_release_sched(struct mptcp_sock *msk)if (!sched)return ; +if (msk->sched_data) { +kfree (msk->sched_data); + msk->sched_data =NULL ; + } msk->sched =NULL ;if (sched->release) sched->release (msk);
Signature · 1 line
2.35.3
PATCH v3 3/15 Squash to "mptcp: add scheduler wrappers"
In reply to Geliang TangUse msk->sched_data instead of the local variable data.
--- net/mptcp/sched.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
net/mptcp/sched.c +6 -8
@@ -127,7 +127,6 @@ void mptcp_sched_data_set_contexts(const struct mptcp_sock *msk,int mptcp_sched_get_send (struct mptcp_sock *msk) {struct mptcp_subflow_context *subflow; -struct mptcp_sched_data data;msk_owned_by_me (msk);
@@ -157,15 +156,14 @@ int mptcp_sched_get_send(struct mptcp_sock *msk)return 0 ; } - data.reinject = false; - msk->sched->data_init (msk, &data); -return msk->sched->get_subflow (msk, &data); + msk->sched_data->reinject = false; + msk->sched->data_init (msk, msk->sched_data); +return msk->sched->get_subflow (msk, msk->sched_data); }int mptcp_sched_get_retrans (struct mptcp_sock *msk) {struct mptcp_subflow_context *subflow; -struct mptcp_sched_data data;msk_owned_by_me (msk);
@@ -188,7 +186,7 @@ int mptcp_sched_get_retrans(struct mptcp_sock *msk)return 0 ; } - data.reinject = true; - msk->sched->data_init (msk, &data); -return msk->sched->get_subflow (msk, &data); + msk->sched_data->reinject = true; + msk->sched->data_init (msk, msk->sched_data); +return msk->sched->get_subflow (msk, msk->sched_data); }
Signature · 1 line
2.35.3