mptcp: pm: userspace: make remove_addr_entry static

[PATCH next mptcp-next] mptcp: pm: userspace: make remove_addr_entry static

Posted by Matthieu Baerts (NGI0) 1 week, 1 day ago

Only used in pm_userspace.c.

While at it, use the mptcp_userspace_pm_ prefix, like most functions in
this file: that makes it clear it is specific to this userspace PM.

Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
 net/mptcp/pm_userspace.c | 7 ++++---
 net/mptcp/protocol.h     | 2 --
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index 8537fd75f73f..f723a134356f 100644
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -291,8 +291,9 @@ static int mptcp_userspace_pm_remove_id_zero_address(struct mptcp_sock *msk)
 	return err;
 }
 
-void mptcp_pm_remove_addr_entry(struct mptcp_sock *msk,
-				struct mptcp_pm_addr_entry *entry)
+static void
+mptcp_userspace_pm_remove_addr_entry(struct mptcp_sock *msk,
+				     struct mptcp_pm_addr_entry *entry)
 {
 	struct mptcp_rm_list alist = { .nr = 0 };
 	int anno_nr = 0;
@@ -350,7 +351,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)
 	list_del_rcu(&match->list);
 	spin_unlock_bh(&msk->pm.lock);
 
-	mptcp_pm_remove_addr_entry(msk, match);
+	mptcp_userspace_pm_remove_addr_entry(msk, match);
 
 	release_sock(sk);
 
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 2f5b2f671c44..70200e75facf 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -1149,8 +1149,6 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk,
 			   const struct mptcp_addr_info *addr,
 			   bool echo);
 int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_list);
-void mptcp_pm_remove_addr_entry(struct mptcp_sock *msk,
-				struct mptcp_pm_addr_entry *entry);
 
 /* the default path manager, used in mptcp_pm_unregister */
 extern struct mptcp_pm_ops mptcp_pm_kernel;

---
base-commit: f393de6a43c333c11fbecdd76fa4fa3cc06aa834
change-id: 20260807-mptcp-pm-user-remove_addr_entry-bcf1a456d0f8

Best regards,
--  
Matthieu Baerts (NGI0) <matttbe@kernel.org>

Re: [PATCH next mptcp-next] mptcp: pm: userspace: make remove_addr_entry static

Posted by Geliang Tang 1 week ago

Hi Matt,

On Fri, 2026-08-07 at 12:51 +0200, Matthieu Baerts (NGI0) wrote:
> Only used in pm_userspace.c.
> 
> While at it, use the mptcp_userspace_pm_ prefix, like most functions
> in
> this file: that makes it clear it is specific to this userspace PM.

Looks good!

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

Thanks,
-Geliang

> 
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> ---
>  net/mptcp/pm_userspace.c | 7 ++++---
>  net/mptcp/protocol.h     | 2 --
>  2 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
> index 8537fd75f73f..f723a134356f 100644
> --- a/net/mptcp/pm_userspace.c
> +++ b/net/mptcp/pm_userspace.c
> @@ -291,8 +291,9 @@ static int
> mptcp_userspace_pm_remove_id_zero_address(struct mptcp_sock *msk)
>  	return err;
>  }
>  
> -void mptcp_pm_remove_addr_entry(struct mptcp_sock *msk,
> -				struct mptcp_pm_addr_entry *entry)
> +static void
> +mptcp_userspace_pm_remove_addr_entry(struct mptcp_sock *msk,
> +				     struct mptcp_pm_addr_entry
> *entry)
>  {
>  	struct mptcp_rm_list alist = { .nr = 0 };
>  	int anno_nr = 0;
> @@ -350,7 +351,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb,
> struct genl_info *info)
>  	list_del_rcu(&match->list);
>  	spin_unlock_bh(&msk->pm.lock);
>  
> -	mptcp_pm_remove_addr_entry(msk, match);
> +	mptcp_userspace_pm_remove_addr_entry(msk, match);
>  
>  	release_sock(sk);
>  
> diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
> index 2f5b2f671c44..70200e75facf 100644
> --- a/net/mptcp/protocol.h
> +++ b/net/mptcp/protocol.h
> @@ -1149,8 +1149,6 @@ int mptcp_pm_announce_addr(struct mptcp_sock
> *msk,
>  			   const struct mptcp_addr_info *addr,
>  			   bool echo);
>  int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct
> mptcp_rm_list *rm_list);
> -void mptcp_pm_remove_addr_entry(struct mptcp_sock *msk,
> -				struct mptcp_pm_addr_entry *entry);
>  
>  /* the default path manager, used in mptcp_pm_unregister */
>  extern struct mptcp_pm_ops mptcp_pm_kernel;
> 
> ---
> base-commit: f393de6a43c333c11fbecdd76fa4fa3cc06aa834
> change-id: 20260807-mptcp-pm-user-remove_addr_entry-bcf1a456d0f8
> 
> Best regards,
> --  
> Matthieu Baerts (NGI0) <matttbe@kernel.org>
>

Re: [PATCH next mptcp-next] mptcp: pm: userspace: make remove_addr_entry static

Posted by Matthieu Baerts 5 days, 6 hours ago

Hi Geliang,

On 08/08/2026 06:47, Geliang Tang wrote:
> Hi Matt,
> 
> On Fri, 2026-08-07 at 12:51 +0200, Matthieu Baerts (NGI0) wrote:
>> Only used in pm_userspace.c.
>>
>> While at it, use the mptcp_userspace_pm_ prefix, like most functions
>> in
>> this file: that makes it clear it is specific to this userspace PM.
> 
> Looks good!
> 
>     Reviewed-by: Geliang Tang <geliang@kernel.org>

Thank you for the review!

Now in our tree:

New patches for t/upstream:
- e3681f8bf822: mptcp: pm: userspace: make remove_addr_entry static
- Results: 60c67cc44648..9594adeb3fc7 (export)

Tests are now in progress:

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

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

Re: [PATCH next mptcp-next] mptcp: pm: userspace: make remove_addr_entry static

Posted by MPTCP CI 1 week, 1 day ago

Hi Matthieu,

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): Success! ✅
- KVM Validation: normal (only selftest_mptcp_join): Success! ✅
- KVM Validation: debug (except selftest_mptcp_join): Success! ✅
- KVM Validation: debug (only selftest_mptcp_join): 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/31173477284

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


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)