v18:
 - drop "mptcp: add last_snd write access".
 - add mptcp_sched_data_init helper.
 - move mptcp_sched_get_send() and mptcp_sched_get_retrans() into sched.c.

v17:
 - drop "mptcp: register default scheduler"
 - add back "mptcp: add last_snd write access"
 - update "mptcp: add get_subflow wrappers" as Paolo suggested.
 - fix the issue reported-by kernel test robot <lkp@intel.com> in [1].

[1]
https://patchwork.kernel.org/project/mptcp/patch/8ac278434203662add804d00e007c2cb2b6f52e4.1651024344.git.geliang.tang@suse.com/

v16:
 - add CONFIG_BPF_JIT check around the scheduler code inside bpf.c
 - depends on export/20220426T102605 +
	      Squash to "bpf: add bpf_skc_to_mptcp_sock_proto" +
              Squash to "selftests: bpf: test bpf_skc_to_mptcp_sock"
              Squash to "selftests: bpf: add MPTCP test base"

v15:
 - set mptcp_sched_id and mptcp_sched_type in bpf_mptcp_sched_init().
 - add CONFIG_BPF_JIT in patch 6.
 - drop '#include <sys/param.h>' in patch 8.
 - depends on export/20220426T102605 +
	      Squash to "bpf: add bpf_skc_to_mptcp_sock_proto" +
              Squash to "selftests: bpf: test bpf_skc_to_mptcp_sock"

v14:
 - add struct mptcp_sched_data.

base-commit: export/20220422T060337

v13:
 - rename retrans to reinject
 - drop "add last_snd write access" patch
 - change %lu to %zu to fix the build break on i386.

base-commit: export/20220420T152103

v12:
 - add call_me_again flag.

base-commit: export/20220419T055400

v11:
 - add retrans argment for get_subflow()

base-commit: export/20220408T100826

v10:
 - patch 5: keep msk->last_snd setting in get_subflow().
 - patch 6: add bpf_mptcp_sched_btf_struct_access().
 - patch 8: use MIN() in sys/param.h, instead of defining a new one.
 - update commit logs.

base-commit: export/20220406T054706

v9:
 - patch 2: add the missing mptcp_sched_init() invoking in
   mptcp_proto_init().
 - patch 5: set last_snd after invoking get_subflow().
 - patch 7: merge the squash-to patch.

v8:
 - use global sched_list instead of pernet sched_list.
 - drop synchronize_rcu() in mptcp_unregister_scheduler().
 - update mptcp_init_sched and mptcp_release_sched as Mat and Florian
   suggested.
 - fix the build break in patch 8.
 - depends on: "add skc_to_mptcp_sock" v14.
 - export/20220325T055307

v7:
 - add bpf_try_module_get in mptcp_init_sched.
 - add bpf_module_put in mptcp_release_sched.
 - rename bpf_first to mptcp_bpf_first.
 - update commit logs.

v6:
 - still use pernet sched_list, use current->nsproxy->net_ns in BPF
   context instead of using init_net.
 - patch 1:
   - use rcu_read_lock instead of spin_lock in mptcp_sched_find as Florian suggested.
   - drop synchronize_rcu in sched_exit_net as Florian suggested.
   - keep synchronize_rcu in mptcp_unregister_scheduler, otherwise, got
     a workqueue lockup in my test.
   - update Makefile as Mat suggested.
 - patch 2:
   - add mptcp_sched_data_init to register default sched, instead of
     registering it in init_net.
 - patch 5:
   - move mptcp_sched_get_subflow to protocol.h as Mat suggested.
 - patch 6:
   - use current->nsproxy->net_ns instead of init_net.
 - patch 8:
   - add send_data to send more data, instead of send_byte.

v5:
 - patch 1: define per-namespace sched_list (but only used init_net
   namespace. It is difficult to get 'net' in bpf_mptcp_sched_reg and
   bpf_mptcp_sched_unreg. I need some suggestions here.)
 - patch 2: skip mptcp_sched_default in mptcp_unregister_scheduler.
 - patch 8: add tests into mptcp.c, instead of bpf_tcp_ca.c.

