Recent changes (master)
The following changes since commit dd4620b7f9171edaa10955c4826454a05af27c85:
io_uring: drop redundant IO_MODE_OFFLOAD check (2021-06-10 16:40:49 -0600)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to a59b12d2a5eb92c1128a5d8ebcd03b1831962ce5:
t/zbd: update test case 42 (2021-06-14 08:54:56 -0600)
----------------------------------------------------------------
Niklas Cassel (5):
zbd: disallow pipes for zonemode=zbd
zbd: allow zonemode=zbd with regular files by emulating zones
zbd: remove zbd_zoned_model ZBD_IGNORE
zbd: change some f->zbd_info conditionals to asserts t/zbd: update test case 42
engines/libzbc.c | 6 ++---- engines/skeleton_external.c | 1 - oslib/linux-blkzoned.c | 6 ++---- t/zbd/test-zbd-support | 2 +- zbd.c | 37 +++++++++++++++++++++++++------------ zbd_types.h | 7 +++---- 6 files changed, 33 insertions(+), 26 deletions(-)
---
Diff of recent changes:
engines/libzbc.c +2 -4
@@ -180,10 +180,8 @@ static int libzbc_get_zoned_model(struct thread_data *td, struct fio_file *f,struct libzbc_data *ld;int ret; -if (f->filetype !=FIO_TYPE_BLOCK && f->filetype !=FIO_TYPE_CHAR ) { - *model =ZBD_IGNORE ; -return 0 ; - } +if (f->filetype !=FIO_TYPE_BLOCK && f->filetype !=FIO_TYPE_CHAR ) +return -EINVAL ; ret =libzbc_open_dev (td, f, &ld);if (ret)
engines/skeleton_external.c +0 -1
@@ -156,7 +156,6 @@ static int fio_skeleton_close(struct thread_data *td, struct fio_file *f)/* * Hook for getting the zoned model of a zoned block device for zonemode=zbd. * The zoned model can be one of (see zbd_types.h): -* - ZBD_IGNORE: skip regular files * - ZBD_NONE: regular block device (zone emulation will be used) * - ZBD_HOST_AWARE: host aware zoned block device * - ZBD_HOST_MANAGED: host managed zoned block device
oslib/linux-blkzoned.c +2 -4
@@ -140,10 +140,8 @@ int blkzoned_get_zoned_model(struct thread_data *td, struct fio_file *f, {char *model_str =NULL ; -if (f->filetype !=FIO_TYPE_BLOCK ) { - *model =ZBD_IGNORE ; -return 0 ; - } +if (f->filetype !=FIO_TYPE_BLOCK ) +return -EINVAL ; *model =ZBD_NONE ;
t/zbd/test-zbd-support +1 -1
@@ -922,7 +922,7 @@ test41() { test42() { require_regular_block_dev || return $SKIP_TESTCASE read_one_block --zonemode=zbd --zonesize=0 | - grep -q 'Specifying the zone size is mandatory for regular block devices with --zonemode=zbd' + grep -q 'Specifying the zone size is mandatory for regular file/block device with --zonemode=zbd' } # Check whether fio handles --zonesize=1 correctly for regular block devices.
zbd.c +25 -12
@@ -32,6 +32,17 @@ int zbd_get_zoned_model(struct thread_data *td, struct fio_file *f, {int ret; +if (f->filetype ==FIO_TYPE_PIPE ) { +log_err ("zonemode=zbd does not support pipes\n" ); +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
@@ -409,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 ; }
@@ -430,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 ]));
@@ -644,8 +661,6 @@ static int zbd_create_zone_info(struct thread_data *td, struct fio_file *f)return ret;switch (zbd_model) { -case ZBD_IGNORE : -return 0 ;case ZBD_HOST_AWARE :case ZBD_HOST_MANAGED : ret =parse_zone_info (td, f);
@@ -663,6 +678,7 @@ static int zbd_create_zone_info(struct thread_data *td, struct fio_file *f)return -EINVAL ; } +assert (f->zbd_info); f->zbd_info->model = zbd_model; ret =zbd_set_max_open_zones (td, f);
@@ -792,8 +808,7 @@ int zbd_setup_files(struct thread_data *td)struct fio_zone_info *z;int zi; -if (!zbd) -continue ; +assert (zbd); f->min_zone =zbd_zone_idx (f, f->file_offset); f->max_zone =zbd_zone_idx (f, f->file_offset + f->io_size);
@@ -1454,8 +1469,7 @@ static void zbd_queue_io(struct thread_data *td, struct io_u *io_u, int q,uint32_t zone_idx;uint64_t zone_end; -if (!zbd_info) -return ; +assert (zbd_info); zone_idx =zbd_zone_idx (f, io_u->offset);assert (zone_idx < zbd_info->nr_zones);
@@ -1515,8 +1529,7 @@ static void zbd_put_io(struct thread_data *td, const struct io_u *io_u)struct fio_zone_info *z;uint32_t zone_idx; -if (!zbd_info) -return ; +assert (zbd_info); zone_idx =zbd_zone_idx (f, io_u->offset);assert (zone_idx < zbd_info->nr_zones);
@@ -1572,6 +1585,7 @@ void setup_zbd_zone_mode(struct thread_data *td, struct io_u *io_u)assert (td->o.zone_mode ==ZONE_MODE_ZBD );assert (td->o.zone_size); +assert (f->zbd_info); zone_idx =zbd_zone_idx (f, f->last_pos[ddir]); z =get_zone (f, zone_idx);
@@ -1646,6 +1660,7 @@ enum fio_ddir zbd_adjust_ddir(struct thread_data *td, struct io_u *io_u,* devices with all empty zones. Overwrite the first I/O direction as * write to make sure data to read exists. */ +assert (io_u->file->zbd_info);if (ddir !=DDIR_READ || !td_rw (td))return ddir;
@@ -1675,9 +1690,7 @@ enum io_u_action zbd_adjust_block(struct thread_data *td, struct io_u *io_u)uint64_t new_len;int64_t range; -if (!f->zbd_info) -return io_u_accept; - +assert (f->zbd_info);assert (min_bs);assert (is_valid_offset (f, io_u->offset));assert (io_u->buflen);
zbd_types.h +3 -4
@@ -14,10 +14,9 @@* Zoned block device models. */ enum zbd_zoned_model { -ZBD_IGNORE ,/* Ignore file */ -ZBD_NONE ,/* Regular block device */ -ZBD_HOST_AWARE ,/* Host-aware zoned block device */ -ZBD_HOST_MANAGED ,/* Host-managed zoned block device */ +ZBD_NONE =0x1 ,/* No zone support. Emulate zones. */ +ZBD_HOST_AWARE =0x2 ,/* Host-aware zoned block device */ +ZBD_HOST_MANAGED =0x3 ,/* Host-managed zoned block device */ };/*