Re: [PATCH mptcp-next v3 1/3] mptcp: remove duplicate sk_reset_timer call

[Matthieu Baerts <matttbe@kernel.org>]

Hi Geliang,

On 06/08/2025 05:17, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
> 
> sk_reset_timer() was called twice in mptcp_pm_alloc_anno_list. Simplify the
> code by using a 'goto' statement to eliminate the duplication.
> 
> Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
> ---
>  net/mptcp/pm.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
> index 5dec018fdda2..1330af6a2154 100644
> --- a/net/mptcp/pm.c
> +++ b/net/mptcp/pm.c
> @@ -348,7 +348,6 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk,
>  {
>  	struct mptcp_pm_add_entry *add_entry = NULL;
>  	struct sock *sk = (struct sock *)msk;
> -	struct net *net = sock_net(sk);
>  
>  	lockdep_assert_held(&msk->pm.lock);
>  
> @@ -358,9 +357,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk,
>  		if (WARN_ON_ONCE(mptcp_pm_is_kernel(msk)))
>  			return false;
>  
> -		sk_reset_timer(sk, &add_entry->add_timer,
> -			       jiffies + mptcp_get_add_addr_timeout(net));
> -		return true;
> +		goto out;

Good idea, but maybe better to have a more explicit label, e.g. reset_timer.

>  	}
>  
>  	add_entry = kmalloc(sizeof(*add_entry), GFP_ATOMIC);
> @@ -374,8 +371,9 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk,
>  	add_entry->retrans_times = 0;
>  
>  	timer_setup(&add_entry->add_timer, mptcp_pm_add_timer, 0);
> +out:
>  	sk_reset_timer(sk, &add_entry->add_timer,
> -		       jiffies + mptcp_get_add_addr_timeout(net));
> +		       jiffies + mptcp_get_add_addr_timeout(sock_net(sk)));
>  
>  	return true;
>  }

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