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 13:48:58 +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 2/4] mptcp: unify pm get_local_id interfaces
Message-ID: <ZIMRqh1uMp8K57CK@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-2-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-2-b301717c9ff5@tessares.net>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VpP6Oe7j2ljJnJs7ejeyXglL2z5eYGGxOuXu1Vgw9dirSNuUTwYERtm+fBe2?=
 =?us-ascii?Q?FuYp8JJl5AELHooXbFM69bIjLyQlfZNPYLY+AhktzzmQC73f/B/By8C0+Kbp?=
 =?us-ascii?Q?Cxs7ylSSC2bSTbSJhKzWSpw1Dduxe6GZgPzUFmwmzM02WGQ3+whu8+ppWSPq?=
 =?us-ascii?Q?aaUAG5AkdNacZ8f0vvLUZvMrdjDqEpv38XnxJnzME7mYgNCkTAAqhEm+z5+v?=
 =?us-ascii?Q?jD0MSzxlWMxZAZo2Z5v1DlY8sdOObwMA1+143/OG0XJQLYrFJx8HIzLI/1kO?=
 =?us-ascii?Q?BBapGeqqJdNWoAPsnjkA37Im66GIwqHEssQOYgzqiXgZ8jEx3za1Jo+5CJKz?=
 =?us-ascii?Q?faSCNVWZ0lr/ox0ozN02B8bcP34fvQbyAuLwpMCIMi+ceWg7itZ2sTzVFZQ4?=
 =?us-ascii?Q?Dy4uGO0F9RB3XCHBjyzXQM4pwnrSBUofxPtc6FKQGQi6zPFI5VnAzrQXE03g?=
 =?us-ascii?Q?cPSQ18Xp9ORqeaLXYotod9u9TBDhRMBxQbYirgALVwANwiykW6je5/tdHLfZ?=
 =?us-ascii?Q?8W6n5QrbINLeTl5eKYPR1z5/hT8NeMr/VKtV60bZ9oOYCvKOmg51PDlWHUrY?=
 =?us-ascii?Q?w+qcj1VB4YOkhgTAkz4/CkQoFcAjCf0SsvZoiGSM5NcuwAcPpfmQFSuJu2sH?=
 =?us-ascii?Q?NV/TvWYfqDzD4/ZH9YAYCsKIlilmy0Eops1JZoNMMaHOBYr8axf7nPd3SOc7?=
 =?us-ascii?Q?bMU9bVFYyUQztDlmt7pD4/JGejPgZxJdgjpIpTElw1uGu1PicVA/ehdVQyY0?=
 =?us-ascii?Q?u7petd7VvK60AX0vTiZXIZaA62xCGvsVJojW2nRs7AQJ/R5qZg10LCm5gp91?=
 =?us-ascii?Q?R9MBkVY1cb6jR9jQ/S9cu+79vtMwM/FHXKvKDghDLUtACW3heM/zJfiK6dmx?=
 =?us-ascii?Q?d63rFUqTi7+iUw81Z2jElSs9+Y21N4NqOOdZ++vi4HBzYUjo6qBIA44Ndrlo?=
 =?us-ascii?Q?v9D+weHVxNzrgMxf0G9ailCFhcFpJ5q3d1oS+ocdf/k7VMSGPpceYEyCK+4g?=
 =?us-ascii?Q?wTtNl0u6Iq266sV9RNa5fCaU8ACUUGXnDent6rhuBsCQZac0etVOruLl68C1?=
 =?us-ascii?Q?k8SYCSbHoQy9A1e4AzZFk4e73unzUIC61Gk/hAWCnbMT6yc7Be8Nd2le79Uj?=
 =?us-ascii?Q?LuHFPP4IrJMhSFW6H96CiYwmvGaZM+VPJsjig2E3lPdOkkF5MS1ivBXeilGQ?=
 =?us-ascii?Q?gfe2YwqIzaFRWflGFLkqEOjLBsIy6ldMTBHO1yk1jhkNQU0hi0jOiYgRSEWA?=
 =?us-ascii?Q?dTGv3bUcUJRedmRzNZKtGfL9y8E+0TqIRLEJScY9/C0btrKYV4IQ1IlMxOUm?=
 =?us-ascii?Q?125eG5cYnf5Gxw/0hcbCnw1KXfFKqzIyVBI2kp9qIl6eyphcvqoK7713PfLe?=
 =?us-ascii?Q?kU4MkBvESRlWxozlP+JaKmN0HOcMKs2qXEPqggvB1jJpmw4hEPHgBm2qn5SN?=
 =?us-ascii?Q?xbkdlw+GWGCGdtIDjPg4Z911CcuY4FFry08NRlCcTJjYQrbbwr8CuMk5cQjJ?=
 =?us-ascii?Q?dcFg6YWzXCRec5nnutCdl4BzRgb8jkFB3I3PyDhOHPjgy8C8ZDcfwJFYbYgR?=
 =?us-ascii?Q?zpZQFOraVif7jGeHTU+yzDU9gnH8jllXWBxWedscgrx6uUjvvWg9gD3yVc5y?=
 =?us-ascii?Q?IQ=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: dc4e8b5d-b01b-445b-2db6-08db68dff33b
