Skip to content

Commit 964791a

Browse files
author
Ryan Moeller
authored
Make spa_stats.c tunables visible on FreeBSD
Use ZFS_MODULE_PARAM for cross-platform tunables in spa_stats.c, and add update tunables.cfg in tests for the newly supported ones. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ryan Moeller <ryan@iXsystems.com> Closes #10858
1 parent e84e492 commit 964791a

File tree

2 files changed

+14
-20
lines changed

2 files changed

+14
-20
lines changed

module/zfs/spa_stats.c

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,22 +1028,16 @@ spa_stats_destroy(spa_t *spa)
10281028
spa_mmp_history_destroy(spa);
10291029
}
10301030

1031-
#if defined(_KERNEL)
1032-
/* CSTYLED */
1033-
module_param(zfs_read_history, int, 0644);
1034-
MODULE_PARM_DESC(zfs_read_history,
1035-
"Historical statistics for the last N reads");
1036-
1037-
module_param(zfs_read_history_hits, int, 0644);
1038-
MODULE_PARM_DESC(zfs_read_history_hits,
1039-
"Include cache hits in read history");
1040-
1041-
module_param(zfs_txg_history, int, 0644);
1042-
MODULE_PARM_DESC(zfs_txg_history,
1043-
"Historical statistics for the last N txgs");
1044-
1045-
module_param(zfs_multihost_history, int, 0644);
1046-
MODULE_PARM_DESC(zfs_multihost_history,
1047-
"Historical statistics for last N multihost writes");
1031+
/* BEGIN CSTYLED */
1032+
ZFS_MODULE_PARAM(zfs, zfs_, read_history, INT, ZMOD_RW,
1033+
"Historical statistics for the last N reads");
1034+
1035+
ZFS_MODULE_PARAM(zfs, zfs_, read_history_hits, INT, ZMOD_RW,
1036+
"Include cache hits in read history");
1037+
1038+
ZFS_MODULE_PARAM(zfs_txg, zfs_txg_, history, INT, ZMOD_RW,
1039+
"Historical statistics for the last N txgs");
1040+
1041+
ZFS_MODULE_PARAM(zfs_multihost, zfs_multihost_, history, INT, ZMOD_RW,
1042+
"Historical statistics for last N multihost writes");
10481043
/* END CSTYLED */
1049-
#endif

tests/zfs-tests/include/tunables.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ MAX_MISSING_TVDS max_missing_tvds zfs_max_missing_tvds
5454
METASLAB_DEBUG_LOAD metaslab.debug_load metaslab_debug_load
5555
METASLAB_FORCE_GANGING metaslab.force_ganging metaslab_force_ganging
5656
MULTIHOST_FAIL_INTERVALS multihost.fail_intervals zfs_multihost_fail_intervals
57-
MULTIHOST_HISTORY UNSUPPORTED zfs_multihost_history
57+
MULTIHOST_HISTORY multihost.history zfs_multihost_history
5858
MULTIHOST_IMPORT_INTERVALS multihost.import_intervals zfs_multihost_import_intervals
5959
MULTIHOST_INTERVAL multihost.interval zfs_multihost_interval
6060
OVERRIDE_ESTIMATE_RECORDSIZE send.override_estimate_recordsize zfs_override_estimate_recordsize
@@ -73,7 +73,7 @@ SPA_LOAD_VERIFY_METADATA spa.load_verify_metadata spa_load_verify_metadata
7373
TRIM_EXTENT_BYTES_MIN trim.extent_bytes_min zfs_trim_extent_bytes_min
7474
TRIM_METASLAB_SKIP trim.metaslab_skip zfs_trim_metaslab_skip
7575
TRIM_TXG_BATCH trim.txg_batch zfs_trim_txg_batch
76-
TXG_HISTORY UNSUPPORTED zfs_txg_history
76+
TXG_HISTORY txg.history zfs_txg_history
7777
TXG_TIMEOUT txg.timeout zfs_txg_timeout
7878
UNLINK_SUSPEND_PROGRESS UNSUPPORTED zfs_unlink_suspend_progress
7979
VDEV_MIN_MS_COUNT vdev.min_ms_count zfs_vdev_min_ms_count

0 commit comments

Comments
 (0)