diff options
| -rw-r--r-- | include/os/linux/kernel/linux/mod_compat.h | 2 | ||||
| -rw-r--r-- | include/sys/spa.h | 5 | ||||
| -rw-r--r-- | include/sys/spa_impl.h | 2 | ||||
| -rw-r--r-- | module/os/linux/zfs/Makefile.in | 1 | ||||
| -rw-r--r-- | module/os/linux/zfs/spa_misc_os.c | 105 | ||||
| -rw-r--r-- | module/zfs/spa_misc.c | 87 |
6 files changed, 125 insertions, 77 deletions
diff --git a/include/os/linux/kernel/linux/mod_compat.h b/include/os/linux/kernel/linux/mod_compat.h index 5579cb5bf..11df19411 100644 --- a/include/os/linux/kernel/linux/mod_compat.h +++ b/include/os/linux/kernel/linux/mod_compat.h @@ -53,6 +53,7 @@ enum scope_prefix_types { zfs_condense, zfs_dbuf, zfs_dbuf_cache, + zfs_deadman, zfs_l2arc, zfs_livelist, zfs_livelist_condense, @@ -71,6 +72,7 @@ enum scope_prefix_types { zfs_vdev_mirror, zfs_zio, zfs_zil, + spa }; /* diff --git a/include/sys/spa.h b/include/sys/spa.h index 3780fdae0..cb9157738 100644 --- a/include/sys/spa.h +++ b/include/sys/spa.h @@ -1171,6 +1171,11 @@ extern int spa_wait_tag(const char *name, zpool_wait_activity_t activity, extern void spa_notify_waiters(spa_t *spa); extern void spa_wake_waiters(spa_t *spa); +/* module param call functions */ +int param_set_deadman_ziotime(const char *val, zfs_kernel_param_t *kp); +int param_set_deadman_synctime(const char *val, zfs_kernel_param_t *kp); +int param_set_slop_shift(const char *buf, zfs_kernel_param_t *kp); + #ifdef ZFS_DEBUG #define dprintf_bp(bp, fmt, ...) do { \ if (zfs_flags & ZFS_DEBUG_DPRINTF) { \ diff --git a/include/sys/spa_impl.h b/include/sys/spa_impl.h index 8dfd46431..c83252bca 100644 --- a/include/sys/spa_impl.h +++ b/include/sys/spa_impl.h @@ -433,7 +433,7 @@ struct spa { }; extern char *spa_config_path; - +extern int spa_slop_shift; extern void spa_taskq_dispatch_ent(spa_t *spa, zio_type_t t, zio_taskq_type_t q, task_func_t *func, void *arg, uint_t flags, taskq_ent_t *ent); extern void spa_taskq_dispatch_sync(spa_t *, zio_type_t t, zio_taskq_type_t q, diff --git a/module/os/linux/zfs/Makefile.in b/module/os/linux/zfs/Makefile.in index e8ea81db3..153277378 100644 --- a/module/os/linux/zfs/Makefile.in +++ b/module/os/linux/zfs/Makefile.in @@ -17,6 +17,7 @@ $(MODULE)-objs += ../os/linux/zfs/trace.o $(MODULE)-objs += ../os/linux/zfs/qat.o $(MODULE)-objs += ../os/linux/zfs/qat_compress.o $(MODULE)-objs += ../os/linux/zfs/qat_crypt.o +$(MODULE)-objs += ../os/linux/zfs/spa_misc_os.o $(MODULE)-objs += ../os/linux/zfs/spa_stats.o $(MODULE)-objs += ../os/linux/zfs/vdev_disk.o $(MODULE)-objs += ../os/linux/zfs/vdev_file.o diff --git a/module/os/linux/zfs/spa_misc_os.c b/module/os/linux/zfs/spa_misc_os.c new file mode 100644 index 000000000..5c222d2fb --- /dev/null +++ b/module/os/linux/zfs/spa_misc_os.c @@ -0,0 +1,105 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ +/* + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2019 by Delphix. All rights reserved. + * Copyright 2015 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. + * Copyright 2013 Saso Kiselkov. All rights reserved. + * Copyright (c) 2017 Datto Inc. + * Copyright (c) 2017, Intel Corporation. + */ + +#include <sys/zfs_context.h> +#include <sys/spa_impl.h> +#include <sys/spa.h> +#include <sys/txg.h> +#include <sys/unique.h> +#include <sys/dsl_pool.h> +#include <sys/dsl_dir.h> +#include <sys/dsl_prop.h> +#include <sys/fm/util.h> +#include <sys/dsl_scan.h> +#include <sys/fs/zfs.h> +#include <sys/kstat.h> +#include "zfs_prop.h" + +int +param_set_deadman_ziotime(const char *val, zfs_kernel_param_t *kp) +{ + spa_t *spa = NULL; + int error; + + error = param_set_ulong(val, kp); + if (error < 0) + return (SET_ERROR(error)); + + if (spa_mode_global != 0) { + mutex_enter(&spa_namespace_lock); + while ((spa = spa_next(spa)) != NULL) + spa->spa_deadman_ziotime = + MSEC2NSEC(zfs_deadman_ziotime_ms); + mutex_exit(&spa_namespace_lock); + } + + return (0); +} + +int +param_set_deadman_synctime(const char *val, zfs_kernel_param_t *kp) +{ + spa_t *spa = NULL; + int error; + + error = param_set_ulong(val, kp); + if (error < 0) + return (SET_ERROR(error)); + + if (spa_mode_global != 0) { + mutex_enter(&spa_namespace_lock); + while ((spa = spa_next(spa)) != NULL) + spa->spa_deadman_synctime = + MSEC2NSEC(zfs_deadman_synctime_ms); + mutex_exit(&spa_namespace_lock); + } + + return (0); +} + +int +param_set_slop_shift(const char *buf, zfs_kernel_param_t *kp) +{ + unsigned long val; + int error; + + error = kstrtoul(buf, 0, &val); + if (error) + return (SET_ERROR(error)); + + if (val < 1 || val > 31) + return (SET_ERROR(-EINVAL)); + + error = param_set_int(buf, kp); + if (error < 0) + return (SET_ERROR(error)); + + return (0); +} diff --git a/module/zfs/spa_misc.c b/module/zfs/spa_misc.c index 46279517d..5dd11f6a3 100644 --- a/module/zfs/spa_misc.c +++ b/module/zfs/spa_misc.c @@ -2733,69 +2733,6 @@ param_set_deadman_failmode(const char *val, zfs_kernel_param_t *kp) return (param_set_charp(val, kp)); } - -static int -param_set_deadman_ziotime(const char *val, zfs_kernel_param_t *kp) -{ - spa_t *spa = NULL; - int error; - - error = param_set_ulong(val, kp); - if (error < 0) - return (SET_ERROR(error)); - - if (spa_mode_global != 0) { - mutex_enter(&spa_namespace_lock); - while ((spa = spa_next(spa)) != NULL) - spa->spa_deadman_ziotime = - MSEC2NSEC(zfs_deadman_ziotime_ms); - mutex_exit(&spa_namespace_lock); - } - - return (0); -} - -static int -param_set_deadman_synctime(const char *val, zfs_kernel_param_t *kp) -{ - spa_t *spa = NULL; - int error; - - error = param_set_ulong(val, kp); - if (error < 0) - return (SET_ERROR(error)); - - if (spa_mode_global != 0) { - mutex_enter(&spa_namespace_lock); - while ((spa = spa_next(spa)) != NULL) - spa->spa_deadman_synctime = - MSEC2NSEC(zfs_deadman_synctime_ms); - mutex_exit(&spa_namespace_lock); - } - - return (0); -} - -static int -param_set_slop_shift(const char *buf, zfs_kernel_param_t *kp) -{ - unsigned long val; - int error; - - error = kstrtoul(buf, 0, &val); - if (error) - return (SET_ERROR(error)); - - if (val < 1 || val > 31) - return (SET_ERROR(-EINVAL)); - - error = param_set_int(buf, kp); - if (error < 0) - return (SET_ERROR(error)); - - return (0); -} - #endif /* Namespace manipulation */ @@ -2911,26 +2848,24 @@ ZFS_MODULE_PARAM(zfs, zfs_, user_indirect_is_special, INT, ZMOD_RW, "Place user data indirect blocks into the special class"); #ifdef _KERNEL -module_param_call(zfs_deadman_synctime_ms, param_set_deadman_synctime, - param_get_ulong, &zfs_deadman_synctime_ms, 0644); -MODULE_PARM_DESC(zfs_deadman_synctime_ms, - "Pool sync expiration time in milliseconds"); - -module_param_call(zfs_deadman_ziotime_ms, param_set_deadman_ziotime, - param_get_ulong, &zfs_deadman_ziotime_ms, 0644); -MODULE_PARM_DESC(zfs_deadman_ziotime_ms, - "IO expiration time in milliseconds"); - -ZFS_MODULE_PARAM_CALL(zfs_spa, spa_, slop_shift, param_set_slop_shift, - param_get_int, ZMOD_RW, "Reserved free space in pool"); - module_param_call(zfs_deadman_failmode, param_set_deadman_failmode, param_get_charp, &zfs_deadman_failmode, 0644); MODULE_PARM_DESC(zfs_deadman_failmode, "Failmode for deadman timer"); #endif /* BEGIN CSTYLED */ +ZFS_MODULE_PARAM_CALL(zfs_deadman, zfs_deadman_, synctime_ms, + param_set_deadman_synctime, param_get_ulong, ZMOD_RW, + "Pool sync expiration time in milliseconds"); + +ZFS_MODULE_PARAM_CALL(zfs_deadman, zfs_deadman_, ziotime_ms, + param_set_deadman_ziotime, param_get_ulong, ZMOD_RW, + "IO expiration time in milliseconds"); + ZFS_MODULE_PARAM(zfs, zfs_, special_class_metadata_reserve_pct, INT, ZMOD_RW, "Small file blocks in special vdevs depends on this much " "free space available"); /* END CSTYLED */ + +ZFS_MODULE_PARAM_CALL(spa, spa_, slop_shift, param_set_slop_shift, + param_get_int, ZMOD_RW, "Reserved free space in pool"); |