BPF redundant scheduler
Subsystems (5)
v14 cover BPF redundant scheduler
v14:
- add "mptcp: refactor push_pending logic" v10 as patch 1
- drop update_first_pending in patch 4
- drop update_already_sent in patch 5
v13:
- deponds on "refactor push pending" v9.
- Simply 'goto out' after invoking mptcp_subflow_delegate in patch 1.
- All selftests (mptcp_connect.sh, mptcp_join.sh and simult_flows.sh) passed.
v12:
- fix WARN_ON_ONCE(reuse_skb) and WARN_ON_ONCE(!msk->recovery) errors in kernel logs.
v11:
- address to Mat's comments in v10.
- rebase to export/20220908T063452
v10:
- send multiple dfrags in __mptcp_push_pending().
v9:
- drop the extra *err paramenter of mptcp_sched_get_send() as Florian suggested.
v8:
- update __mptcp_push_pending(), send the same data on each subflow.
- update __mptcp_retrans, track the max sent data.
= add a new patch.
v7:
- drop redundant flag in v6
- drop __mptcp_subflows_push_pending in v6
- update redundant subflows support in __mptcp_push_pending
- update redundant subflows support in __mptcp_retrans
v6:
- Add redundant flag for struct mptcp_sched_ops.
- add a dedicated function __mptcp_subflows_push_pending() to deal with redundat subflows push pending.
v5:
- address to Paolo's comment, keep the optimization tomptcp_subflow_get_send() for the non eBPF case.
- merge mptcp_sched_get_send() and __mptcp_sched_get_send() in v4 into one.
- depends on "cleanups for bpf sched selftests".
v4:
- small cleanups in patch 1, 2.
- add TODO in patch 3.
- rebase patch 5 on 'cleanups for bpf sched selftests'.
v3:
- use new API.
- fix the link failure tests issue mentioned in ("https://patchwork.kernel.org/project/mptcp/cover/[email protected]/").
v2:
- add MPTCP_SUBFLOWS_MAX limit to avoid infinite loops when the scheduler always sets call_again to true.
- track the largest copied amount.
- deal with __mptcp_subflow_push_pending() and the retransmit loop.
- depends on "BPF round-robin scheduler" v14.
v1:
Implements the redundant BPF MPTCP scheduler, which sends all packets redundantly on all available subflows.
Geliang Tang (7):
mptcp: refactor push_pending logic
mptcp: use get_send wrapper
mptcp: use get_retrans wrapper
mptcp: delay updating first_pending
mptcp: delay updating already_sent
selftests/bpf: Add bpf_red scheduler
selftests/bpf: Add bpf_red test
net/mptcp/protocol.c | 291 ++++++++++++------ net/mptcp/protocol.h | 16 +- .../testing/selftests/bpf/prog_tests/mptcp.c | 34 ++ .../selftests/bpf/progs/mptcp_bpf_red.c | 37 +++ 4 files changed, 271 insertions(+), 107 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_red.c
Signature · 1 line
2.35.3
PATCH v14 1/7 mptcp: refactor push_pending logic
To support redundant package schedulers more easily, this patch refactors __mptcp_push_pending() logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst) Update subflow locks (push/release/acquire as needed) Send the dfrag data with mptcp_sendmsg_frag() Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Push/release on final subflow
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst) Update subflow locks (push/release/acquire as needed) For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag() Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Push/release on final subflow
Refactors __mptcp_subflow_push_pending logic from:
For each dfrag:
While sends succeed: Call the scheduler (selects subflow and msk->snd_burst) Send the dfrag data with mptcp_subflow_delegate(), break Send the dfrag data with mptcp_sendmsg_frag() Update dfrag->already_sent, msk->snd_nxt, msk->snd_burst Update msk->first_pending
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst) Send the dfrag data with mptcp_subflow_delegate(), break Send the dfrag data with mptcp_sendmsg_frag()
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag() Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Move the duplicate code from __mptcp_push_pending() and __mptcp_subflow_push_pending() into a new helper function, named __subflow_push_pending(). Simplify __mptcp_push_pending() and __mptcp_subflow_push_pending() by invoking this helper.
Also move the burst check conditions out of the function mptcp_subflow_get_send(), check them in __subflow_push_pending() in the inner "for each pending dfrag" loop.
--- net/mptcp/protocol.c | 154 ++++++++++++++++++++++--------------------- 1 file changed, 80 insertions(+), 74 deletions(-)
net/mptcp/protocol.c +80 -74
@@ -1417,14 +1417,6 @@ struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk)u64 linger_time;long tout =0 ; -/* re-use last subflow, if the burst allow that */ -if (msk->last_snd && msk->snd_burst >0 && -sk_stream_memory_free (msk->last_snd) && -mptcp_subflow_active (mptcp_subflow_ctx (msk->last_snd))) { -mptcp_set_timeout (sk); -return msk->last_snd; - } -/* pick the subflow with the lower wmem/wspace ratio */ for (i =0 ; i <SSK_MODE_MAX ; ++i) { send_info[i].ssk =NULL ;
@@ -1528,57 +1520,83 @@ void mptcp_check_and_set_pending(struct sock *sk)mptcp_sk (sk)->push_pending |=BIT (MPTCP_PUSH_PENDING ); } -void __mptcp_push_pending (struct sock *sk,unsigned int flags) +static int __subflow_push_pending (struct sock *sk,struct sock *ssk, +struct mptcp_sendmsg_info *info) { -struct sock *prev_ssk =NULL , *ssk =NULL ;struct mptcp_sock *msk =mptcp_sk (sk); -struct mptcp_sendmsg_info info = { - .flags = flags, - }; -bool do_check_data_fin = false;struct mptcp_data_frag *dfrag; -int len; +int len, copied =0 , err =0 ;while ((dfrag =mptcp_send_head (sk))) { - info.sent = dfrag->already_sent; - info.limit = dfrag->data_len; + info->sent = dfrag->already_sent; + info->limit = dfrag->data_len; len = dfrag->data_len - dfrag->already_sent;while (len >0 ) {int ret =0 ; - prev_ssk = ssk; - ssk =mptcp_subflow_get_send (msk); - -/* First check. If the ssk has changed since -* the last round, release prev_ssk -*/ -if (ssk != prev_ssk && prev_ssk) -mptcp_push_release (prev_ssk, &info); -if (!ssk) - goto out; - -/* Need to lock the new subflow only if different -* from the previous one, otherwise we are still -* helding the relevant lock -*/ -if (ssk != prev_ssk) -lock_sock (ssk); - - ret =mptcp_sendmsg_frag (sk, ssk, dfrag, &info); + ret =mptcp_sendmsg_frag (sk, ssk, dfrag, info);if (ret <=0 ) { -if (ret == -EAGAIN ) -continue ; -mptcp_push_release (ssk, &info); + err = copied ? : ret; goto out; } - do_check_data_fin = true; - info.sent += ret; + info->sent += ret; + copied += ret; len -= ret;mptcp_update_post_push (msk, dfrag, ret); }WRITE_ONCE (msk->first_pending,mptcp_send_next (sk)); + +if (msk->snd_burst <=0 || + !sk_stream_memory_free (ssk) || + !mptcp_subflow_active (mptcp_subflow_ctx (ssk))) { + err = copied ? : -EAGAIN ; + goto out; + } +mptcp_set_timeout (sk); + } + err = copied; + +out: +return err; +} + +void __mptcp_push_pending (struct sock *sk,unsigned int flags) +{ +struct sock *prev_ssk =NULL , *ssk =NULL ; +struct mptcp_sock *msk =mptcp_sk (sk); +struct mptcp_sendmsg_info info = { + .flags = flags, + }; +int ret =0 ; + +while (mptcp_send_head (sk)) { + prev_ssk = ssk; + ssk =mptcp_subflow_get_send (msk); + +/* First check. If the ssk has changed since +* the last round, release prev_ssk +*/ +if (ssk != prev_ssk && prev_ssk) +mptcp_push_release (prev_ssk, &info); +if (!ssk) + goto out; + +/* Need to lock the new subflow only if different +* from the previous one, otherwise we are still +* helding the relevant lock +*/ +if (ssk != prev_ssk) +lock_sock (ssk); + + ret =__subflow_push_pending (sk, ssk, &info); +if (ret <=0 ) { +if (ret == -EAGAIN ) +continue ; +mptcp_push_release (ssk, &info); + goto out; + } }/* at this point we held the socket lock for the last subflow we used */
@@ -1589,7 +1607,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags)/* ensure the rtx timer is running */ if (!mptcp_timer_pending (sk))mptcp_reset_timer (sk); -if (do_check_data_fin) +if (ret >0 )__mptcp_check_send_data_fin (sk); }
@@ -1599,49 +1617,37 @@ static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk, boolstruct mptcp_sendmsg_info info = { .data_lock_held = true, }; -struct mptcp_data_frag *dfrag;struct sock *xmit_ssk; -int len, copied =0 ; +int ret =0 ; info.flags =0 ; -while ((dfrag =mptcp_send_head (sk))) { - info.sent = dfrag->already_sent; - info.limit = dfrag->data_len; - len = dfrag->data_len - dfrag->already_sent; -while (len >0 ) { -int ret =0 ; - -/* check for a different subflow usage only after -* spooling the first chunk of data -*/ - xmit_ssk = first ? ssk :mptcp_subflow_get_send (msk); -if (!xmit_ssk) - goto out; -if (xmit_ssk != ssk) { -mptcp_subflow_delegate (mptcp_subflow_ctx (xmit_ssk), -MPTCP_DELEGATE_SEND ); - goto out; - } - - ret =mptcp_sendmsg_frag (sk, ssk, dfrag, &info); -if (ret <=0 ) - goto out; - - info.sent += ret; - copied += ret; - len -= ret; - first = false; +while (mptcp_send_head (sk)) { +/* check for a different subflow usage only after +* spooling the first chunk of data +*/ + xmit_ssk = first ? ssk :mptcp_subflow_get_send (msk); +if (!xmit_ssk) + goto out; +if (xmit_ssk != ssk) { +mptcp_subflow_delegate (mptcp_subflow_ctx (xmit_ssk), +MPTCP_DELEGATE_SEND ); + goto out; + } -mptcp_update_post_push (msk, dfrag, ret); + ret =__subflow_push_pending (sk, ssk, &info); + first = false; +if (ret <=0 ) { +if (ret == -EAGAIN ) +continue ; +break ; } -WRITE_ONCE (msk->first_pending,mptcp_send_next (sk)); } out:/* __mptcp_alloc_tx_skb could have released some wmem and we are * not going to flush it via release_sock() */ -if (copied) { +if (ret >0 ) {tcp_push (ssk,0 , info.mss_now,tcp_sk (ssk)->nonagle, info.size_goal);if (!mptcp_timer_pending (sk))
Signature · 1 line
2.35.3
Re: [PATCH mptcp-next v14 1/7] mptcp: refactor push_pending logic
Quoted 53 lines · Geliang Tang
To support redundant package schedulers more easily, this patch refactors
__mptcp_push_pending()logic from:For each dfrag:
While sends succeed:
Call the scheduler (selects subflow andmsk->snd_burst) Update subflow locks (push/release/acquire as needed) Send the dfrag data withmptcp_sendmsg_frag()Updatealready_sent,snd_nxt,snd_burst
Updatemsk->first_pending
Push/release on final subflow->
While
first_pendingisn't empty:
Call the scheduler (selects subflow andmsk->snd_burst) Update subflow locks (push/release/acquire as needed) For each pending dfrag:
While sends succeed:
Send the dfrag data withmptcp_sendmsg_frag()Updatealready_sent,snd_nxt,snd_burst
Updatemsk->first_pending
Break if required bymsk->snd_burst/ etc
Push/release on final subflowRefactors
__mptcp_subflow_push_pendinglogic from:For each dfrag:
While sends succeed: Call the scheduler (selects subflow and msk->snd_burst) Send the dfrag data with mptcp_subflow_delegate(), break Send the dfrag data with mptcp_sendmsg_frag() Update dfrag->already_sent, msk->snd_nxt, msk->snd_burst Update msk->first_pending->
While
first_pendingisn't empty:
Call the scheduler (selects subflow andmsk->snd_burst) Send the dfrag data withmptcp_subflow_delegate(), break Send the dfrag data withmptcp_sendmsg_frag()
For each pending dfrag:
While sends succeed:
Send the dfrag data withmptcp_sendmsg_frag()Updatealready_sent,snd_nxt,snd_burst
Updatemsk->first_pending
Break if required bymsk->snd_burst/ etcMove the duplicate code from
__mptcp_push_pending()and__mptcp_subflow_push_pending()into a new helper function, named__subflow_push_pending(). Simplify__mptcp_push_pending()and__mptcp_subflow_push_pending()by invoking this helper.
Quoted 5 lines
Also move the burst check conditions out of the function
mptcp_subflow_get_send(), check them in__subflow_push_pending()in the inner "for each pending dfrag" loop.Signed-off-by Geliang Tang <[email protected]>
Hi Geliang -
Thanks for the changes here. I need to run some tests before signing off but this patch looks good so far.
- Mat
Quoted 216 lines
---
net/mptcp/protocol.c| 154 ++++++++++++++++++++++---------------------1 file changed, 80 insertions(+), 74 deletions(-)net/mptcp/protocol.c +79
-73@@ -1417,14 +1417,6 @@ struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk)u64 linger_time;long tout =0 ; -/* re-use last subflow, if the burst allow that */ -if (msk->last_snd && msk->snd_burst >0 && -sk_stream_memory_free (msk->last_snd) && -mptcp_subflow_active (mptcp_subflow_ctx (msk->last_snd))) { -mptcp_set_timeout (sk); -return msk->last_snd; - } -/* pick the subflow with the lower wmem/wspace ratio */ for (i =0 ; i <SSK_MODE_MAX ; ++i) { send_info[i].ssk =NULL ;@@ -1528,57 +1520,83 @@ void mptcp_check_and_set_pending(struct sock *sk)mptcp_sk (sk)->push_pending |=BIT (MPTCP_PUSH_PENDING ); } -void __mptcp_push_pending (struct sock *sk,unsigned int flags) +static int __subflow_push_pending (struct sock *sk,struct sock *ssk, +struct mptcp_sendmsg_info *info) { -struct sock *prev_ssk =NULL , *ssk =NULL ;struct mptcp_sock *msk =mptcp_sk (sk); -struct mptcp_sendmsg_info info = { - .flags = flags, - }; -bool do_check_data_fin = false;struct mptcp_data_frag *dfrag; -int len; +int len, copied =0 , err =0 ;while ((dfrag =mptcp_send_head (sk))) { - info.sent = dfrag->already_sent; - info.limit = dfrag->data_len; + info->sent = dfrag->already_sent; + info->limit = dfrag->data_len; len = dfrag->data_len - dfrag->already_sent;while (len >0 ) {int ret =0 ; - prev_ssk = ssk; - ssk =mptcp_subflow_get_send (msk); - -/* First check. If the ssk has changed since -* the last round, release prev_ssk -*/ -if (ssk != prev_ssk && prev_ssk) -mptcp_push_release (prev_ssk, &info); -if (!ssk) - goto out; - -/* Need to lock the new subflow only if different -* from the previous one, otherwise we are still -* helding the relevant lock -*/ -if (ssk != prev_ssk) -lock_sock (ssk); - - ret =mptcp_sendmsg_frag (sk, ssk, dfrag, &info); + ret =mptcp_sendmsg_frag (sk, ssk, dfrag, info);if (ret <=0 ) { -if (ret == -EAGAIN ) -continue ; -mptcp_push_release (ssk, &info); + err = copied ? : ret; goto out; } - do_check_data_fin = true; - info.sent += ret; + info->sent += ret; + copied += ret; len -= ret;mptcp_update_post_push (msk, dfrag, ret); }WRITE_ONCE (msk->first_pending,mptcp_send_next (sk)); + +if (msk->snd_burst <=0 || + !sk_stream_memory_free (ssk) || + !mptcp_subflow_active (mptcp_subflow_ctx (ssk))) { + err = copied ? : -EAGAIN ; + goto out; + } +mptcp_set_timeout (sk); + } + err = copied; + +out: +return err; +} + +void __mptcp_push_pending (struct sock *sk,unsigned int flags) +{ +struct sock *prev_ssk =NULL , *ssk =NULL ; +struct mptcp_sock *msk =mptcp_sk (sk); +struct mptcp_sendmsg_info info = { + .flags = flags, + }; +int ret =0 ; + +while (mptcp_send_head (sk)) { + prev_ssk = ssk; + ssk =mptcp_subflow_get_send (msk); + +/* First check. If the ssk has changed since +* the last round, release prev_ssk +*/ +if (ssk != prev_ssk && prev_ssk) +mptcp_push_release (prev_ssk, &info); +if (!ssk) + goto out; + +/* Need to lock the new subflow only if different +* from the previous one, otherwise we are still +* helding the relevant lock +*/ +if (ssk != prev_ssk) +lock_sock (ssk); + + ret =__subflow_push_pending (sk, ssk, &info); +if (ret <=0 ) { +if (ret == -EAGAIN ) +continue ; +mptcp_push_release (ssk, &info); + goto out; + } }/* at this point we held the socket lock for the last subflow we used */ @@ -1589,7 +1607,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags)/* ensure the rtx timer is running */ if (!mptcp_timer_pending (sk))mptcp_reset_timer (sk); -if (do_check_data_fin) +if (ret >0 )__mptcp_check_send_data_fin (sk); }@@ -1599,49 +1617,37 @@ static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk, boolstruct mptcp_sendmsg_info info = { .data_lock_held = true, }; -struct mptcp_data_frag *dfrag;struct sock *xmit_ssk; -int len, copied =0 ; +int ret =0 ; info.flags =0 ; -while ((dfrag =mptcp_send_head (sk))) { - info.sent = dfrag->already_sent; - info.limit = dfrag->data_len; - len = dfrag->data_len - dfrag->already_sent; -while (len >0 ) { -int ret =0 ; - -/* check for a different subflow usage only after -* spooling the first chunk of data -*/ - xmit_ssk = first ? ssk :mptcp_subflow_get_send (msk); -if (!xmit_ssk) - goto out; -if (xmit_ssk != ssk) { -mptcp_subflow_delegate (mptcp_subflow_ctx (xmit_ssk), -MPTCP_DELEGATE_SEND ); - goto out; - } - - ret =mptcp_sendmsg_frag (sk, ssk, dfrag, &info); -if (ret <=0 ) - goto out; - - info.sent += ret; - copied += ret; - len -= ret; - first = false; +while (mptcp_send_head (sk)) { +/* check for a different subflow usage only after +* spooling the first chunk of data +*/ + xmit_ssk = first ? ssk :mptcp_subflow_get_send (msk); +if (!xmit_ssk) + goto out; +if (xmit_ssk != ssk) { +mptcp_subflow_delegate (mptcp_subflow_ctx (xmit_ssk), +MPTCP_DELEGATE_SEND ); + goto out; + } -mptcp_update_post_push (msk, dfrag, ret); + ret =__subflow_push_pending (sk, ssk, &info); + first = false; +if (ret <=0 ) { +if (ret == -EAGAIN ) +continue ; +break ; } -WRITE_ONCE (msk->first_pending,mptcp_send_next (sk)); }out:
/* __mptcp_alloc_tx_skb could have released some wmem and we are * not going to flush it via release_sock() */net/mptcp/protocol.c +1
-1-if (copied) { +if (ret >0 ) {
Quoted 8 lines
tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle, info.size_goal); if (!mptcp_timer_pending(sk))Signature · 1 line
2.35.3
--
Mat Martineau
Intel
PATCH v14 2/7 mptcp: use get_send wrapper
In reply to Geliang TangThis patch adds the multiple subflows support for __mptcp_push_pending() and __mptcp_subflow_push_pending(). Use mptcp_sched_get_send() wrapper instead of mptcp_subflow_get_send() in them.
Check the subflow scheduled flags to test which subflow or subflows are picked by the scheduler, use them to send data.
--- net/mptcp/protocol.c | 98 +++++++++++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 37 deletions(-)
net/mptcp/protocol.c +61 -37
@@ -1566,36 +1566,41 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags) {struct sock *prev_ssk =NULL , *ssk =NULL ;struct mptcp_sock *msk =mptcp_sk (sk); +struct mptcp_subflow_context *subflow;struct mptcp_sendmsg_info info = { .flags = flags, };int ret =0 ; -while (mptcp_send_head (sk)) { - prev_ssk = ssk; - ssk =mptcp_subflow_get_send (msk); - -/* First check. If the ssk has changed since -* the last round, release prev_ssk -*/ -if (ssk != prev_ssk && prev_ssk) -mptcp_push_release (prev_ssk, &info); -if (!ssk) - goto out; +again: +while (mptcp_send_head (sk) && !mptcp_sched_get_send (msk)) { +mptcp_for_each_subflow (msk, subflow) { +if (READ_ONCE (subflow->scheduled)) { + prev_ssk = ssk; + ssk =mptcp_subflow_tcp_sock (subflow); -/* Need to lock the new subflow only if different -* from the previous one, otherwise we are still -* helding the relevant lock -*/ -if (ssk != prev_ssk) -lock_sock (ssk); +/* First check. If the ssk has changed since +* the last round, release prev_ssk +*/ +if (ssk != prev_ssk && prev_ssk) +mptcp_push_release (prev_ssk, &info); - ret =__subflow_push_pending (sk, ssk, &info); -if (ret <=0 ) { -if (ret == -EAGAIN ) -continue ; -mptcp_push_release (ssk, &info); - goto out; +/* Need to lock the new subflow only if different +* from the previous one, otherwise we are still +* helding the relevant lock +*/ +if (ssk != prev_ssk) +lock_sock (ssk); + + ret =__subflow_push_pending (sk, ssk, &info); +if (ret <=0 ) { +if (ret == -EAGAIN ) + goto again; +mptcp_push_release (ssk, &info); + goto out; + } +mptcp_subflow_set_scheduled (subflow, false); + } } }
@@ -1614,32 +1619,51 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags)static void __mptcp_subflow_push_pending (struct sock *sk,struct sock *ssk,bool first) {struct mptcp_sock *msk =mptcp_sk (sk); +struct mptcp_subflow_context *subflow;struct mptcp_sendmsg_info info = { .data_lock_held = true, }; -struct sock *xmit_ssk;int ret =0 ; info.flags =0 ; +again:while (mptcp_send_head (sk)) {/* check for a different subflow usage only after * spooling the first chunk of data */ - xmit_ssk = first ? ssk :mptcp_subflow_get_send (msk); -if (!xmit_ssk) - goto out; -if (xmit_ssk != ssk) { -mptcp_subflow_delegate (mptcp_subflow_ctx (xmit_ssk), -MPTCP_DELEGATE_SEND ); - goto out; +if (first) { + ret =__subflow_push_pending (sk, ssk, &info); + first = false; +if (ret <=0 ) { +if (ret == -EAGAIN ) + goto again; +break ; + } +continue ; } - ret =__subflow_push_pending (sk, ssk, &info); - first = false; -if (ret <=0 ) { -if (ret == -EAGAIN ) -continue ; -break ; +if (mptcp_sched_get_send (msk)) + goto out; + +mptcp_for_each_subflow (msk, subflow) { +if (READ_ONCE (subflow->scheduled)) { +struct sock *xmit_ssk =mptcp_subflow_tcp_sock (subflow); + +if (xmit_ssk != ssk) { +mptcp_subflow_delegate (subflow, +MPTCP_DELEGATE_SEND ); +mptcp_subflow_set_scheduled (subflow, false); + goto out; + } + + ret =__subflow_push_pending (sk, ssk, &info); +if (ret <=0 ) { +if (ret == -EAGAIN ) + goto again; + goto out; + } +mptcp_subflow_set_scheduled (subflow, false); + } } }
Signature · 1 line
2.35.3
Re: [PATCH mptcp-next v14 2/7] mptcp: use get_send wrapper
Quoted 8 lines · Geliang Tang
This patch adds the multiple subflows support for
__mptcp_push_pending()and__mptcp_subflow_push_pending(). Usemptcp_sched_get_send()wrapper instead ofmptcp_subflow_get_send()in them.Check the subflow scheduled flags to test which subflow or subflows are picked by the scheduler, use them to send data.
Signed-off-by Geliang Tang <[email protected]>
Geliang -
Could you split the multi-subflow changes for __mptcp_push_pending() and __mptcp_subflow_push_pending() in to separate commits?
__mptcp_subflow_push_pending() is going to involve some larger changes. I'll work on some specific code suggestions/examples to clarify what I was trying to suggest after the meeting last week.
Thanks,
Mat
Quoted 144 lines
---
net/mptcp/protocol.c| 98 +++++++++++++++++++++++++++-----------------1 file changed, 61 insertions(+), 37 deletions(-)net/mptcp/protocol.c +61
-37@@ -1566,36 +1566,41 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags) {struct sock *prev_ssk =NULL , *ssk =NULL ;struct mptcp_sock *msk =mptcp_sk (sk); +struct mptcp_subflow_context *subflow;struct mptcp_sendmsg_info info = { .flags = flags, };int ret =0 ; -while (mptcp_send_head (sk)) { - prev_ssk = ssk; - ssk =mptcp_subflow_get_send (msk); - -/* First check. If the ssk has changed since -* the last round, release prev_ssk -*/ -if (ssk != prev_ssk && prev_ssk) -mptcp_push_release (prev_ssk, &info); -if (!ssk) - goto out; +again: +while (mptcp_send_head (sk) && !mptcp_sched_get_send (msk)) { +mptcp_for_each_subflow (msk, subflow) { +if (READ_ONCE (subflow->scheduled)) { + prev_ssk = ssk; + ssk =mptcp_subflow_tcp_sock (subflow); -/* Need to lock the new subflow only if different -* from the previous one, otherwise we are still -* helding the relevant lock -*/ -if (ssk != prev_ssk) -lock_sock (ssk); +/* First check. If the ssk has changed since +* the last round, release prev_ssk +*/ +if (ssk != prev_ssk && prev_ssk) +mptcp_push_release (prev_ssk, &info); - ret =__subflow_push_pending (sk, ssk, &info); -if (ret <=0 ) { -if (ret == -EAGAIN ) -continue ; -mptcp_push_release (ssk, &info); - goto out; +/* Need to lock the new subflow only if different +* from the previous one, otherwise we are still +* helding the relevant lock +*/ +if (ssk != prev_ssk) +lock_sock (ssk); + + ret =__subflow_push_pending (sk, ssk, &info); +if (ret <=0 ) { +if (ret == -EAGAIN ) + goto again; +mptcp_push_release (ssk, &info); + goto out; + } +mptcp_subflow_set_scheduled (subflow, false); + } } }@@ -1614,32 +1619,51 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags)static void __mptcp_subflow_push_pending (struct sock *sk,struct sock *ssk,bool first) {struct mptcp_sock *msk =mptcp_sk (sk); +struct mptcp_subflow_context *subflow;struct mptcp_sendmsg_info info = { .data_lock_held = true, }; -struct sock *xmit_ssk;int ret =0 ; info.flags =0 ; +again:while (mptcp_send_head (sk)) {/* check for a different subflow usage only after * spooling the first chunk of data */ - xmit_ssk = first ? ssk :mptcp_subflow_get_send (msk); -if (!xmit_ssk) - goto out; -if (xmit_ssk != ssk) { -mptcp_subflow_delegate (mptcp_subflow_ctx (xmit_ssk), -MPTCP_DELEGATE_SEND ); - goto out; +if (first) { + ret =__subflow_push_pending (sk, ssk, &info); + first = false; +if (ret <=0 ) { +if (ret == -EAGAIN ) + goto again; +break ; + } +continue ; } - ret =__subflow_push_pending (sk, ssk, &info); - first = false; -if (ret <=0 ) { -if (ret == -EAGAIN ) -continue ; -break ; +if (mptcp_sched_get_send (msk)) + goto out; + +mptcp_for_each_subflow (msk, subflow) { +if (READ_ONCE (subflow->scheduled)) { +struct sock *xmit_ssk =mptcp_subflow_tcp_sock (subflow); + +if (xmit_ssk != ssk) { +mptcp_subflow_delegate (subflow, +MPTCP_DELEGATE_SEND ); +mptcp_subflow_set_scheduled (subflow, false); + goto out; + } + + ret =__subflow_push_pending (sk, ssk, &info); +if (ret <=0 ) { +if (ret == -EAGAIN ) + goto again; + goto out; + } +mptcp_subflow_set_scheduled (subflow, false); + } } }Signature · 1 line
2.35.3
--
Mat Martineau
Intel
PATCH v14 3/7 mptcp: use get_retrans wrapper
In reply to Geliang TangThis patch adds the multiple subflows support for __mptcp_retrans(). In it, use sched_get_retrans() wrapper instead of mptcp_subflow_get_retrans().
Iterate each subflow of msk, check the scheduled flag to test if it is picked by the scheduler. If so, use it to retrans data.
--- net/mptcp/protocol.c | 61 +++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 23 deletions(-)
net/mptcp/protocol.c +38 -23
@@ -2519,16 +2519,17 @@ static void mptcp_check_fastclose(struct mptcp_sock *msk)static void __mptcp_retrans (struct sock *sk) {struct mptcp_sock *msk =mptcp_sk (sk); +struct mptcp_subflow_context *subflow;struct mptcp_sendmsg_info info = {};struct mptcp_data_frag *dfrag; -size_t copied =0 ;struct sock *ssk; -int ret; +int ret, err; +u16 len =0 ;mptcp_clean_una_wakeup (sk);/* first check ssk: need to kick "stale" logic */ - ssk =mptcp_subflow_get_retrans (msk); + err =mptcp_sched_get_retrans (msk); dfrag =mptcp_rtx_head (sk);if (!dfrag) {if (mptcp_data_fin_enabled (msk)) {
@@ -2547,31 +2548,45 @@ static void __mptcp_retrans(struct sock *sk) goto reset_timer; } -if (!ssk) +if (err) goto reset_timer; -lock_sock (ssk); +mptcp_for_each_subflow (msk, subflow) { +if (READ_ONCE (subflow->scheduled)) { +u16 copied =0 ; + + ssk =mptcp_subflow_tcp_sock (subflow); +if (!ssk) + goto reset_timer; + +lock_sock (ssk); + +/* limit retransmission to the bytes already sent on some subflows */ + info.sent =0 ; + info.limit =READ_ONCE (msk->csum_enabled) ? dfrag->data_len : + dfrag->already_sent; +while (info.sent < info.limit) { + ret =mptcp_sendmsg_frag (sk, ssk, dfrag, &info); +if (ret <=0 ) +break ; + +MPTCP_INC_STATS (sock_net (sk),MPTCP_MIB_RETRANSSEGS ); + copied += ret; + info.sent += ret; + } +if (copied) { + len =max (copied, len); +tcp_push (ssk,0 , info.mss_now,tcp_sk (ssk)->nonagle, + info.size_goal); +WRITE_ONCE (msk->allow_infinite_fallback, false); + } -/* limit retransmission to the bytes already sent on some subflows */ - info.sent =0 ; - info.limit =READ_ONCE (msk->csum_enabled) ? dfrag->data_len : dfrag->already_sent; -while (info.sent < info.limit) { - ret =mptcp_sendmsg_frag (sk, ssk, dfrag, &info); -if (ret <=0 ) -break ; +release_sock (ssk); -MPTCP_INC_STATS (sock_net (sk),MPTCP_MIB_RETRANSSEGS ); - copied += ret; - info.sent += ret; - } -if (copied) { - dfrag->already_sent =max (dfrag->already_sent, info.sent); -tcp_push (ssk,0 , info.mss_now,tcp_sk (ssk)->nonagle, - info.size_goal); -WRITE_ONCE (msk->allow_infinite_fallback, false); +mptcp_subflow_set_scheduled (subflow, false); + } } - -release_sock (ssk); + dfrag->already_sent =max (dfrag->already_sent, len); reset_timer:mptcp_check_and_set_pending (sk);
Signature · 1 line
2.35.3
PATCH v14 4/7 mptcp: delay updating first_pending
In reply to Geliang TangTo support redundant package schedulers more easily, this patch refactors the data sending loop in __subflow_push_pending(), to delay updating first_pending until all data are sent.
--- net/mptcp/protocol.c | 28 +++++++++++++++++++++++++--- net/mptcp/protocol.h | 15 ++++++++++----- 2 files changed, 35 insertions(+), 8 deletions(-)
net/mptcp/protocol.c +25 -3
@@ -1121,6 +1121,7 @@ struct mptcp_sendmsg_info {u16 sent;unsigned int flags;bool data_lock_held; +struct mptcp_data_frag *last_frag; }; static int mptcp_check_allowed_size(const struct mptcp_sock *msk, struct sock *ssk,
@@ -1514,6 +1515,14 @@ static void mptcp_update_post_push(struct mptcp_sock *msk, msk->snd_nxt = snd_nxt_new; } +static void mptcp_update_first_pending (struct sock *sk,struct mptcp_sendmsg_info *info) +{ +struct mptcp_sock *msk =mptcp_sk (sk); + +if (info->last_frag) +WRITE_ONCE (msk->first_pending,mptcp_next_frag (sk, info->last_frag)); +} +void mptcp_check_and_set_pending (struct sock *sk) {if (mptcp_send_head (sk))
@@ -1527,7 +1536,13 @@ static int __subflow_push_pending(struct sock *sk, struct sock *ssk,struct mptcp_data_frag *dfrag;int len, copied =0 , err =0 ; -while ((dfrag =mptcp_send_head (sk))) { + info->last_frag =NULL ; + + dfrag =mptcp_send_head (sk); +if (!dfrag) + goto out; + + do { info->sent = dfrag->already_sent; info->limit = dfrag->data_len; len = dfrag->data_len - dfrag->already_sent;
@@ -1546,7 +1561,8 @@ static int __subflow_push_pending(struct sock *sk, struct sock *ssk,mptcp_update_post_push (msk, dfrag, ret); } -WRITE_ONCE (msk->first_pending,mptcp_send_next (sk)); + info->last_frag = dfrag; + dfrag =mptcp_next_frag (sk, dfrag); if (msk->snd_burst <= 0 || !sk_stream_memory_free(ssk) ||
@@ -1555,7 +1571,7 @@ static int __subflow_push_pending(struct sock *sk, struct sock *ssk, goto out; }mptcp_set_timeout (sk); - } + }while (dfrag); err = copied; out:
@@ -1594,6 +1610,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags) ret =__subflow_push_pending (sk, ssk, &info);if (ret <=0 ) { +mptcp_update_first_pending (sk, &info);if (ret == -EAGAIN ) goto again;mptcp_push_release (ssk, &info);
@@ -1602,6 +1619,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags)mptcp_subflow_set_scheduled (subflow, false); } } +mptcp_update_first_pending (sk, &info); }/* at this point we held the socket lock for the last subflow we used */
@@ -1635,10 +1653,12 @@ static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk, bool ret =__subflow_push_pending (sk, ssk, &info); first = false;if (ret <=0 ) { +mptcp_update_first_pending (sk, &info);if (ret == -EAGAIN ) goto again;break ; } +mptcp_update_first_pending (sk, &info);continue ; }
@@ -1658,6 +1678,7 @@ static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk, bool ret =__subflow_push_pending (sk, ssk, &info);if (ret <=0 ) { +mptcp_update_first_pending (sk, &info);if (ret == -EAGAIN ) goto again; goto out;
@@ -1665,6 +1686,7 @@ static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk, boolmptcp_subflow_set_scheduled (subflow, false); } } +mptcp_update_first_pending (sk, &info); } out:
net/mptcp/protocol.h +10 -5
@@ -350,16 +350,21 @@ static inline struct mptcp_data_frag *mptcp_send_head(const struct sock *sk)return READ_ONCE (msk->first_pending); } -static inline struct mptcp_data_frag *mptcp_send_next (struct sock *sk) +static inline struct mptcp_data_frag *mptcp_next_frag (const struct sock *sk, +struct mptcp_data_frag *cur) { -struct mptcp_sock *msk =mptcp_sk (sk); -struct mptcp_data_frag *cur; +if (!cur) +return NULL ; - cur = msk->first_pending; -return list_is_last (&cur->list, &msk->rtx_queue) ?NULL : +return list_is_last (&cur->list, &mptcp_sk (sk)->rtx_queue) ?NULL :list_next_entry (cur, list); } +static inline struct mptcp_data_frag *mptcp_send_next (const struct sock *sk) +{ +return mptcp_next_frag (sk,mptcp_send_head (sk)); +} +static inline struct mptcp_data_frag *mptcp_pending_tail (const struct sock *sk) {struct mptcp_sock *msk =mptcp_sk (sk);
Signature · 1 line
2.35.3
PATCH v14 5/7 mptcp: delay updating already_sent
In reply to Geliang TangThis patch adds a new member info_sent in struct mptcp_data_frag, save info->sent in it, to support delay updating already_sent of dfrag until all data are sent.
--- net/mptcp/protocol.c | 34 +++++++++++++++++++++++++++------- net/mptcp/protocol.h | 1 + 2 files changed, 28 insertions(+), 7 deletions(-)
net/mptcp/protocol.c +27 -7
@@ -1108,6 +1108,7 @@ mptcp_carve_data_frag(const struct mptcp_sock *msk, struct page_frag *pfrag, dfrag->data_seq = msk->write_seq; dfrag->overhead = offset - orig_offset +sizeof (struct mptcp_data_frag ); dfrag->offset = offset +sizeof (struct mptcp_data_frag ); + dfrag->sent =0 ; dfrag->already_sent =0 ; dfrag->page = pfrag->page;
@@ -1243,8 +1244,8 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk,pr_debug ("msk=%p ssk=%p sending dfrag at seq=%llu len=%u already sent=%u" , msk, ssk, dfrag->data_seq, dfrag->data_len, info->sent); -if (WARN_ON_ONCE (info->sent > info->limit || - info->limit > dfrag->data_len)) +if (info->sent > info->limit || + info->limit > dfrag->data_len)return 0 ;if (unlikely (!__tcp_can_send (ssk)))
@@ -1496,11 +1497,11 @@ static void mptcp_update_post_push(struct mptcp_sock *msk, {u64 snd_nxt_new = dfrag->data_seq; - dfrag->already_sent += sent; + dfrag->sent += sent; msk->snd_burst -= sent; - snd_nxt_new += dfrag->already_sent; + snd_nxt_new += dfrag->sent;/* snd_nxt_new can be smaller than snd_nxt in case mptcp * is recovering after a failover. In that event, this re-sends
@@ -1523,6 +1524,23 @@ static void mptcp_update_first_pending(struct sock *sk, struct mptcp_sendmsg_infWRITE_ONCE (msk->first_pending,mptcp_next_frag (sk, info->last_frag)); } +static void mptcp_update_dfrags (struct sock *sk,struct mptcp_sendmsg_info *info) +{ +struct mptcp_data_frag *dfrag =mptcp_send_head (sk); + +if (!dfrag) +return ; + +do { +if (dfrag->sent) { + dfrag->already_sent =max (dfrag->already_sent, dfrag->sent); + dfrag->sent =0 ; + } + }while ((dfrag =mptcp_next_frag (sk, dfrag))); + +mptcp_update_first_pending (sk, info); +} +void mptcp_check_and_set_pending (struct sock *sk) {if (mptcp_send_head (sk))
@@ -1546,6 +1564,7 @@ static int __subflow_push_pending(struct sock *sk, struct sock *ssk, info->sent = dfrag->already_sent; info->limit = dfrag->data_len; len = dfrag->data_len - dfrag->already_sent; + dfrag->sent = info->sent;while (len >0 ) {int ret =0 ;
@@ -1556,6 +1575,7 @@ static int __subflow_push_pending(struct sock *sk, struct sock *ssk, } info->sent += ret; + info->limit -= ret; copied += ret; len -= ret;
@@ -1619,7 +1639,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags)mptcp_subflow_set_scheduled (subflow, false); } } -mptcp_update_first_pending (sk, &info); +mptcp_update_dfrags (sk, &info); }/* at this point we held the socket lock for the last subflow we used */
@@ -1658,7 +1678,7 @@ static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk, bool goto again;break ; } -mptcp_update_first_pending (sk, &info); +mptcp_update_dfrags (sk, &info);continue ; }
@@ -1686,7 +1706,7 @@ static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk, boolmptcp_subflow_set_scheduled (subflow, false); } } -mptcp_update_first_pending (sk, &info); +mptcp_update_dfrags (sk, &info); } out:
net/mptcp/protocol.h +1 -0
@@ -242,6 +242,7 @@ struct mptcp_data_frag {u16 data_len;u16 offset;u16 overhead; +u16 sent;u16 already_sent;struct page *page; };
Signature · 1 line
2.35.3
PATCH v14 6/7 selftests/bpf: Add bpf_red scheduler
In reply to Geliang TangThis patch implements the redundant BPF MPTCP scheduler, named bpf_red, which sends all packets redundantly on all available subflows.
--- .../selftests/bpf/progs/mptcp_bpf_red.c | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_red.c
tools/testing/selftests/bpf/progs/mptcp_bpf_red.c new file +37 -0
@@ -0,0 +1,37 @@ +// 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_red_init") +void BPF_PROG (mptcp_sched_red_init ,const struct mptcp_sock *msk) +{ +} + +SEC("struct_ops/mptcp_sched_red_release") +void BPF_PROG (mptcp_sched_red_release ,const struct mptcp_sock *msk) +{ +} + +void BPF_STRUCT_OPS (bpf_red_get_subflow ,const struct mptcp_sock *msk, +struct mptcp_sched_data *data) +{ +for (int i =0 ; i <MPTCP_SUBFLOWS_MAX ; i++) { +if (!data->contexts[i]) +break ; + +mptcp_subflow_set_scheduled (data->contexts[i], true); + } +} + +SEC(".struct_ops") +struct mptcp_sched_ops red = { + .init = (void *)mptcp_sched_red_init, + .release = (void *)mptcp_sched_red_release, + .data_init = (void *)bpf_red_data_init, + .get_subflow = (void *)bpf_red_get_subflow, + .name ="bpf_red" , +};
Signature · 1 line
2.35.3
Re: [PATCH mptcp-next v14 6/7] selftests/bpf: Add bpf_red scheduler
Quoted 39 lines · Geliang Tang
This patch implements the redundant BPF MPTCP scheduler, named
bpf_red, which sends all packets redundantly on all available subflows.Signed-off-by Geliang Tang <[email protected]>--- .../selftests/bpf/progs/mptcp_bpf_red.c | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_red.ctools/testing/selftests/bpf/progs/mptcp_bpf_red.c new file +24
-0@@ -0,0 +1,37 @@ +// 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_red_init") +void BPF_PROG (mptcp_sched_red_init ,const struct mptcp_sock *msk) +{ +} + +SEC("struct_ops/mptcp_sched_red_release") +void BPF_PROG (mptcp_sched_red_release ,const struct mptcp_sock *msk) +{ +} + +void BPF_STRUCT_OPS (bpf_red_get_subflow ,const struct mptcp_sock *msk, +struct mptcp_sched_data *data) +{ +for (int i =0 ; i <MPTCP_SUBFLOWS_MAX ; i++) { +if (!data->contexts[i]) +break ;
tools/testing/selftests/bpf/progs/mptcp_bpf_red.c line 34
Quoted 10 lines
tools/testing/selftests/bpf/progs/mptcp_bpf_red.c new file +10
-0+ +mptcp_subflow_set_scheduled (data->contexts[i], true); + } +} + +SEC(".struct_ops") +struct mptcp_sched_ops red = { + .init = (void *)mptcp_sched_red_init, + .release = (void *)mptcp_sched_red_release, + .data_init = (void *)bpf_red_data_init,
This line should be dropped. Will update in v15.
-Geliang
Quoted 6 lines
tools/testing/selftests/bpf/progs/mptcp_bpf_red.c new file +3
-0+ .get_subflow = (void *)bpf_red_get_subflow, + .name = "bpf_red", +};Signature · 1 line
2.35.3
PATCH v14 7/7 selftests/bpf: Add bpf_red test
In reply to Geliang TangThis patch adds the redundant BPF MPTCP scheduler test: test_red(). Use sysctl to set net.mptcp.scheduler to use this sched. Add two veth net devices to simulate the multiple addresses case. Use 'ip mptcp endpoint' command to add the new endpoint ADDR_2 to PM netlink. Send data and check bytes_sent of 'ss' output after it to make sure the data has been redundantly sent on both net devices.
--- .../testing/selftests/bpf/prog_tests/mptcp.c | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+)
tools/testing/selftests/bpf/prog_tests/mptcp.c +34 -0
@@ -9,6 +9,7 @@#include "mptcp_bpf_first.skel.h" #include "mptcp_bpf_bkup.skel.h" #include "mptcp_bpf_rr.skel.h" +#include "mptcp_bpf_red.skel.h" #ifndef TCP_CA_NAME_MAX #define TCP_CA_NAME_MAX 16
@@ -381,6 +382,37 @@ static void test_rr(void)mptcp_bpf_rr__destroy (rr_skel); } +static void test_red (void ) +{ +struct mptcp_bpf_red *red_skel; +int server_fd, client_fd; +struct bpf_link *link; + + red_skel =mptcp_bpf_red__open_and_load (); +if (!ASSERT_OK_PTR (red_skel,"bpf_red__open_and_load" )) +return ; + + link =bpf_map__attach_struct_ops (red_skel->maps.red); +if (!ASSERT_OK_PTR (link,"bpf_map__attach_struct_ops" )) { +mptcp_bpf_red__destroy (red_skel); +return ; + } + +sched_init ("subflow" ,"bpf_red" ); + server_fd =start_mptcp_server (AF_INET ,ADDR_1 ,0 ,0 ); + client_fd =connect_to_fd (server_fd,0 ); + +send_data (server_fd, client_fd); +ASSERT_OK (has_bytes_sent (ADDR_1 ),"has_bytes_sent addr 1" ); +ASSERT_OK (has_bytes_sent (ADDR_2 ),"has_bytes_sent addr 2" ); + +close (client_fd); +close (server_fd); +sched_cleanup (); +bpf_link__destroy (link); +mptcp_bpf_red__destroy (red_skel); +} +void test_mptcp (void ) {if (test__start_subtest ("base" ))
@@ -391,4 +423,6 @@ void test_mptcp(void)test_bkup ();if (test__start_subtest ("rr" ))test_rr (); +if (test__start_subtest ("red" )) +test_red (); }
Signature · 1 line
2.35.3