v15:
 - drop "mptcp: export remove_anno_list_by_saddr"
 - drop MPTCP_USER_PM_FLAG_RM_* flags
 - drop mptcp_pm_alloc_anno_list in mptcp_nl_cmd_sf_create.

v14:
 - drop mptcp_pm_remove_addrs helper in patch 1
 - add two flags in patch 4, the address entry'll be removed from
   userspace_pm_local_addr_list only when both flags are set, by doing this,
   it's now independent of the order of the remove_subflows command and
   the remove_addrs command.

v13:
 - move the RM_ADDR command after the destruction of the subflow in
   patch 2 and patch 5.
 - drop mptcp_pm_remove_anno_list_by_saddr in mptcp_nl_cmd_sf_destroy in
   patch 4.
 - update userspace_pm.sh too in patch 5.

v12:
 - address Matt's commits in v11.

v11:
 - #1-#5 part 1, address Matt's comments in v10.
 - #6-#9 part 2, update pm mptcp_info
 - #10-#12 part 3, some cleanups.

v10:
 - fix userspace_pm.sh errors reported by CI.
 - fix the bug in mptcp_pm_remove_addrs in patch 1.
 - drop msk->pm.subflow == 1 in mptcp_userspace_pm_delete_local_addr in
   patch 3.
 - exchange the order of "pm_nl_ctl rem" and "pm_nl_ctl dsf" in patch 2
   and 6.
 - update the commit logs.

v9:
 - address Matt's commets in v8.

v8:
 - address Matt's comments.
 - split into two series, pt 2 will send later.

v7:
 - fix userspace_pm.sh errors reported by CI.
 - only remove addrs in mptcp_nl_cmd_remove().

v6:
 - send a RM ADDR from userspace.

v5:
 - fix a memleak error reported by CI.
 - add more delay for userspace pm tests.

v4:
 - add more patches
 - add selftests

v3:
 - update local_addr_used and add_addr_signaled

v2:
 - hold pm locks

Geliang Tang (5):
  mptcp: only send RM_ADDR in nl_cmd_remove
  selftests: mptcp: update userspace pm addr tests
  mptcp: add address into userspace pm list
  selftests: mptcp: update userspace pm subflow tests
  mptcp: update userspace pm infos

 net/mptcp/pm.c                                | 23 +++++++--
 net/mptcp/pm_netlink.c                        | 18 +++++++
 net/mptcp/pm_userspace.c                      | 48 ++++++++++++++++++-
 net/mptcp/protocol.h                          |  1 +
 .../testing/selftests/net/mptcp/mptcp_join.sh | 11 ++++-
 5 files changed, 95 insertions(+), 6 deletions(-)

-- 
2.35.3

Hi Geliang,

On 24/05/2023 10:02, Geliang Tang wrote:
> v15:
>  - drop "mptcp: export remove_anno_list_by_saddr"
>  - drop MPTCP_USER_PM_FLAG_RM_* flags
>  - drop mptcp_pm_alloc_anno_list in mptcp_nl_cmd_sf_create.

Thank you for the v15, it looks good to me!

Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>

I suggest to apply this series today. Then I will look at my series
(selftests: mptcp: skip tests when features are not supported) and hope
to apply it soon. Then we can look at the part 2 of this series if
that's OK for you.

If you need a hand to rebase your series on top of mine, please tell me!

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

Hi Geliang,

On 24/05/2023 15:27, Matthieu Baerts wrote:
> Hi Geliang,
> 
> On 24/05/2023 10:02, Geliang Tang wrote:
>> v15:
>>  - drop "mptcp: export remove_anno_list_by_saddr"
>>  - drop MPTCP_USER_PM_FLAG_RM_* flags
>>  - drop mptcp_pm_alloc_anno_list in mptcp_nl_cmd_sf_create.
> 
> Thank you for the v15, it looks good to me!
> 
> Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
> 
> I suggest to apply this series today.

Just did, applied in our tree (fixes for -net):

New patches for t/upstream-net and t/upstream:
- 7b19c98c1195: mptcp: only send RM_ADDR in nl_cmd_remove
- c9fb355d4359: selftests: mptcp: update userspace pm addr tests
- d8a70092983f: mptcp: add address into userspace pm list
- ce75026f702c: selftests: mptcp: update userspace pm subflow tests
- 3a08dcee555f: mptcp: update userspace pm infos
- Results: b87768580a4d..a38ce6e2d547 (export-net)



- Results: 0a9978390b78..ba37a83b8dc3 (export)

Tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export-net/20230524T141239
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20230524T141239

Cheers,
Matt

-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net