[PATCH mptcp-net] mptcp: add validity check for sending RM_ADDR

[PATCH mptcp-net] mptcp: add validity check for sending RM_ADDR

[Geliang Tang]

This patch adds the validity check for sending RM_ADDRs for userspace PM
in mptcp_pm_remove_addrs(), only send a RM_ADDR when the address is in the
anno_list or conn_list.

Fixes: 8b1c94da1e48 ("mptcp: only send RM_ADDR in nl_cmd_remove")
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 net/mptcp/pm_netlink.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 1529ec358815..bf4d96f6f99a 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -1515,8 +1515,9 @@ void mptcp_pm_remove_addrs(struct mptcp_sock *msk, struct list_head *rm_list)
 	struct mptcp_pm_addr_entry *entry;
 
 	list_for_each_entry(entry, rm_list, list) {
-		remove_anno_list_by_saddr(msk, &entry->addr);
-		if (alist.nr < MPTCP_RM_IDS_MAX)
+		if ((remove_anno_list_by_saddr(msk, &entry->addr) ||
+		     lookup_subflow_by_saddr(&msk->conn_list, &entry->addr)) &&
+		    alist.nr < MPTCP_RM_IDS_MAX)
 			alist.ids[alist.nr++] = entry->addr.id;
 	}
 
-- 
2.35.3

Re: mptcp: add validity check for sending RM_ADDR: Tests Results

[MPTCP CI]

Hi Geliang,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: normal (except selftest_mptcp_join):
  - Unstable: 1 failed test(s): packetdrill_sockopts 🔴:
  - Task: https://cirrus-ci.com/task/6042959330672640
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/6042959330672640/summary/summary.txt

- KVM Validation: debug (only selftest_mptcp_join):
  - Success! ✅:
  - Task: https://cirrus-ci.com/task/4776321935474688
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/4776321935474688/summary/summary.txt

- KVM Validation: normal (only selftest_mptcp_join):
  - Success! ✅:
  - Task: https://cirrus-ci.com/task/5480009377251328
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/5480009377251328/summary/summary.txt

- KVM Validation: debug (except selftest_mptcp_join):
  - Success! ✅:
  - Task: https://cirrus-ci.com/task/6605909284093952
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/6605909284093952/summary/summary.txt

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/cfde3fbdcdb2


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-debug

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 (Tessares)

Re: [PATCH mptcp-net] mptcp: add validity check for sending RM_ADDR

[Mat Martineau]

On Fri, 3 Nov 2023, Geliang Tang wrote:

> This patch adds the validity check for sending RM_ADDRs for userspace PM
> in mptcp_pm_remove_addrs(), only send a RM_ADDR when the address is in the
> anno_list or conn_list.
>
> Fixes: 8b1c94da1e48 ("mptcp: only send RM_ADDR in nl_cmd_remove")
> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
> ---
> net/mptcp/pm_netlink.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
> index 1529ec358815..bf4d96f6f99a 100644
> --- a/net/mptcp/pm_netlink.c
> +++ b/net/mptcp/pm_netlink.c
> @@ -1515,8 +1515,9 @@ void mptcp_pm_remove_addrs(struct mptcp_sock *msk, struct list_head *rm_list)
> 	struct mptcp_pm_addr_entry *entry;
>
> 	list_for_each_entry(entry, rm_list, list) {
> -		remove_anno_list_by_saddr(msk, &entry->addr);
> -		if (alist.nr < MPTCP_RM_IDS_MAX)
> +		if ((remove_anno_list_by_saddr(msk, &entry->addr) ||
> +		     lookup_subflow_by_saddr(&msk->conn_list, &entry->addr)) &&
> +		    alist.nr < MPTCP_RM_IDS_MAX)
> 			alist.ids[alist.nr++] = entry->addr.id;
> 	}

Looks good to me, thanks Geliang.

Reviewed-by: Mat Martineau <martineau@kernel.org>

Re: mptcp: add validity check for sending RM_ADDR: Tests Results

[MPTCP CI]

Hi Geliang,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: normal (except selftest_mptcp_join):
  - Unstable: 1 failed test(s): selftest_simult_flows 🔴:
  - Task: https://cirrus-ci.com/task/4609094967885824
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/4609094967885824/summary/summary.txt

- KVM Validation: debug (only selftest_mptcp_join):
  - Success! ✅:
  - Task: https://cirrus-ci.com/task/6297944828149760
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/6297944828149760/summary/summary.txt

- KVM Validation: normal (only selftest_mptcp_join):
  - Success! ✅:
  - Task: https://cirrus-ci.com/task/5734994874728448
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/5734994874728448/summary/summary.txt

- KVM Validation: debug (except selftest_mptcp_join):
  - Success! ✅:
  - Task: https://cirrus-ci.com/task/5172044921307136
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/5172044921307136/summary/summary.txt

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/f51f98faccc2


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-debug

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 (Tessares)

Re: [PATCH mptcp-net] mptcp: add validity check for sending RM_ADDR

[Matthieu Baerts]

Hi Geliang, Mat,

On 03/11/2023 13:31, Geliang Tang wrote:
> This patch adds the validity check for sending RM_ADDRs for userspace PM
> in mptcp_pm_remove_addrs(), only send a RM_ADDR when the address is in the
> anno_list or conn_list.

Thank you for the patch and the review!

Now in our tree (fixes for -net) with Mat's RvB tag:

New patches for t/upstream-net and t/upstream:
- 1df4971eb5ab: mptcp: add validity check for sending RM_ADDR
- Results: 4ce71da6e4a0..688025cbce11 (export-net)
- Results: 8f6ba7dc0295..15e4d31937fc (export)

Tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export-net/20231107T212152
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20231107T212152

Cheers,
Matt