zbd: Ensure first I/O is write for random read/write to sequential zones

[fio.git] / zbd.c

diff --git a/zbd.c b/zbd.c
index b89d56c42fa428ab2db93a48ee087ff06a99bc6e..99ac72cab71cbcbdec4c32f755367aff94a8669a 100644 (file)
--- a/zbd.c
+++ b/zbd.c
@@ -7,11 +7,11 @@
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
-#include <dirent.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "os/os.h"
 #include "file.h"
 #include "fio.h"
 #include "lib/pow2.h"
@@ -31,7 +31,10 @@ int zbd_get_zoned_model(struct thread_data *td, struct fio_file *f,
 {
        int ret;
 
-       ret = blkzoned_get_zoned_model(td, f, model);
+       if (td->io_ops && td->io_ops->get_zoned_model)
+               ret = td->io_ops->get_zoned_model(td, f, model);
+       else
+               ret = blkzoned_get_zoned_model(td, f, model);
        if (ret < 0) {
                td_verror(td, errno, "get zoned model failed");
                log_err("%s: get zoned model failed (%d).\n",
@@ -62,7 +65,10 @@ int zbd_report_zones(struct thread_data *td, struct fio_file *f,
 {
        int ret;
 
-       ret = blkzoned_report_zones(td, f, offset, zones, nr_zones);
+       if (td->io_ops && td->io_ops->report_zones)
+               ret = td->io_ops->report_zones(td, f, offset, zones, nr_zones);
+       else
+               ret = blkzoned_report_zones(td, f, offset, zones, nr_zones);
        if (ret < 0) {
                td_verror(td, errno, "report zones failed");
                log_err("%s: report zones from sector %llu failed (%d).\n",
@@ -92,7 +98,10 @@ int zbd_reset_wp(struct thread_data *td, struct fio_file *f,
 {
        int ret;
 
-       ret = blkzoned_reset_wp(td, f, offset, length);
+       if (td->io_ops && td->io_ops->reset_wp)
+               ret = td->io_ops->reset_wp(td, f, offset, length);
+       else
+               ret = blkzoned_reset_wp(td, f, offset, length);
        if (ret < 0) {
                td_verror(td, errno, "resetting wp failed");
                log_err("%s: resetting wp for %llu sectors at sector %llu failed (%d).\n",
@@ -623,7 +632,6 @@ static int zbd_reset_range(struct thread_data *td, struct fio_file *f,
        struct fio_zone_info *zb, *ze, *z;
        int ret = 0;
 
-       assert(f->fd != -1);
        assert(is_valid_offset(f, offset + length - 1));
 
        switch (f->zbd_info->model) {
@@ -697,9 +705,10 @@ static int zbd_reset_zones(struct thread_data *td, struct fio_file *f,
        bool reset_wp;
        int res = 0;
 
+       assert(min_bs);
+
        dprint(FD_ZBD, "%s: examining zones %u .. %u\n", f->file_name,
                zbd_zone_nr(f->zbd_info, zb), zbd_zone_nr(f->zbd_info, ze));
-       assert(f->fd != -1);
        for (z = zb; z < ze; z++) {
                if (!zbd_zone_swr(z))
                        continue;
@@ -998,6 +1007,8 @@ static struct fio_zone_info *zbd_convert_to_open_zone(struct thread_data *td,
 
                dprint(FD_ZBD, "%s(%s): no candidate zone\n",
                        __func__, f->file_name);
+               pthread_mutex_unlock(&f->zbd_info->mutex);
+               pthread_mutex_unlock(&z->mutex);
                return NULL;
 
 found_candidate_zone:
@@ -1209,6 +1220,7 @@ static void zbd_put_io(const struct io_u *io_u)
        struct zoned_block_device_info *zbd_info = f->zbd_info;
        struct fio_zone_info *z;
        uint32_t zone_idx;
+       int ret;
 
        if (!zbd_info)
                return;
@@ -1224,10 +1236,18 @@ static void zbd_put_io(const struct io_u *io_u)
               "%s: terminate I/O (%lld, %llu) for zone %u\n",
               f->file_name, io_u->offset, io_u->buflen, zone_idx);
 
-       assert(pthread_mutex_unlock(&z->mutex) == 0);
+       ret = pthread_mutex_unlock(&z->mutex);
+       assert(ret == 0);
        zbd_check_swd(f);
 }
 
+/*
+ * Windows and MacOS do not define this.
+ */
+#ifndef EREMOTEIO
+#define EREMOTEIO      121     /* POSIX value */
+#endif
+
 bool zbd_unaligned_write(int error_code)
 {
        switch (error_code) {
@@ -1319,6 +1339,7 @@ enum io_u_action zbd_adjust_block(struct thread_data *td, struct io_u *io_u)
        if (!f->zbd_info)
                return io_u_accept;
 
+       assert(min_bs);
        assert(is_valid_offset(f, io_u->offset));
        assert(io_u->buflen);
        zone_idx_b = zbd_zone_idx(f, io_u->offset);
@@ -1329,6 +1350,16 @@ enum io_u_action zbd_adjust_block(struct thread_data *td, struct io_u *io_u)
        if (!zbd_zone_swr(zb))
                return io_u_accept;
 
+       /*
+        * In case read direction is chosen for the first random I/O, fio with
+        * zonemode=zbd stops because no data can be read from zoned block
+        * devices with all empty zones. Overwrite the first I/O direction as
+        * write to make sure data to read exists.
+        */
+       if (td_rw(td) && !f->zbd_info->sectors_with_data
+           && !td->o.read_beyond_wp)
+               io_u->ddir = DDIR_WRITE;
+
        /*
         * Accept the I/O offset for reads if reading beyond the write pointer
         * is enabled.