v4:
 - set msk->sched to &mptcp_sched_default when the sched argument is NULL
in mptcp_init_sched().

v3:
 - add mptcp_release_sched helper in patch 4.
 - rename mptcp_set_sched to mptcp_init_sched in patch 4.
 - add mptcp_sched_first_release in patch 7.
 - do some cleanups.

v2:
 - split into more small patches.
 - change all parameters of mptcp_sched_ops from sk to msk:
       void (*init)(struct mptcp_sock *msk);
       void (*release)(struct mptcp_sock *msk);
       struct sock *   (*get_subflow)(struct mptcp_sock *msk);
 - add tests in bpf_tcp_ca.c, instead of adding a new one.

v1:
 - Addressed to the commends in the RFC version.

Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/75

Geliang Tang (7):
  mptcp: add struct mptcp_sched_ops
  mptcp: add a new sysctl scheduler
  mptcp: add sched in mptcp_sock
  mptcp: add get_subflow wrappers
  mptcp: add bpf_mptcp_sched_ops
  selftests: bpf: add bpf_first scheduler
  selftests: bpf: add bpf_first test

 Documentation/networking/mptcp-sysctl.rst     |   8 +
 include/net/mptcp.h                           |  19 +++
 kernel/bpf/bpf_struct_ops_types.h             |   4 +
 net/mptcp/Makefile                            |   2 +-
 net/mptcp/bpf.c                               | 154 ++++++++++++++++++
 net/mptcp/ctrl.c                              |  14 ++
 net/mptcp/protocol.c                          |  32 ++--
 net/mptcp/protocol.h                          |  10 ++
 net/mptcp/sched.c                             | 143 ++++++++++++++++
 .../testing/selftests/bpf/bpf_mptcp_helpers.h |  19 +++
 .../testing/selftests/bpf/prog_tests/mptcp.c  | 112 +++++++++++++
 .../selftests/bpf/progs/mptcp_bpf_first.c     |  32 ++++
 12 files changed, 529 insertions(+), 20 deletions(-)
 create mode 100644 net/mptcp/sched.c
 create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_first.c

-- 
2.34.1

Hi Geliang, Mat, Paolo,

On 01/05/2022 15:48, Geliang Tang wrote:
> v18:
>  - drop "mptcp: add last_snd write access".
>  - add mptcp_sched_data_init helper.
>  - move mptcp_sched_get_send() and mptcp_sched_get_retrans() into sched.c.

Thank you for the patches and reviews!

Now in our tree (feat. for others) with Paolo's ACK and Mat's RvB tags:

New patches for t/upstream:
- 2d934cabfc25: mptcp: add struct mptcp_sched_ops
- 467bf7c54c40: mptcp: add a new sysctl scheduler
- 9281e21f5f4d: mptcp: add sched in mptcp_sock
- 656ddb9db4e1: mptcp: add get_subflow wrappers
- be9de4168364: mptcp: add bpf_mptcp_sched_ops
- 2885b934b680: selftests: bpf: add bpf_first scheduler
- 0201204572f8: selftests: bpf: add bpf_first test
- Results: bea7cea0ffcd..9d8bf95bd8a7 (export)

And the squash-to patches:

- d8a1213416ef: "squashed" in "mptcp: add get_subflow wrappers"
- Results: 9d8bf95bd8a7..4c418cbad090 (export)

- 014d79843c44: "squashed" in "mptcp: add bpf_mptcp_sched_ops"
- Results: 4c418cbad090..aa6bec3f788f (export)

- 3b8d5a354bf6: "squashed" in "mptcp: add struct mptcp_sched_ops"
- Results: aa6bec3f788f..527315ca1901 (export)

- 92b309479c5c: "squashed" in "selftests: bpf: add bpf_first scheduler"
- Results: 527315ca1901..a800c43a02ab (export)

- 35a824bb888a: "squashed" in "selftests: bpf: add bpf_first test"
- Results: a800c43a02ab..c3f5d94e8dc4 (export)


Builds and tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220503T162811
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export


> Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/75

I didn't close it because "BPF round-robin scheduler" series also closes it.

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