From patchwork Mon Apr 18 19:19:44 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: 611871 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 3qpdJX4fGmz9sDb for ; Tue, 19 Apr 2016 05:20:12 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=stressinduktion.org header.i=@stressinduktion.org header.b=TT6/3Vcd; dkim=pass (1024-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b=ZeeTv75v; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751614AbcDRTUH (ORCPT ); Mon, 18 Apr 2016 15:20:07 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:37599 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751658AbcDRTUE (ORCPT ); Mon, 18 Apr 2016 15:20:04 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 5447820DAF for ; Mon, 18 Apr 2016 15:20:03 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 18 Apr 2016 15:20:03 -0400 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=dwY3k FxRV0nZpIhkIb6zvckJAKE=; b=TT6/3VcdlkcTocxHQMNceHHfYC9wYeUroS+Hk 3kBNtNy1c2hGCyM+KYb3Hq4vdL1M0ARiEC2pOp3gloIVhj7QvUdEYCDuJL5LV3an mUJ9sbpdYG136r5CbANCeTdt7mkADw+J2g7TyrskDxxIcxWGKgOmgetjQpkEjhTO 33VUWg= 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=dwY3 kFxRV0nZpIhkIb6zvckJAKE=; b=ZeeTv75vDZVcAkLaiUjmNXGA2wEV6Rwc7+GY k29STunPbh69iOrLIRR5bkHAI6W73YdzNM2tbwZLdQI7bDkDnPPcO2F2OaZEzxTb J5O8+c7veeeukbFOL6SLr5XPWoMp6PsDo0iC6QePHvXgE2CxjxjFbaN09QTh14Nv 0a8r6nw= X-Sasl-enc: aRvokD5LEx7tRur6DjWrkMjGtuWXmI5ep580ngsvFJrU 1461007202 Received: from z.localhost.localdomain (unknown [213.55.184.201]) by mail.messagingengine.com (Postfix) with ESMTPA id 3021BC00014; Mon, 18 Apr 2016 15:20:00 -0400 (EDT) From: Hannes Frederic Sowa To: netdev@vger.kernel.org Cc: jesse@kernel.org, Eugenia Emantayev , Yishai Hadas Subject: [PATCH net-next 3/7] mlx4: protect mlx4_en_start_port in mlx4_en_restart with rtnl_lock Date: Mon, 18 Apr 2016 21:19:44 +0200 Message-Id: <1461007188-1603-4-git-send-email-hannes@stressinduktion.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1461007188-1603-1-git-send-email-hannes@stressinduktion.org> References: <1461007188-1603-1-git-send-email-hannes@stressinduktion.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org mlx4_en_start_port requires rtnl_lock to be held. Cc: Eugenia Emantayev Cc: Yishai Hadas 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 b4b258c8ca47d4..8bd143dda95d11 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -1856,6 +1856,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); @@ -1863,6 +1864,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)