From owner-svn-src-head@FreeBSD.ORG Mon Dec 14 19:49:59 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA3611065694; Mon, 14 Dec 2009 19:49:59 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id AC1538FC14; Mon, 14 Dec 2009 19:49:59 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 4FEA946B37; Mon, 14 Dec 2009 14:49:59 -0500 (EST) Received: from jhbbsd.localnet (unknown [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPA id EAD218A021; Mon, 14 Dec 2009 14:49:57 -0500 (EST) From: John Baldwin To: Jack F Vogel Date: Mon, 14 Dec 2009 14:31:10 -0500 User-Agent: KMail/1.12.1 (FreeBSD/7.2-CBSD-20091103; KDE/4.3.1; amd64; ; ) References: <200912141843.nBEIhIsA034642@svn.freebsd.org> In-Reply-To: <200912141843.nBEIhIsA034642@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <200912141431.10603.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Mon, 14 Dec 2009 14:49:58 -0500 (EST) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.5 required=4.2 tests=AWL,BAYES_00,RDNS_NONE autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r200523 - head/sys/dev/e1000 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Dec 2009 19:50:00 -0000 On Monday 14 December 2009 1:43:18 pm Jack F Vogel wrote: > Author: jfv > Date: Mon Dec 14 18:43:18 2009 > New Revision: 200523 > URL: http://svn.freebsd.org/changeset/base/200523 > > Log: > Remove the MTX_SPIN flag to the shared code MUTEX > as it was causing a panic, also took the opportunity > to rename the lock for clarity. > > Modified: > head/sys/dev/e1000/e1000_osdep.h > > Modified: head/sys/dev/e1000/e1000_osdep.h > ============================================================================== > --- head/sys/dev/e1000/e1000_osdep.h Mon Dec 14 18:27:34 2009 (r200522) > +++ head/sys/dev/e1000/e1000_osdep.h Mon Dec 14 18:43:18 2009 (r200523) > @@ -82,8 +82,7 @@ > /* Mutex used in the shared code */ > #define E1000_MUTEX struct mtx > #define E1000_MUTEX_INIT(mutex) mtx_init((mutex), #mutex, \ > - MTX_NETWORK_LOCK, \ > - MTX_DEF | MTX_SPIN) > + "E1000 Shared Lock", MTX_DEF) > #define E1000_MUTEX_DESTROY(mutex) mtx_destroy(mutex) > #define E1000_MUTEX_LOCK(mutex) mtx_lock(mutex) > #define E1000_MUTEX_TRYLOCK(mutex) mtx_trylock(mutex) Hmm, most NIC drivers use MTX_NETWORK_LOCK so that WITNESS will report LORs that happen if any two NIC drivers locks "cross" (e.g. if one driver leaked a lock while passing a packet up the stack that was forwarded to another interface). Not sure if that is relevant to this particular lock though. -- John Baldwin