Update scheduler refactor commits

[PATCH mptcp-next 0/9] Update scheduler refactor commits

Geliang Tang posted 9 patches 8 months, 2 weeks ago

Download series mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/multipath-tcp/mptcp_net-next tags/patchew/cover.1692080803.git.geliang.tang@suse.com

Maintainers: Matthieu Baerts <matthieu.baerts@tessares.net>, Mat Martineau <martineau@kernel.org>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Alexei Starovoitov <ast@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, Andrii Nakryiko <andrii@kernel.org>, Martin KaFai Lau <martin.lau@linux.dev>, Song Liu <song@kernel.org>, Yonghong Song <yonghong.song@linux.dev>, John Fastabend <john.fastabend@gmail.com>, KP Singh <kpsingh@kernel.org>, Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>, Jiri Olsa <jolsa@kernel.org>, Mykola Lysenko <mykolal@fb.com>, Shuah Khan <shuah@kernel.org>

include/net/mptcp.h                           |  4 +--
net/mptcp/sched.c                             | 36 ++++---------------
tools/testing/selftests/bpf/bpf_tcp_helpers.h |  4 +--
.../selftests/bpf/progs/mptcp_bpf_bkup.c      | 11 ++----
.../selftests/bpf/progs/mptcp_bpf_burst.c     | 15 +++-----
.../selftests/bpf/progs/mptcp_bpf_first.c     | 10 ++----
.../selftests/bpf/progs/mptcp_bpf_red.c       |  9 ++---
.../selftests/bpf/progs/mptcp_bpf_rr.c        | 11 ++----
8 files changed, 23 insertions(+), 77 deletions(-)

Expand all Fold all

[PATCH mptcp-next 0/9] Update scheduler refactor commits

Posted by Geliang Tang 8 months, 2 weeks ago

Update scheduler refactor commits:
 - drop data_init interface.
 - call mptcp_sched_default_get_subflow in get_send/retrans.
 - update commit logs.

Geliang Tang (9):
  Squash to "mptcp: add struct mptcp_sched_ops"
  Squash to "mptcp: add scheduler wrappers"
  Squash to "mptcp: register default scheduler"
  Squash to "selftests/bpf: Add mptcp sched structs"
  Squash to "selftests/bpf: Add bpf_first scheduler"
  Squash to "selftests/bpf: Add bpf_bkup scheduler"
  Squash to "selftests/bpf: Add bpf_rr scheduler"
  Squash to "selftests/bpf: Add bpf_red scheduler"
  Squash to "selftests/bpf: Add bpf_burst scheduler"

 include/net/mptcp.h                           |  4 +--
 net/mptcp/sched.c                             | 36 ++++---------------
 tools/testing/selftests/bpf/bpf_tcp_helpers.h |  4 +--
 .../selftests/bpf/progs/mptcp_bpf_bkup.c      | 11 ++----
 .../selftests/bpf/progs/mptcp_bpf_burst.c     | 15 +++-----
 .../selftests/bpf/progs/mptcp_bpf_first.c     | 10 ++----
 .../selftests/bpf/progs/mptcp_bpf_red.c       |  9 ++---
 .../selftests/bpf/progs/mptcp_bpf_rr.c        | 11 ++----
 8 files changed, 23 insertions(+), 77 deletions(-)

-- 
2.35.3

Re: [PATCH mptcp-next 0/9] Update scheduler refactor commits

Posted by Mat Martineau 8 months, 2 weeks ago

On Tue, 15 Aug 2023, Geliang Tang wrote:

> Update scheduler refactor commits:
> - drop data_init interface.
> - call mptcp_sched_default_get_subflow in get_send/retrans.
> - update commit logs.
>

Thanks for the changes Geliang, these look good to squash.

Matthieu, I think the build failures were due to the squash commits being 
applied after the final export branch commit?

- Mat


> Geliang Tang (9):
>  Squash to "mptcp: add struct mptcp_sched_ops"
>  Squash to "mptcp: add scheduler wrappers"
>  Squash to "mptcp: register default scheduler"
>  Squash to "selftests/bpf: Add mptcp sched structs"
>  Squash to "selftests/bpf: Add bpf_first scheduler"
>  Squash to "selftests/bpf: Add bpf_bkup scheduler"
>  Squash to "selftests/bpf: Add bpf_rr scheduler"
>  Squash to "selftests/bpf: Add bpf_red scheduler"
>  Squash to "selftests/bpf: Add bpf_burst scheduler"
>
> include/net/mptcp.h                           |  4 +--
> net/mptcp/sched.c                             | 36 ++++---------------
> tools/testing/selftests/bpf/bpf_tcp_helpers.h |  4 +--
> .../selftests/bpf/progs/mptcp_bpf_bkup.c      | 11 ++----
> .../selftests/bpf/progs/mptcp_bpf_burst.c     | 15 +++-----
> .../selftests/bpf/progs/mptcp_bpf_first.c     | 10 ++----
> .../selftests/bpf/progs/mptcp_bpf_red.c       |  9 ++---
> .../selftests/bpf/progs/mptcp_bpf_rr.c        | 11 ++----
> 8 files changed, 23 insertions(+), 77 deletions(-)
>
> -- 
> 2.35.3
>
>
>

Re: [PATCH mptcp-next 0/9] Update scheduler refactor commits

Posted by Matthieu Baerts 8 months, 2 weeks ago

Hi Geliang, Mat,

On 17/08/2023 02:07, Mat Martineau wrote:
> On Tue, 15 Aug 2023, Geliang Tang wrote:
> 
>> Update scheduler refactor commits:
>> - drop data_init interface.
>> - call mptcp_sched_default_get_subflow in get_send/retrans.
>> - update commit logs.
>>

Thank you for the patches and the review!

> Thanks for the changes Geliang, these look good to squash.
> 
> Matthieu, I think the build failures were due to the squash commits
> being applied after the final export branch commit?

It looks like they are due to the squash commits. Let's see :)

New patches for t/upstream:
- 334385dbbaff: "squashed" patch 1/9 in "mptcp: add struct mptcp_sched_ops"
- 72867507b737: tg:msg: update after the recent squash-to patch

- b1737babf8e1: "squashed" patch 2/9 (with conflicts) in "mptcp: add
scheduler wrappers"
- ebc8d6bc5e46: tg:msg: update after the recent squash-to patch

- eeffd6a7a5d6: "squashed" patch 3/9 (with conflicts) in "mptcp:
register default scheduler"
- ff14b1c54442: tg:msg: update after the recent squash-to patch

- dd2afaeb7bf9: "squashed" patch 4/9 in "selftests/bpf: Add mptcp sched
structs"
- 28c12982dd5b: "squashed" patch 5/9 in "selftests/bpf: Add bpf_first
scheduler"
- 22674b47badb: "squashed" patch 6/9 in "selftests/bpf: Add bpf_bkup
scheduler"
- 48f4f33191d4: "squashed" patch 7/9 in "selftests/bpf: Add bpf_rr
scheduler"
- 658be6218f95: "squashed" patch 8/9 in "selftests/bpf: Add bpf_red
scheduler"
- c1714527d1e2: "squashed" patch 9/9 in "selftests/bpf: Add bpf_burst
scheduler"
- Results: f28cd69d6233..ca3243095d76 (export)

Tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20230817T092922

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net