From owner-svn-src-all@FreeBSD.ORG Mon Dec 14 19:51:50 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 93DD7106566B; Mon, 14 Dec 2009 19:51:50 +0000 (UTC) (envelope-from jfvogel@gmail.com) Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.157]) by mx1.freebsd.org (Postfix) with ESMTP id 7748C8FC22; Mon, 14 Dec 2009 19:51:49 +0000 (UTC) Received: by fg-out-1718.google.com with SMTP id 16so102117fgg.13 for ; Mon, 14 Dec 2009 11:51:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type; bh=ScDIKovZmvnENA/NZ002xGlhjafgxrs3gi9HdgQ0ANA=; b=Ym+STE6Ilta3T1D+oFcV/iFfWfRgr3fOsq3agoS4yserWBpHnRApeugCf2NnGIFSX6 eNowOz/lOf4oaUiH+IJ20sQcPiV9gYSlITcF8B4KTwTw+mziEdnhQcaRX65o/9Vj6UbU bdKEt+//0qR+yEeUDim9J9LLODxA0Y5z20Gyk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=v/lCz8jTL4YimeBzrbmy48A8kL10vzvwwdsvKyxoveF1O8WaBIIWBrJurOuYKLXwUS MxFJxjsEtgNKJtBvIKBGsGPDvYaC9YU0qtW74OdTLOHtV9wGiLKWuegJH9gNBIrLw1Co 15+Ilb+xBmUY1cYdzTpQqLkCJ1TTnikMNlHXE= MIME-Version: 1.0 Received: by 10.216.88.208 with SMTP id a58mr847782wef.115.1260820307726; Mon, 14 Dec 2009 11:51:47 -0800 (PST) In-Reply-To: <200912141431.10603.jhb@freebsd.org> References: <200912141843.nBEIhIsA034642@svn.freebsd.org> <200912141431.10603.jhb@freebsd.org> Date: Mon, 14 Dec 2009 11:51:47 -0800 Message-ID: <2a41acea0912141151p5d596118h6900ea8e2731256f@mail.gmail.com> From: Jack Vogel To: John Baldwin Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Jack F Vogel , 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-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Dec 2009 19:51:50 -0000 Well, its a unique lock in the shared code, and I was already naming the other em locks, if there is some big loss in my doing that I don't have any big emotional investment in them being that way :) Jack On Mon, Dec 14, 2009 at 11:31 AM, John Baldwin wrote: > 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 >