svn commit: r260302 - stable/10/sys/vm

[Alexander Motin]

Author: mav
Date: Sat Jan  4 23:38:06 2014
New Revision: 260302
URL: http://svnweb.freebsd.org/changeset/base/260302

Log:
  MFC r258338:
  Grow UMA zone bucket size also on lock congestion during item free.
  
  Lock congestion is the same, whether it happens on alloc or free, so
  handle it equally.  Now that we have back pressure, there is no problem
  to grow buckets a bit faster.  Any way growth is much slower then in 9.x.

Modified:
  stable/10/sys/vm/uma_core.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/vm/uma_core.c
==============================================================================
--- stable/10/sys/vm/uma_core.c	Sat Jan  4 23:37:01 2014	(r260301)
+++ stable/10/sys/vm/uma_core.c	Sat Jan  4 23:38:06 2014	(r260302)
@@ -2531,6 +2531,7 @@ uma_zfree_arg(uma_zone_t zone, void *ite
 {
 	uma_cache_t cache;
 	uma_bucket_t bucket;
+	int lockfail;
 	int cpu;
 
 #ifdef UMA_DEBUG_ALLOC_1
@@ -2615,7 +2616,12 @@ zfree_start:
 	if (zone->uz_count == 0 || bucketdisable)
 		goto zfree_item;
 
-	ZONE_LOCK(zone);
+	lockfail = 0;
+	if (ZONE_TRYLOCK(zone) == 0) {
+		/* Record contention to size the buckets. */
+		ZONE_LOCK(zone);
+		lockfail = 1;
+	}
 	critical_enter();
 	cpu = curcpu;
 	cache = &zone->uz_cpu[cpu];
@@ -2649,7 +2655,12 @@ zfree_start:
 	/* We are no longer associated with this CPU. */
 	critical_exit();
 
-	/* And the zone.. */
+	/*
+	 * We bump the uz count when the cache size is insufficient to
+	 * handle the working set.
+	 */
+	if (lockfail && zone->uz_count < BUCKET_MAX)
+		zone->uz_count++;
 	ZONE_UNLOCK(zone);
 
 #ifdef UMA_DEBUG_ALLOC