Re: [PATCH mptcp-next v2 5/8] mptcp: change info of get_addr as const

[Matthieu Baerts <matttbe@kernel.org>]

Hi Geliang,

On 13/12/2024 08:35, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
> 
> get_addr() interfaces will be invoked by dump_addr(), which using const
> parameters 'info', so this patch changes 'info' parameters of get_addr()
> as const too.
> 
> Some adaptations are also needed. No longer use genl_info_pm_nl() because
> it doesn't accept a 'const' variable, but that's OK to get pernet via
> genl_info_net().

(...)

> --- a/net/mptcp/pm_netlink.c
> +++ b/net/mptcp/pm_netlink.c
> @@ -1763,12 +1763,15 @@ int mptcp_nl_fill_addr(struct sk_buff *skb,
>  }
>  
>  int mptcp_pm_nl_get_addr(u8 id, struct mptcp_pm_addr_entry *addr,
> -			 struct genl_info *info)
> +			 const struct genl_info *info)
>  {
> -	struct pm_nl_pernet *pernet = genl_info_pm_nl(info);
> +	struct net *net = genl_info_net(info);
>  	struct mptcp_pm_addr_entry *entry;
> +	struct pm_nl_pernet *pernet;
>  	int ret = -EINVAL;
>  
> +	pernet = pm_nl_get_pernet(net);

A small detail if you have something anything to change: maybe the 'net'
variable is not needed, and instead of 3 lines, you can have it in 1:

  struct pm_nl_pernet *pernet = pm_nl_get_pernet(genl_info_net(info));

> +
>  	rcu_read_lock();
>  	entry = __lookup_addr_by_id(pernet, id);
>  	if (entry) {

(...)

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