diff options
| author | Allan Jude <[email protected]> | 2021-08-16 11:35:19 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-08-16 09:35:19 -0600 |
| commit | e945e8d7f4fcafd4f1c01abd90810fc09ab6a811 (patch) | |
| tree | bd303352b4c601274ec9418d43d2d29c9602e6d6 /module/zfs/arc.c | |
| parent | 41bee4039c546a8f700e173694be2dba3e34a7ce (diff) | |
Restore FreeBSD sysctl processing for arc.min and arc.max
Before OpenZFS 2.0, trying to set the FreeBSD sysctl vfs.zfs.arc_max
to a disallowed value would return an error.
Since the switch, it instead only generates WARN_IF_TUNING_IGNORED
Keep the ability to set the sysctl's specifically to 0, even though
that is less than the minimum, because some tests depend on this.
Also lost, was the ability to set vfs.zfs.arc_max to a value less
than the default vfs.zfs.arc_min at boot time. Restore this as well.
Reviewed-by: Tony Nguyen <[email protected]>
Reviewed-by: Ryan Moeller <[email protected]>
Signed-off-by: Allan Jude <[email protected]>
Closes #12161
Diffstat (limited to 'module/zfs/arc.c')
| -rw-r--r-- | module/zfs/arc.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/module/zfs/arc.c b/module/zfs/arc.c index 003aacc6c..a8404182c 100644 --- a/module/zfs/arc.c +++ b/module/zfs/arc.c @@ -7498,7 +7498,7 @@ arc_tuning_update(boolean_t verbose) /* Valid range: 64M - <all physical memory> */ if ((zfs_arc_max) && (zfs_arc_max != arc_c_max) && - (zfs_arc_max >= 64 << 20) && (zfs_arc_max < allmem) && + (zfs_arc_max >= MIN_ARC_MAX) && (zfs_arc_max < allmem) && (zfs_arc_max > arc_c_min)) { arc_c_max = zfs_arc_max; arc_c = MIN(arc_c, arc_c_max); @@ -7893,7 +7893,23 @@ arc_init(void) arc_set_limits(allmem); -#ifndef _KERNEL +#ifdef _KERNEL + /* + * If zfs_arc_max is non-zero at init, meaning it was set in the kernel + * environment before the module was loaded, don't block setting the + * maximum because it is less than arc_c_min, instead, reset arc_c_min + * to a lower value. + * zfs_arc_min will be handled by arc_tuning_update(). + */ + if (zfs_arc_max != 0 && zfs_arc_max >= MIN_ARC_MAX && + zfs_arc_max < allmem) { + arc_c_max = zfs_arc_max; + if (arc_c_min >= arc_c_max) { + arc_c_min = MAX(zfs_arc_max / 2, + 2ULL << SPA_MAXBLOCKSHIFT); + } + } +#else /* * In userland, there's only the memory pressure that we artificially * create (see arc_available_memory()). Don't let arc_c get too @@ -10965,10 +10981,10 @@ EXPORT_SYMBOL(arc_add_prune_callback); EXPORT_SYMBOL(arc_remove_prune_callback); /* BEGIN CSTYLED */ -ZFS_MODULE_PARAM_CALL(zfs_arc, zfs_arc_, min, param_set_arc_long, +ZFS_MODULE_PARAM_CALL(zfs_arc, zfs_arc_, min, param_set_arc_min, param_get_long, ZMOD_RW, "Min arc size"); -ZFS_MODULE_PARAM_CALL(zfs_arc, zfs_arc_, max, param_set_arc_long, +ZFS_MODULE_PARAM_CALL(zfs_arc, zfs_arc_, max, param_set_arc_max, param_get_long, ZMOD_RW, "Max arc size"); ZFS_MODULE_PARAM_CALL(zfs_arc, zfs_arc_, meta_limit, param_set_arc_long, |