Recent changes (master)
The following changes since commit 30bec59eab3908b681cbc2866179f7166a849c83:
os: define EDQUOT to EIO if the OS doesn't provide it (2021-05-11 07:58:03 -0600)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to dfecde6a4b49bd299b2a7192c10533b9beb4820d:
Merge branch '2021-05-13/stat-fix-integer-overflow' of https://github.com/flx42/fio (2021-05-14 09:36:59 -0600)
----------------------------------------------------------------
Felix Abecassis (1):
stat: fix integer overflow in convert_agg_kbytes_percent
Jens Axboe (1):
Merge branch '2021-05-13/stat-fix-integer-overflow' of https://github.com/flx42/fio
Niklas Cassel (4):
zbd: only put an upper limit on max open zones once oslib/linux-blkzoned: move sysfs reading into its own function
ioengines: add get_max_open_zones zoned block device operation engines/libzbc: add support for the get_max_open_zones io op
engines/libzbc.c | 21 +++++++++++ engines/skeleton_external.c | 13 +++++++ ioengines.h | 4 +- oslib/blkzoned.h | 7 ++++ oslib/linux-blkzoned.c | 83 ++++++++++++++++++++++++++++++----------- stat.c | 2 +- zbd.c | 91 ++++++++++++++++++++++++++++++++++++++++++--- 7 files changed, 191 insertions(+), 30 deletions(-)
---
Diff of recent changes:
engines/libzbc.c +21 -0
@@ -19,6 +19,7 @@ struct libzbc_data {struct zbc_device *zdev;enum zbc_dev_model model;uint64_t nr_sectors; +uint32_t max_open_seq_req; };static int libzbc_get_dev_info (struct libzbc_data *ld,struct fio_file *f)
@@ -32,6 +33,7 @@ static int libzbc_get_dev_info(struct libzbc_data *ld, struct fio_file *f)zbc_get_device_info (ld->zdev, zinfo); ld->model = zinfo->zbd_model; ld->nr_sectors = zinfo->zbd_sectors; + ld->max_open_seq_req = zinfo->zbd_max_nr_open_seq_req; dprint(FD_ZBD, "%s: vendor_id:%s, type: %s, model: %s\n", f->file_name, zinfo->zbd_vendor_id,
@@ -335,6 +337,24 @@ err:return -ret; } +static int libzbc_get_max_open_zones (struct thread_data *td,struct fio_file *f, +unsigned int *max_open_zones) +{ +struct libzbc_data *ld; +int ret; + + ret =libzbc_open_dev (td, f, &ld); +if (ret) +return ret; + +if (ld->max_open_seq_req ==ZBC_NO_LIMIT ) + *max_open_zones =0 ; +else + *max_open_zones = ld->max_open_seq_req; + +return 0 ; +} +ssize_t libzbc_rw (struct thread_data *td,struct io_u *io_u) {struct libzbc_data *ld = td->io_ops_data;
@@ -414,6 +434,7 @@ FIO_STATIC struct ioengine_ops ioengine = { .get_zoned_model = libzbc_get_zoned_model, .report_zones = libzbc_report_zones, .reset_wp = libzbc_reset_wp, + .get_max_open_zones = libzbc_get_max_open_zones, .queue = libzbc_queue, .flags = FIO_SYNCIO | FIO_NOEXTEND | FIO_RAWIO, };
engines/skeleton_external.c +13 -0
@@ -193,6 +193,18 @@ static int fio_skeleton_reset_wp(struct thread_data *td, struct fio_file *f,return 0 ; } +/* +* Hook called for getting the maximum number of open zones for a +* ZBD_HOST_MANAGED zoned block device. +* A @max_open_zones value set to zero means no limit. +*/ +static int fio_skeleton_get_max_open_zones (struct thread_data *td, +struct fio_file *f, +unsigned int *max_open_zones) +{ +return 0 ; +} +/* * Note that the structure is exported, so that fio can get it via * dlsym(..., "ioengine"); for (and only for) external engines.
@@ -212,6 +224,7 @@ struct ioengine_ops ioengine = { .get_zoned_model = fio_skeleton_get_zoned_model, .report_zones = fio_skeleton_report_zones, .reset_wp = fio_skeleton_reset_wp, + .get_max_open_zones = fio_skeleton_get_max_open_zones, .options = options, .option_struct_size = sizeof(struct fio_skeleton_options), };
ioengines.h +3 -1
@@ -8,7 +8,7 @@#include "io_u.h" #include "zbd_types.h" -#define FIO_IOOPS_VERSION 29 +#define FIO_IOOPS_VERSION 30#ifndef CONFIG_DYNAMIC_ENGINES #define FIO_STATIC static
@@ -59,6 +59,8 @@ struct ioengine_ops { uint64_t, struct zbd_zone *, unsigned int);int (*reset_wp)(struct thread_data *,struct fio_file *,uint64_t ,uint64_t ); +int (*get_max_open_zones)(struct thread_data *,struct fio_file *, +unsigned int *);int option_struct_size;struct fio_option *options; };
oslib/blkzoned.h +7 -0
@@ -16,6 +16,8 @@ extern int blkzoned_report_zones(struct thread_data *td, struct zbd_zone *zones, unsigned int nr_zones);extern int blkzoned_reset_wp (struct thread_data *td,struct fio_file *f,uint64_t offset,uint64_t length); +extern int blkzoned_get_max_open_zones (struct thread_data *td,struct fio_file *f, +unsigned int *max_open_zones);#else /* * Define stubs for systems that do not have zoned block device support.
@@ -44,6 +46,11 @@ static inline int blkzoned_reset_wp(struct thread_data *td, struct fio_file *f, {return -EIO ; } +static inline int blkzoned_get_max_open_zones (struct thread_data *td,struct fio_file *f, +unsigned int *max_open_zones) +{ +return -EIO ; +}#endif #endif /* FIO_BLKZONED_H */
oslib/linux-blkzoned.c +61 -22
110 lines not on this page · raw message
stat.c +1 -1
@@ -462,7 +462,7 @@ static double convert_agg_kbytes_percent(struct group_run_stats *rs, int ddir, i {double p_of_agg =100.0 ;if (rs && rs->agg[ddir] >1024 ) { - p_of_agg = mean *100 / (double ) (rs->agg[ddir] /1024.0 ); + p_of_agg = mean *100.0 / (double ) (rs->agg[ddir] /1024.0 );if (p_of_agg >100.0 ) p_of_agg =100.0 ;
zbd.c +85 -6
125 lines not on this page · raw message