Merge remote-tracking branch 'origin/6.0/release' into 6.0/stage

cmd/arcstat/arcstat

@@ -96,6 +96,7 @@ cols = {
     "grow":       [4, 1000, "ARC Grow disabled"],
     "need":       [4, 1024, "ARC Reclaim need"],
     "free":       [4, 1024, "ARC Free memory"],
+    "avail":      [4, 1024, "ARC available memory"],
 }
 
 v = {}
@@ -197,15 +198,15 @@ def prettynum(sz, scale, num=0):
     elif 0 < num < 1:
         num = 0
 
-    while num > scale and index < 5:
+    while abs(num) > scale and index < 5:
         save = num
         num = num / scale
         index += 1
 
     if index == 0:
         return "%*d" % (sz, num)
 
-    if (save / scale) < 10:
+    if abs(save / scale) < 10:
         return "%*.1f%s" % (sz - 1, num, suffix[index])
     else:
         return "%*d%s" % (sz - 1, num, suffix[index])
@@ -429,7 +430,8 @@ def calculate():
 
     v["grow"] = 0 if cur["arc_no_grow"] else 1
     v["need"] = cur["arc_need_free"]
-    v["free"] = cur["arc_sys_free"]
+    v["free"] = cur["memory_free_bytes"]
+    v["avail"] = cur["memory_available_bytes"]
 
 
 def main():

module/zfs/arc.c

@@ -7857,12 +7857,8 @@ arc_init(void)
 
 	/* Set min cache to 1/32 of all memory, or 32MB, whichever is more */
 	arc_c_min = MAX(allmem / 32, 2ULL << SPA_MAXBLOCKSHIFT);
-	/* set max to 3/4 of all memory, or all but 1GB, whichever is more */
-	if (allmem >= 1 << 30)
-		arc_c_max = allmem - (1 << 30);
-	else
-		arc_c_max = arc_c_min;
-	arc_c_max = MAX(allmem * 3 / 4, arc_c_max);
+	/* set max to 1/2 of all memory */
+	arc_c_max = MAX(allmem / 2, arc_c_min);
 
 	/*
 	 * In userland, there's only the memory pressure that we artificially