Index: uspace/app/hbench/benchlist.c =================================================================== --- uspace/app/hbench/benchlist.c (revision f393bc0d4ffc04bd749e016223d32741edb44ab1) +++ uspace/app/hbench/benchlist.c (revision bdd9e92c3ff20c6239bc3d55ce5d75f1f95cf119) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2023 Jiri Svoboda + * Copyright (c) 2024 Jiri Svoboda * Copyright (c) 2018 Vojtech Horky * All rights reserved. @@ -42,4 +42,6 @@ &benchmark_fibril_mutex, &benchmark_file_read, + &benchmark_rand_read, + &benchmark_seq_read, &benchmark_malloc1, &benchmark_malloc2, Index: uspace/app/hbench/disk/randread.c =================================================================== --- uspace/app/hbench/disk/randread.c (revision bdd9e92c3ff20c6239bc3d55ce5d75f1f95cf119) +++ uspace/app/hbench/disk/randread.c (revision bdd9e92c3ff20c6239bc3d55ce5d75f1f95cf119) @@ -0,0 +1,148 @@ +/* + * Copyright (c) 2024 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup hbench + * @{ + */ + +#include +#include +#include +#include +#include +#include "../hbench.h" + +/** Execute disk random read benchmark. */ +static bool runner(bench_env_t *env, bench_run_t *run, uint64_t size) +{ + const char *disk; + const char *nbstr; + service_id_t svcid; + size_t block_size; + aoff64_t dev_nblocks; + aoff64_t baddr; + bool block_inited = false; + char *buf = NULL; + uint64_t i; + errno_t rc; + int nitem; + unsigned nb; + + disk = bench_env_param_get(env, "disk", NULL); + if (disk == NULL) { + bench_run_fail(run, "You must specify 'disk' parameter."); + goto error; + } + + nbstr = bench_env_param_get(env, "nb", "1"); + nitem = sscanf(nbstr, "%u", &nb); + if (nitem < 1) { + bench_run_fail(run, "'nb' must be an integer number of blocks."); + goto error; + } + + rc = loc_service_get_id(disk, &svcid, 0); + if (rc != EOK) { + bench_run_fail(run, "failed resolving device '%s'", disk); + goto error; + } + + rc = block_init(svcid, 2048); + if (rc != EOK) { + bench_run_fail(run, "failed opening block device '%s'", + disk); + } + + block_inited = true; + + rc = block_get_bsize(svcid, &block_size); + if (rc != EOK) { + bench_run_fail(run, "error determining device block size."); + goto error; + } + + rc = block_get_nblocks(svcid, &dev_nblocks); + if (rc != EOK) { + bench_run_fail(run, "failed to obtain block device size.\n"); + goto error; + } + + if (dev_nblocks < nb) { + bench_run_fail(run, "device is smaller than %u blocks.\n", + nb); + goto error; + } + + buf = malloc(block_size * nb); + if (buf == NULL) { + bench_run_fail(run, "failed to allocate buffer (%zu bytes)", + block_size * nb); + goto error; + } + + printf("NOTE Block size=%zu nb=%u\n", block_size, nb); + + bench_run_start(run); + for (i = 0; i < size; i++) { + /* Generate pseudo-random block address */ + baddr = (rand() + rand() * RAND_MAX) % (dev_nblocks - nb + 1); + + rc = block_read_direct(svcid, baddr, nb, buf); + if (rc != EOK) { + bench_run_fail(run, "failed to read blockd %llu-%llu: " + "%s", (unsigned long long)baddr, + (unsigned long long)(baddr + nb - 1), + str_error(errno)); + goto error; + } + } + + bench_run_stop(run); + block_fini(svcid); + free(buf); + + return true; +error: + if (buf != NULL) + free(buf); + if (block_inited) + block_fini(svcid); + return false; +} + +benchmark_t benchmark_rand_read = { + .name = "rand_read", + .desc = "Random disk read (must set 'disk' parameter).", + .entry = &runner, + .setup = NULL, + .teardown = NULL +}; + +/** + * @} + */ Index: uspace/app/hbench/disk/seqread.c =================================================================== --- uspace/app/hbench/disk/seqread.c (revision bdd9e92c3ff20c6239bc3d55ce5d75f1f95cf119) +++ uspace/app/hbench/disk/seqread.c (revision bdd9e92c3ff20c6239bc3d55ce5d75f1f95cf119) @@ -0,0 +1,147 @@ +/* + * Copyright (c) 2024 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup hbench + * @{ + */ + +#include +#include +#include +#include +#include +#include "../hbench.h" + +/** Execute disk sequential read benchmark. */ +static bool runner(bench_env_t *env, bench_run_t *run, uint64_t size) +{ + const char *disk; + const char *nbstr; + service_id_t svcid; + size_t block_size; + aoff64_t dev_nblocks; + aoff64_t baddr; + bool block_inited = false; + char *buf = NULL; + uint64_t i; + errno_t rc; + int nitem; + unsigned nb; + + disk = bench_env_param_get(env, "disk", NULL); + if (disk == NULL) { + bench_run_fail(run, "Yo must specify 'disk' parameter."); + goto error; + } + + nbstr = bench_env_param_get(env, "nb", "1"); + nitem = sscanf(nbstr, "%u", &nb); + if (nitem < 1) { + bench_run_fail(run, "'nb' must be an integer number of blocks."); + goto error; + } + + rc = loc_service_get_id(disk, &svcid, 0); + if (rc != EOK) { + bench_run_fail(run, "failed resolving device '%s'", disk); + goto error; + } + + rc = block_init(svcid, 2048); + if (rc != EOK) { + bench_run_fail(run, "failed opening block device '%s'", + disk); + } + + block_inited = true; + + rc = block_get_bsize(svcid, &block_size); + if (rc != EOK) { + bench_run_fail(run, "error determining device block size."); + goto error; + } + + rc = block_get_nblocks(svcid, &dev_nblocks); + if (rc != EOK) { + bench_run_fail(run, "failed to obtain block device size.\n"); + goto error; + } + + if (dev_nblocks < nb) { + bench_run_fail(run, "device is smaller than %u blocks.\n", + nb); + goto error; + } + + buf = malloc(block_size); + if (buf == NULL) { + bench_run_fail(run, "failed to allocate buffer (%zu bytes)", + block_size); + goto error; + } + + printf("NOTE Block size=%zu nb=%u\n", block_size, nb); + + bench_run_start(run); + for (i = 0; i < size; i++) { + baddr = i % (dev_nblocks - nb + 1); + + rc = block_read_direct(svcid, baddr, 1, buf); + if (rc != EOK) { + bench_run_fail(run, "failed to read blocks %llu-%llu: " + "%s", (unsigned long long)baddr, + (unsigned long long)(baddr + nb - 1), + str_error(errno)); + goto error; + } + } + + bench_run_stop(run); + block_fini(svcid); + free(buf); + + return true; +error: + if (buf != NULL) + free(buf); + if (block_inited) + block_fini(svcid); + return false; +} + +benchmark_t benchmark_seq_read = { + .name = "seq_read", + .desc = "Sequential disk read (must set 'disk' parameter).", + .entry = &runner, + .setup = NULL, + .teardown = NULL +}; + +/** + * @} + */ Index: uspace/app/hbench/hbench.h =================================================================== --- uspace/app/hbench/hbench.h (revision f393bc0d4ffc04bd749e016223d32741edb44ab1) +++ uspace/app/hbench/hbench.h (revision bdd9e92c3ff20c6239bc3d55ce5d75f1f95cf119) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2023 Jiri Svoboda + * Copyright (c) 2024 Jiri Svoboda * Copyright (c) 2019 Vojtech Horky * All rights reserved. @@ -135,4 +135,6 @@ extern benchmark_t benchmark_fibril_mutex; extern benchmark_t benchmark_file_read; +extern benchmark_t benchmark_rand_read; +extern benchmark_t benchmark_seq_read; extern benchmark_t benchmark_malloc1; extern benchmark_t benchmark_malloc2; Index: uspace/app/hbench/meson.build =================================================================== --- uspace/app/hbench/meson.build (revision f393bc0d4ffc04bd749e016223d32741edb44ab1) +++ uspace/app/hbench/meson.build (revision bdd9e92c3ff20c6239bc3d55ce5d75f1f95cf119) @@ -1,4 +1,4 @@ # -# Copyright (c) 2023 Jiri Svoboda +# Copyright (c) 2024 Jiri Svoboda # All rights reserved. # @@ -27,5 +27,5 @@ # -deps = [ 'math', 'ipctest' ] +deps = [ 'block', 'math', 'ipctest' ] src = files( 'benchlist.c', @@ -34,4 +34,6 @@ 'main.c', 'utils.c', + 'disk/randread.c', + 'disk/seqread.c', 'fs/dirread.c', 'fs/fileread.c',