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;
Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates
 12.22.5.234 as permitted sender) receiver=protection.outlook.com;
 client-ip=12.22.5.234; helo=mail.nvidia.com; pr=C
References: <f4afce5ab0318617f3866b85274be52542d59b32.1660211614.git.petrm@nvidia.com>
User-agent: mu4e 1.6.6; emacs 28.1
From:   Petr Machata <petrm@nvidia.com>
To:     Petr Machata <petrm@nvidia.com>
CC:     "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>,
        Vadim Pasternak <vadimp@nvidia.com>,
        "Ido Schimmel" <idosch@nvidia.com>, Jiri Pirko <jiri@nvidia.com>
Subject: Re: [PATCH net] mlxsw: minimal: Fix deadlock in ports creation
Date:   Thu, 11 Aug 2022 13:44:17 +0200
In-Reply-To: <f4afce5ab0318617f3866b85274be52542d59b32.1660211614.git.petrm@nvidia.com>
Message-ID: <87wnbf57bw.fsf@nvidia.com>
MIME-Version: 1.0
Content-Type: text/plain
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2022 11:48:57.9239
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 15e1a9ff-109b-4885-73c4-08da7b8f79d8
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[12.22.5.234];Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT063.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6867
X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=no 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

CC'ing Jiri, which I forgot to do.

Petr Machata <petrm@nvidia.com> writes:

> From: Vadim Pasternak <vadimp@nvidia.com>
>
> Drop devl_lock() / devl_unlock() from ports creation and removal flows
> since the devlink instance lock is now taken by mlxsw_core.
>
> Fixes: 72a4c8c94efa ("mlxsw: convert driver to use unlocked devlink API during init/fini")
> Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
> Signed-off-by: Ido Schimmel <idosch@nvidia.com>
> Signed-off-by: Petr Machata <petrm@nvidia.com>
> ---
>  drivers/net/ethernet/mellanox/mlxsw/minimal.c | 7 -------
>  1 file changed, 7 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlxsw/minimal.c b/drivers/net/ethernet/mellanox/mlxsw/minimal.c
> index d9bf584234a6..bb1cd4bae82e 100644
> --- a/drivers/net/ethernet/mellanox/mlxsw/minimal.c
> +++ b/drivers/net/ethernet/mellanox/mlxsw/minimal.c
> @@ -328,7 +328,6 @@ static void mlxsw_m_port_module_unmap(struct mlxsw_m *mlxsw_m, u8 module)
>  static int mlxsw_m_ports_create(struct mlxsw_m *mlxsw_m)
>  {
>  	unsigned int max_ports = mlxsw_core_max_ports(mlxsw_m->core);
> -	struct devlink *devlink = priv_to_devlink(mlxsw_m->core);
>  	u8 last_module = max_ports;
>  	int i;
>  	int err;
> @@ -357,7 +356,6 @@ static int mlxsw_m_ports_create(struct mlxsw_m *mlxsw_m)
>  	}
>  
>  	/* Create port objects for each valid entry */
> -	devl_lock(devlink);
>  	for (i = 0; i < mlxsw_m->max_ports; i++) {
>  		if (mlxsw_m->module_to_port[i] > 0) {
>  			err = mlxsw_m_port_create(mlxsw_m,
> @@ -367,7 +365,6 @@ static int mlxsw_m_ports_create(struct mlxsw_m *mlxsw_m)
>  				goto err_module_to_port_create;
>  		}
>  	}
> -	devl_unlock(devlink);
>  
>  	return 0;
>  
> @@ -377,7 +374,6 @@ static int mlxsw_m_ports_create(struct mlxsw_m *mlxsw_m)
>  			mlxsw_m_port_remove(mlxsw_m,
>  					    mlxsw_m->module_to_port[i]);
>  	}
> -	devl_unlock(devlink);
>  	i = max_ports;
>  err_module_to_port_map:
>  	for (i--; i > 0; i--)
> @@ -390,10 +386,8 @@ static int mlxsw_m_ports_create(struct mlxsw_m *mlxsw_m)
>  
>  static void mlxsw_m_ports_remove(struct mlxsw_m *mlxsw_m)
>  {
> -	struct devlink *devlink = priv_to_devlink(mlxsw_m->core);
>  	int i;
>  
> -	devl_lock(devlink);
>  	for (i = 0; i < mlxsw_m->max_ports; i++) {
>  		if (mlxsw_m->module_to_port[i] > 0) {
>  			mlxsw_m_port_remove(mlxsw_m,
> @@ -401,7 +395,6 @@ static void mlxsw_m_ports_remove(struct mlxsw_m *mlxsw_m)
>  			mlxsw_m_port_module_unmap(mlxsw_m, i);
>  		}
>  	}
> -	devl_unlock(devlink);
>  
>  	kfree(mlxsw_m->module_to_port);
>  	kfree(mlxsw_m->ports);