- The first 10 patches is for bpf-next v5.
- Rebased the "BPF packet scheduler" series on export branch.
- base-commit: df896c77f02a ("DO-NOT-MERGE: git markup: features
net-next-next"), export/20220517T155019

Geliang Tang (16):
  mptcp: move MPTCPOPT_HMAC_LEN to net/mptcp.h
  mptcp: move mptcp_subflow_context in net/mptcp.h
  bpf: add bpf_mptcp_sock_from_subflow helper
  bpf: add bpf_skc_to_mptcp_sock_proto
  selftests/bpf: Enable CONFIG_IKCONFIG_PROC in config
  selftests/bpf: test bpf_skc_to_mptcp_sock
  selftests/bpf: verify token of struct mptcp_sock
  selftests/bpf: verify ca_name of struct mptcp_sock
  selftests/bpf: verify first of struct mptcp_sock
  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

Nicolas Rybowski (1):
  selftests/bpf: add MPTCP test base

 Documentation/networking/mptcp-sysctl.rst     |   8 +
 MAINTAINERS                                   |   1 +
 include/linux/bpf.h                           |   1 +
 include/linux/btf_ids.h                       |   3 +-
 include/net/mptcp.h                           | 131 +++++++-
 include/uapi/linux/bpf.h                      |   7 +
 kernel/bpf/bpf_struct_ops_types.h             |   4 +
 kernel/bpf/verifier.c                         |   1 +
 kernel/trace/bpf_trace.c                      |   2 +
 net/core/filter.c                             |  18 ++
 net/mptcp/Makefile                            |   6 +-
 net/mptcp/bpf.c                               | 162 ++++++++++
 net/mptcp/ctrl.c                              |  14 +
 net/mptcp/protocol.c                          |  32 +-
 net/mptcp/protocol.h                          | 106 +------
 net/mptcp/sched.c                             | 141 +++++++++
 scripts/bpf_doc.py                            |   2 +
 tools/include/uapi/linux/bpf.h                |   7 +
 tools/testing/selftests/bpf/bpf_tcp_helpers.h |  32 ++
 tools/testing/selftests/bpf/config            |   3 +
 tools/testing/selftests/bpf/network_helpers.c |  40 ++-
 tools/testing/selftests/bpf/network_helpers.h |   2 +
 .../testing/selftests/bpf/prog_tests/mptcp.c  | 288 ++++++++++++++++++
 .../selftests/bpf/progs/mptcp_bpf_first.c     |  32 ++
 .../testing/selftests/bpf/progs/mptcp_sock.c  |  89 ++++++
 25 files changed, 1007 insertions(+), 125 deletions(-)
 create mode 100644 net/mptcp/bpf.c
 create mode 100644 net/mptcp/sched.c
 create mode 100644 tools/testing/selftests/bpf/prog_tests/mptcp.c
 create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_first.c
 create mode 100644 tools/testing/selftests/bpf/progs/mptcp_sock.c

-- 
2.34.1

Hi Geliang,

Thank you for this series.

On 18/05/2022 08:10, Geliang Tang wrote:
> - The first 10 patches is for bpf-next v5.
> - Rebased the "BPF packet scheduler" series on export branch.
> - base-commit: df896c77f02a ("DO-NOT-MERGE: git markup: features
> net-next-next"), export/20220517T155019

Does this correspond to what I should get if I apply all the Squash-to
patch you sent yesterday?
Or are there differences on top of that?

On my side, it is easier to apply squash-to patch and re-apply an
updated series which is already in our tree.
Of course if the conflicts are complex, you can send your version on a
public Git repo for me to compare.

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

Hi Matt,

Matthieu Baerts <matthieu.baerts@tessares.net> 于2022年5月18日周三 18:59写道：
>
> Hi Geliang,
>
> Thank you for this series.
>
> On 18/05/2022 08:10, Geliang Tang wrote:
> > - The first 10 patches is for bpf-next v5.
> > - Rebased the "BPF packet scheduler" series on export branch.
> > - base-commit: df896c77f02a ("DO-NOT-MERGE: git markup: features
> > net-next-next"), export/20220517T155019
>
> Does this correspond to what I should get if I apply all the Squash-to
> patch you sent yesterday?
> Or are there differences on top of that?

This series addresses all BPF maintainers‘ comments for v4. It makes
the squash-to patches I sent yesterday superseded. I found it's hard
to send them as squash-to patches because there are too many
differences. So I sent this new series. I think it's much easier for
Mat to review and upstream.

>
> On my side, it is easier to apply squash-to patch and re-apply an
> updated series which is already in our tree.
> Of course if the conflicts are complex, you can send your version on a
> public Git repo for me to compare.

I suggest we skip merging this version into our export branch. I guess
BPF maintainers will give some comments for this v5 too. When this
series is accepted at last, then I'll split them as squash-to patches,
and send to you for merging into our export branch.

Thanks,
-Geliang

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