netdev - Re: [PATCH net-next 3/4] mptcp: unify pm get_flags_and_ifindex_by

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <ZIMUyt2f2D+fiuGI@lincoln>
Date: Fri, 9 Jun 2023 14:02:18 +0200
From: Larysa Zaremba <larysa.zaremba@...el.com>
To: Matthieu Baerts <matthieu.baerts@...sares.net>
CC: <mptcp@...ts.linux.dev>, Mat Martineau <martineau@...nel.org>, "David S.
 Miller" <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>, "Jakub
 Kicinski" <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>,
	<netdev@...r.kernel.org>, <linux-kernel@...r.kernel.org>, Geliang Tang
	<geliang.tang@...e.com>
Subject: Re: [PATCH net-next 3/4] mptcp: unify pm get_flags_and_ifindex_by_id

On Thu, Jun 08, 2023 at 03:20:51PM +0200, Matthieu Baerts wrote:
> From: Geliang Tang <geliang.tang@...e.com>
> 
> This patch unifies the three PM get_flags_and_ifindex_by_id() interfaces:
> 
> mptcp_pm_nl_get_flags_and_ifindex_by_id() in mptcp/pm_netlink.c for the
> in-kernel PM and mptcp_userspace_pm_get_flags_and_ifindex_by_id() in
> mptcp/pm_userspace.c for the userspace PM.
> 
> They'll be switched in the common PM infterface
> mptcp_pm_get_flags_and_ifindex_by_id() in mptcp/pm.c based on whether
> mptcp_pm_is_userspace() or not.
> 
> Signed-off-by: Geliang Tang <geliang.tang@...e.com>
> Reviewed-by: Matthieu Baerts <matthieu.baerts@...sares.net>
> Signed-off-by: Matthieu Baerts <matthieu.baerts@...sares.net>

Reviewed-by: Larysa Zaremba <larysa.zaremba@...el.com>

> ---
>  net/mptcp/pm.c           | 14 ++++++++++++++
>  net/mptcp/pm_netlink.c   | 27 ++++++++-------------------
>  net/mptcp/pm_userspace.c |  3 ---
>  net/mptcp/protocol.h     |  2 ++
>  4 files changed, 24 insertions(+), 22 deletions(-)
> 
> diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
> index 5a027a46196c..2d04598dde05 100644
> --- a/net/mptcp/pm.c
> +++ b/net/mptcp/pm.c
> @@ -419,6 +419,20 @@ int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)
>  	return mptcp_pm_nl_get_local_id(msk, &skc_local);
>  }
>  
> +int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int id,
> +					 u8 *flags, int *ifindex)
> +{
> +	*flags = 0;
> +	*ifindex = 0;
> +
> +	if (!id)
> +		return 0;
> +
> +	if (mptcp_pm_is_userspace(msk))
> +		return mptcp_userspace_pm_get_flags_and_ifindex_by_id(msk, id, flags, ifindex);
> +	return mptcp_pm_nl_get_flags_and_ifindex_by_id(msk, id, flags, ifindex);
> +}
> +
>  void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk)
>  {
>  	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);
> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
> index 315ad669eb3c..e8b32d369f11 100644
> --- a/net/mptcp/pm_netlink.c
> +++ b/net/mptcp/pm_netlink.c
> @@ -1356,31 +1356,20 @@ static int mptcp_nl_cmd_add_addr(struct sk_buff *skb, struct genl_info *info)
>  	return ret;
>  }
>  
> -int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int id,
> -					 u8 *flags, int *ifindex)
> +int mptcp_pm_nl_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int id,
> +					    u8 *flags, int *ifindex)
>  {
>  	struct mptcp_pm_addr_entry *entry;
>  	struct sock *sk = (struct sock *)msk;
>  	struct net *net = sock_net(sk);
>  
> -	*flags = 0;
> -	*ifindex = 0;
> -
> -	if (id) {
> -		if (mptcp_pm_is_userspace(msk))
> -			return mptcp_userspace_pm_get_flags_and_ifindex_by_id(msk,
> -									      id,
> -									      flags,
> -									      ifindex);
> -
> -		rcu_read_lock();
> -		entry = __lookup_addr_by_id(pm_nl_get_pernet(net), id);
> -		if (entry) {
> -			*flags = entry->flags;
> -			*ifindex = entry->ifindex;
> -		}
> -		rcu_read_unlock();
> +	rcu_read_lock();
> +	entry = __lookup_addr_by_id(pm_nl_get_pernet(net), id);
> +	if (entry) {
> +		*flags = entry->flags;
> +		*ifindex = entry->ifindex;
>  	}
> +	rcu_read_unlock();
>  
>  	return 0;
>  }
> diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
> index 27a275805c06..e1df3a4a4f23 100644
> --- a/net/mptcp/pm_userspace.c
> +++ b/net/mptcp/pm_userspace.c
> @@ -85,9 +85,6 @@ int mptcp_userspace_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk,
>  {
>  	struct mptcp_pm_addr_entry *entry, *match = NULL;
>  
> -	*flags = 0;
> -	*ifindex = 0;
> -
>  	spin_lock_bh(&msk->pm.lock);
>  	list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) {
>  		if (id == entry->addr.id) {
> diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
> index 8a2e01d10582..607cbd2ccb98 100644
> --- a/net/mptcp/protocol.h
> +++ b/net/mptcp/protocol.h
> @@ -822,6 +822,8 @@ mptcp_lookup_anno_list_by_saddr(const struct mptcp_sock *msk,
>  int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk,
>  					 unsigned int id,
>  					 u8 *flags, int *ifindex);
> +int mptcp_pm_nl_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int id,
> +					    u8 *flags, int *ifindex);
>  int mptcp_userspace_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk,
>  						   unsigned int id,
>  						   u8 *flags, int *ifindex);
> 
> -- 
> 2.40.1
> 
>