From owner-p4-projects@FreeBSD.ORG Tue Jun 27 16:31:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 867B016A4A0; Tue, 27 Jun 2006 16:31:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0DA8D16A47B for ; Tue, 27 Jun 2006 16:31:05 +0000 (UTC) (envelope-from kip.macy@gmail.com) Received: from nz-out-0102.google.com (nz-out-0102.google.com [64.233.162.193]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6CC0B43D53 for ; Tue, 27 Jun 2006 16:31:03 +0000 (GMT) (envelope-from kip.macy@gmail.com) Received: by nz-out-0102.google.com with SMTP id o1so238815nzf for ; Tue, 27 Jun 2006 09:31:02 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:reply-to:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=DVU+9IONal8GBB0nBRvBP/bnogFdry2LNtQULsgN1Ey2E723JqaoFsHyEVD2qBQOXk36KI7z8kK6VsGCGd15ZpXzz4HKjGrvrd8R8cHAuj3HIHSl6Dqf5Q8TYn6qvA4H4JNePo7msKIonv50Rz5w2HumRhJzrngd6kK3wncoERA= Received: by 10.65.224.7 with SMTP id b7mr7770328qbr; Tue, 27 Jun 2006 09:31:02 -0700 (PDT) Received: by 10.65.225.9 with HTTP; Tue, 27 Jun 2006 09:31:02 -0700 (PDT) Message-ID: Date: Tue, 27 Jun 2006 09:31:02 -0700 From: "Kip Macy" To: "John Baldwin" In-Reply-To: <200606271127.13228.jhb@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200606270742.k5R7gCfT001310@repoman.freebsd.org> <200606271127.13228.jhb@freebsd.org> Cc: kris@freebsd.org, Perforce Change Reviews , Kip Macy Subject: Re: PERFORCE change 100121 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: kmacy@fsmware.com List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jun 2006 16:31:05 -0000 Point me at your tree. I do :-). -Kip On 6/27/06, John Baldwin wrote: > On Tuesday 27 June 2006 03:42, Kip Macy wrote: > > http://perforce.freebsd.org/chv.cgi?CH=100121 > > > > Change 100121 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/27 > 07:41:14 > > > > avoid pointless turnstile contention if mutex owner is running > > Yes, I did this already in jhb_lock for both mutexes and rwlocks at BSDCan. > Kris said my patch panic'd for him at BSDCan but I don't have an SMP machine > I can test it on now to debug it. :( > > > > > Affected files ... > > > > .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#20 edit > > > > Differences ... > > > > ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#20 (text+ko) > ==== > > > > @@ -176,7 +176,7 @@ > > static int mutex_prof_maxrecords = MPROF_HASH_SIZE; > > SYSCTL_INT(_debug_mutex_prof, OID_AUTO, maxrecords, CTLFLAG_RD, > > &mutex_prof_maxrecords, 0, "Maximum number of profiling records"); > > -int mutex_prof_rejected; > > +int mutex_prof_rejected = 0; > > SYSCTL_INT(_debug_mutex_prof, OID_AUTO, rejected, CTLFLAG_RD, > > &mutex_prof_rejected, 0, "Number of rejected profiling records"); > > static int mutex_prof_hashsize = MPROF_HASH_SIZE; > > @@ -418,6 +418,16 @@ > > > > while (!_obtain_lock(m, tid)) { > > lock_profile_obtain_lock_failed(&m->mtx_object, &contested); > > +#if defined(SMP) && !defined(NO_ADAPTIVE_MUTEXES) > > + /* > > + * If the current owner of the lock is executing on another > > + * CPU, spin instead of blocking. > > + */ > > + for (owner = mtx_owner(m); owner && TD_IS_RUNNING(owner); owner = > mtx_owner(m)) > > + cpu_spinwait(); > > + if (mtx_unowned(m)) > > + continue; > > +#endif /* SMP && !NO_ADAPTIVE_MUTEXES */ > > turnstile_lock(&m->mtx_object); > > v = m->mtx_lock; > > > > @@ -425,7 +435,7 @@ > > * Check if the lock has been released while spinning for > > * the turnstile chain lock. > > */ > > - if (v == MTX_UNOWNED) { > > + if (mtx_unowned(m)) { > > turnstile_release(&m->mtx_object); > > cpu_spinwait(); > > continue; > > @@ -837,6 +847,8 @@ > > mtx_validate(m); > > #endif > > > > + > > + > > /* Determine lock class and lock flags. */ > > if (opts & MTX_SPIN) > > class = &lock_class_mtx_spin; > > > > -- > John Baldwin >