From owner-freebsd-firewire@FreeBSD.ORG Wed Dec 12 22:17:40 2007 Return-Path: Delivered-To: freebsd-firewire@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5466216A468; Wed, 12 Dec 2007 22:17:40 +0000 (UTC) (envelope-from scottl@samsco.org) Received: from pooker.samsco.org (pooker.samsco.org [168.103.85.57]) by mx1.freebsd.org (Postfix) with ESMTP id EE54E13C45B; Wed, 12 Dec 2007 22:17:39 +0000 (UTC) (envelope-from scottl@samsco.org) Received: from phobos.samsco.home (phobos.samsco.home [192.168.254.11]) (authenticated bits=0) by pooker.samsco.org (8.13.8/8.13.8) with ESMTP id lBCLj0Mq016746; Wed, 12 Dec 2007 14:45:00 -0700 (MST) (envelope-from scottl@samsco.org) Message-ID: <47605645.70509@samsco.org> Date: Wed, 12 Dec 2007 14:44:37 -0700 From: Scott Long User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.6) Gecko/20070802 SeaMonkey/1.1.4 MIME-Version: 1.0 To: Sean Bruno References: <1197420795.2738.6.camel@iago.office.miralink.com> <86sl28snpe.wl%simokawa@FreeBSD.ORG> <1197425759.14437.0.camel@home-desk> <626eb4530712111837y4608e919w845461d36a18118f@mail.gmail.com> <475F5669.1010800@miralink.com> In-Reply-To: <475F5669.1010800@miralink.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (pooker.samsco.org [168.103.85.57]); Wed, 12 Dec 2007 14:45:00 -0700 (MST) X-Spam-Status: No, score=-1.4 required=5.4 tests=ALL_TRUSTED autolearn=failed version=3.1.8 X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on pooker.samsco.org Cc: nate@root.org, freebsd-firewire@freebsd.org, freebsd-scsi@freebsd.org Subject: Re: scsi_target witness lock error X-BeenThere: freebsd-firewire@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Firewire support in FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 22:17:40 -0000 Sean Bruno wrote: > Hidetoshi Shimokawa wrote: >> On 12/12/07, Sean Bruno wrote: >> >>>> --- //depot/vendor/freebsd/src/sys/cam/scsi/scsi_target.c >>>> 2007/04/15 08:53:22 >>>> +++ >>>> //depot/user/simokawa/firewire_lock/sys/cam/scsi/scsi_target.c >>>> 2007/05/21 14:31:55 >>>> @@ -372,10 +372,14 @@ >>>> int retval; >>>> >>>> softc = (struct targ_softc *)kn->kn_hook; >>>> +#if 0 >>>> cam_periph_lock(softc->periph); >>>> +#endif >>>> retval = !TAILQ_EMPTY(&softc->user_ccb_queue) || >>>> !TAILQ_EMPTY(&softc->abort_queue); >>>> +#if 0 >>>> cam_periph_unlock(softc->periph); >>>> +#endif >>>> return (retval); >>>> } >>>> >>> Are these two "if 0"'s supposed to be commented out? I'm leaving this >>> out of my RELENG_6 test for now unless you say otherwise. >>> >>> >>> Sean >>> >> >> Yes, it is same as comment out. >> The patch was for RELENG_7 or current. I'm not sure about RELENG_6. >> >> > Ok, I merged the patch(RELENG_6) to the best of my ability. The system > now panics and has the same witness error. > > panic/witness/trace --> http://consultcsg.com/scsitarget_witness.txt > scsi_target.c diff --> http://consultcsg.com/scsi_target.c.diff > CAM locking in RELENG_6 is completely different from locking in RELENG_7. I'm not saying that your problems are imaginary, just pointing out that any problems in 6.x are going to almost certainly be completely different from problems in 7.x. I'll look at both. Scott