Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 9 Jun 2023 14:02:18 +0200
From:   Larysa Zaremba <larysa.zaremba@intel.com>
To:     Matthieu Baerts <matthieu.baerts@tessares.net>
CC:     <mptcp@lists.linux.dev>, Mat Martineau <martineau@kernel.org>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        "Jakub Kicinski" <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, <netdev@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>,
        Geliang Tang <geliang.tang@suse.com>
Subject: Re: [PATCH net-next 3/4] mptcp: unify pm get_flags_and_ifindex_by_id
Message-ID: <ZIMUyt2f2D+fiuGI@lincoln>
References: <20230608-upstream-net-next-20230608-mptcp-unify-pm-interfaces-v1-0-b301717c9ff5@tessares.net>
 <20230608-upstream-net-next-20230608-mptcp-unify-pm-interfaces-v1-3-b301717c9ff5@tessares.net>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20230608-upstream-net-next-20230608-mptcp-unify-pm-interfaces-v1-3-b301717c9ff5@tessares.net>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?oY9qS6MlH8WY2xMqw2ZvnBx2lRAUfUX/E9/JeMbAVT0yFGRr2olPwopSsbN7?=
 =?us-ascii?Q?FHAIusmWZxq/xxmzIHkEI/464l2y0ofyjY/cbiHJciOwtqW4xTOTFaCEtL/A?=
 =?us-ascii?Q?i02xcw8LlBiJf7bscn0h1Yk5sDsKtytLnBEEZ2dCXOF52zCrB0uHkRowxLYt?=
 =?us-ascii?Q?1HjLLcLJM1ssmVAWyNvEAJ67ISq9wdmsvOLUsPaC6mQq/vQJWXPpm5rj0W1Z?=
 =?us-ascii?Q?L3Fnb41xfM62eEZnKo3eW6oIOk0U14nfi27Y/isZ1/YtczBpXkFRNqiQhdmp?=
 =?us-ascii?Q?7mXoV3LDefLMuqKJ0Oe/ACwOR2HCloSJzG0oVdGtXSUe20mfCIXoRKH/IIeT?=
 =?us-ascii?Q?uUmUC9CaDyhMceHsUf6SVHk3kGyNy/dVg5k8VKcbElrq0tLs6ZWZkE6Gth0i?=
 =?us-ascii?Q?9n7Vt0baT82VNsY5lXC622JH0n+SaxD06DakNLkAhovcMQAePySAEqcRITaX?=
 =?us-ascii?Q?VyNJk1McJP/GQrMzFl7QYmnRwZQYc6BEXh7IGq0pxhmzNQohyX0wziqoDpZL?=
 =?us-ascii?Q?62HASV1zilbvQBmsUiE8Pe26aPHhHfoFfyt2KQlGeqE9NfLzPTYZmzKWNyKL?=
 =?us-ascii?Q?V8GFe0USKURLN2gDw0v6UgJaShY+c/TQrQIbZHLz/7pAOe1fTRsGEiRXSiQT?=
 =?us-ascii?Q?mjix9BFn66NVrdCUF/EOPCd2laYQPowyV+bDlRIH08bFMb2UQE2TL5ieY+ia?=
 =?us-ascii?Q?Wn3v26JH+DBqh6F689bw3+xwm9DdOh3eW7Qxr0s/ZMYUzCe8M6tyVJ1Jnspb?=
 =?us-ascii?Q?aiNy8gS1m4VHDzHbJ2+zHQkkZlfblV/vTwnFje2CtEtkLwN5FIbl0rMJ+QBR?=
 =?us-ascii?Q?s+H/Iym113tBwrbxgQfan6Dxw4SoE4AasesLtlqw0RC5cti9/fPVe+QnHrlP?=
 =?us-ascii?Q?u0LZi2H5XBTEWhFxyJ/zRS/6G0ehb2mIGmiFNp+P0ZpYQ6drOI+JEnTYWs0e?=
 =?us-ascii?Q?ersrsUqja8ormB5dVt3kfViqRwC5mZ6N5/fGb/dw+d0IklHfzun6dtR472KM?=
 =?us-ascii?Q?ds4blyvpnC5tdHgMIPOjT1R2v6YfY2bVWePl+oLx4mjUutvYZ+X50k2n3vCN?=
 =?us-ascii?Q?W3zK9yggt2FQbYUqIqQXzGi6rjOZ+Mq6HJ80QOJmdoUNEIlMVzw3qTN9y0p0?=
 =?us-ascii?Q?39t8C03UJCFKUyw2pZFbXXsaxwAe3LcWAwBPQiLPY+eb4wlLyFotRYxZBfja?=
 =?us-ascii?Q?0ogm5X6oU1lGwX4d8JBccg8n0IPkNUkHzwgsdHdfPyQ9oWsvC2CvYzh44jRp?=
 =?us-ascii?Q?UFDAxJMeEYmbepObeC4YNGM1+hJDWD7Xw/RIAU4ESBi8rZ+W4CnoLBBKIJBg?=
 =?us-ascii?Q?Rdu3Gpjdzq97e72S4YlJBqqtS1ad3b75lB77JvRXhIzA+62kvvzZz3wYDjPS?=
 =?us-ascii?Q?Xm+Ai1lwE8Y+LUm5CiJcumqFN3KCw4XReVbVuyxcHAVrPGDCEaQWvQn7u/6D?=
 =?us-ascii?Q?4VEqZStSEQNMOQGPIqSxnp30VbfTWX7ytL7xbe12kvrQW8/3mr9+pn/J4rAC?=
 =?us-ascii?Q?oYOXnHmAWDlW3lG4ahPI3LjkaJj+elxkcKgOyqw/ZbmrekgHc13f3hIMMjm1?=
 =?us-ascii?Q?X2DLwmQc1zc/DQMP1Nlr4FMc1ffC5jw7zZzqXe421jrofOCD+8oXe8D5I5Dp?=
 =?us-ascii?Q?IQ=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 7f87c24c-40d4-4065-9788-08db68e1cf47
X-MS-Exchange-CrossTenant-AuthSource: SN7PR11MB7540.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2023 12:05:26.0621
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: hmmxvhFw8vp6M3xNA7eU5lMgwwHwQnLmB9GpPKfXX86lhSrUxaEbvCDhq/gBtG5Rhr3X+oG/j0HZK8aqQzwja5XRub88Qq78uSudx6pdymw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR11MB5667
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,
        SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Jun 08, 2023 at 03:20:51PM +0200, Matthieu Baerts wrote:
> From: Geliang Tang <geliang.tang@suse.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@suse.com>
> Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>

Reviewed-by: Larysa Zaremba <larysa.zaremba@intel.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
> 
>