[PATCH mptcp-next v2 00/10] mptcp: pm: a few cleanups

Matthieu Baerts (NGI0) posted 10 patches 3 weeks ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/multipath-tcp/mptcp_net-next tags/patchew/20250919-pm-kern-endp-add._5Faddr-v2-0-1f8f04f01914@kernel.org
include/uapi/linux/mptcp.h                        |   5 +
net/mptcp/pm.c                                    |  17 +-
net/mptcp/pm_kernel.c                             | 458 ++++++++++++----------
net/mptcp/pm_userspace.c                          |   2 +-
net/mptcp/protocol.h                              |  15 +-
net/mptcp/sockopt.c                               |  20 +-
tools/testing/selftests/bpf/progs/mptcp_subflow.c |   2 +-
7 files changed, 292 insertions(+), 227 deletions(-)
[PATCH mptcp-next v2 00/10] mptcp: pm: a few cleanups
Posted by Matthieu Baerts (NGI0) 3 weeks ago
I'm currently looking at adding ADD-ADDR endpoint type, see [1].

When working on this, I decided to do something we should have done from
a long time: renaming some variables with confusing names, and split
some functions.

Flushing this now, just to ease the reviews: this should be pure
refactoring, no functional changes intended in all these commits.

Based-on: <20250916-pm-c-flag-client-default-v2-0-3be2c5bc4d6a@kernel.org>
Link: https://github.com/multipath-tcp/mptcp_net-next/issues/503
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
Changes in v2:
- patch 1: move protocol.h modif from patch 2 (Geliang)
- patch 3: 'Reverse X-Mas Tree' order, and comments (Geliang)
- patches 4 & 7: avoid one line above 80 chars
- Link to v1: https://lore.kernel.org/r/20250918-pm-kern-endp-add_addr-v1-0-e12e58770a11@kernel.org

---
Matthieu Baerts (NGI0) (10):
      Squash to "mptcp: pm: in-kernel: usable client side with C-flag"
      mptcp: pm: in-kernel: refactor fill_local_addresses_vec
      mptcp: pm: in-kernel: refactor fill_remote_addresses_vec
      mptcp: pm: rename 'subflows' to 'extra_subflows'
      mptcp: pm: in-kernel: rename 'subflows_max' to 'limit_extra_subflows'
      mptcp: pm: in-kernel: rename 'add_addr_signal_max' to 'endp_signal_max'
      mptcp: pm: in-kernel: rename 'add_addr_accept_max' to 'limit_add_addr_accepted'
      mptcp: pm: in-kernel: rename 'local_addr_max' to 'endp_subflow_max'
      mptcp: pm: in-kernel: rename 'local_addr_list' to 'endp_list'
      mptcp: pm: in-kernel: rename 'addrs' to 'endpoints'

 include/uapi/linux/mptcp.h                        |   5 +
 net/mptcp/pm.c                                    |  17 +-
 net/mptcp/pm_kernel.c                             | 458 ++++++++++++----------
 net/mptcp/pm_userspace.c                          |   2 +-
 net/mptcp/protocol.h                              |  15 +-
 net/mptcp/sockopt.c                               |  20 +-
 tools/testing/selftests/bpf/progs/mptcp_subflow.c |   2 +-
 7 files changed, 292 insertions(+), 227 deletions(-)
---
base-commit: 32778f6dc930afb30f995997c12cd8b829ac1600
change-id: 20250916-pm-kern-endp-add_addr-95cfceaef3fc

Best regards,
-- 
Matthieu Baerts (NGI0) <matttbe@kernel.org>
Re: [PATCH mptcp-next v2 00/10] mptcp: pm: a few cleanups
Posted by MPTCP CI 3 weeks ago
Hi Matthieu,

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): Unstable: 1 failed test(s): bpftest_test_progs_mptcp 🔴
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/17854465141

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


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)
Re: [PATCH mptcp-next v2 00/10] mptcp: pm: a few cleanups
Posted by Geliang Tang 3 weeks ago
Hi Matt,

Thanks for this v2.

On Fri, 2025-09-19 at 11:08 +0200, Matthieu Baerts (NGI0) wrote:
> I'm currently looking at adding ADD-ADDR endpoint type, see [1].
> 
> When working on this, I decided to do something we should have done
> from
> a long time: renaming some variables with confusing names, and split
> some functions.
> 
> Flushing this now, just to ease the reviews: this should be pure
> refactoring, no functional changes intended in all these commits.
> 
> Based-on:
> <20250916-pm-c-flag-client-default-v2-0-3be2c5bc4d6a@kernel.org>
> Link: https://github.com/multipath-tcp/mptcp_net-next/issues/503
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

