From patchwork Tue May 12 17:45:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 27099 Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 3B838B7069 for ; Wed, 13 May 2009 03:46:18 +1000 (EST) Received: by ozlabs.org (Postfix) id 23E18DDF9B; Wed, 13 May 2009 03:46:18 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id B9B5FDDF90 for ; Wed, 13 May 2009 03:46:17 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753880AbZELRp7 (ORCPT ); Tue, 12 May 2009 13:45:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753524AbZELRp7 (ORCPT ); Tue, 12 May 2009 13:45:59 -0400 Received: from qmta12.emeryville.ca.mail.comcast.net ([76.96.27.227]:42306 "EHLO QMTA12.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752168AbZELRp6 (ORCPT ); Tue, 12 May 2009 13:45:58 -0400 Received: from OMTA06.emeryville.ca.mail.comcast.net ([76.96.30.51]) by QMTA12.emeryville.ca.mail.comcast.net with comcast id qcQ51b00616AWCUAChm0Xr; Tue, 12 May 2009 17:46:00 +0000 Received: from localhost.localdomain ([63.64.152.142]) by OMTA06.emeryville.ca.mail.comcast.net with comcast id qhll1b00R34bfcX8ShloPZ; Tue, 12 May 2009 17:45:58 +0000 From: Jeff Kirsher Subject: [STABLE 2.6.29.y PATCH] e1000: fix virtualization bug To: chrisw@sous-sol.org, greg@kroah.com Cc: stable@kernel.org, netdev@vger.kernel.org Date: Tue, 12 May 2009 10:45:44 -0700 Message-ID: <20090512174544.20466.52936.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jesse Brandeburg [STABLE] backport upstream commit e151a60ad1faffb6241cf7eb6846353df1f33a32 a recent fix to e1000 (commit 15b2bee2) caused KVM/QEMU/VMware based virtualized e1000 interfaces to begin failing when resetting. This is because the driver in a virtual environment doesn't get to run instructions *AT ALL* when an interrupt is asserted. The interrupt code runs immediately and this recent bug fix allows an interrupt to be possible when the interrupt handler will reject it (due to the new code), when being called from any path in the driver that holds the E1000_RESETTING flag. the driver should use the __E1000_DOWN flag instead of the __E1000_RESETTING flag to prevent interrupt execution while reconfiguring the hardware. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: "David S. Miller" --- drivers/net/e1000/e1000_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 6bd63cc..d436e27 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -3712,7 +3712,7 @@ static irqreturn_t e1000_intr(int irq, void *data) struct e1000_hw *hw = &adapter->hw; u32 rctl, icr = er32(ICR); - if (unlikely((!icr) || test_bit(__E1000_RESETTING, &adapter->flags))) + if (unlikely((!icr) || test_bit(__E1000_DOWN, &adapter->flags))) return IRQ_NONE; /* Not our interrupt */ /* IMS will not auto-mask if INT_ASSERTED is not set, and if it is