svn commit: r307298 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Alexander Motin]

Author: mav
Date: Fri Oct 14 07:45:10 2016
New Revision: 307298
URL: https://svnweb.freebsd.org/changeset/base/307298

Log:
  MFC r305561: MFV r305560:
  7278 tuning zfs_arc_max does not impact arc_c_min
  
  When changing zfs_arc_max (e.g. as zdb does), it may be set to less
  than the default arc_c_min. arc_c_min should decrease to not be more than
  arc_c_max, but it doesn't; therefore tuning of arc_c_max is ineffective.
  
  Reviewed by: Dan Kimmel <dan.kimmel at delphix.com>
  Reviewed by: Paul Dagnelie <paul.dagnelie at delphix.com>
  Reviewed by: Prakash Surya <prakash.surya at delphix.com>
  Reviewed by: Igor Kozhukhov <ikozhukhov at gmail.com>
  Author: Matthew Ahrens <mahrens at delphix.com>
  
  openzfs/openzfs at 608764beadaf4bb71c5d8fe1818e8392ac66a61b

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Fri Oct 14 07:44:24 2016	(r307297)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Fri Oct 14 07:45:10 2016	(r307298)
@@ -5998,8 +5998,10 @@ arc_init(void)
 	 * Allow the tunables to override our calculations if they are
 	 * reasonable.
 	 */
-	if (zfs_arc_max > arc_abs_min && zfs_arc_max < kmem_size())
+	if (zfs_arc_max > arc_abs_min && zfs_arc_max < kmem_size()) {
 		arc_c_max = zfs_arc_max;
+		arc_c_min = MIN(arc_c_min, arc_c_max);
+	}
 	if (zfs_arc_min > arc_abs_min && zfs_arc_min <= arc_c_max)
 		arc_c_min = zfs_arc_min;
 #endif