aboutsummaryrefslogtreecommitdiffstats
path: root/module/zfs
diff options
context:
space:
mode:
authorJohn Gallagher <[email protected]>2018-06-15 15:10:42 -0700
committerBrian Behlendorf <[email protected]>2018-06-15 15:10:42 -0700
commit917f475fba03ceb4e11c7aa35aff09c47a6c596e (patch)
tree92ce7d3981d5ca93e1bbcb42665e9ecc3e1ed1ed /module/zfs
parent7b98f0d91f09df90218322df5cf1b8ba7928972e (diff)
Add tunables for channel programs
This patch adds tunables for modifying the maximum memory limit and maximum instruction limit that can be specified when running a channel program. Reviewed-by: Matthew Ahrens <[email protected]> Reviewed-by: Brian Behlendorf <[email protected] Reviewed-by: Sara Hartse <[email protected]> Signed-off-by: John Gallagher <[email protected]> External-issue: LX-1085 Closes #7618
Diffstat (limited to 'module/zfs')
-rw-r--r--module/zfs/zcp.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/module/zfs/zcp.c b/module/zfs/zcp.c
index e7194344b..dad09da50 100644
--- a/module/zfs/zcp.c
+++ b/module/zfs/zcp.c
@@ -14,7 +14,7 @@
*/
/*
- * Copyright (c) 2016, 2017 by Delphix. All rights reserved.
+ * Copyright (c) 2016, 2018 by Delphix. All rights reserved.
*/
/*
@@ -108,8 +108,8 @@
#define ZCP_NVLIST_MAX_DEPTH 20
uint64_t zfs_lua_check_instrlimit_interval = 100;
-uint64_t zfs_lua_max_instrlimit = ZCP_MAX_INSTRLIMIT;
-uint64_t zfs_lua_max_memlimit = ZCP_MAX_MEMLIMIT;
+unsigned long zfs_lua_max_instrlimit = ZCP_MAX_INSTRLIMIT;
+unsigned long zfs_lua_max_memlimit = ZCP_MAX_MEMLIMIT;
/*
* Forward declarations for mutually recursive functions
@@ -1417,3 +1417,15 @@ zcp_parse_args(lua_State *state, const char *fname, const zcp_arg_t *pargs,
zcp_parse_pos_args(state, fname, pargs, kwargs);
}
}
+
+#if defined(_KERNEL)
+/* BEGIN CSTYLED */
+module_param(zfs_lua_max_instrlimit, ulong, 0644);
+MODULE_PARM_DESC(zfs_lua_max_instrlimit,
+ "Max instruction limit that can be specified for a channel program");
+
+module_param(zfs_lua_max_memlimit, ulong, 0644);
+MODULE_PARM_DESC(zfs_lua_max_memlimit,
+ "Max memory limit that can be specified for a channel program");
+/* END CSTYLED */
+#endif