diff options
author | Don Brady <[email protected]> | 2015-09-17 17:55:22 -0600 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2015-09-22 09:13:20 -0700 |
commit | 56b3986316365d997cb381d3295b99612e18ab6e (patch) | |
tree | 8a822457f008582ae54adb6bff198da6c5811db5 /module | |
parent | e7a05183c49fc897fe56e060fcbfbc20a41bf9f0 (diff) |
Add large block support to zpios(1) benchmark
As part of the large block support effort, it makes sense to add
support for large blocks to **zpios(1)**. The specifying of a zfs
block size for zpios is optional and will default to 128K if the
block size is not specified.
`zpios ... -S size | --blocksize size ...`
This will use *size* ZFS blocks for each test, specified as a comma
delimited list with an optional unit suffix. The supported range is
powers of two from 128K through 16M. A range of block sizes can be
tested as follows: `-S 128K,256K,512K,1M`
Example run below
(non realistic results from a VM and output abbreviated for space)
```
--regioncount=750 --regionsize=8M --chunksize=1M --offset=4K
--threaddelay=0 --cleanup --human-readable --verbose --cleanup
--blocksize=128K,256K,512K,1M
th-cnt rg-cnt rg-sz ch-sz blksz wr-data wr-bw rd-data rd-bw
---------------------------------------------------------------------
4 750 8m 1m 128k 5g 90.06m 5g 93.37m
4 750 8m 1m 256k 5g 79.71m 5g 99.81m
4 750 8m 1m 512k 5g 42.20m 5g 93.14m
4 750 8m 1m 1m 5g 35.51m 5g 89.36m
8 750 8m 1m 128k 5g 85.49m 5g 90.81m
8 750 8m 1m 256k 5g 61.42m 5g 99.24m
8 750 8m 1m 512k 5g 49.09m 5g 108.78m
16 750 8m 1m 128k 5g 86.28m 5g 88.73m
16 750 8m 1m 256k 5g 64.34m 5g 93.47m
16 750 8m 1m 512k 5g 68.84m 5g 124.47m
16 750 8m 1m 1m 5g 53.97m 5g 97.20m
---------------------------------------------------------------------
```
Signed-off-by: Don Brady <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #3795
Closes #2071
Diffstat (limited to 'module')
-rw-r--r-- | module/zpios/pios.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/module/zpios/pios.c b/module/zpios/pios.c index e3a85c168..8f4a8fd69 100644 --- a/module/zpios/pios.c +++ b/module/zpios/pios.c @@ -29,10 +29,13 @@ * * You should have received a copy of the GNU General Public License along * with ZPIOS. If not, see <http://www.gnu.org/licenses/>. + * + * Copyright (c) 2015, Intel Corporation. */ #include <sys/zfs_context.h> #include <sys/dmu.h> +#include <sys/spa.h> #include <sys/txg.h> #include <sys/dsl_destroy.h> #include <linux/miscdevice.h> @@ -129,8 +132,17 @@ zpios_dmu_object_create(run_args_t *run_args, objset_t *os) { struct dmu_tx *tx; uint64_t obj = 0ULL; + uint64_t blksize = run_args->block_size; int rc; + if (blksize < SPA_MINBLOCKSIZE || + blksize > spa_maxblocksize(dmu_objset_spa(os)) || + !ISP2(blksize)) { + zpios_print(run_args->file, + "invalid block size for pool: %d\n", (int)blksize); + return (obj); + } + tx = dmu_tx_create(os); dmu_tx_hold_write(tx, DMU_NEW_OBJECT, 0, OBJ_SIZE); rc = dmu_tx_assign(tx, TXG_WAIT); @@ -142,10 +154,11 @@ zpios_dmu_object_create(run_args_t *run_args, objset_t *os) } obj = dmu_object_alloc(os, DMU_OT_UINT64_OTHER, 0, DMU_OT_NONE, 0, tx); - rc = dmu_object_set_blocksize(os, obj, 128ULL << 10, 0, tx); + rc = dmu_object_set_blocksize(os, obj, blksize, 0, tx); if (rc) { zpios_print(run_args->file, - "dmu_object_set_blocksize() failed: %d\n", rc); + "dmu_object_set_blocksize to %d failed: %d\n", + (int)blksize, rc); dmu_tx_abort(tx); return (obj); } @@ -295,6 +308,7 @@ zpios_setup_run(run_args_t **run_args, zpios_cmd_t *kcmd, struct file *file) ra->chunk_noise = kcmd->cmd_chunk_noise; ra->thread_delay = kcmd->cmd_thread_delay; ra->flags = kcmd->cmd_flags; + ra->block_size = kcmd->cmd_block_size; ra->stats.wr_data = 0; ra->stats.wr_chunks = 0; ra->stats.rd_data = 0; |