From le@univie.ac.at  Sat Jul 26 17:03:58 2003
Return-Path: <le@univie.ac.at>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6201137B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 26 Jul 2003 17:03:58 -0700 (PDT)
Received: from mailbox.univie.ac.at (mail.univie.ac.at [131.130.1.27])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5C0B743F93
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 26 Jul 2003 17:03:57 -0700 (PDT)
	(envelope-from le@univie.ac.at)
Received: from korben.in.tern (dialin202.cc.univie.ac.at [131.130.202.202])
	by mailbox.univie.ac.at (8.12.2/8.12.2) with ESMTP id h6R03WPL205768
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 27 Jul 2003 02:03:41 +0200
Received: from korben.in.tern (korben.in.tern [127.0.0.1])
	by korben.in.tern (8.12.9/8.12.9) with ESMTP id h6R0383t092637
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 27 Jul 2003 02:03:15 +0200 (CEST)
	(envelope-from le@korben.in.tern)
Received: (from le@localhost)
	by korben.in.tern (8.12.9/8.12.9/Submit) id h6R032HI092632;
	Sun, 27 Jul 2003 02:03:02 +0200 (CEST)
	(envelope-from le)
Message-Id: <200307270003.h6R032HI092632@korben.in.tern>
Date: Sun, 27 Jul 2003 02:03:02 +0200 (CEST)
From: Lukas Ertl <l.ertl@univie.ac.at>
Reply-To: Lukas Ertl <l.ertl@univie.ac.at>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] don't hold Giant when calling kmem_malloc
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         54890
>Category:       kern
>Synopsis:       [PATCH] don't hold Giant when calling kmem_malloc
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    alc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 26 17:10:15 PDT 2003
>Closed-Date:    Sun Jul 27 19:34:23 PDT 2003
>Last-Modified:  Sun Jul 27 19:34:23 PDT 2003
>Originator:     Lukas Ertl
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
Vienna University Computer Center
>Environment:
System: FreeBSD korben 5.1-CURRENT FreeBSD 5.1-CURRENT #10: Sat Jul 26 19:16:52 CEST 2003 le@korben:/usr/obj/usr/src/sys/KORBEN i386


	
>Description:

I'm not quite sure, but I think we don't have to hold Giant anymore when
we are calling kmem_malloc.

>How-To-Repeat:
	
>Fix:

	

--- uma_core.c.diff begins here ---
Index: sys/vm/uma_core.c
===================================================================
RCS file: /usr/local/bsdcvs/src/sys/vm/uma_core.c,v
retrieving revision 1.62
diff -u -r1.62 uma_core.c
--- sys/vm/uma_core.c	26 Jul 2003 03:55:32 -0000	1.62
+++ sys/vm/uma_core.c	26 Jul 2003 17:14:09 -0000
@@ -706,15 +706,8 @@
 		wait &= ~M_ZERO;
 
 	if (booted || (zone->uz_flags & UMA_ZFLAG_PRIVALLOC)) {
-		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);
-		}
+		mem = zone->uz_allocf(zone, 
+		    zone->uz_ppera * UMA_SLAB_SIZE, &flags, wait);
 		if (mem == NULL) {
 			ZONE_LOCK(zone);
 			return (NULL);
--- uma_core.c.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->alc 
Responsible-Changed-By: ceri 
Responsible-Changed-When: Sun Jul 27 13:12:32 PDT 2003 
Responsible-Changed-Why:  
Alan has been working in this area, pass this PR over for his perusal. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=54890 
State-Changed-From-To: open->closed 
State-Changed-By: alc 
State-Changed-When: Sun Jul 27 19:29:57 PDT 2003 
State-Changed-Why:  
UMA uses several allocation functions besides kmem_malloc().  After 
eliminating the presumption of Giant in several of them, I have applied 
the patch described in this PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=54890 
>Unformatted:
