From patchwork Mon Jan 11 12:17:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Frederic Sowa X-Patchwork-Id: 565788 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0F75B1402ED for ; Mon, 11 Jan 2016 23:18:27 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=stressinduktion.org header.i=@stressinduktion.org header.b=VzmoykxG; dkim=pass (1024-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b=D58zkJWD; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932828AbcAKMRo (ORCPT ); Mon, 11 Jan 2016 07:17:44 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:48500 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752006AbcAKMRm (ORCPT ); Mon, 11 Jan 2016 07:17:42 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 16A6C20B58 for ; Mon, 11 Jan 2016 07:17:42 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Mon, 11 Jan 2016 07:17:42 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= stressinduktion.org; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=hvEBU LMtgOvLR0Wgx8P/VjfptAY=; b=VzmoykxGvLobYiwzPOxDHBjJDrO2aoff64AFq HvKZVWxiGI0w39GdVOU+0hN0sf6czon8epzwklHy+r59AUWVWlqduFvH82A9JVeK vANo1QMby/n0u2NUbxW9e0L6lPJI+P0NWNIhoKen0y5zt8foW82+XYg9QQIaaa79 w3G4qg= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=hvEB ULMtgOvLR0Wgx8P/VjfptAY=; b=D58zkJWDyXXlCNurm/M87OVjiJpEs4rOxNzW kiULgoRInPQ53Hell+WFwqrX7NRajRJLiGm2BxxLG7Dk23g+k/JpFq62cvSAMXmw IvnvvPBezsdq/VmCJLP225OCd8bENpSsyepFeFI/Z4+NTx4ynNVjVltz1Rp+8Vl1 fjIS6CY= X-Sasl-enc: 7TTuDgEA4q8mQ0Uy1d45Esf2fpMqsnEuPOp1St+G0Ng6 1452514661 Received: from z.localhost.localdomain (unknown [217.192.177.51]) by mail.messagingengine.com (Postfix) with ESMTPA id 68AFFC00017; Mon, 11 Jan 2016 07:17:41 -0500 (EST) From: Hannes Frederic Sowa To: netdev@vger.kernel.org Cc: jesse@kernel.org, Eugenia Emantayev Subject: [PATCH net-next v5 02/10] mlx4: add rtnl lock protection in mlx4_en_restart Date: Mon, 11 Jan 2016 13:17:23 +0100 Message-Id: <1452514651-15445-3-git-send-email-hannes@stressinduktion.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1452514651-15445-1-git-send-email-hannes@stressinduktion.org> References: <1452514651-15445-1-git-send-email-hannes@stressinduktion.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org I don't really understand the use of the state_lock. Can't it be simply replaced by rtnl_lock? It seems a lot of current users depend on rtnl_lock anyway. Anyway, fix this up for the moment. Cc: Eugenia Emantayev Signed-off-by: Hannes Frederic Sowa --- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index 0c7e3f69a73bb6..94abd0843901cf 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -1846,6 +1846,7 @@ static void mlx4_en_restart(struct work_struct *work) en_dbg(DRV, priv, "Watchdog task called for port %d\n", priv->port); + rtnl_lock(); mutex_lock(&mdev->state_lock); if (priv->port_up) { mlx4_en_stop_port(dev, 1); @@ -1853,6 +1854,7 @@ static void mlx4_en_restart(struct work_struct *work) en_err(priv, "Failed restarting port %d\n", priv->port); } mutex_unlock(&mdev->state_lock); + rtnl_unlock(); } static void mlx4_en_clear_stats(struct net_device *dev)