Windows: libspl: implement ZFS_MODULE_PARAM for userspace

Signed-off-by: Jorgen Lundman <lundman@lundman.net>

Author: lundman

lib/libspl/CMakeLists.txt

@@ -8,6 +8,7 @@ add_library(libspl
 	strlcat.c
 	strlcpy.c
     timestamp.c
+	tunables.c
 	assert.c
 	backtrace.c
     os/windows/posix.c

lib/libspl/include/os/windows/inttypes.h

@@ -22,17 +22,20 @@
 #ifndef _LIBSPL_INTTYPES_H
 #define	_LIBSPL_INTTYPES_H
 
+#include_next <inttypes.h>
+
 #define	SCNi8  "hhi"
 #define	SCNi16 "hi"
 #define	SCNi32 "i"
 #define	SCNi64 "lli"
-#define	PRId32 "i"
+// #define	PRId32 "i"
 #define	PRIu64 "llu"
 #define	PRIx64 "llx"
 #define	PRIi64 "lli"
-#define	PRId64 "lli"
+// #define	PRId64 "lli"
 
-#define	strtoimax strtoull
 
+#define	strtoimax strtoull
+#define	strtoumax strtoull
 
 #endif /* SPL_INTTYPES_H */

lib/libspl/include/sys/mod.h

@@ -32,6 +32,26 @@
 
 #include <sys/tunables.h>
 
+/*
+ * We use sys/linker_set.h, so let's simulate it
+ * for the platforms that haven't got that.
+ */
+
+#if defined(_WIN32)
+
+#include <sys/linker_set.h>
+
+#else /* Not Windows */
+
+#define	SET_ENTRY(set, sym) \
+	static const zfs_tunable_t *			\
+	_##set##sym					\
+	__attribute__((__section__(ZFS_TUNABLE_SECTION))) \
+	__attribute__((__used__))			\
+	= &set##sym;
+
+#endif
+
 #define	ZFS_MODULE_PARAM(scope, prefix, name, type, perm, desc)		\
 	static const zfs_tunable_t _zfs_tunable_##prefix##name = {	\
 		.zt_name = #prefix#name,				\
@@ -41,11 +61,7 @@
 		.zt_perm = ZFS_TUNABLE_PERM_##perm,			\
 		.zt_desc = desc						\
 	};								\
-	static const zfs_tunable_t *					\
-	__zfs_tunable_##prefix##name					\
-	__attribute__((__section__(ZFS_TUNABLE_SECTION))) \
-	__attribute__((__used__))					\
-	= &_zfs_tunable_##prefix##name;
+	SET_ENTRY(zfs_tunables, _zfs_tunable_##prefix##name)
 
 #define	ZFS_MODULE_PARAM_ARGS void
 #define	ZFS_MODULE_PARAM_CALL(scope_prefix, name_prefix, name, setfunc, \

lib/libspl/include/sys/tunables.h

@@ -27,6 +27,10 @@
 #ifndef _SYS_TUNABLES_H
 #define	_SYS_TUNABLES_H
 
+#if defined(_WIN32)
+#include <sys/linker_set.h>
+#endif
+
 typedef enum {
 	ZFS_TUNABLE_TYPE_INT,
 	ZFS_TUNABLE_TYPE_UINT,
@@ -51,6 +55,8 @@ typedef struct zfs_tunable {
 
 #if defined(__APPLE__)
 #define	ZFS_TUNABLE_SECTION "__DATA_CONST,zfs_tunables"
+#elif defined(_WIN32)
+/* Not used */
 #else
 #define	ZFS_TUNABLE_SECTION "zfs_tunables"
 #endif

lib/libspl/tunables.c

@@ -112,6 +112,10 @@
 	for ((pvar) = &__start_##set; \
 	    (pvar) < &__stop_##set; (pvar)++)
 
+#elif defined(_WIN32)
+
+#include <sys/linker_set.h>
+
 #else
 
 #define	SET_DECLARE(set, type) \
@@ -130,9 +134,11 @@
  * that, we force a symbol into that section, and then when iterating, skip
  * any NULL pointers.
  */
+#ifndef _WIN32
 static void *__zfs_tunable__placeholder
 	__attribute__((__section__(ZFS_TUNABLE_SECTION)))
 	__attribute__((__used__)) = NULL;
+#endif
 
 /*
  * Find the name tunable by walking through the linker set and comparing names,