From patchwork Thu Apr 5 15:11:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Poirier X-Patchwork-Id: 150973 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 D08D0B7000 for ; Fri, 6 Apr 2012 01:12:30 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755120Ab2DEPLj (ORCPT ); Thu, 5 Apr 2012 11:11:39 -0400 Received: from mail-gy0-f174.google.com ([209.85.160.174]:52161 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755099Ab2DEPLh (ORCPT ); Thu, 5 Apr 2012 11:11:37 -0400 Received: by ghrr11 with SMTP id r11so741369ghr.19 for ; Thu, 05 Apr 2012 08:11:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=v6VRlzOiaaFcKqedZYcmmkKx+xVvJp83hydIcOpKExo=; b=gmSFINHNnTUr5oKGYQm5OkOT4KISvuVtloEjn7FSBRpuVFrdqMSd0puXlcHBMRYmTP w8OZ5qTWd0gHeT/fvy3+nnNX8HAByOF2NeGh4yFlTaRbfUTCi/6EcyqbQJOusyqH5w5w xU1+Q+5LS3+JtofJMma2UjJhRr5uNxj8siM/3dpCqhhuG+coabjZ2mkNbQVRkHMthjX5 RlFMC4y0XlGqh+cpJQZRZg+fz6mrtRlL3vv8rN/7/mWojm5gz45UMsBNHt7D2YyfHi2v wJBr+/VsT4Qd1w7DzPEXxMAp8D/8fngwJC0+LYR3j2IkQ1E8maNGLEq6g4DTpV4Z4w2w Ol5Q== Received: by 10.50.168.41 with SMTP id zt9mr1967864igb.19.1333638695698; Thu, 05 Apr 2012 08:11:35 -0700 (PDT) Received: from localhost.localdomain (modemcable121.56-203-24.mc.videotron.ca. [24.203.56.121]) by mx.google.com with ESMTPS id gr1sm7578766igc.1.2012.04.05.08.11.32 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Apr 2012 08:11:34 -0700 (PDT) From: Benjamin Poirier To: Jeff Kirsher Cc: Alex Duyck , Bruce Allan , Carolyn Wyborny , "David S. Miller" , Don Skidmore , e1000-devel@lists.sourceforge.net, Emil Tantilov , Eric Dumazet , Greg Rose , Jesse Brandeburg , John Fastabend , John Ronciak , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Peter P Waskiewicz Jr Subject: [PATCH 2/2] ixgbe: add missing rtnl_lock in PM resume path Date: Thu, 5 Apr 2012 11:11:04 -0400 Message-Id: <1333638664-17062-2-git-send-email-bpoirier@suse.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1333638664-17062-1-git-send-email-bpoirier@suse.de> References: <1333638664-17062-1-git-send-email-bpoirier@suse.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Upon resume from standby, ixgbe may trigger the ASSERT_RTNL() in netif_set_real_num_tx_queues(). The call stack is: netif_set_real_num_tx_queues ixgbe_set_num_queues ixgbe_init_interrupt_scheme ixgbe_resume Signed-off-by: Benjamin Poirier --- Unlike patch 1 for igb, we cannot lock rtnl closer to the point where netif_set_real_num_tx_queues() is called because ixgbe_init_interrupt_scheme() is also called by the dcb code, already under rtnl. --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 3e26b1f..ff6edab 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -4836,7 +4836,9 @@ static int ixgbe_resume(struct pci_dev *pdev) pci_wake_from_d3(pdev, false); + rtnl_lock(); err = ixgbe_init_interrupt_scheme(adapter); + rtnl_unlock(); if (err) { e_dev_err("Cannot initialize interrupts for device\n"); return err;