X-MS-Exchange-CrossTenant-AuthSource: SN7PR11MB7540.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2023 11:52:07.1850
 (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: GDZ5pWIwhEPlz0rvEFKdYkKFv0Sb3Pz0jDxl8R8rRji85iQc9gFAVAAVYy8yJqLQkVcyLk//R5bq0nihVKTx6rIFKqhbvs6uzw0ix3mGfs0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR11MB8342
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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:50PM +0200, Matthieu Baerts wrote:
> From: Geliang Tang <geliang.tang@suse.com>
> 
> This patch unifies the three PM get_local_id() interfaces:
> 
> mptcp_pm_nl_get_local_id() in mptcp/pm_netlink.c for the in-kernel PM and
> mptcp_userspace_pm_get_local_id() in mptcp/pm_userspace.c for the
> userspace PM.
> 
> They'll be switched in the common PM infterface mptcp_pm_get_local_id()
> in mptcp/pm.c based on whether mptcp_pm_is_userspace() or not.
> 
> Also put together the declarations of these three functions in protocol.h.
> 
> 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         | 18 +++++++++++++++++-
>  net/mptcp/pm_netlink.c | 22 +++-------------------
>  net/mptcp/protocol.h   |  2 +-
>  3 files changed, 21 insertions(+), 21 deletions(-)
> 
> diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
> index 7d03b5fd8200..5a027a46196c 100644
> --- a/net/mptcp/pm.c
> +++ b/net/mptcp/pm.c
> @@ -400,7 +400,23 @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
>  
>  int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)
>  {
> -	return mptcp_pm_nl_get_local_id(msk, skc);
> +	struct mptcp_addr_info skc_local;
> +	struct mptcp_addr_info msk_local;
> +
> +	if (WARN_ON_ONCE(!msk))
> +		return -1;
> +
> +	/* The 0 ID mapping is defined by the first subflow, copied into the msk
> +	 * addr
> +	 */
> +	mptcp_local_address((struct sock_common *)msk, &msk_local);
> +	mptcp_local_address((struct sock_common *)skc, &skc_local);
> +	if (mptcp_addresses_equal(&msk_local, &skc_local, false))
> +		return 0;
> +
> +	if (mptcp_pm_is_userspace(msk))
> +		return mptcp_userspace_pm_get_local_id(msk, &skc_local);
> +	return mptcp_pm_nl_get_local_id(msk, &skc_local);
>  }
>  
>  void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk)
> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
> index c55ed3dda0d8..315ad669eb3c 100644
> --- a/net/mptcp/pm_netlink.c
> +++ b/net/mptcp/pm_netlink.c
> @@ -1055,33 +1055,17 @@ static int mptcp_pm_nl_create_listen_socket(struct sock *sk,
>  	return 0;
>  }
>  
> -int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)
> +int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc)
>  {
>  	struct mptcp_pm_addr_entry *entry;
> -	struct mptcp_addr_info skc_local;
> -	struct mptcp_addr_info msk_local;
>  	struct pm_nl_pernet *pernet;
>  	int ret = -1;
>  
> -	if (WARN_ON_ONCE(!msk))
> -		return -1;
> -
> -	/* The 0 ID mapping is defined by the first subflow, copied into the msk
> -	 * addr
> -	 */
> -	mptcp_local_address((struct sock_common *)msk, &msk_local);
> -	mptcp_local_address((struct sock_common *)skc, &skc_local);
> -	if (mptcp_addresses_equal(&msk_local, &skc_local, false))
> -		return 0;
> -
> -	if (mptcp_pm_is_userspace(msk))
> -		return mptcp_userspace_pm_get_local_id(msk, &skc_local);
> -
>  	pernet = pm_nl_get_pernet_from_msk(msk);
>  
>  	rcu_read_lock();
>  	list_for_each_entry_rcu(entry, &pernet->local_addr_list, list) {
> -		if (mptcp_addresses_equal(&entry->addr, &skc_local, entry->addr.port)) {
> +		if (mptcp_addresses_equal(&entry->addr, skc, entry->addr.port)) {
>  			ret = entry->addr.id;
>  			break;
>  		}
> @@ -1095,7 +1079,7 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)
>  	if (!entry)
>  		return -ENOMEM;
>  
> -	entry->addr = skc_local;
> +	entry->addr = *skc;
>  	entry->addr.id = 0;
>  	entry->addr.port = 0;
>  	entry->ifindex = 0;
> diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
> index 6e6cffc04ced..8a2e01d10582 100644
> --- a/net/mptcp/protocol.h
> +++ b/net/mptcp/protocol.h
> @@ -916,13 +916,13 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, const struct sk_buff *skb,
>  bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
>  			     struct mptcp_rm_list *rm_list);
>  int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc);
> +int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc);
>  int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc);
>  
>  void __init mptcp_pm_nl_init(void);
>  void mptcp_pm_nl_work(struct mptcp_sock *msk);
>  void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk,
>  				     const struct mptcp_rm_list *rm_list);
> -int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc);
>  unsigned int mptcp_pm_get_add_addr_signal_max(const struct mptcp_sock *msk);
>  unsigned int mptcp_pm_get_add_addr_accept_max(const struct mptcp_sock *msk);
>  unsigned int mptcp_pm_get_subflows_max(const struct mptcp_sock *msk);
> 
> -- 
> 2.40.1
> 
>