From owner-freebsd-current@FreeBSD.ORG  Wed Apr  9 10:22:59 2003
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 05BCF37B401
	for <current@freebsd.org>; Wed,  9 Apr 2003 10:22:59 -0700 (PDT)
Received: from rootlabs.com (root.org [67.118.192.226])
	by mx1.FreeBSD.org (Postfix) with SMTP id 91AD843F75
	for <current@freebsd.org>; Wed,  9 Apr 2003 10:22:58 -0700 (PDT)
	(envelope-from nate@rootlabs.com)
Received: (qmail 29926 invoked by uid 1000); 9 Apr 2003 17:22:59 -0000
Date: Wed, 9 Apr 2003 10:22:59 -0700 (PDT)
From: Nate Lawson <nate@root.org>
To: Andrew Gallatin <gallatin@cs.duke.edu>
In-Reply-To: <16013.49267.867140.38329@grasshopper.cs.duke.edu>
Message-ID: <Pine.BSF.4.21.0304091021530.29923-100000@root.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: current@freebsd.org
Subject: Re: mbuf LOR
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Apr 2003 17:22:59 -0000

On Fri, 4 Apr 2003, Andrew Gallatin wrote:
> The following patch boots & passed the basic 'make -j16 buildworld'
> test on x86 SMP.  As I outlined before, I'm not certain if it is safe
> on all platforms.
> 
> Index: vm/uma_core.c
> ===================================================================
> RCS file: /home/ncvs/src/sys/vm/uma_core.c,v
> retrieving revision 1.51
> diff -u -r1.51 uma_core.c
> --- vm/uma_core.c	26 Mar 2003 18:44:53 -0000	1.51
> +++ vm/uma_core.c	4 Apr 2003 15:11:34 -0000
> @@ -703,10 +703,15 @@
>  		wait &= ~M_ZERO;
>  
>  	if (booted || (zone->uz_flags & UMA_ZFLAG_PRIVALLOC)) {
> -		mtx_lock(&Giant);
> -		mem = zone->uz_allocf(zone, 
> -		    zone->uz_ppera * UMA_SLAB_SIZE, &flags, wait);
> -		mtx_unlock(&Giant);
> +		if ((wait & M_NOWAIT) == 0) {
> +			mtx_lock(&Giant);
> +			mem = zone->uz_allocf(zone, 
> +			    zone->uz_ppera * UMA_SLAB_SIZE, &flags, wait);
> +			mtx_unlock(&Giant);
> +		} else {
> +			mem = zone->uz_allocf(zone, 
> +			    zone->uz_ppera * UMA_SLAB_SIZE, &flags, wait);
> +		}
>  		if (mem == NULL) {
>  			ZONE_LOCK(zone);
>  			return (NULL);

I have been running with this patch for days with MPSAFE and it works
fine.  Will you commit it at some point?  Can the non-i386 platform heads
chime in?

-Nate