From owner-cvs-all@FreeBSD.ORG Mon Nov 15 22:22:19 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 82B6B16A4D0 for ; Mon, 15 Nov 2004 22:22:19 +0000 (GMT) Received: from mail4.speakeasy.net (mail4.speakeasy.net [216.254.0.204]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDAC643D41 for ; Mon, 15 Nov 2004 22:22:18 +0000 (GMT) (envelope-from jmg@hydrogen.funkthat.com) Received: (qmail 3238 invoked from network); 15 Nov 2004 22:22:18 -0000 Received: from gate.funkthat.com (HELO hydrogen.funkthat.com) ([69.17.45.168]) (envelope-sender ) by mail4.speakeasy.net (qmail-ldap-1.03) with SMTP for ; 15 Nov 2004 22:22:18 -0000 Received: from hydrogen.funkthat.com (qpszcd@localhost.funkthat.com [127.0.0.1])iAFMMGB6079488; Mon, 15 Nov 2004 14:22:17 -0800 (PST) (envelope-from jmg@hydrogen.funkthat.com) Received: (from jmg@localhost) by hydrogen.funkthat.com (8.12.10/8.12.10/Submit) id iAFMMEM0079487; Mon, 15 Nov 2004 14:22:14 -0800 (PST) Date: Mon, 15 Nov 2004 14:22:14 -0800 From: John-Mark Gurney To: "Bjoern A. Zeeb" Message-ID: <20041115222214.GK57546@funkthat.com> References: <200411151937.iAFJbLak002480@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.1i X-Operating-System: FreeBSD 4.2-RELEASE i386 X-PGP-Fingerprint: B7 EC EF F8 AE ED A7 31 96 7A 22 B3 D8 56 36 F4 X-Files: The truth is out there X-URL: http://resnet.uoregon.edu/~gurney_j/ X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/pci if_sk.c if_skreg.h X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: John-Mark Gurney List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Nov 2004 22:22:19 -0000 Bjoern A. Zeeb wrote this message on Mon, Nov 15, 2004 at 21:37 +0000: > On Mon, 15 Nov 2004, John-Mark Gurney wrote: > > > jmg 2004-11-15 19:37:21 UTC > > > > FreeBSD src repository > > > > Modified files: > > sys/pci if_sk.c if_skreg.h > > Log: > > fix the missing lock in sk_jfree (verified w/ an assert) > > also fix up handling and proding of the tx, _OACTIVE is now handled > > better... > > > > Submitted by: Peter Edwards (sk_jfree) > > Obtained from: OpenBSD and/or NetBSD (tx prod) > > This seems to be different from the version in > http://lists.freebsd.org/pipermail/freebsd-current/2004-November/042195.html > I had reports of people running into the panic in sk_jfree > with the patch from this link. Yes, the one that I posted in that message was to make sure that we didn't have the lock (and prevent adding another recursion point).. I finally got around to testing that patch myself, and it was truely unlocked... > *hmm* > > > @@ -1104,6 +1106,7 @@ sk_jfree(buf, args) > > > > /* Extract the softc struct pointer. */ > > sc_if = (struct sk_if_softc *)args; > > + SK_IF_LOCK(sc_if); > > > > if (sc_if == NULL) > > panic("sk_jfree: didn't get softc pointer!"); > > mind moving the SK_IF_LOCK down behind the NULL/panic check ? Sure, np... -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not."