From patchwork Mon Apr 18 19:19:43 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: 611870 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 3qpdJS1gfzz9sDb for ; Tue, 19 Apr 2016 05:20:08 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=stressinduktion.org header.i=@stressinduktion.org header.b=JWo419Bd; dkim=pass (1024-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b=VcVEsoZ3; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751901AbcDRTUE (ORCPT ); Mon, 18 Apr 2016 15:20:04 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:55889 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751525AbcDRTUB (ORCPT ); Mon, 18 Apr 2016 15:20:01 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 0568A20EF7 for ; Mon, 18 Apr 2016 15:20:01 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute3.internal (MEProxy); Mon, 18 Apr 2016 15:20:01 -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=h5khg RQcLaOg7yUmNp/f8L1w4lQ=; b=JWo419BdlNhZbudNSpYjYmG8Milk1bt9TcPUD lEjRzS+pVp69QU3ILq8T9yF8j5KtnmI+TuE06J5ihBe0COUcZVtOkK3iGQgg1qdO tmAqUoOSt+U8rdyUp1Cp5HIdXjD6el9rbBS7oP7r6527M/pZI47Nj9FQgV+TlZRJ dAO830= 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=h5kh gRQcLaOg7yUmNp/f8L1w4lQ=; b=VcVEsoZ3VH/lOPSSO9Z6XnPgfAko7by5+zND 9wD8EMK+IQxh3h5RedG6N1LV9rn6NwFW93zBpx9ZW1Fp8uKPdmr9YvfN87GTuaOT +OdBvMkabkDSgsC66eWfEG9uiFAz5Ud+4GYsHv+myM+OchpBSMCwoIjwYzP/i2lB gxehN8s= X-Sasl-enc: 76UzWcho33P6YcLufctBw9/SdoH5CmaNA9HFKOrFKpmG 1461007200 Received: from z.localhost.localdomain (unknown [213.55.184.201]) by mail.messagingengine.com (Postfix) with ESMTPA id 5244DC00014; Mon, 18 Apr 2016 15:19:58 -0400 (EDT) From: Hannes Frederic Sowa To: netdev@vger.kernel.org Cc: jesse@kernel.org, Jeff Kirsher , Jesse Brandeburg , Shannon Nelson , Carolyn Wyborny , Don Skidmore , Bruce Allan , John Ronciak , Mitch Williams Subject: [PATCH net-next 2/7] fm10k: protect fm10k_open in fm10k_io_resume with rtnl_lock Date: Mon, 18 Apr 2016 21:19:43 +0200 Message-Id: <1461007188-1603-3-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 fm10k_open requires rtnl_lock to be held. Cc: Jeff Kirsher Cc: Jesse Brandeburg Cc: Shannon Nelson Cc: Carolyn Wyborny Cc: Don Skidmore Cc: Bruce Allan Cc: John Ronciak Cc: Mitch Williams Signed-off-by: Hannes Frederic Sowa --- drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c index f0992950e228eb..04304d9a633935 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c @@ -2362,8 +2362,10 @@ static void fm10k_io_resume(struct pci_dev *pdev) /* reset clock */ fm10k_ts_reset(interface); + rtnl_lock(); if (netif_running(netdev)) err = fm10k_open(netdev); + rtnl_unlock(); /* final check of hardware state before registering the interface */ err = err ? : fm10k_hw_ready(interface);