@@ -94,11 +94,25 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subflow,
WRITE_ONCE(subflow->scheduled, scheduled);
}
-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;
+ }
+ mptcp_subflow_set_scheduled(subflow, false);
+ data->contexts[i++] = subflow;
+ }
+
+ for (; i < MPTCP_SUBFLOWS_MAX; i++)
+ data->contexts[i] = NULL;
return 0;
}
@@ -106,6 +120,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);
@@ -119,16 +135,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);
@@ -139,9 +164,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;
}
Please 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. ''' Signed-off-by: Geliang Tang <geliang.tang@suse.com> --- net/mptcp/sched.c | 54 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 11 deletions(-)