git: 54f421f9e842 - main - uma: Split bucket_cache_drain() to permit per-domain reclamation

[Mark Johnston]

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=54f421f9e84234c4313f2d636e4ebd74009a74d6

commit 54f421f9e84234c4313f2d636e4ebd74009a74d6
Author:     Mark Johnston <markj at FreeBSD.org>
AuthorDate: 2021-04-09 13:47:09 +0000
Commit:     Mark Johnston <markj at FreeBSD.org>
CommitDate: 2021-04-14 17:03:34 +0000

    uma: Split bucket_cache_drain() to permit per-domain reclamation
    
    Note that the per-domain variant does not shrink the target bucket size.
    
    No functional change intended.
    
    MFC after:      2 weeks
    Sponsored by:   The FreeBSD Foundation
---
 sys/vm/uma_core.c | 78 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 42 insertions(+), 36 deletions(-)

diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c
index d73eef70e249..0348d6468d74 100644
--- a/sys/vm/uma_core.c
+++ b/sys/vm/uma_core.c
@@ -1400,11 +1400,50 @@ pcpu_cache_drain_safe(uma_zone_t zone)
  * estimated working set size.
  */
 static void
-bucket_cache_reclaim(uma_zone_t zone, bool drain)
+bucket_cache_reclaim_domain(uma_zone_t zone, bool drain, int domain)
 {
 	uma_zone_domain_t zdom;
 	uma_bucket_t bucket;
 	long target;
+
+	/*
+	 * The cross bucket is partially filled and not part of
+	 * the item count.  Reclaim it individually here.
+	 */
+	zdom = ZDOM_GET(zone, domain);
+	if ((zone->uz_flags & UMA_ZONE_SMR) == 0 || drain) {
+		ZONE_CROSS_LOCK(zone);
+		bucket = zdom->uzd_cross;
+		zdom->uzd_cross = NULL;
+		ZONE_CROSS_UNLOCK(zone);
+		if (bucket != NULL)
+			bucket_free(zone, bucket, NULL);
+	}
+
+	/*
+	 * If we were asked to drain the zone, we are done only once
+	 * this bucket cache is empty.  Otherwise, we reclaim items in
+	 * excess of the zone's estimated working set size.  If the
+	 * difference nitems - imin is larger than the WSS estimate,
+	 * then the estimate will grow at the end of this interval and
+	 * we ignore the historical average.
+	 */
+	ZDOM_LOCK(zdom);
+	target = drain ? 0 : lmax(zdom->uzd_wss, zdom->uzd_nitems -
+	    zdom->uzd_imin);
+	while (zdom->uzd_nitems > target) {
+		bucket = zone_fetch_bucket(zone, zdom, true);
+		if (bucket == NULL)
+			break;
+		bucket_free(zone, bucket, NULL);
+		ZDOM_LOCK(zdom);
+	}
+	ZDOM_UNLOCK(zdom);
+}
+
+static void
+bucket_cache_reclaim(uma_zone_t zone, bool drain)
+{
 	int i;
 
 	/*
@@ -1414,41 +1453,8 @@ bucket_cache_reclaim(uma_zone_t zone, bool drain)
 	if (zone->uz_bucket_size > zone->uz_bucket_size_min)
 		zone->uz_bucket_size--;
 
-	for (i = 0; i < vm_ndomains; i++) {
-		/*
-		 * The cross bucket is partially filled and not part of
-		 * the item count.  Reclaim it individually here.
-		 */
-		zdom = ZDOM_GET(zone, i);
-		if ((zone->uz_flags & UMA_ZONE_SMR) == 0 || drain) {
-			ZONE_CROSS_LOCK(zone);
-			bucket = zdom->uzd_cross;
-			zdom->uzd_cross = NULL;
-			ZONE_CROSS_UNLOCK(zone);
-			if (bucket != NULL)
-				bucket_free(zone, bucket, NULL);
-		}
-
-		/*
-		 * If we were asked to drain the zone, we are done only once
-		 * this bucket cache is empty.  Otherwise, we reclaim items in
-		 * excess of the zone's estimated working set size.  If the
-		 * difference nitems - imin is larger than the WSS estimate,
-		 * then the estimate will grow at the end of this interval and
-		 * we ignore the historical average.
-		 */
-		ZDOM_LOCK(zdom);
-		target = drain ? 0 : lmax(zdom->uzd_wss, zdom->uzd_nitems -
-		    zdom->uzd_imin);
-		while (zdom->uzd_nitems > target) {
-			bucket = zone_fetch_bucket(zone, zdom, true);
-			if (bucket == NULL)
-				break;
-			bucket_free(zone, bucket, NULL);
-			ZDOM_LOCK(zdom);
-		}
-		ZDOM_UNLOCK(zdom);
-	}
+	for (i = 0; i < vm_ndomains; i++)
+		bucket_cache_reclaim_domain(zone, drain, i);
 }
 
 static void