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: export remove_anno_list_by_saddr
  mptcp: add addr into userspace pm list
  selftests: mptcp: update userspace pm subflow tests

 net/mptcp/pm_netlink.c                        | 26 ++++++++--
 net/mptcp/pm_userspace.c                      | 50 ++++++++++++++++++-
 net/mptcp/protocol.h                          |  3 ++
 .../testing/selftests/net/mptcp/mptcp_join.sh | 11 +++-
 .../selftests/net/mptcp/userspace_pm.sh       |  3 ++
 5 files changed, 87 insertions(+), 6 deletions(-)

-- 
2.35.3

Hi Geliang,

On 10/05/2023 06:20, Geliang Tang wrote:
> 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.

Thank you for the v12 and v13 and sorry for the delay!

I think we are almost there. The last thing is linked to the
modifications you did in this v13: I think we should destroy the local
addresses in mptcp_nl_cmd_sf_destroy(), see my comment in patch 4/5.
But we still need the modifications in userspace_pm.sh to send the
RM_ADDR (or change the verify step not to expect seeing a RM_ADDR).

Also, it looks like the 6 first patches (5 patches from part 1 and the
1st one of part 2) are for "net" while the other ones are for
"net-next". Do you mind sending these 6 patches first,  wait for me to
apply them, then we look at the second part for net-next?

(I have a bunch of patches in preparation modifying the selftests and
that's for -net. It will be easier to apply them first and then look at
the new features: I can help with the rebase, no issue with that.)

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