Skip to content

BPF packet scheduler

Geliang Tang mptcp 25 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v7 posting 2/213 patches 5 repliesIn review
  2. v6 posting 2/211 patches 6 repliesSuperseded
  3. v5 posting 3/311 patches 2 repliesSuperseded
Earlier versions · 22
VersionPostedPatchesRepliesStatus
v4 posting 2/210 patches6 repliesSuperseded
v3 posting 2/210 patches2 repliesSuperseded
v2 posting 2/25 patches8 repliesSuperseded
v18 Latest7 patches5 repliesIn review
v178 patches3 repliesSuperseded
v168 patches5 repliesSuperseded
v158 patches1 replySuperseded
v148 patches2 repliesSuperseded
v139 patches2 repliesSuperseded
v1210 patches6 repliesSuperseded
v118 patches3 repliesSuperseded
v108 patches2 repliesSuperseded
v98 patches4 repliesSuperseded
v88 patches7 repliesSuperseded
v7 posting 1/28 patches8 repliesSuperseded
v6 posting 1/28 patches5 repliesSuperseded
v5 posting 2/38 patches11 repliesSuperseded
v5 posting 1/38 patches0 repliesSuperseded
v4 posting 1/28 patches4 repliesSuperseded
v3 posting 1/28 patches0 repliesSuperseded
v2 posting 1/28 patches0 repliesSuperseded
v15 patches0 repliesSuperseded

Changes in v18 from the cover letter

- 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.

Patches in v18 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/7mptcp: add struct mptcp_sched_opsinclude/net/mptcp.h net/mptcp/Makefile net/mptcp/protocol.h +2 more+97 -10 replies
2/7mptcp: add a new sysctl schedulerDocumentation/networking/mptcp-sysctl.rst net/mptcp/ctrl.c net/mptcp/protocol.h+23 -00 replies
3/7mptcp: add sched in mptcp_socknet/mptcp/protocol.c net/mptcp/protocol.h net/mptcp/sched.c +1 more+45 -00 replies
4/7mptcp: add get_subflow wrappersnet/mptcp/protocol.c net/mptcp/protocol.h net/mptcp/sched.c+62 -190 replies
5/7mptcp: add bpf_mptcp_sched_opskernel/bpf/bpf_struct_ops_types.h net/mptcp/bpf.c+158 -02 replies
6/7selftests: bpf: add bpf_first schedulertools/testing/selftests/bpf/progs/mptcp_bpf_first.c+32 -00 replies
7/7selftests: bpf: add bpf_first testtools/testing/selftests/bpf/prog_tests/mptcp.c+112 -02 replies

Reviews trailers per patch

1 of 7 patches has a Reviewed-by or Acked-by.

PatchMat Martineau
1/7
2/7
3/7
4/7
5/7R-b
6/7
7/7

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v18 thread

Cover letter [PATCH mptcp-next v18 0/7] BPF packet scheduler

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 <[email protected]> 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.

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
Signature · 1 line
2.34.1