Apart from a small comment in patch 1, the whole patch set looks good
to me.

Reviewed-by: Geliang Tang <geliang@kernel.org>

-Geliang

> ---
> Changes in v2:
> - patch 1: move protocol.h modif from patch 2 (Geliang)
> - patch 3: 'Reverse X-Mas Tree' order, and comments (Geliang)
> - patches 4 & 7: avoid one line above 80 chars
> - Link to v1:
> https://lore.kernel.org/r/20250918-pm-kern-endp-add_addr-v1-0-e12e58770a11@kernel.org
> 
> ---
> Matthieu Baerts (NGI0) (10):
>       Squash to "mptcp: pm: in-kernel: usable client side with C-
> flag"
>       mptcp: pm: in-kernel: refactor fill_local_addresses_vec
>       mptcp: pm: in-kernel: refactor fill_remote_addresses_vec
>       mptcp: pm: rename 'subflows' to 'extra_subflows'
>       mptcp: pm: in-kernel: rename 'subflows_max' to
> 'limit_extra_subflows'
>       mptcp: pm: in-kernel: rename 'add_addr_signal_max' to
> 'endp_signal_max'
>       mptcp: pm: in-kernel: rename 'add_addr_accept_max' to
> 'limit_add_addr_accepted'
>       mptcp: pm: in-kernel: rename 'local_addr_max' to
> 'endp_subflow_max'
>       mptcp: pm: in-kernel: rename 'local_addr_list' to 'endp_list'
>       mptcp: pm: in-kernel: rename 'addrs' to 'endpoints'
> 
>  include/uapi/linux/mptcp.h                        |   5 +
>  net/mptcp/pm.c                                    |  17 +-
>  net/mptcp/pm_kernel.c                             | 458
> ++++++++++++----------
>  net/mptcp/pm_userspace.c                          |   2 +-
>  net/mptcp/protocol.h                              |  15 +-
>  net/mptcp/sockopt.c                               |  20 +-
>  tools/testing/selftests/bpf/progs/mptcp_subflow.c |   2 +-
>  7 files changed, 292 insertions(+), 227 deletions(-)
> ---
> base-commit: 32778f6dc930afb30f995997c12cd8b829ac1600
> change-id: 20250916-pm-kern-endp-add_addr-95cfceaef3fc
> 
> Best regards,
Re: [PATCH mptcp-next v2 00/10] mptcp: pm: a few cleanups
Posted by Matthieu Baerts 3 weeks ago
Hi Geliang,

On 19/09/2025 12:20, Geliang Tang wrote:
> Hi Matt,
> 
> Thanks for this v2.
> 
> On Fri, 2025-09-19 at 11:08 +0200, Matthieu Baerts (NGI0) wrote:
>> I'm currently looking at adding ADD-ADDR endpoint type, see [1].
>>
>> When working on this, I decided to do something we should have done
>> from
>> a long time: renaming some variables with confusing names, and split
>> some functions.
>>
>> Flushing this now, just to ease the reviews: this should be pure
>> refactoring, no functional changes intended in all these commits.
>>
>> Based-on:
>> <20250916-pm-c-flag-client-default-v2-0-3be2c5bc4d6a@kernel.org>
>> Link: https://github.com/multipath-tcp/mptcp_net-next/issues/503
>> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> 
> Apart from a small comment in patch 1, the whole patch set looks good
> to me.
> 
> Reviewed-by: Geliang Tang <geliang@kernel.org>

Thank you for the review!

Now in our tree:

New patches for t/upstream:
- 740dfcb5f7a5: mptcp: pm: in-kernel: refactor fill_local_addresses_vec
- 84e1cff472a8: mptcp: pm: in-kernel: refactor fill_remote_addresses_vec
- 03ab82dc7dee: mptcp: pm: rename 'subflows' to 'extra_subflows'
- b28ca23293e0: mptcp: pm: in-kernel: rename 'subflows_max' to
'limit_extra_subflows'
- 6e7aa1ce549c: mptcp: pm: in-kernel: rename 'add_addr_signal_max' to
'endp_signal_max'
- 6cf4bdae1069: mptcp: pm: in-kernel: rename 'add_addr_accept_max' to
'limit_add_addr_accepted'
- ff082e4b5a79: mptcp: pm: in-kernel: rename 'local_addr_max' to
'endp_subflow_max'
- 105e63c8190b: mptcp: pm: in-kernel: rename 'local_addr_list' to
'endp_list'
- 3390557d8f17: mptcp: pm: in-kernel: rename 'addrs' to 'endpoints'
- Results: 169aef388767..77807b94c731 (export)

Tests are now in progress:

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

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