From linimon@FreeBSD.org  Tue May 22 02:59:28 2012
Return-Path: <linimon@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9A0571065677
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 22 May 2012 02:59:28 +0000 (UTC)
	(envelope-from linimon@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 83E0A8FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 22 May 2012 02:59:28 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q4M2xSxv056816
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 22 May 2012 02:59:28 GMT
	(envelope-from linimon@freefall.freebsd.org)
Received: (from linimon@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q4M2xSHY056814;
	Tue, 22 May 2012 02:59:28 GMT
	(envelope-from linimon)
Message-Id: <201205220259.q4M2xSHY056814@freefall.freebsd.org>
Date: Tue, 22 May 2012 02:59:28 GMT
From: Mark Linimon <linimon@FreeBSD.org>
Reply-To: Mark Linimon <linimon@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [kernel] [patch] uma_core.c is missing at least one (possibly two) sleep counts
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         168211
>Category:       kern
>Synopsis:       [kernel] [patch] uma_core.c is missing at least one (possibly two) sleep counts
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    eadler
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 22 03:00:12 UTC 2012
>Closed-Date:    Sun Sep 02 18:28:41 UTC 2012
>Last-Modified:  Sun Sep  2 18:30:13 UTC 2012
>Originator:     Mark Linimon
>Release:        FreeBSD 9.0-STABLE i386
>Organization:
FreeBSD
>Environment:
System: FreeBSD freefall.freebsd.org 9.0-STABLE FreeBSD 9.0-STABLE #6 r235139: Tue May 8 21:19:03 UTC 2012 simon@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386
>Description:
In at least one case the zone sleep counts are not being incremented.  I'n not sure
about the second; someone who understands this better will have to review.
>How-To-Repeat:
>Fix:
Index: uma_core.c
===================================================================
RCS file: /home/FreeBSD/ncvs/src/sys/vm/uma_core.c,v
retrieving revision 1.173
diff -u -r1.173 uma_core.c
--- uma_core.c	27 Jan 2012 20:18:31 -0000	1.173
+++ uma_core.c	22 May 2012 02:55:49 -0000
@@ -770,6 +770,7 @@
 		if (waitok == M_NOWAIT)
 			goto out;
 		mtx_unlock(&uma_mtx);
+		zone->uz_sleeps++;		// XXX MCL
 		msleep(zone, zone->uz_lock, PVM, "zonedrain", 1);
 		mtx_lock(&uma_mtx);
 	}
@@ -2196,6 +2197,7 @@
 				zone->uz_flags |= UMA_ZFLAG_FULL;
 			if (flags & M_NOWAIT)
 				break;
+			// XXX MCL no sleep count is kept track of here!
 			msleep(keg, &keg->uk_lock, PVM, "keglimit", 0);
 			continue;
 		}
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->eadler 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Sun Jun 24 18:49:09 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168211 
State-Changed-From-To: open->analyzed 
State-Changed-By: eadler 
State-Changed-When: Tue Jul 3 03:25:55 UTC 2012 
State-Changed-Why:  
awaiting approval/review 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168211 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/168211: commit references a PR
Date: Sat,  7 Jul 2012 17:46:25 +0000 (UTC)

 Author: eadler
 Date: Sat Jul  7 17:46:11 2012
 New Revision: 238206
 URL: http://svn.freebsd.org/changeset/base/238206
 
 Log:
   Add missing sleep stat increase
   
   PR:		kern/168211
   Submitted by:	linimon
   Reviewed by:	alc
   Approved by:	cperciva
   MFC after:	3 days
 
 Modified:
   head/sys/vm/uma_core.c
 
 Modified: head/sys/vm/uma_core.c
 ==============================================================================
 --- head/sys/vm/uma_core.c	Sat Jul  7 17:35:34 2012	(r238205)
 +++ head/sys/vm/uma_core.c	Sat Jul  7 17:46:11 2012	(r238206)
 @@ -2193,6 +2193,7 @@ keg_fetch_slab(uma_keg_t keg, uma_zone_t
  				zone->uz_flags |= UMA_ZFLAG_FULL;
  			if (flags & M_NOWAIT)
  				break;
 +			zone->uz_sleeps++;
  			msleep(keg, &keg->uk_lock, PVM, "keglimit", 0);
  			continue;
  		}
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: analyzed->patched 
State-Changed-By: eadler 
State-Changed-When: Sat Jul 7 17:57:19 UTC 2012 
State-Changed-Why:  
committed in r238206 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168211 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/168211: commit references a PR
Date: Sun,  2 Sep 2012 18:19:48 +0000 (UTC)

 Author: eadler
 Date: Sun Sep  2 18:19:37 2012
 New Revision: 240044
 URL: http://svn.freebsd.org/changeset/base/240044
 
 Log:
   MFC r238206:
   	Add missing sleep stat increase
   
   PR:		kern/168211
   Approved by:	cperciva (implicit)
 
 Modified:
   stable/8/sys/vm/uma_core.c
 Directory Properties:
   stable/8/sys/   (props changed)
   stable/8/sys/vm/   (props changed)
 
 Modified: stable/8/sys/vm/uma_core.c
 ==============================================================================
 --- stable/8/sys/vm/uma_core.c	Sun Sep  2 18:17:20 2012	(r240043)
 +++ stable/8/sys/vm/uma_core.c	Sun Sep  2 18:19:37 2012	(r240044)
 @@ -2161,6 +2161,7 @@ keg_fetch_slab(uma_keg_t keg, uma_zone_t
  				zone->uz_flags |= UMA_ZFLAG_FULL;
  			if (flags & M_NOWAIT)
  				break;
 +			zone->uz_sleeps++;
  			msleep(keg, &keg->uk_lock, PVM, "keglimit", 0);
  			continue;
  		}
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: eadler 
State-Changed-When: Sun Sep 2 18:28:39 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168211 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/168211: commit references a PR
Date: Sun,  2 Sep 2012 18:20:13 +0000 (UTC)

 Author: eadler
 Date: Sun Sep  2 18:19:41 2012
 New Revision: 240045
 URL: http://svn.freebsd.org/changeset/base/240045
 
 Log:
   MFC r238206:
   	Add missing sleep stat increase
   
   PR:		kern/168211
   Approved by:	cperciva (implicit)
 
 Modified:
   stable/9/sys/vm/uma_core.c
 Directory Properties:
   stable/9/sys/   (props changed)
 
 Modified: stable/9/sys/vm/uma_core.c
 ==============================================================================
 --- stable/9/sys/vm/uma_core.c	Sun Sep  2 18:19:37 2012	(r240044)
 +++ stable/9/sys/vm/uma_core.c	Sun Sep  2 18:19:41 2012	(r240045)
 @@ -2166,6 +2166,7 @@ keg_fetch_slab(uma_keg_t keg, uma_zone_t
  				zone->uz_flags |= UMA_ZFLAG_FULL;
  			if (flags & M_NOWAIT)
  				break;
 +			zone->uz_sleeps++;
  			msleep(keg, &keg->uk_lock, PVM, "keglimit", 0);
  			continue;
  		}
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
