From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 432F0C43215 for ; Tue, 19 Nov 2019 06:12:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0B78C20692 for ; Tue, 19 Nov 2019 06:12:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574143940; bh=6icoMpvlZKEX/tSX+7s6u8Q+/PUACauLc2VxSg+cLuE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=F9HgWlzJOQozgQIn/1SkjeJPf6LyrfrR15SmmhQjUfFHjIsm6V4U1UkV8mYOFwFoR 5qD9vDvUUZA00dNTgBbYImncDO/LhoLKzfXwl64tLTyPMvt/DC9LrE6+hTdMPGVO4O WTar+mLNfkLvJgXMV/OOVyv5/qMBO9jIQEb+8RWw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727744AbfKSFWg (ORCPT ); Tue, 19 Nov 2019 00:22:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:37918 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727777AbfKSFWf (ORCPT ); Tue, 19 Nov 2019 00:22:35 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5236B21939; Tue, 19 Nov 2019 05:22:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574140954; bh=6icoMpvlZKEX/tSX+7s6u8Q+/PUACauLc2VxSg+cLuE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ME+7/0mXu5SrXR1V3NnfZaIasaJ5/6dO2yuHeffF87vTpZLKndkMxkt4Q3vkppqnT qAAa0yMjO+B8j2wv5QllzMamlim4FzZ6BToBtB12Zo23TFBNbhKWR4BjPt/S0Nd86I Ej1f2Bw/ma+aYnV4xYsSeh3rJlVh3PUFqbUo0w3o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shalom Toledo , Jiri Pirko , "David S. Miller" Subject: [PATCH 5.3 05/48] mlxsw: core: Enable devlink reload only on probe Date: Tue, 19 Nov 2019 06:19:25 +0100 Message-Id: <20191119050951.850109484@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119050946.745015350@linuxfoundation.org> References: <20191119050946.745015350@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jiri Pirko [ Upstream commit 73a533ecf0af5f73ff72dd7c96d1c8598ca93649 ] Call devlink enable only during probe time and avoid deadlock during reload. Reported-by: Shalom Toledo Fixes: 5a508a254bed ("devlink: disallow reload operation during device cleanup") Signed-off-by: Jiri Pirko Tested-by: Shalom Toledo Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlxsw/core.c | 5 +++-- net/core/devlink.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) --- a/drivers/net/ethernet/mellanox/mlxsw/core.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core.c @@ -1128,10 +1128,11 @@ __mlxsw_core_bus_device_register(const s if (err) goto err_thermal_init; - if (mlxsw_driver->params_register) { + if (mlxsw_driver->params_register) devlink_params_publish(devlink); + + if (!reload) devlink_reload_enable(devlink); - } return 0; --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -5559,7 +5559,7 @@ EXPORT_SYMBOL_GPL(devlink_register); void devlink_unregister(struct devlink *devlink) { mutex_lock(&devlink_mutex); - WARN_ON(devlink_reload_supported(devlink) && + WARN_ON(devlink->ops->reload && devlink->reload_enabled); devlink_notify(devlink, DEVLINK_CMD_DEL); list_del(&devlink->list);