From: Geliang Tang <tanggeliang@kylinos.cn>

v3:
 - put bpt_iter kfuncs into bpf_mptcp_iter_kfunc_set.

v2:
 - Drop mptcp_subflow bpf_iter subtest.

Some squash-to patches based on Martin's feedback for "bpf: Add
mptcp_subflow bpf_iter support" v3.

Geliang Tang (3):
  Squash to "bpf: Register mptcp common kfunc set"
  Squash to "bpf: Add mptcp_subflow bpf_iter"
  Revert "selftests/bpf: Add mptcp_subflow bpf_iter subtest"

 net/mptcp/bpf.c                               | 48 ++++++++++--
 .../testing/selftests/bpf/bpf_experimental.h  |  8 --
 .../testing/selftests/bpf/prog_tests/mptcp.c  | 73 -------------------
 .../selftests/bpf/progs/mptcp_bpf_iters.c     | 59 ---------------
 4 files changed, 43 insertions(+), 145 deletions(-)
 delete mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c

-- 
2.43.0

Hi Geliang,

On 30/05/2025 10:03, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
> 
> v3:
>  - put bpt_iter kfuncs into bpf_mptcp_iter_kfunc_set.

Thank you for this new version! The modifications in the code look good
to me, but applying them like that would cause issues in the code. Your
first squash-to patch for "bpf: Register mptcp common kfunc set" would
add a dependence on a later patch introducing bpf_mptcp_sched_ops.

I did the following modifications directly in the tree:
- Revert "bpf: Register mptcp common kfunc set".
- Add its content to "bpf: Add mptcp_subflow bpf_iter" & "bpf: Export
mptcp packet scheduler helpers".
- Remove the filter for the mptcp subflow iter.

Feel free to check the modifications I did and suggest any changes if
needed.

New patches for t/upstream:
- 7464c07e0b21: Revert "bpf: Register mptcp common kfunc set"
- 7a67a1f3a43d: tgupdate: merge t/bpf-Add-mptcp_subflow-bpf_iter base
into t/bpf-Add-mptcp_subflow-bpf_iter
- 6a9ee240a5f5: "squashed" (with conflicts) in "bpf: Add mptcp_subflow
bpf_iter"
- a3557639df4e: "squashed" (with conflicts) in "selftests/bpf: Add
mptcp_subflow bpf_iter subtest"
- 4bb0a3a3a05f: tgupdate: merge t/mptcp-add-bpf_mptcp_sched_ops base
into t/mptcp-add-bpf_mptcp_sched_ops
- e43d77b0c6aa: tgupdate: merge t/bpf-Add-bpf_mptcp_sched_kfunc_set base
into t/bpf-Add-bpf_mptcp_sched_kfunc_set
- 3f5d496d0334: conflict in t/selftests-bpf-Add-bpf-scheduler-test
- f89d0256f95f: conflict in t/selftests-bpf-add-bpf_first-scheduler
- Results: 226663e50465..8df73de5f995 (export)

Tests are now in progress:

- export:
https://github.com/multipath-tcp/mptcp_net-next/commit/d4388fa1829e204dbc8bf97843787e8b143352cb/checks

Note: I will monitor the CI and hopefully fix new issues if any.

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.

Hi Geliang,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: normal: Success! ✅
- KVM Validation: debug: Success! ✅
- KVM Validation: btf-normal (only bpftest_all): Success! ✅
- KVM Validation: btf-debug (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/15342501617

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/abd8fe632270
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=967524


If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:

    $ cd [kernel source code]
    $ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
        --pull always mptcp/mptcp-upstream-virtme-docker:latest \
        auto-normal

For more details:

    https://github.com/multipath-tcp/mptcp-upstream-virtme-docker


Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)

Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)