Recent changes (master)
The following changes since commit 20c7a244e75e4aa705a31a74e7067de4c890dff7:
options: flow should parse as FIO_OPT_INT (2020-08-31 09:07:12 -0600)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 3412afb7b365b97ba515df9c72dfc89bf75aca0a:
t/zbd: Remove unnecessary option for zbc_reset_zone (2020-09-01 08:37:45 -0600)
----------------------------------------------------------------
Shin'ichiro Kawasaki (7):
zbd: Decrement open zones count at write command completion oslib/linux-blkzoned: Allow reset zone before file set up
zbd: Initialize open zones list referring zone status at fio start t/zbd: Improve usage message of test-zbd-support script t/zbd: Add -o option to t/zbd/test-zoned-support
t/zbd: Reset all zones before test when max open zones is specified t/zbd: Remove unnecessary option for zbc_reset_zone
io_u.c | 4 +- io_u.h | 5 +- ioengines.c | 4 +- oslib/linux-blkzoned.c | 18 +++++-- t/zbd/functions | 2 +- t/zbd/test-zbd-support | 122 ++++++++++++++++++++++++++++++++++++++++------- zbd.c | 127 +++++++++++++++++++++++++++++++++++++++---------- zbd.h | 9 ++-- 8 files changed, 236 insertions(+), 55 deletions(-)
---
Diff of recent changes:
io_u.c +2 -2
@@ -795,7 +795,7 @@ void put_io_u(struct thread_data *td, struct io_u *io_u) {const bool needs_lock =td_async_processing (td); -zbd_put_io_u (io_u); +zbd_put_io_u (td, io_u);if (td->parent) td = td->parent;
@@ -1369,7 +1369,7 @@ static long set_io_u_file(struct thread_data *td, struct io_u *io_u)if (!fill_io_u (td, io_u))break ; -zbd_put_io_u (io_u); +zbd_put_io_u (td, io_u);put_file_log (td, f);td_io_close_file (td, f);
io_u.h +3 -2
@@ -101,13 +101,14 @@ struct io_u {* @success == true means that the I/O operation has been queued or * completed successfully. */ -void (*zbd_queue_io)(struct io_u *,int q,bool success); +void (*zbd_queue_io)(struct thread_data *td,struct io_u *,int q, +bool success);/* * ZBD mode zbd_put_io callback: called in after completion of an I/O * or commit of an async I/O to unlock the I/O target zone. */ -void (*zbd_put_io)(const struct io_u *); +void (*zbd_put_io)(struct thread_data *td,const struct io_u *);/* * Callback for io completion
ioengines.c +2 -2
@@ -352,7 +352,7 @@ enum fio_q_status td_io_queue(struct thread_data *td, struct io_u *io_u) } ret = td->io_ops->queue (td, io_u); -zbd_queue_io_u (io_u, ret); +zbd_queue_io_u (td, io_u, ret);unlock_file (td, io_u->file);
@@ -394,7 +394,7 @@ enum fio_q_status td_io_queue(struct thread_data *td, struct io_u *io_u)if (!td->io_ops->commit) {io_u_mark_submit (td,1 );io_u_mark_complete (td,1 ); -zbd_put_io_u (io_u); +zbd_put_io_u (td, io_u); }if (ret ==FIO_Q_COMPLETED ) {
oslib/linux-blkzoned.c +15 -3
@@ -222,9 +222,21 @@ int blkzoned_reset_wp(struct thread_data *td, struct fio_file *f, .sector = offset >> 9, .nr_sectors = length >> 9, }; +int fd, ret =0 ; + +/* If the file is not yet opened, open it for this function. */ + fd = f->fd; +if (fd <0 ) { + fd =open (f->file_name,O_RDWR |O_LARGEFILE ); +if (fd <0 ) +return -errno; + } -if (ioctl (f->fd,BLKRESETZONE , &zr) <0 ) -return -errno; +if (ioctl (fd,BLKRESETZONE , &zr) <0 ) + ret = -errno; -return 0 ; +if (f->fd <0 ) +close (fd); + +return ret; }
t/zbd/functions +1 -1
@@ -185,7 +185,7 @@ reset_zone() { fi else if [ "$offset" -lt 0 ]; then - ${zbc_reset_zone} -all "$dev" "${offset}" >/dev/null + ${zbc_reset_zone} -all "$dev" >/dev/null else ${zbc_reset_zone} -sector "$dev" "${offset}" >/dev/null fi
t/zbd/test-zbd-support +106 -16
400 lines not on this page · raw message
zbd.c +102 -25
248 lines not on this page · raw message
zbd.h +5 -4
@@ -98,18 +98,19 @@ static inline void zbd_close_file(struct fio_file *f)zbd_free_zone_info (f); } -static inline void zbd_queue_io_u (struct io_u *io_u,enum fio_q_status status) +static inline void zbd_queue_io_u (struct thread_data *td,struct io_u *io_u, +enum fio_q_status status) {if (io_u->zbd_queue_io) { - io_u->zbd_queue_io (io_u, status, io_u->error ==0 ); + io_u->zbd_queue_io (td, io_u, status, io_u->error ==0 ); io_u->zbd_queue_io =NULL ; } } -static inline void zbd_put_io_u (struct io_u *io_u) +static inline void zbd_put_io_u (struct thread_data *td,struct io_u *io_u) {if (io_u->zbd_put_io) { - io_u->zbd_put_io (io_u); + io_u->zbd_put_io (td, io_u); io_u->zbd_queue_io =NULL ; io_u->zbd_put_io =NULL ; }