rpms/kernel/devel linux-2.6-e100-race.patch, NONE, 1.1 kernel.spec, 1.214, 1.215

Dave Jones (davej) fedora-extras-commits at redhat.com
Thu Oct 11 17:19:31 UTC 2007 

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30266

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-e100-race.patch 
Log Message:
* Thu Oct 11 2007 Dave Jones <davej at redhat.com>
- Fix race in e100 driver.


linux-2.6-e100-race.patch:

--- NEW FILE linux-2.6-e100-race.patch ---
>From davej  Thu Oct 11 12:19:56 2007
Return-Path: <netdev-owner at vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-4.7 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.3
Received: from pobox.devel.redhat.com [10.11.255.8]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.7)
	for <davej at localhost> (single-drop); Thu, 11 Oct 2007 12:19:56 -0400 (EDT)
Received: from pobox.devel.redhat.com ([unix socket])
	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-8.1.RHEL4) with LMTPA;
	 Thu, 11 Oct 2007 12:11:05 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id l9BGB5ud001848
	for <davej at pobox.devel.redhat.com>; Thu, 11 Oct 2007 12:11:05 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id l9BGB36o006745;
	Thu, 11 Oct 2007 12:11:03 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id l9BFtX8s028181;
	Thu, 11 Oct 2007 12:10:55 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1754538AbXJKQKy (ORCPT <rfc822;haoki at redhat.com> + 9 others);
	Thu, 11 Oct 2007 12:10:54 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1755726AbXJKQKy
	(ORCPT <rfc822;netdev-outgoing>); Thu, 11 Oct 2007 12:10:54 -0400
Received: from mga03.intel.com ([143.182.124.21]:63409 "EHLO mga03.intel.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754302AbXJKQKx (ORCPT <rfc822;netdev at vger.kernel.org>);
	Thu, 11 Oct 2007 12:10:53 -0400
Received: from azsmga001.ch.intel.com ([10.2.17.19])
  by azsmga101.ch.intel.com with ESMTP; 11 Oct 2007 09:10:52 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="4.21,260,1188802800"; 
   d="scan'208";a="296741632"
Received: from orsmsx334.jf.intel.com ([10.22.226.45])
  by azsmga001.ch.intel.com with ESMTP; 11 Oct 2007 09:10:52 -0700
Received: from ahkok-mobl.jf.intel.com ([134.134.3.210]) by orsmsx334.jf.intel.com with Microsoft SMTPSVC(6.0.3790.1830);
	 Thu, 11 Oct 2007 09:10:51 -0700
Received: from [127.0.0.1] (localhost [127.0.0.1])
	by ahkok-mobl.jf.intel.com (Postfix) with ESMTP id 0A9FD40810;
	Thu, 11 Oct 2007 09:10:35 -0700 (PDT)
Message-ID: <470E4AFA.60507 at intel.com>
Date: 	Thu, 11 Oct 2007 09:10:34 -0700
From: "Kok, Auke" <auke-jan.h.kok at intel.com>
User-Agent: Thunderbird 2.0.0.6 (X11/20070911)
MIME-Version: 1.0
To: Herbert Xu <herbert.xu at redhat.com>, Dave Jones <davej at redhat.com>
CC: "Kok, Auke" <auke-jan.h.kok at intel.com>, netdev at vger.kernel.org,
        esandeen at redhat.com, dmack at juniper.net
Subject: Re: e100 problems in .23rc8 ?
References: <46FAA083.9020604 at intel.com> <E1IanKN-0003ju-00 at gondolin.me.apana.org.au> <20071011003638.GA27174 at redhat.com> <20071011012520.GA13160 at gondor.apana.org.au>
In-Reply-To: <20071011012520.GA13160 at gondor.apana.org.au>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-OriginalArrivalTime: 11 Oct 2007 16:10:52.0033 (UTC) FILETIME=[4B821710:01C80C21]
Sender: netdev-owner at vger.kernel.org
Precedence: bulk
X-Mailing-List: 	netdev at vger.kernel.org
X-RedHat-Spam-Score: 0 
X-Scanned-By: MIMEDefang 2.58 on 172.16.48.32
Status: RO
Content-Length: 1753
Lines: 51

Herbert Xu wrote:
> On Wed, Oct 10, 2007 at 08:36:38PM -0400, Dave Jones wrote:
>> The e1000 changes you reference above, is this the changeset you mean?
>>
>> commit 416b5d10afdc797c21c457ade3714e8f2f75edd9
>> Author: Auke Kok <auke-jan.h.kok at intel.com>
>> Date:   Fri Jun 1 10:22:39 2007 -0700
>>
>>     e1000: disable polling before registering netdevice
> 
> Yep.

this patch actually called napi_disable() in the probe routine which was wrong,
but e100 does not do that. Nonetheless e100 doesn't call netif_carrier_off() and
netif_stop_queue(), so to make e100 the same as e1000 we should probably do this,
see below.

Dave, can you see if this resolves the issue for you? If so then we might want to
push this to -stable.

Auke


---
e100: disable netdevice explicitly to avoid rx irq oops

Several reported OOPS messages suggest that e100 has a race that was fixed in
e1000 before where incoming interrupts trigger an OOPS immediately after probe()
finishes.

Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>

diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 280313b..ded5f68 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2682,6 +2682,10 @@ static int __devinit e100_probe(struct pci_dev *pdev,
 	if (err)
 		DPRINTK(PROBE, ERR, "Error clearing wake event\n");

+	/* tell the stack to leave us alone until e100_open() is called */
+	netif_carrier_off(netdev);
+	netif_stop_queue(netdev);
+
 	strcpy(netdev->name, "eth%d");
 	if((err = register_netdev(netdev))) {
 		DPRINTK(PROBE, ERR, "Cannot register net device, aborting.\n");
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- kernel.spec	10 Oct 2007 21:58:11 -0000	1.214
+++ kernel.spec	11 Oct 2007 17:18:58 -0000	1.215
@@ -675,6 +675,8 @@
 Patch1801: nouveau-drm.patch
 # Fix lockdep bug in firewire.
 Patch1900: linux-2.6-firewire-lockdep.patch
+# - Fix race in e100 driver.
+Patch2000: linux-2.6-e100-race.patch
 
 %endif
 
@@ -1216,6 +1218,7 @@
 # http://www.lirc.org/
 ApplyPatch linux-2.6-lirc.patch
 ApplyPatch linux-2.6-firewire-lockdep.patch
+ApplyPatch linux-2.6-e100-race.patch
 
 # ---------- below all scheduled for 2.6.23 -----------------
 
@@ -1810,6 +1813,9 @@
 
 
 %changelog
+* Thu Oct 11 2007 Dave Jones <davej at redhat.com>
+- Fix race in e100 driver.
+
 * Wed Oct 10 2007 John W. Linville <linville at redhat.com>
 - fix scanning for hidden SSID w/ NetworkManager

More information about the fedora-extras-commits mailing list