Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

configure.ac

@@ -96,5 +96,7 @@ AC_CONFIG_FILES([
 	module/zpios/include/Makefile
 	scripts/Makefile
 	scripts/zpool-config/Makefile
+	scripts/zpios-test/Makefile
+	scripts/zpios-profile/Makefile
 ])
 AC_OUTPUT

scripts/Makefile.am

@@ -1,5 +1,6 @@
-SUBDIRS = zpool-config
+SUBDIRS = zpool-config zpios-test zpios-profile
 EXTRA_DIST = common.sh zfs-update.sh zfs.sh zpool-create.sh
+EXTRA_DIST += zpios.sh zpios-survey.sh
 
 check:
 	./zfs.sh -v

scripts/zpios-profile/Makefile.am

@@ -0,0 +1 @@
+EXTRA_DIST = *.sh

scripts/zpios-test/16th-8192rc-4rs-1cs-4off.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+#
+#
+# Usage: zpios
+#         --chunksize         -c    =values
+#         --chunksize_low     -a    =value
+#         --chunksize_high    -b    =value
+#         --chunksize_incr    -g    =value
+#         --offset            -o    =values
+#         --offset_low        -m    =value
+#         --offset_high       -q    =value
+#         --offset_incr       -r    =value
+#         --regioncount       -n    =values
+#         --regioncount_low   -i    =value
+#         --regioncount_high  -j    =value
+#         --regioncount_incr  -k    =value
+#         --threadcount       -t    =values
+#         --threadcount_low   -l    =value
+#         --threadcount_high  -h    =value
+#         --threadcount_incr  -e    =value
+#         --regionsize        -s    =values
+#         --regionsize_low    -A    =value
+#         --regionsize_high   -B    =value
+#         --regionsize_incr   -C    =value
+#         --cleanup           -x
+#         --verify            -V
+#         --zerocopy          -z
+#         --threaddelay       -T    =jiffies
+#         --regionnoise       -I    =shift
+#         --chunknoise        -N    =bytes
+#         --prerun            -P    =pre-command
+#         --postrun           -R    =post-command
+#         --log               -G    =log directory
+#         --pool | --path     -p    =pool name
+#         --load              -L    =dmuio
+#         --help              -?    =this help
+#         --verbose           -v    =increase verbosity
+
+ZPIOS_CMD="${CMDDIR}/zpios/zpios                                 \
+	--load=dmuio                                             \
+	--path=${ZPOOL_NAME}                                     \
+	--threadcount=1                                          \
+	--regioncount=16                                         \
+	--regionsize=4M                                          \
+	--chunksize=1M                                           \
+	--offset=4M                                              \
+        --cleanup                                                \
+	--verbose                                                \
+	--human-readable                                         \
+	${ZPIOS_OPTIONS}"
+
+zpios_start() {
+	echo ${ZPIOS_CMD}
+	${ZPIOS_CMD} || exit 1
+}
+
+zpios_stop() {
+	echo
+}

scripts/zpios-test/256th-65536rc-4rs-1cs-4off.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+#
+#
+# Usage: zpios
+#         --chunksize         -c    =values
+#         --chunksize_low     -a    =value
+#         --chunksize_high    -b    =value
+#         --chunksize_incr    -g    =value
+#         --offset            -o    =values
+#         --offset_low        -m    =value
+#         --offset_high       -q    =value
+#         --offset_incr       -r    =value
+#         --regioncount       -n    =values
+#         --regioncount_low   -i    =value
+#         --regioncount_high  -j    =value
+#         --regioncount_incr  -k    =value
+#         --threadcount       -t    =values
+#         --threadcount_low   -l    =value
+#         --threadcount_high  -h    =value
+#         --threadcount_incr  -e    =value
+#         --regionsize        -s    =values
+#         --regionsize_low    -A    =value
+#         --regionsize_high   -B    =value
+#         --regionsize_incr   -C    =value
+#         --cleanup           -x
+#         --verify            -V
+#         --zerocopy          -z
+#         --threaddelay       -T    =jiffies
+#         --regionnoise       -I    =shift
+#         --chunknoise        -N    =bytes
+#         --prerun            -P    =pre-command
+#         --postrun           -R    =post-command
+#         --log               -G    =log directory
+#         --pool | --path     -p    =pool name
+#         --load              -L    =dmuio
+#         --help              -?    =this help
+#         --verbose           -v    =increase verbosity
+
+ZPIOS_CMD="${CMDDIR}/zpios/zpios                                 \
+	--load=dmuio                                             \
+	--path=${ZPOOL_NAME}                                     \
+	--threadcount=256                                        \
+	--regioncount=65536                                      \
+	--regionsize=4M                                          \
+	--chunksize=1M                                           \
+	--offset=4M                                              \
+        --cleanup                                                \
+	--verbose                                                \
+	--human-readable                                         \
+	${ZPIOS_OPTIONS}"
+
+zpios_start() {
+	echo ${ZPIOS_CMD}
+	${ZPIOS_CMD} || exit 1
+}
+
+zpios_stop() {
+	echo
+}

scripts/zpios-test/Makefile.am

@@ -0,0 +1 @@
+EXTRA_DIST = *.sh

scripts/zpios-test/large.sh

@@ -0,0 +1 @@
+256th-65536rc-4rs-1cs-4off.sh

scripts/zpios-test/medium.sh

@@ -0,0 +1 @@
+16th-8192rc-4rs-1cs-4off.sh