v2:
 - The series is for bpf-next v5.
 - patch 1, keep bpf_mptcp_sock_from_subflow() in bpf.c
 - patch 3, Drop the 'msg' parameter of verify_sk
 - base-commit: df896c77f02a ("DO-NOT-MERGE: git markup: features
net-next-next"), export/20220517T155019
 - The last squash-to patch is for "BPF packet scheduler" series.

v1:
 - The first 10 patches is for bpf-next v5.
 - Rebased the "BPF packet scheduler" series on export branch.

Geliang Tang (6):
  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

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

 MAINTAINERS                                   |   1 +
 include/linux/bpf.h                           |   1 +
 include/linux/btf_ids.h                       |   3 +-
 include/net/mptcp.h                           |   6 +
 include/uapi/linux/bpf.h                      |   7 +
 kernel/bpf/verifier.c                         |   1 +
 kernel/trace/bpf_trace.c                      |   2 +
 net/core/filter.c                             |  18 ++
 net/mptcp/Makefile                            |   2 +
 net/mptcp/bpf.c                               |  21 +++
 scripts/bpf_doc.py                            |   2 +
 tools/include/uapi/linux/bpf.h                |   7 +
 tools/testing/selftests/bpf/bpf_tcp_helpers.h |  13 ++
 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  | 174 ++++++++++++++++++
 .../testing/selftests/bpf/progs/mptcp_sock.c  |  89 +++++++++
 18 files changed, 382 insertions(+), 10 deletions(-)
 create mode 100644 net/mptcp/bpf.c
 create mode 100644 tools/testing/selftests/bpf/prog_tests/mptcp.c
 create mode 100644 tools/testing/selftests/bpf/progs/mptcp_sock.c

-- 
2.34.1

Hi Geliang,

On 19/05/2022 10:25, Geliang Tang wrote:
> v2:
>  - The series is for bpf-next v5.
>  - patch 1, keep bpf_mptcp_sock_from_subflow() in bpf.c
>  - patch 3, Drop the 'msg' parameter of verify_sk
>  - base-commit: df896c77f02a ("DO-NOT-MERGE: git markup: features
> net-next-next"), export/20220517T155019
>  - The last squash-to patch is for "BPF packet scheduler" series.

I just imported this new series in our tree.

- 7046a98c4501: "squashed" patch 1/7 in "bpf: add
bpf_skc_to_mptcp_sock_proto"
- dc043d25d647: "squashed" patch 2/7 in "selftests/bpf: Enable
CONFIG_IKCONFIG_PROC in config"
- bd3e6e2ffc15: "squashed" patch 3/7 in "selftests/bpf: add MPTCP test base"
- efa55efc427c: "squashed" patch 4/7 in "selftests/bpf: test
bpf_skc_to_mptcp_sock"
- f087e13912ad: "squashed" patch 5/7 in "selftests/bpf: verify token of
struct mptcp_sock"
- 21c0f634b797: "squashed" patch 6/7 in "selftests/bpf: verify ca_name
of struct mptcp_sock"
- d38ab51eb84e: "squashed" patch 7/7 in "selftests/bpf: verify first of
struct mptcp_sock"
- c79872213ec4: conflict in t/selftests-bpf-add-bpf_first-test
- Results: 9ceda99ef71f..5fbf0e7a331f (export)

- 4353cb87928e: "squashed" in "selftests/bpf: add bpf_first test"
- Results: 5fbf0e7a331f..086d4a4a0f34 (export)

Builds and tests are now in progress:



https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220519T141104

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

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