diff options
| author | Niklas Cassel <niklas.cassel@wdc.com> | 2021-06-14 13:49:04 +0000 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-06-14 08:54:49 -0600 |
| commit | 9db0cde87d1c928b9d629c6f1b0f8f2ed729d908 (patch) | |
| tree | 6966cf4fcd49b17f9cd2c10d45df7b3a429eaf33 /zbd.c | |
| parent | 50cc48d52fec6c74a46e377b23f19ebed532125a (diff) | |
| download | fio-9db0cde87d1c928b9d629c6f1b0f8f2ed729d908.tar.gz fio-9db0cde87d1c928b9d629c6f1b0f8f2ed729d908.tar.bz2 | |
zbd: allow zonemode=zbd with regular files by emulating zones
Currently when using zonemode=zbd and running against a regular file,
fio will fail with:
fio: file hash not empty on exit
Treat regular files just like how we treat regular (non-zoned) block
devices: return ZBD_NONE and let zbd.c emulate zones inside the regular
file/block device.
Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'zbd.c')
| -rw-r--r-- | zbd.c | 14 |
1 files changed, 13 insertions, 1 deletions
@@ -37,6 +37,12 @@ int zbd_get_zoned_model(struct thread_data *td, struct fio_file *f, return -EINVAL; } + /* If regular file, always emulate zones inside the file. */ + if (f->filetype == FIO_TYPE_FILE) { + *model = ZBD_NONE; + return 0; + } + if (td->io_ops && td->io_ops->get_zoned_model) ret = td->io_ops->get_zoned_model(td, f, model); else @@ -414,7 +420,7 @@ static int init_zone_info(struct thread_data *td, struct fio_file *f) int i; if (zone_size == 0) { - log_err("%s: Specifying the zone size is mandatory for regular block devices with --zonemode=zbd\n\n", + log_err("%s: Specifying the zone size is mandatory for regular file/block device with --zonemode=zbd\n\n", f->file_name); return 1; } @@ -435,6 +441,12 @@ static int init_zone_info(struct thread_data *td, struct fio_file *f) return 1; } + if (f->real_file_size < zone_size) { + log_err("%s: file/device size %"PRIu64" is smaller than zone size %"PRIu64"\n", + f->file_name, f->real_file_size, zone_size); + return -EINVAL; + } + nr_zones = (f->real_file_size + zone_size - 1) / zone_size; zbd_info = scalloc(1, sizeof(*zbd_info) + (nr_zones + 1) * sizeof(zbd_info->zone_info[0])); |