zbd: engines/libzbc: don't fail on assert for offline zones
[fio.git] / zbd.c
diff --git a/zbd.c b/zbd.c
index 2bf352122bf1dfae08c9cbb8a97f7f22ca2ace4a..a834f94c03fa0f8dd80ea5be6a1d685977c1192d 100644 (file)
--- a/zbd.c
+++ b/zbd.c
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
-#include <dirent.h>
 #include <fcntl.h>
-#include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <linux/blkzoned.h>
+
+#include "os/os.h"
 #include "file.h"
 #include "fio.h"
 #include "lib/pow2.h"
 #include "log.h"
+#include "oslib/asprintf.h"
 #include "smalloc.h"
 #include "verify.h"
+#include "pshared.h"
 #include "zbd.h"
 
+/**
+ * zbd_get_zoned_model - Get a device zoned model
+ * @td: FIO thread data
+ * @f: FIO file for which to get model information
+ */
+int zbd_get_zoned_model(struct thread_data *td, struct fio_file *f,
+                       enum zbd_zoned_model *model)
+{
+       int ret;
+
+       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",
+                       f->file_name, errno);
+       }
+
+       return ret;
+}
+
+/**
+ * zbd_report_zones - Get zone information
+ * @td: FIO thread data.
+ * @f: FIO file for which to get zone information
+ * @offset: offset from which to report zones
+ * @zones: Array of struct zbd_zone
+ * @nr_zones: Size of @zones array
+ *
+ * Get zone information into @zones starting from the zone at offset @offset
+ * for the device specified by @f.
+ *
+ * Returns the number of zones reported upon success and a negative error code
+ * upon failure. If the zone report is empty, always assume an error (device
+ * problem) and return -EIO.
+ */
+int zbd_report_zones(struct thread_data *td, struct fio_file *f,
+                    uint64_t offset, struct zbd_zone *zones,
+                    unsigned int nr_zones)
+{
+       int ret;
+
+       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",
+                       f->file_name, (unsigned long long)offset >> 9, errno);
+       } else if (ret == 0) {
+               td_verror(td, errno, "Empty zone report");
+               log_err("%s: report zones from sector %llu is empty.\n",
+                       f->file_name, (unsigned long long)offset >> 9);
+               ret = -EIO;
+       }
+
+       return ret;
+}
+
+/**
+ * zbd_reset_wp - reset the write pointer of a range of zones
+ * @td: FIO thread data.
+ * @f: FIO file for which to reset zones
+ * @offset: Starting offset of the first zone to reset
+ * @length: Length of the range of zones to reset
+ *
+ * Reset the write pointer of all zones in the range @offset...@offset+@length.
+ * Returns 0 upon success and a negative error code upon failure.
+ */
+int zbd_reset_wp(struct thread_data *td, struct fio_file *f,
+                uint64_t offset, uint64_t length)
+{
+       int ret;
+
+       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",
+                       f->file_name, (unsigned long long)length >> 9,
+                       (unsigned long long)offset >> 9, errno);
+       }
+
+       return ret;
+}
+
 /**
  * zbd_zone_idx - convert an offset into a zone number
  * @f: file pointer.
@@ -31,14 +123,41 @@ static uint32_t zbd_zone_idx(const struct fio_file *f, uint64_t offset)
 {
        uint32_t zone_idx;
 
-       if (f->zbd_info->zone_size_log2)
+       if (f->zbd_info->zone_size_log2 > 0)
                zone_idx = offset >> f->zbd_info->zone_size_log2;
        else
-               zone_idx = (offset >> 9) / f->zbd_info->zone_size;
+               zone_idx = offset / f->zbd_info->zone_size;
 
        return min(zone_idx, f->zbd_info->nr_zones);
 }
 
+/**
+ * zbd_zone_swr - Test whether a zone requires sequential writes
+ * @z: zone info pointer.
+ */
+static inline bool zbd_zone_swr(struct fio_zone_info *z)
+{
+       return z->type == ZBD_ZONE_TYPE_SWR;
+}
+
+/**
+ * zbd_zone_end - Return zone end location
+ * @z: zone info pointer.
+ */
+static inline uint64_t zbd_zone_end(const struct fio_zone_info *z)
+{
+       return (z+1)->start;
+}
+
+/**
+ * zbd_zone_capacity_end - Return zone capacity limit end location
+ * @z: zone info pointer.
+ */
+static inline uint64_t zbd_zone_capacity_end(const struct fio_zone_info *z)
+{
+       return z->start + z->capacity;
+}
+
 /**
  * zbd_zone_full - verify whether a minimum number of bytes remain in a zone
  * @f: file pointer.
@@ -52,8 +171,40 @@ static bool zbd_zone_full(const struct fio_file *f, struct fio_zone_info *z,
 {
        assert((required & 511) == 0);
 
-       return z->type == BLK_ZONE_TYPE_SEQWRITE_REQ &&
-               z->wp + (required >> 9) > z->start + f->zbd_info->zone_size;
+       return zbd_zone_swr(z) &&
+               z->wp + required > zbd_zone_capacity_end(z);
+}
+
+static void zone_lock(struct thread_data *td, struct fio_file *f, struct fio_zone_info *z)
+{
+       struct zoned_block_device_info *zbd = f->zbd_info;
+       uint32_t nz = z - zbd->zone_info;
+
+       /* A thread should never lock zones outside its working area. */
+       assert(f->min_zone <= nz && nz < f->max_zone);
+
+       /*
+        * Lock the io_u target zone. The zone will be unlocked if io_u offset
+        * is changed or when io_u completes and zbd_put_io() executed.
+        * To avoid multiple jobs doing asynchronous I/Os from deadlocking each
+        * other waiting for zone locks when building an io_u batch, first
+        * only trylock the zone. If the zone is already locked by another job,
+        * process the currently queued I/Os so that I/O progress is made and
+        * zones unlocked.
+        */
+       if (pthread_mutex_trylock(&z->mutex) != 0) {
+               if (!td_ioengine_flagged(td, FIO_SYNCIO))
+                       io_u_quiesce(td);
+               pthread_mutex_lock(&z->mutex);
+       }
+}
+
+static inline void zone_unlock(struct fio_zone_info *z)
+{
+       int ret;
+
+       ret = pthread_mutex_unlock(&z->mutex);
+       assert(!ret);
 }
 
 static bool is_valid_offset(const struct fio_file *f, uint64_t offset)
@@ -61,6 +212,12 @@ static bool is_valid_offset(const struct fio_file *f, uint64_t offset)
        return (uint64_t)(offset - f->file_offset) < f->io_size;
 }
 
+static inline struct fio_zone_info *get_zone(const struct fio_file *f,
+                                            unsigned int zone_nr)
+{
+       return &f->zbd_info->zone_info[zone_nr];
+}
+
 /* Verify whether direct I/O is used for all host-managed zoned drives. */
 static bool zbd_using_direct_io(void)
 {
@@ -73,7 +230,7 @@ static bool zbd_using_direct_io(void)
                        continue;
                for_each_file(td, f, j) {
                        if (f->zbd_info &&
-                           f->zbd_info->model == ZBD_DM_HOST_MANAGED)
+                           f->zbd_info->model == ZBD_HOST_MANAGED)
                                return false;
                }
        }
@@ -92,8 +249,7 @@ static bool zbd_is_seq_job(struct fio_file *f)
        zone_idx_b = zbd_zone_idx(f, f->file_offset);
        zone_idx_e = zbd_zone_idx(f, f->file_offset + f->io_size - 1);
        for (zone_idx = zone_idx_b; zone_idx <= zone_idx_e; zone_idx++)
-               if (f->zbd_info->zone_info[zone_idx].type ==
-                   BLK_ZONE_TYPE_SEQWRITE_REQ)
+               if (zbd_zone_swr(get_zone(f, zone_idx)))
                        return true;
 
        return false;
@@ -119,35 +275,65 @@ static bool zbd_verify_sizes(void)
                                continue;
                        if (!zbd_is_seq_job(f))
                                continue;
+
+                       if (!td->o.zone_size) {
+                               td->o.zone_size = f->zbd_info->zone_size;
+                               if (!td->o.zone_size) {
+                                       log_err("%s: invalid 0 zone size\n",
+                                               f->file_name);
+                                       return false;
+                               }
+                       } else if (td->o.zone_size != f->zbd_info->zone_size) {
+                               log_err("%s: job parameter zonesize %llu does not match disk zone size %llu.\n",
+                                       f->file_name, (unsigned long long) td->o.zone_size,
+                                       (unsigned long long) f->zbd_info->zone_size);
+                               return false;
+                       }
+
+                       if (td->o.zone_skip &&
+                           (td->o.zone_skip < td->o.zone_size ||
+                            td->o.zone_skip % td->o.zone_size)) {
+                               log_err("%s: zoneskip %llu is not a multiple of the device zone size %llu.\n",
+                                       f->file_name, (unsigned long long) td->o.zone_skip,
+                                       (unsigned long long) td->o.zone_size);
+                               return false;
+                       }
+
                        zone_idx = zbd_zone_idx(f, f->file_offset);
-                       z = &f->zbd_info->zone_info[zone_idx];
-                       if (f->file_offset != (z->start << 9)) {
-                               new_offset = (z+1)->start << 9;
+                       z = get_zone(f, zone_idx);
+                       if ((f->file_offset != z->start) &&
+                           (td->o.td_ddir != TD_DDIR_READ)) {
+                               new_offset = zbd_zone_end(z);
                                if (new_offset >= f->file_offset + f->io_size) {
                                        log_info("%s: io_size must be at least one zone\n",
                                                 f->file_name);
                                        return false;
                                }
-                               log_info("%s: rounded up offset from %lu to %lu\n",
-                                        f->file_name, f->file_offset,
-                                        new_offset);
+                               log_info("%s: rounded up offset from %llu to %llu\n",
+                                        f->file_name, (unsigned long long) f->file_offset,
+                                        (unsigned long long) new_offset);
                                f->io_size -= (new_offset - f->file_offset);
                                f->file_offset = new_offset;
                        }
                        zone_idx = zbd_zone_idx(f, f->file_offset + f->io_size);
-                       z = &f->zbd_info->zone_info[zone_idx];
-                       new_end = z->start << 9;
-                       if (f->file_offset + f->io_size != new_end) {
+                       z = get_zone(f, zone_idx);
+                       new_end = z->start;
+                       if ((td->o.td_ddir != TD_DDIR_READ) &&
+                           (f->file_offset + f->io_size != new_end)) {
                                if (new_end <= f->file_offset) {
                                        log_info("%s: io_size must be at least one zone\n",
                                                 f->file_name);
                                        return false;
                                }
-                               log_info("%s: rounded down io_size from %lu to %lu\n",
-                                        f->file_name, f->io_size,
-                                        new_end - f->file_offset);
+                               log_info("%s: rounded down io_size from %llu to %llu\n",
+                                        f->file_name, (unsigned long long) f->io_size,
+                                        (unsigned long long) new_end - f->file_offset);
                                f->io_size = new_end - f->file_offset;
                        }
+
+                       f->min_zone = zbd_zone_idx(f, f->file_offset);
+                       f->max_zone = zbd_zone_idx(f, f->file_offset + f->io_size);
+                       assert(f->min_zone < f->max_zone);
                }
        }
 
@@ -166,12 +352,12 @@ static bool zbd_verify_bs(void)
                        if (!f->zbd_info)
                                continue;
                        zone_size = f->zbd_info->zone_size;
-                       for (k = 0; k < ARRAY_SIZE(td->o.bs); k++) {
+                       for (k = 0; k < FIO_ARRAY_SIZE(td->o.bs); k++) {
                                if (td->o.verify != VERIFY_NONE &&
-                                   (zone_size << 9) % td->o.bs[k] != 0) {
+                                   zone_size % td->o.bs[k] != 0) {
                                        log_info("%s: block size %llu is not a divisor of the zone size %d\n",
                                                 f->file_name, td->o.bs[k],
-                                                zone_size << 9);
+                                                zone_size);
                                        return false;
                                }
                        }
@@ -180,75 +366,6 @@ static bool zbd_verify_bs(void)
        return true;
 }
 
-/*
- * Read zone information into @buf starting from sector @start_sector.
- * @fd is a file descriptor that refers to a block device and @bufsz is the
- * size of @buf.
- *
- * Returns 0 upon success and a negative error code upon failure.
- */
-static int read_zone_info(int fd, uint64_t start_sector,
-                         void *buf, unsigned int bufsz)
-{
-       struct blk_zone_report *hdr = buf;
-
-       if (bufsz < sizeof(*hdr))
-               return -EINVAL;
-
-       memset(hdr, 0, sizeof(*hdr));
-
-       hdr->nr_zones = (bufsz - sizeof(*hdr)) / sizeof(struct blk_zone);
-       hdr->sector = start_sector;
-       return ioctl(fd, BLKREPORTZONE, hdr) >= 0 ? 0 : -errno;
-}
-
-/*
- * Read up to 255 characters from the first line of a file. Strip the trailing
- * newline.
- */
-static char *read_file(const char *path)
-{
-       char line[256], *p = line;
-       FILE *f;
-
-       f = fopen(path, "rb");
-       if (!f)
-               return NULL;
-       if (!fgets(line, sizeof(line), f))
-               line[0] = '\0';
-       strsep(&p, "\n");
-       fclose(f);
-
-       return strdup(line);
-}
-
-static enum blk_zoned_model get_zbd_model(const char *file_name)
-{
-       enum blk_zoned_model model = ZBD_DM_NONE;
-       char *zoned_attr_path = NULL;
-       char *model_str = NULL;
-       struct stat statbuf;
-
-       if (stat(file_name, &statbuf) < 0)
-               goto out;
-       if (asprintf(&zoned_attr_path, "/sys/dev/block/%d:%d/queue/zoned",
-                    major(statbuf.st_rdev), minor(statbuf.st_rdev)) < 0)
-               goto out;
-       model_str = read_file(zoned_attr_path);
-       if (!model_str)
-               goto out;
-       dprint(FD_ZBD, "%s: zbd model string: %s\n", file_name, model_str);
-       if (strcmp(model_str, "host-aware") == 0)
-               model = ZBD_DM_HOST_AWARE;
-       else if (strcmp(model_str, "host-managed") == 0)
-               model = ZBD_DM_HOST_MANAGED;
-
-out:
-       free(model_str);
-       free(zoned_attr_path);
-       return model;
-}
-
 static int ilog2(uint64_t i)
 {
        int log = -1;
@@ -268,31 +385,50 @@ static int init_zone_info(struct thread_data *td, struct fio_file *f)
 {
        uint32_t nr_zones;
        struct fio_zone_info *p;
-       uint64_t zone_size;
+       uint64_t zone_size = td->o.zone_size;
+       uint64_t zone_capacity = td->o.zone_capacity;
        struct zoned_block_device_info *zbd_info = NULL;
-       pthread_mutexattr_t attr;
        int i;
 
-       zone_size = td->o.zone_size >> 9;
-       assert(zone_size);
-       nr_zones = ((f->real_file_size >> 9) + zone_size - 1) / zone_size;
+       if (zone_size == 0) {
+               log_err("%s: Specifying the zone size is mandatory for regular block devices with --zonemode=zbd\n\n",
+                       f->file_name);
+               return 1;
+       }
+
+       if (zone_size < 512) {
+               log_err("%s: zone size must be at least 512 bytes for --zonemode=zbd\n\n",
+                       f->file_name);
+               return 1;
+       }
+
+       if (zone_capacity == 0)
+               zone_capacity = zone_size;
+
+       if (zone_capacity > zone_size) {
+               log_err("%s: job parameter zonecapacity %llu is larger than zone size %llu\n",
+                       f->file_name, (unsigned long long) td->o.zone_capacity,
+                       (unsigned long long) td->o.zone_size);
+               return 1;
+       }
+
+       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]));
        if (!zbd_info)
                return -ENOMEM;
 
-       pthread_mutexattr_init(&attr);
-       pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-       pthread_mutexattr_setpshared(&attr, true);
-       pthread_mutex_init(&zbd_info->mutex, &attr);
+       mutex_init_pshared(&zbd_info->mutex);
        zbd_info->refcount = 1;
        p = &zbd_info->zone_info[0];
        for (i = 0; i < nr_zones; i++, p++) {
-               pthread_mutex_init(&p->mutex, &attr);
+               mutex_init_pshared_with_type(&p->mutex,
+                                            PTHREAD_MUTEX_RECURSIVE);
                p->start = i * zone_size;
-               p->wp = p->start + zone_size;
-               p->type = BLK_ZONE_TYPE_SEQWRITE_REQ;
-               p->cond = BLK_ZONE_COND_EMPTY;
+               p->wp = p->start;
+               p->type = ZBD_ZONE_TYPE_SWR;
+               p->cond = ZBD_ZONE_COND_EMPTY;
+               p->capacity = zone_capacity;
        }
        /* a sentinel */
        p->start = nr_zones * zone_size;
@@ -300,91 +436,75 @@ static int init_zone_info(struct thread_data *td, struct fio_file *f)
        f->zbd_info = zbd_info;
        f->zbd_info->zone_size = zone_size;
        f->zbd_info->zone_size_log2 = is_power_of_2(zone_size) ?
-               ilog2(zone_size) + 9 : -1;
+               ilog2(zone_size) : 0;
        f->zbd_info->nr_zones = nr_zones;
-       pthread_mutexattr_destroy(&attr);
        return 0;
 }
 
 /*
- * Parse the BLKREPORTZONE output and store it in f->zbd_info. Must be called
- * only for devices that support this ioctl, namely zoned block devices.
+ * Maximum number of zones to report in one operation.
+ */
+#define ZBD_REPORT_MAX_ZONES   8192U
+
+/*
+ * Parse the device zone report and store it in f->zbd_info. Must be called
+ * only for devices that are zoned, namely those with a model != ZBD_NONE.
  */
 static int parse_zone_info(struct thread_data *td, struct fio_file *f)
 {
-       const unsigned int bufsz = sizeof(struct blk_zone_report) +
-               4096 * sizeof(struct blk_zone);
-       uint32_t nr_zones;
-       struct blk_zone_report *hdr;
-       const struct blk_zone *z;
+       int nr_zones, nrz;
+       struct zbd_zone *zones, *z;
        struct fio_zone_info *p;
-       uint64_t zone_size, start_sector;
+       uint64_t zone_size, offset;
        struct zoned_block_device_info *zbd_info = NULL;
-       pthread_mutexattr_t attr;
-       void *buf;
-       int fd, i, j, ret = 0;
-
-       pthread_mutexattr_init(&attr);
-       pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-       pthread_mutexattr_setpshared(&attr, true);
+       int i, j, ret = -ENOMEM;
 
-       buf = malloc(bufsz);
-       if (!buf)
+       zones = calloc(ZBD_REPORT_MAX_ZONES, sizeof(struct zbd_zone));
+       if (!zones)
                goto out;
 
-       fd = open(f->file_name, O_RDONLY | O_LARGEFILE);
-       if (fd < 0) {
-               ret = -errno;
-               goto free;
+       nrz = zbd_report_zones(td, f, 0, zones, ZBD_REPORT_MAX_ZONES);
+       if (nrz < 0) {
+               ret = nrz;
+               log_info("fio: report zones (offset 0) failed for %s (%d).\n",
+                        f->file_name, -ret);
+               goto out;
        }
 
-       ret = read_zone_info(fd, 0, buf, bufsz);
-       if (ret < 0) {
-               log_info("fio: BLKREPORTZONE(%lu) failed for %s (%d).\n",
-                        0UL, f->file_name, -ret);
-               goto close;
-       }
-       hdr = buf;
-       if (hdr->nr_zones < 1) {
-               log_info("fio: %s has invalid zone information.\n",
-                        f->file_name);
-               goto close;
-       }
-       z = (void *)(hdr + 1);
-       zone_size = z->len;
-       nr_zones = ((f->real_file_size >> 9) + zone_size - 1) / zone_size;
+       zone_size = zones[0].len;
+       nr_zones = (f->real_file_size + zone_size - 1) / zone_size;
 
        if (td->o.zone_size == 0) {
-               td->o.zone_size = zone_size << 9;
-       } else if (td->o.zone_size != zone_size << 9) {
-               log_info("fio: %s job parameter zonesize %lld does not match disk zone size %ld.\n",
-                        f->file_name, td->o.zone_size, zone_size << 9);
+               td->o.zone_size = zone_size;
+       } else if (td->o.zone_size != zone_size) {
+               log_err("fio: %s job parameter zonesize %llu does not match disk zone size %llu.\n",
+                       f->file_name, (unsigned long long) td->o.zone_size,
+                       (unsigned long long) zone_size);
                ret = -EINVAL;
-               goto close;
+               goto out;
        }
 
-       dprint(FD_ZBD, "Device %s has %d zones of size %lu KB\n", f->file_name,
-              nr_zones, zone_size / 2);
+       dprint(FD_ZBD, "Device %s has %d zones of size %llu KB\n", f->file_name,
+              nr_zones, (unsigned long long) zone_size / 1024);
 
        zbd_info = scalloc(1, sizeof(*zbd_info) +
                           (nr_zones + 1) * sizeof(zbd_info->zone_info[0]));
-       ret = -ENOMEM;
        if (!zbd_info)
-               goto close;
-       pthread_mutex_init(&zbd_info->mutex, &attr);
+               goto out;
+       mutex_init_pshared(&zbd_info->mutex);
        zbd_info->refcount = 1;
        p = &zbd_info->zone_info[0];
-       for (start_sector = 0, j = 0; j < nr_zones;) {
-               z = (void *)(hdr + 1);
-               for (i = 0; i < hdr->nr_zones; i++, j++, z++, p++) {
-                       pthread_mutex_init(&p->mutex, &attr);
+       for (offset = 0, j = 0; j < nr_zones;) {
+               z = &zones[0];
+               for (i = 0; i < nrz; i++, j++, z++, p++) {
+                       mutex_init_pshared_with_type(&p->mutex,
+                                                    PTHREAD_MUTEX_RECURSIVE);
                        p->start = z->start;
+                       p->capacity = z->capacity;
                        switch (z->cond) {
-                       case BLK_ZONE_COND_NOT_WP:
-                               p->wp = z->start;
-                               break;
-                       case BLK_ZONE_COND_FULL:
-                               p->wp = z->start + zone_size;
+                       case ZBD_ZONE_COND_NOT_WP:
+                       case ZBD_ZONE_COND_FULL:
+                               p->wp = p->start + p->capacity;
                                break;
                        default:
                                assert(z->start <= z->wp);
@@ -398,38 +518,38 @@ static int parse_zone_info(struct thread_data *td, struct fio_file *f)
                                log_info("%s: invalid zone data\n",
                                         f->file_name);
                                ret = -EINVAL;
-                               goto close;
+                               goto out;
                        }
                }
                z--;
-               start_sector = z->start + z->len;
+               offset = z->start + z->len;
                if (j >= nr_zones)
                        break;
-               ret = read_zone_info(fd, start_sector, buf, bufsz);
-               if (ret < 0) {
-                       log_info("fio: BLKREPORTZONE(%lu) failed for %s (%d).\n",
-                                start_sector, f->file_name, -ret);
-                       goto close;
+               nrz = zbd_report_zones(td, f, offset,
+                                           zones, ZBD_REPORT_MAX_ZONES);
+               if (nrz < 0) {
+                       ret = nrz;
+                       log_info("fio: report zones (offset %llu) failed for %s (%d).\n",
+                                (unsigned long long)offset,
+                                f->file_name, -ret);
+                       goto out;
                }
        }
+
        /* a sentinel */
-       zbd_info->zone_info[nr_zones].start = start_sector;
+       zbd_info->zone_info[nr_zones].start = offset;
 
        f->zbd_info = zbd_info;
        f->zbd_info->zone_size = zone_size;
        f->zbd_info->zone_size_log2 = is_power_of_2(zone_size) ?
-               ilog2(zone_size) + 9 : -1;
+               ilog2(zone_size) : 0;
        f->zbd_info->nr_zones = nr_zones;
        zbd_info = NULL;
        ret = 0;
 
-close:
-       sfree(zbd_info);
-       close(fd);
-free:
-       free(buf);
 out:
-       pthread_mutexattr_destroy(&attr);
+       sfree(zbd_info);
+       free(zones);
        return ret;
 }
 
@@ -438,25 +558,37 @@ out:
  *
  * Returns 0 upon success and a negative error code upon failure.
  */
-int zbd_create_zone_info(struct thread_data *td, struct fio_file *f)
+static int zbd_create_zone_info(struct thread_data *td, struct fio_file *f)
 {
-       enum blk_zoned_model zbd_model;
-       int ret = 0;
+       enum zbd_zoned_model zbd_model;
+       int ret;
 
        assert(td->o.zone_mode == ZONE_MODE_ZBD);
 
-       zbd_model = get_zbd_model(f->file_name);
+       ret = zbd_get_zoned_model(td, f, &zbd_model);
+       if (ret)
+               return ret;
+
        switch (zbd_model) {
-       case ZBD_DM_HOST_AWARE:
-       case ZBD_DM_HOST_MANAGED:
+       case ZBD_IGNORE:
+               return 0;
+       case ZBD_HOST_AWARE:
+       case ZBD_HOST_MANAGED:
                ret = parse_zone_info(td, f);
                break;
-       case ZBD_DM_NONE:
+       case ZBD_NONE:
                ret = init_zone_info(td, f);
                break;
+       default:
+               td_verror(td, EINVAL, "Unsupported zoned model");
+               log_err("Unsupported zoned model\n");
+               return -EINVAL;
        }
-       if (ret == 0)
+
+       if (ret == 0) {
                f->zbd_info->model = zbd_model;
+               f->zbd_info->max_open_zones = td->o.max_open_zones;
+       }
        return ret;
 }
 
@@ -464,8 +596,7 @@ void zbd_free_zone_info(struct fio_file *f)
 {
        uint32_t refcount;
 
-       if (!f->zbd_info)
-               return;
+       assert(f->zbd_info);
 
        pthread_mutex_lock(&f->zbd_info->mutex);
        refcount = --f->zbd_info->refcount;
@@ -506,30 +637,23 @@ static int zbd_init_zone_info(struct thread_data *td, struct fio_file *file)
 
        ret = zbd_create_zone_info(td, file);
        if (ret < 0)
-               td_verror(td, -ret, "BLKREPORTZONE failed");
+               td_verror(td, -ret, "zbd_create_zone_info() failed");
        return ret;
 }
 
-int zbd_init(struct thread_data *td)
+static bool zbd_open_zone(struct thread_data *td, const struct fio_file *f,
+                         uint32_t zone_idx);
+static int zbd_reset_zone(struct thread_data *td, struct fio_file *f,
+                         struct fio_zone_info *z);
+
+int zbd_setup_files(struct thread_data *td)
 {
        struct fio_file *f;
        int i;
 
        for_each_file(td, f, i) {
-               if (f->filetype != FIO_TYPE_BLOCK)
-                       continue;
-               if (td->o.zone_size && td->o.zone_size < 512) {
-                       log_err("%s: zone size must be at least 512 bytes for --zonemode=zbd\n\n",
-                               f->file_name);
+               if (zbd_init_zone_info(td, f))
                        return 1;
-               }
-               if (td->o.zone_size == 0 &&
-                   get_zbd_model(f->file_name) == ZBD_DM_NONE) {
-                       log_err("%s: Specifying the zone size is mandatory for regular block devices with --zonemode=zbd\n\n",
-                               f->file_name);
-                       return 1;
-               }
-               zbd_init_zone_info(td, f);
        }
 
        if (!zbd_using_direct_io()) {
@@ -543,79 +667,123 @@ int zbd_init(struct thread_data *td)
        if (!zbd_verify_bs())
                return 1;
 
+       for_each_file(td, f, i) {
+               struct zoned_block_device_info *zbd = f->zbd_info;
+               struct fio_zone_info *z;
+               int zi;
+
+               if (!zbd)
+                       continue;
+
+               zbd->max_open_zones = zbd->max_open_zones ?: ZBD_MAX_OPEN_ZONES;
+
+               if (td->o.max_open_zones > 0 &&
+                   zbd->max_open_zones != td->o.max_open_zones) {
+                       log_err("Different 'max_open_zones' values\n");
+                       return 1;
+               }
+               if (zbd->max_open_zones > ZBD_MAX_OPEN_ZONES) {
+                       log_err("'max_open_zones' value is limited by %u\n", ZBD_MAX_OPEN_ZONES);
+                       return 1;
+               }
+
+               for (zi = f->min_zone; zi < f->max_zone; zi++) {
+                       z = &zbd->zone_info[zi];
+                       if (z->cond != ZBD_ZONE_COND_IMP_OPEN &&
+                           z->cond != ZBD_ZONE_COND_EXP_OPEN)
+                               continue;
+                       if (zbd_open_zone(td, f, zi))
+                               continue;
+                       /*
+                        * If the number of open zones exceeds specified limits,
+                        * reset all extra open zones.
+                        */
+                       if (zbd_reset_zone(td, f, z) < 0) {
+                               log_err("Failed to reest zone %d\n", zi);
+                               return 1;
+                       }
+               }
+       }
+
        return 0;
 }
 
+static inline unsigned int zbd_zone_nr(const struct fio_file *f,
+                                      struct fio_zone_info *zone)
+{
+       return zone - f->zbd_info->zone_info;
+}
+
 /**
- * zbd_reset_range - reset zones for a range of sectors
+ * zbd_reset_zone - reset the write pointer of a single zone
  * @td: FIO thread data.
- * @f: Fio file for which to reset zones
- * @sector: Starting sector in units of 512 bytes
- * @nr_sectors: Number of sectors in units of 512 bytes
+ * @f: FIO file associated with the disk for which to reset a write pointer.
+ * @z: Zone to reset.
  *
  * Returns 0 upon success and a negative error code upon failure.
+ *
+ * The caller must hold z->mutex.
  */
-static int zbd_reset_range(struct thread_data *td, const struct fio_file *f,
-                          uint64_t sector, uint64_t nr_sectors)
+static int zbd_reset_zone(struct thread_data *td, struct fio_file *f,
+                         struct fio_zone_info *z)
 {
-       struct blk_zone_range zr = {
-               .sector         = sector,
-               .nr_sectors     = nr_sectors,
-       };
-       uint32_t zone_idx_b, zone_idx_e;
-       struct fio_zone_info *zb, *ze, *z;
+       uint64_t offset = z->start;
+       uint64_t length = (z+1)->start - offset;
        int ret = 0;
 
-       assert(f->fd != -1);
-       assert(is_valid_offset(f, ((sector + nr_sectors) << 9) - 1));
+       if (z->wp == z->start)
+               return 0;
+
+       assert(is_valid_offset(f, offset + length - 1));
+
+       dprint(FD_ZBD, "%s: resetting wp of zone %u.\n", f->file_name,
+               zbd_zone_nr(f, z));
        switch (f->zbd_info->model) {
-       case ZBD_DM_HOST_AWARE:
-       case ZBD_DM_HOST_MANAGED:
-               ret = ioctl(f->fd, BLKRESETZONE, &zr);
-               if (ret < 0) {
-                       td_verror(td, errno, "resetting wp failed");
-                       log_err("%s: resetting wp for %llu sectors at sector %llu failed (%d).\n",
-                               f->file_name, zr.nr_sectors, zr.sector, errno);
+       case ZBD_HOST_AWARE:
+       case ZBD_HOST_MANAGED:
+               ret = zbd_reset_wp(td, f, offset, length);
+               if (ret < 0)
                        return ret;
-               }
                break;
-       case ZBD_DM_NONE:
+       default:
                break;
        }
 
-       zone_idx_b = zbd_zone_idx(f, sector << 9);
-       zb = &f->zbd_info->zone_info[zone_idx_b];
-       zone_idx_e = zbd_zone_idx(f, (sector + nr_sectors) << 9);
-       ze = &f->zbd_info->zone_info[zone_idx_e];
-       for (z = zb; z < ze; z++) {
-               pthread_mutex_lock(&z->mutex);
-               z->wp = z->start;
-               z->verify_block = 0;
-               pthread_mutex_unlock(&z->mutex);
-       }
+       pthread_mutex_lock(&f->zbd_info->mutex);
+       f->zbd_info->sectors_with_data -= z->wp - z->start;
+       pthread_mutex_unlock(&f->zbd_info->mutex);
+       z->wp = z->start;
+       z->verify_block = 0;
 
-       td->ts.nr_zone_resets += ze - zb;
+       td->ts.nr_zone_resets++;
 
        return ret;
 }
 
-/**
- * zbd_reset_zone - reset the write pointer of a single zone
- * @td: FIO thread data.
- * @f: FIO file associated with the disk for which to reset a write pointer.
- * @z: Zone to reset.
- *
- * Returns 0 upon success and a negative error code upon failure.
- */
-static int zbd_reset_zone(struct thread_data *td, const struct fio_file *f,
-                         struct fio_zone_info *z)
+/* The caller must hold f->zbd_info->mutex */
+static void zbd_close_zone(struct thread_data *td, const struct fio_file *f,
+                          unsigned int zone_idx)
 {
-       int ret;
+       uint32_t open_zone_idx = 0;
 
-       dprint(FD_ZBD, "%s: resetting wp of zone %lu.\n", f->file_name,
-              z - f->zbd_info->zone_info);
-       ret = zbd_reset_range(td, f, z->start, (z+1)->start - z->start);
-       return ret;
+       for (; open_zone_idx < f->zbd_info->num_open_zones; open_zone_idx++) {
+               if (f->zbd_info->open_zones[open_zone_idx] == zone_idx)
+                       break;
+       }
+       if (open_zone_idx == f->zbd_info->num_open_zones) {
+               dprint(FD_ZBD, "%s: zone %d is not open\n",
+                      f->file_name, zone_idx);
+               return;
+       }
+
+       dprint(FD_ZBD, "%s: closing zone %d\n", f->file_name, zone_idx);
+       memmove(f->zbd_info->open_zones + open_zone_idx,
+               f->zbd_info->open_zones + open_zone_idx + 1,
+               (ZBD_MAX_OPEN_ZONES - (open_zone_idx + 1)) *
+               sizeof(f->zbd_info->open_zones[0]));
+       f->zbd_info->num_open_zones--;
+       td->num_open_zones--;
+       get_zone(f, zone_idx)->open = 0;
 }
 
 /*
@@ -631,81 +799,157 @@ static int zbd_reset_zones(struct thread_data *td, struct fio_file *f,
                           struct fio_zone_info *const zb,
                           struct fio_zone_info *const ze, bool all_zones)
 {
-       struct fio_zone_info *z, *start_z = ze;
-       const uint32_t min_bs = td->o.min_bs[DDIR_WRITE] >> 9;
+       struct fio_zone_info *z;
+       const uint32_t min_bs = td->o.min_bs[DDIR_WRITE];
        bool reset_wp;
        int res = 0;
 
-       dprint(FD_ZBD, "%s: examining zones %lu .. %lu\n", f->file_name,
-              zb - f->zbd_info->zone_info, ze - f->zbd_info->zone_info);
-       assert(f->fd != -1);
+       assert(min_bs);
+
+       dprint(FD_ZBD, "%s: examining zones %u .. %u\n", f->file_name,
+               zbd_zone_nr(f, zb), zbd_zone_nr(f, ze));
        for (z = zb; z < ze; z++) {
-               pthread_mutex_lock(&z->mutex);
-               switch (z->type) {
-               case BLK_ZONE_TYPE_SEQWRITE_REQ:
-                       reset_wp = all_zones ? z->wp != z->start :
-                                       (td->o.td_ddir & TD_DDIR_WRITE) &&
-                                       z->wp % min_bs != 0;
-                       if (start_z == ze && reset_wp) {
-                               start_z = z;
-                       } else if (start_z < ze && !reset_wp) {
-                               dprint(FD_ZBD,
-                                      "%s: resetting zones %lu .. %lu\n",
-                                      f->file_name,
-                                      start_z - f->zbd_info->zone_info,
-                                      z - f->zbd_info->zone_info);
-                               if (zbd_reset_range(td, f, start_z->start,
-                                               z->start - start_z->start) < 0)
-                                       res = 1;
-                               start_z = ze;
-                       }
-                       break;
-               default:
-                       if (start_z == ze)
-                               break;
-                       dprint(FD_ZBD, "%s: resetting zones %lu .. %lu\n",
-                              f->file_name, start_z - f->zbd_info->zone_info,
-                              z - f->zbd_info->zone_info);
-                       if (zbd_reset_range(td, f, start_z->start,
-                                           z->start - start_z->start) < 0)
+               uint32_t nz = zbd_zone_nr(f, z);
+
+               if (!zbd_zone_swr(z))
+                       continue;
+               zone_lock(td, f, z);
+               if (all_zones) {
+                       pthread_mutex_lock(&f->zbd_info->mutex);
+                       zbd_close_zone(td, f, nz);
+                       pthread_mutex_unlock(&f->zbd_info->mutex);
+
+                       reset_wp = z->wp != z->start;
+               } else {
+                       reset_wp = z->wp % min_bs != 0;
+               }
+               if (reset_wp) {
+                       dprint(FD_ZBD, "%s: resetting zone %u\n",
+                              f->file_name, zbd_zone_nr(f, z));
+                       if (zbd_reset_zone(td, f, z) < 0)
                                res = 1;
-                       start_z = ze;
-                       break;
                }
+               zone_unlock(z);
        }
-       if (start_z < ze) {
-               dprint(FD_ZBD, "%s: resetting zones %lu .. %lu\n", f->file_name,
-                      start_z - f->zbd_info->zone_info,
-                      z - f->zbd_info->zone_info);
-               if (zbd_reset_range(td, f, start_z->start,
-                                   z->start - start_z->start) < 0)
-                       res = 1;
+
+       return res;
+}
+
+/*
+ * Reset zbd_info.write_cnt, the counter that counts down towards the next
+ * zone reset.
+ */
+static void _zbd_reset_write_cnt(const struct thread_data *td,
+                                const struct fio_file *f)
+{
+       assert(0 <= td->o.zrf.u.f && td->o.zrf.u.f <= 1);
+
+       f->zbd_info->write_cnt = td->o.zrf.u.f ?
+               min(1.0 / td->o.zrf.u.f, 0.0 + UINT_MAX) : UINT_MAX;
+}
+
+static void zbd_reset_write_cnt(const struct thread_data *td,
+                               const struct fio_file *f)
+{
+       pthread_mutex_lock(&f->zbd_info->mutex);
+       _zbd_reset_write_cnt(td, f);
+       pthread_mutex_unlock(&f->zbd_info->mutex);
+}
+
+static bool zbd_dec_and_reset_write_cnt(const struct thread_data *td,
+                                       const struct fio_file *f)
+{
+       uint32_t write_cnt = 0;
+
+       pthread_mutex_lock(&f->zbd_info->mutex);
+       assert(f->zbd_info->write_cnt);
+       if (f->zbd_info->write_cnt)
+               write_cnt = --f->zbd_info->write_cnt;
+       if (write_cnt == 0)
+               _zbd_reset_write_cnt(td, f);
+       pthread_mutex_unlock(&f->zbd_info->mutex);
+
+       return write_cnt == 0;
+}
+
+enum swd_action {
+       CHECK_SWD,
+       SET_SWD,
+};
+
+/* Calculate the number of sectors with data (swd) and perform action 'a' */
+static uint64_t zbd_process_swd(const struct fio_file *f, enum swd_action a)
+{
+       struct fio_zone_info *zb, *ze, *z;
+       uint64_t swd = 0;
+
+       zb = get_zone(f, f->min_zone);
+       ze = get_zone(f, f->max_zone);
+       for (z = zb; z < ze; z++) {
+               pthread_mutex_lock(&z->mutex);
+               swd += z->wp - z->start;
        }
+       pthread_mutex_lock(&f->zbd_info->mutex);
+       switch (a) {
+       case CHECK_SWD:
+               assert(f->zbd_info->sectors_with_data == swd);
+               break;
+       case SET_SWD:
+               f->zbd_info->sectors_with_data = swd;
+               break;
+       }
+       pthread_mutex_unlock(&f->zbd_info->mutex);
        for (z = zb; z < ze; z++)
-               pthread_mutex_unlock(&z->mutex);
+               zone_unlock(z);
 
-       return res;
+       return swd;
+}
+
+/*
+ * The swd check is useful for debugging but takes too much time to leave
+ * it enabled all the time. Hence it is disabled by default.
+ */
+static const bool enable_check_swd = false;
+
+/* Check whether the value of zbd_info.sectors_with_data is correct. */
+static void zbd_check_swd(const struct fio_file *f)
+{
+       if (!enable_check_swd)
+               return;
+
+       zbd_process_swd(f, CHECK_SWD);
+}
+
+static void zbd_init_swd(struct fio_file *f)
+{
+       uint64_t swd;
+
+       if (!enable_check_swd)
+               return;
+
+       swd = zbd_process_swd(f, SET_SWD);
+       dprint(FD_ZBD, "%s(%s): swd = %" PRIu64 "\n", __func__, f->file_name,
+              swd);
 }
 
 void zbd_file_reset(struct thread_data *td, struct fio_file *f)
 {
        struct fio_zone_info *zb, *ze;
-       uint32_t zone_idx_e;
 
-       if (!f->zbd_info)
+       if (!f->zbd_info || !td_write(td))
                return;
 
-       zb = &f->zbd_info->zone_info[zbd_zone_idx(f, f->file_offset)];
-       zone_idx_e = zbd_zone_idx(f, f->file_offset + f->io_size);
-       ze = &f->zbd_info->zone_info[zone_idx_e];
+       zb = get_zone(f, f->min_zone);
+       ze = get_zone(f, f->max_zone);
+       zbd_init_swd(f);
        /*
         * If data verification is enabled reset the affected zones before
         * writing any data to avoid that a zone reset has to be issued while
         * writing data, which causes data loss.
         */
        zbd_reset_zones(td, f, zb, ze, td->o.verify != VERIFY_NONE &&
-                       (td->o.td_ddir & TD_DDIR_WRITE) &&
                        td->runstate != TD_VERIFYING);
+       zbd_reset_write_cnt(td, f);
 }
 
 /* The caller must hold f->zbd_info->mutex. */
@@ -715,8 +959,9 @@ static bool is_zone_open(const struct thread_data *td, const struct fio_file *f,
        struct zoned_block_device_info *zbdi = f->zbd_info;
        int i;
 
-       assert(td->o.max_open_zones <= ARRAY_SIZE(zbdi->open_zones));
-       assert(zbdi->num_open_zones <= td->o.max_open_zones);
+       assert(td->o.job_max_open_zones == 0 || td->num_open_zones <= td->o.job_max_open_zones);
+       assert(td->o.job_max_open_zones <= zbdi->max_open_zones);
+       assert(zbdi->num_open_zones <= zbdi->max_open_zones);
 
        for (i = 0; i < zbdi->num_open_zones; i++)
                if (zbdi->open_zones[i] == zone_idx)
@@ -731,15 +976,14 @@ static bool is_zone_open(const struct thread_data *td, const struct fio_file *f,
  * was not yet open and opening a new zone would cause the zone limit to be
  * exceeded.
  */
-static bool zbd_open_zone(struct thread_data *td, const struct io_u *io_u,
+static bool zbd_open_zone(struct thread_data *td, const struct fio_file *f,
                          uint32_t zone_idx)
 {
        const uint32_t min_bs = td->o.min_bs[DDIR_WRITE];
-       const struct fio_file *f = io_u->file;
-       struct fio_zone_info *z = &f->zbd_info->zone_info[zone_idx];
+       struct fio_zone_info *z = get_zone(f, zone_idx);
        bool res = true;
 
-       if (z->cond == BLK_ZONE_COND_OFFLINE)
+       if (z->cond == ZBD_ZONE_COND_OFFLINE)
                return false;
 
        /*
@@ -749,18 +993,26 @@ static bool zbd_open_zone(struct thread_data *td, const struct io_u *io_u,
        if (td->o.verify != VERIFY_NONE && zbd_zone_full(f, z, min_bs))
                return false;
 
-       /* Zero means no limit */
-       if (!td->o.max_open_zones)
-               return true;
-
        pthread_mutex_lock(&f->zbd_info->mutex);
-       if (is_zone_open(td, f, zone_idx))
+       if (is_zone_open(td, f, zone_idx)) {
+               /*
+                * If the zone is already open and going to be full by writes
+                * in-flight, handle it as a full zone instead of an open zone.
+                */
+               if (z->wp >= zbd_zone_capacity_end(z))
+                       res = false;
                goto out;
+       }
        res = false;
-       if (f->zbd_info->num_open_zones >= td->o.max_open_zones)
+       /* Zero means no limit */
+       if (td->o.job_max_open_zones > 0 &&
+           td->num_open_zones >= td->o.job_max_open_zones)
+               goto out;
+       if (f->zbd_info->num_open_zones >= f->zbd_info->max_open_zones)
                goto out;
        dprint(FD_ZBD, "%s: opening zone %d\n", f->file_name, zone_idx);
        f->zbd_info->open_zones[f->zbd_info->num_open_zones++] = zone_idx;
+       td->num_open_zones++;
        z->open = 1;
        res = true;
 
@@ -769,20 +1021,11 @@ out:
        return res;
 }
 
-/* The caller must hold f->zbd_info->mutex */
-static void zbd_close_zone(struct thread_data *td, const struct fio_file *f,
-                          unsigned int open_zone_idx)
+/* Anything goes as long as it is not a constant. */
+static uint32_t pick_random_zone_idx(const struct fio_file *f,
+                                    const struct io_u *io_u)
 {
-       uint32_t zone_idx;
-
-       assert(open_zone_idx < f->zbd_info->num_open_zones);
-       zone_idx = f->zbd_info->open_zones[open_zone_idx];
-       memmove(f->zbd_info->open_zones + open_zone_idx,
-               f->zbd_info->open_zones + open_zone_idx + 1,
-               (FIO_MAX_OPEN_ZBD_ZONES - (open_zone_idx + 1)) *
-               sizeof(f->zbd_info->open_zones[0]));
-       f->zbd_info->num_open_zones--;
-       f->zbd_info->zone_info[zone_idx].open = 0;
+       return io_u->offset * f->zbd_info->num_open_zones / f->real_file_size;
 }
 
 /*
@@ -792,29 +1035,32 @@ static void zbd_close_zone(struct thread_data *td, const struct fio_file *f,
  * a multiple of the fio block size. The caller must neither hold z->mutex
  * nor f->zbd_info->mutex. Returns with z->mutex held upon success.
  */
-struct fio_zone_info *zbd_convert_to_open_zone(struct thread_data *td,
-                                              struct io_u *io_u)
+static struct fio_zone_info *zbd_convert_to_open_zone(struct thread_data *td,
+                                                     struct io_u *io_u)
 {
        const uint32_t min_bs = td->o.min_bs[io_u->ddir];
-       const struct fio_file *f = io_u->file;
+       struct fio_file *f = io_u->file;
        struct fio_zone_info *z;
        unsigned int open_zone_idx = -1;
        uint32_t zone_idx, new_zone_idx;
        int i;
+       bool wait_zone_close;
 
        assert(is_valid_offset(f, io_u->offset));
 
-       if (td->o.max_open_zones) {
+       if (td->o.max_open_zones || td->o.job_max_open_zones) {
                /*
                 * This statement accesses f->zbd_info->open_zones[] on purpose
                 * without locking.
                 */
-               zone_idx = f->zbd_info->open_zones[(io_u->offset -
-                                                   f->file_offset) *
-                               f->zbd_info->num_open_zones / f->io_size];
+               zone_idx = f->zbd_info->open_zones[pick_random_zone_idx(f, io_u)];
        } else {
                zone_idx = zbd_zone_idx(f, io_u->offset);
        }
+       if (zone_idx < f->min_zone)
+               zone_idx = f->min_zone;
+       else if (zone_idx >= f->max_zone)
+               zone_idx = f->max_zone - 1;
        dprint(FD_ZBD, "%s(%s): starting from zone %d (offset %lld, buflen %lld)\n",
               __func__, f->file_name, zone_idx, io_u->offset, io_u->buflen);
 
@@ -825,60 +1071,103 @@ struct fio_zone_info *zbd_convert_to_open_zone(struct thread_data *td,
         * has been obtained. Hence the loop.
         */
        for (;;) {
-               z = &f->zbd_info->zone_info[zone_idx];
+               uint32_t tmp_idx;
 
-               pthread_mutex_lock(&z->mutex);
+               z = get_zone(f, zone_idx);
+
+               zone_lock(td, f, z);
                pthread_mutex_lock(&f->zbd_info->mutex);
-               if (td->o.max_open_zones == 0)
+               if (td->o.max_open_zones == 0 && td->o.job_max_open_zones == 0)
                        goto examine_zone;
                if (f->zbd_info->num_open_zones == 0) {
-                       pthread_mutex_unlock(&f->zbd_info->mutex);
-                       pthread_mutex_unlock(&z->mutex);
                        dprint(FD_ZBD, "%s(%s): no zones are open\n",
                               __func__, f->file_name);
-                       return NULL;
+                       goto open_other_zone;
                }
-               open_zone_idx = (io_u->offset - f->file_offset) *
-                       f->zbd_info->num_open_zones / f->io_size;
+
+               /*
+                * List of opened zones is per-device, shared across all threads.
+                * Start with quasi-random candidate zone.
+                * Ignore zones which don't belong to thread's offset/size area.
+                */
+               open_zone_idx = pick_random_zone_idx(f, io_u);
                assert(open_zone_idx < f->zbd_info->num_open_zones);
+               tmp_idx = open_zone_idx;
+               for (i = 0; i < f->zbd_info->num_open_zones; i++) {
+                       uint32_t tmpz;
+
+                       if (tmp_idx >= f->zbd_info->num_open_zones)
+                               tmp_idx = 0;
+                       tmpz = f->zbd_info->open_zones[tmp_idx];
+                       if (f->min_zone <= tmpz && tmpz < f->max_zone) {
+                               open_zone_idx = tmp_idx;
+                               goto found_candidate_zone;
+                       }
+
+                       tmp_idx++;
+               }
+
+               dprint(FD_ZBD, "%s(%s): no candidate zone\n",
+                       __func__, f->file_name);
+               pthread_mutex_unlock(&f->zbd_info->mutex);
+               zone_unlock(z);
+               return NULL;
+
+found_candidate_zone:
                new_zone_idx = f->zbd_info->open_zones[open_zone_idx];
                if (new_zone_idx == zone_idx)
                        break;
                zone_idx = new_zone_idx;
                pthread_mutex_unlock(&f->zbd_info->mutex);
-               pthread_mutex_unlock(&z->mutex);
+               zone_unlock(z);
        }
 
        /* Both z->mutex and f->zbd_info->mutex are held. */
 
 examine_zone:
-       if ((z->wp << 9) + min_bs <= ((z+1)->start << 9)) {
+       if (z->wp + min_bs <= zbd_zone_capacity_end(z)) {
                pthread_mutex_unlock(&f->zbd_info->mutex);
                goto out;
        }
-       dprint(FD_ZBD, "%s(%s): closing zone %d\n", __func__, f->file_name,
-              zone_idx);
-       if (td->o.max_open_zones)
-               zbd_close_zone(td, f, open_zone_idx);
+
+open_other_zone:
+       /* Check if number of open zones reaches one of limits. */
+       wait_zone_close =
+               f->zbd_info->num_open_zones == f->max_zone - f->min_zone ||
+               (td->o.max_open_zones &&
+                f->zbd_info->num_open_zones == td->o.max_open_zones) ||
+               (td->o.job_max_open_zones &&
+                td->num_open_zones == td->o.job_max_open_zones);
+
        pthread_mutex_unlock(&f->zbd_info->mutex);
 
        /* Only z->mutex is held. */
 
+       /*
+        * When number of open zones reaches to one of limits, wait for
+        * zone close before opening a new zone.
+        */
+       if (wait_zone_close) {
+               dprint(FD_ZBD, "%s(%s): quiesce to allow open zones to close\n",
+                      __func__, f->file_name);
+               io_u_quiesce(td);
+       }
+
        /* Zone 'z' is full, so try to open a new zone. */
        for (i = f->io_size / f->zbd_info->zone_size; i > 0; i--) {
                zone_idx++;
-               pthread_mutex_unlock(&z->mutex);
+               zone_unlock(z);
                z++;
-               if (!is_valid_offset(f, z->start << 9)) {
+               if (!is_valid_offset(f, z->start)) {
                        /* Wrap-around. */
-                       zone_idx = zbd_zone_idx(f, f->file_offset);
-                       z = &f->zbd_info->zone_info[zone_idx];
+                       zone_idx = f->min_zone;
+                       z = get_zone(f, zone_idx);
                }
-               assert(is_valid_offset(f, z->start << 9));
-               pthread_mutex_lock(&z->mutex);
+               assert(is_valid_offset(f, z->start));
+               zone_lock(td, f, z);
                if (z->open)
                        continue;
-               if (zbd_open_zone(td, io_u, zone_idx))
+               if (zbd_open_zone(td, f, zone_idx))
                        goto out;
        }
 
@@ -888,18 +1177,20 @@ examine_zone:
        pthread_mutex_lock(&f->zbd_info->mutex);
        for (i = 0; i < f->zbd_info->num_open_zones; i++) {
                zone_idx = f->zbd_info->open_zones[i];
+               if (zone_idx < f->min_zone || zone_idx >= f->max_zone)
+                       continue;
                pthread_mutex_unlock(&f->zbd_info->mutex);
-               pthread_mutex_unlock(&z->mutex);
+               zone_unlock(z);
 
-               z = &f->zbd_info->zone_info[zone_idx];
+               z = get_zone(f, zone_idx);
 
-               pthread_mutex_lock(&z->mutex);
-               if ((z->wp << 9) + min_bs <= ((z+1)->start << 9))
+               zone_lock(td, f, z);
+               if (z->wp + min_bs <= zbd_zone_capacity_end(z))
                        goto out;
                pthread_mutex_lock(&f->zbd_info->mutex);
        }
        pthread_mutex_unlock(&f->zbd_info->mutex);
-       pthread_mutex_unlock(&z->mutex);
+       zone_unlock(z);
        dprint(FD_ZBD, "%s(%s): did not open another zone\n", __func__,
               f->file_name);
        return NULL;
@@ -907,7 +1198,7 @@ examine_zone:
 out:
        dprint(FD_ZBD, "%s(%s): returning zone %d\n", __func__, f->file_name,
               zone_idx);
-       io_u->offset = z->start << 9;
+       io_u->offset = z->start;
        return z;
 }
 
@@ -919,16 +1210,16 @@ static struct fio_zone_info *zbd_replay_write_order(struct thread_data *td,
        const struct fio_file *f = io_u->file;
        const uint32_t min_bs = td->o.min_bs[DDIR_WRITE];
 
-       if (!zbd_open_zone(td, io_u, z - f->zbd_info->zone_info)) {
-               pthread_mutex_unlock(&z->mutex);
+       if (!zbd_open_zone(td, f, zbd_zone_nr(f, z))) {
+               zone_unlock(z);
                z = zbd_convert_to_open_zone(td, io_u);
                assert(z);
        }
 
-       if (z->verify_block * min_bs >= f->zbd_info->zone_size)
-               log_err("%s: %d * %d >= %ld\n", f->file_name, z->verify_block,
-                       min_bs, f->zbd_info->zone_size);
-       io_u->offset = (z->start << 9) + z->verify_block++ * min_bs;
+       if (z->verify_block * min_bs >= z->capacity)
+               log_err("%s: %d * %d >= %llu\n", f->file_name, z->verify_block,
+                       min_bs, (unsigned long long)z->capacity);
+       io_u->offset = z->start + z->verify_block++ * min_bs;
        return z;
 }
 
@@ -945,30 +1236,29 @@ zbd_find_zone(struct thread_data *td, struct io_u *io_u,
              struct fio_zone_info *zb, struct fio_zone_info *zl)
 {
        const uint32_t min_bs = td->o.min_bs[io_u->ddir];
-       const struct fio_file *f = io_u->file;
+       struct fio_file *f = io_u->file;
        struct fio_zone_info *z1, *z2;
-       const struct fio_zone_info *const zf =
-               &f->zbd_info->zone_info[zbd_zone_idx(f, f->file_offset)];
+       const struct fio_zone_info *const zf = get_zone(f, f->min_zone);
 
        /*
         * Skip to the next non-empty zone in case of sequential I/O and to
         * the nearest non-empty zone in case of random I/O.
         */
        for (z1 = zb + 1, z2 = zb - 1; z1 < zl || z2 >= zf; z1++, z2--) {
-               if (z1 < zl && z1->cond != BLK_ZONE_COND_OFFLINE) {
-                       pthread_mutex_lock(&z1->mutex);
-                       if (z1->start + (min_bs >> 9) <= z1->wp)
+               if (z1 < zl && z1->cond != ZBD_ZONE_COND_OFFLINE) {
+                       zone_lock(td, f, z1);
+                       if (z1->start + min_bs <= z1->wp)
                                return z1;
-                       pthread_mutex_unlock(&z1->mutex);
+                       zone_unlock(z1);
                } else if (!td_random(td)) {
                        break;
                }
                if (td_random(td) && z2 >= zf &&
-                   z2->cond != BLK_ZONE_COND_OFFLINE) {
-                       pthread_mutex_lock(&z2->mutex);
-                       if (z2->start + (min_bs >> 9) <= z2->wp)
+                   z2->cond != ZBD_ZONE_COND_OFFLINE) {
+                       zone_lock(td, f, z2);
+                       if (z2->start + min_bs <= z2->wp)
                                return z2;
-                       pthread_mutex_unlock(&z2->mutex);
+                       zone_unlock(z2);
                }
        }
        dprint(FD_ZBD, "%s: adjusting random read offset failed\n",
@@ -976,37 +1266,75 @@ zbd_find_zone(struct thread_data *td, struct io_u *io_u,
        return NULL;
 }
 
+/**
+ * zbd_end_zone_io - update zone status at command completion
+ * @io_u: I/O unit
+ * @z: zone info pointer
+ *
+ * If the write command made the zone full, close it.
+ *
+ * The caller must hold z->mutex.
+ */
+static void zbd_end_zone_io(struct thread_data *td, const struct io_u *io_u,
+                           struct fio_zone_info *z)
+{
+       const struct fio_file *f = io_u->file;
+
+       if (io_u->ddir == DDIR_WRITE &&
+           io_u->offset + io_u->buflen >= zbd_zone_capacity_end(z)) {
+               pthread_mutex_lock(&f->zbd_info->mutex);
+               zbd_close_zone(td, f, zbd_zone_nr(f, z));
+               pthread_mutex_unlock(&f->zbd_info->mutex);
+       }
+}
 
 /**
- * zbd_post_submit - update the write pointer and unlock the zone lock
+ * zbd_queue_io - update the write pointer of a sequential zone
  * @io_u: I/O unit
- * @success: Whether or not the I/O unit has been executed successfully
+ * @success: Whether or not the I/O unit has been queued successfully
+ * @q: queueing status (busy, completed or queued).
  *
- * For write and trim operations, update the write pointer of all affected
- * zones.
+ * For write and trim operations, update the write pointer of the I/O unit
+ * target zone.
  */
-static void zbd_post_submit(const struct io_u *io_u, bool success)
+static void zbd_queue_io(struct thread_data *td, struct io_u *io_u, int q,
+                        bool success)
 {
-       struct zoned_block_device_info *zbd_info;
+       const struct fio_file *f = io_u->file;
+       struct zoned_block_device_info *zbd_info = f->zbd_info;
        struct fio_zone_info *z;
        uint32_t zone_idx;
-       uint64_t end, zone_end;
+       uint64_t zone_end;
 
-       zbd_info = io_u->file->zbd_info;
        if (!zbd_info)
                return;
 
-       zone_idx = zbd_zone_idx(io_u->file, io_u->offset);
-       end = (io_u->offset + io_u->buflen) >> 9;
-       z = &zbd_info->zone_info[zone_idx];
+       zone_idx = zbd_zone_idx(f, io_u->offset);
        assert(zone_idx < zbd_info->nr_zones);
-       if (z->type != BLK_ZONE_TYPE_SEQWRITE_REQ)
+       z = get_zone(f, zone_idx);
+
+       if (!zbd_zone_swr(z))
                return;
+
        if (!success)
                goto unlock;
+
+       dprint(FD_ZBD,
+              "%s: queued I/O (%lld, %llu) for zone %u\n",
+              f->file_name, io_u->offset, io_u->buflen, zone_idx);
+
        switch (io_u->ddir) {
        case DDIR_WRITE:
-               zone_end = min(end, (z + 1)->start);
+               zone_end = min((uint64_t)(io_u->offset + io_u->buflen),
+                              zbd_zone_capacity_end(z));
+               pthread_mutex_lock(&zbd_info->mutex);
+               /*
+                * z->wp > zone_end means that one or more I/O errors
+                * have occurred.
+                */
+               if (z->wp <= zone_end)
+                       zbd_info->sectors_with_data += zone_end - z->wp;
+               pthread_mutex_unlock(&zbd_info->mutex);
                z->wp = zone_end;
                break;
        case DDIR_TRIM:
@@ -1015,10 +1343,56 @@ static void zbd_post_submit(const struct io_u *io_u, bool success)
        default:
                break;
        }
+
+       if (q == FIO_Q_COMPLETED && !io_u->error)
+               zbd_end_zone_io(td, io_u, z);
+
 unlock:
-       pthread_mutex_unlock(&z->mutex);
+       if (!success || q != FIO_Q_QUEUED) {
+               /* BUSY or COMPLETED: unlock the zone */
+               zone_unlock(z);
+               io_u->zbd_put_io = NULL;
+       }
+}
+
+/**
+ * zbd_put_io - Unlock an I/O unit target zone lock
+ * @io_u: I/O unit
+ */
+static void zbd_put_io(struct thread_data *td, const struct io_u *io_u)
+{
+       const struct fio_file *f = io_u->file;
+       struct zoned_block_device_info *zbd_info = f->zbd_info;
+       struct fio_zone_info *z;
+       uint32_t zone_idx;
+
+       if (!zbd_info)
+               return;
+
+       zone_idx = zbd_zone_idx(f, io_u->offset);
+       assert(zone_idx < zbd_info->nr_zones);
+       z = get_zone(f, zone_idx);
+
+       if (!zbd_zone_swr(z))
+               return;
+
+       dprint(FD_ZBD,
+              "%s: terminate I/O (%lld, %llu) for zone %u\n",
+              f->file_name, io_u->offset, io_u->buflen, zone_idx);
+
+       zbd_end_zone_io(td, io_u, z);
+
+       zone_unlock(z);
+       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) {
@@ -1029,6 +1403,111 @@ bool zbd_unaligned_write(int error_code)
        return false;
 }
 
+/**
+ * setup_zbd_zone_mode - handle zoneskip as necessary for ZBD drives
+ * @td: FIO thread data.
+ * @io_u: FIO I/O unit.
+ *
+ * For sequential workloads, change the file offset to skip zoneskip bytes when
+ * no more IO can be performed in the current zone.
+ * - For read workloads, zoneskip is applied when the io has reached the end of
+ *   the zone or the zone write position (when td->o.read_beyond_wp is false).
+ * - For write workloads, zoneskip is applied when the zone is full.
+ * This applies only to read and write operations.
+ */
+void setup_zbd_zone_mode(struct thread_data *td, struct io_u *io_u)
+{
+       struct fio_file *f = io_u->file;
+       enum fio_ddir ddir = io_u->ddir;
+       struct fio_zone_info *z;
+       uint32_t zone_idx;
+
+       assert(td->o.zone_mode == ZONE_MODE_ZBD);
+       assert(td->o.zone_size);
+
+       zone_idx = zbd_zone_idx(f, f->last_pos[ddir]);
+       z = get_zone(f, zone_idx);
+
+       /*
+        * When the zone capacity is smaller than the zone size and the I/O is
+        * sequential write, skip to zone end if the latest position is at the
+        * zone capacity limit.
+        */
+       if (z->capacity < f->zbd_info->zone_size && !td_random(td) &&
+           ddir == DDIR_WRITE &&
+           f->last_pos[ddir] >= zbd_zone_capacity_end(z)) {
+               dprint(FD_ZBD,
+                      "%s: Jump from zone capacity limit to zone end:"
+                      " (%llu -> %llu) for zone %u (%llu)\n",
+                      f->file_name, (unsigned long long) f->last_pos[ddir],
+                      (unsigned long long) zbd_zone_end(z), zone_idx,
+                      (unsigned long long) z->capacity);
+               td->io_skip_bytes += zbd_zone_end(z) - f->last_pos[ddir];
+               f->last_pos[ddir] = zbd_zone_end(z);
+       }
+
+       /*
+        * zone_skip is valid only for sequential workloads.
+        */
+       if (td_random(td) || !td->o.zone_skip)
+               return;
+
+       /*
+        * It is time to switch to a new zone if:
+        * - zone_bytes == zone_size bytes have already been accessed
+        * - The last position reached the end of the current zone.
+        * - For reads with td->o.read_beyond_wp == false, the last position
+        *   reached the zone write pointer.
+        */
+       if (td->zone_bytes >= td->o.zone_size ||
+           f->last_pos[ddir] >= zbd_zone_end(z) ||
+           (ddir == DDIR_READ &&
+            (!td->o.read_beyond_wp) && f->last_pos[ddir] >= z->wp)) {
+               /*
+                * Skip zones.
+                */
+               td->zone_bytes = 0;
+               f->file_offset += td->o.zone_size + td->o.zone_skip;
+
+               /*
+                * Wrap from the beginning, if we exceed the file size
+                */
+               if (f->file_offset >= f->real_file_size)
+                       f->file_offset = get_start_offset(td, f);
+
+               f->last_pos[ddir] = f->file_offset;
+               td->io_skip_bytes += td->o.zone_skip;
+       }
+}
+
+/**
+ * zbd_adjust_ddir - Adjust an I/O direction for zonemode=zbd.
+ *
+ * @td: FIO thread data.
+ * @io_u: FIO I/O unit.
+ * @ddir: I/O direction before adjustment.
+ *
+ * Return adjusted I/O direction.
+ */
+enum fio_ddir zbd_adjust_ddir(struct thread_data *td, struct io_u *io_u,
+                             enum fio_ddir ddir)
+{
+       /*
+        * 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 (ddir != DDIR_READ || !td_rw(td))
+               return ddir;
+
+       if (io_u->file->zbd_info->sectors_with_data ||
+           td->o.read_beyond_wp)
+               return DDIR_READ;
+
+       return DDIR_WRITE;
+}
+
 /**
  * zbd_adjust_block - adjust the offset and length as necessary for ZBD drives
  * @td: FIO thread data.
@@ -1040,9 +1519,9 @@ bool zbd_unaligned_write(int error_code)
  */
 enum io_u_action zbd_adjust_block(struct thread_data *td, struct io_u *io_u)
 {
-       const struct fio_file *f = io_u->file;
+       struct fio_file *f = io_u->file;
        uint32_t zone_idx_b;
-       struct fio_zone_info *zb, *zl;
+       struct fio_zone_info *zb, *zl, *orig_zb;
        uint32_t orig_len = io_u->buflen;
        uint32_t min_bs = td->o.min_bs[io_u->ddir];
        uint64_t new_len;
@@ -1051,49 +1530,47 @@ 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);
-       zb = &f->zbd_info->zone_info[zone_idx_b];
+       zb = get_zone(f, zone_idx_b);
+       orig_zb = zb;
 
        /* Accept the I/O offset for conventional zones. */
-       if (zb->type == BLK_ZONE_TYPE_CONVENTIONAL)
+       if (!zbd_zone_swr(zb))
                return io_u_accept;
 
        /*
         * Accept the I/O offset for reads if reading beyond the write pointer
         * is enabled.
         */
-       if (zb->cond != BLK_ZONE_COND_OFFLINE &&
+       if (zb->cond != ZBD_ZONE_COND_OFFLINE &&
            io_u->ddir == DDIR_READ && td->o.read_beyond_wp)
                return io_u_accept;
 
-       pthread_mutex_lock(&zb->mutex);
+       zbd_check_swd(f);
+
+       zone_lock(td, f, zb);
+
        switch (io_u->ddir) {
        case DDIR_READ:
-               if (td->runstate == TD_VERIFYING) {
+               if (td->runstate == TD_VERIFYING && td_write(td)) {
                        zb = zbd_replay_write_order(td, io_u, zb);
+                       zone_unlock(zb);
                        goto accept;
                }
                /*
-                * Avoid reads past the write pointer because such reads do not
-                * hit the medium.
+                * Check that there is enough written data in the zone to do an
+                * I/O of at least min_bs B. If there isn't, find a new zone for
+                * the I/O.
                 */
-               range = zb->cond != BLK_ZONE_COND_OFFLINE ?
-                       ((zb->wp - zb->start) << 9) - io_u->buflen : 0;
-               if (td_random(td) && range >= 0) {
-                       io_u->offset = (zb->start << 9) +
-                               ((io_u->offset - (zb->start << 9)) %
-                                (range + 1)) / min_bs * min_bs;
-                       assert(zb->start << 9 <= io_u->offset);
-                       assert(io_u->offset + io_u->buflen <= zb->wp << 9);
-                       goto accept;
-               }
-               if (zb->cond == BLK_ZONE_COND_OFFLINE ||
-                   (io_u->offset + io_u->buflen) >> 9 > zb->wp) {
-                       pthread_mutex_unlock(&zb->mutex);
-                       zl = &f->zbd_info->zone_info[zbd_zone_idx(f,
-                                               f->file_offset + f->io_size)];
+               range = zb->cond != ZBD_ZONE_COND_OFFLINE ?
+                       zb->wp - zb->start : 0;
+               if (range < min_bs ||
+                   ((!td_random(td)) && (io_u->offset + min_bs > zb->wp))) {
+                       zone_unlock(zb);
+                       zl = get_zone(f, f->max_zone);
                        zb = zbd_find_zone(td, io_u, zb, zl);
                        if (!zb) {
                                dprint(FD_ZBD,
@@ -1102,24 +1579,57 @@ enum io_u_action zbd_adjust_block(struct thread_data *td, struct io_u *io_u)
                                       io_u->buflen);
                                goto eof;
                        }
-                       io_u->offset = zb->start << 9;
+                       /*
+                        * zbd_find_zone() returned a zone with a range of at
+                        * least min_bs.
+                        */
+                       range = zb->wp - zb->start;
+                       assert(range >= min_bs);
+
+                       if (!td_random(td))
+                               io_u->offset = zb->start;
                }
-               if ((io_u->offset + io_u->buflen) >> 9 > zb->wp) {
-                       dprint(FD_ZBD, "%s: %lld + %lld > %" PRIu64 "\n",
-                              f->file_name, io_u->offset, io_u->buflen,
-                              zb->wp);
-                       goto eof;
+               /*
+                * Make sure the I/O is within the zone valid data range while
+                * maximizing the I/O size and preserving randomness.
+                */
+               if (range <= io_u->buflen)
+                       io_u->offset = zb->start;
+               else if (td_random(td))
+                       io_u->offset = zb->start +
+                               ((io_u->offset - orig_zb->start) %
+                                (range - io_u->buflen)) / min_bs * min_bs;
+               /*
+                * Make sure the I/O does not cross over the zone wp position.
+                */
+               new_len = min((unsigned long long)io_u->buflen,
+                             (unsigned long long)(zb->wp - io_u->offset));
+               new_len = new_len / min_bs * min_bs;
+               if (new_len < io_u->buflen) {
+                       io_u->buflen = new_len;
+                       dprint(FD_IO, "Changed length from %u into %llu\n",
+                              orig_len, io_u->buflen);
                }
+               assert(zb->start <= io_u->offset);
+               assert(io_u->offset + io_u->buflen <= zb->wp);
                goto accept;
        case DDIR_WRITE:
-               if (io_u->buflen > (f->zbd_info->zone_size << 9))
+               if (io_u->buflen > f->zbd_info->zone_size)
                        goto eof;
-               if (!zbd_open_zone(td, io_u, zone_idx_b)) {
-                       pthread_mutex_unlock(&zb->mutex);
+               if (!zbd_open_zone(td, f, zone_idx_b)) {
+                       zone_unlock(zb);
                        zb = zbd_convert_to_open_zone(td, io_u);
                        if (!zb)
                                goto eof;
-                       zone_idx_b = zb - f->zbd_info->zone_info;
+                       zone_idx_b = zbd_zone_nr(f, zb);
+               }
+               /* Check whether the zone reset threshold has been exceeded */
+               if (td->o.zrf.u.f) {
+                       if (f->zbd_info->sectors_with_data >=
+                           f->io_size * td->o.zrt.u.f &&
+                           zbd_dec_and_reset_write_cnt(td, f)) {
+                               zb->reset_zone = 1;
+                       }
                }
                /* Reset the zone pointer if necessary */
                if (zb->reset_zone || zbd_zone_full(f, zb, min_bs)) {
@@ -1135,10 +1645,17 @@ enum io_u_action zbd_adjust_block(struct thread_data *td, struct io_u *io_u)
                        zb->reset_zone = 0;
                        if (zbd_reset_zone(td, f, zb) < 0)
                                goto eof;
+
+                       if (zb->capacity < min_bs) {
+                               log_err("zone capacity %llu smaller than minimum block size %d\n",
+                                       (unsigned long long)zb->capacity,
+                                       min_bs);
+                               goto eof;
+                       }
                }
                /* Make writes occur at the write pointer */
                assert(!zbd_zone_full(f, zb, min_bs));
-               io_u->offset = zb->wp << 9;
+               io_u->offset = zb->wp;
                if (!is_valid_offset(f, io_u->offset)) {
                        dprint(FD_ZBD, "Dropped request with offset %llu\n",
                               io_u->offset);
@@ -1150,7 +1667,7 @@ enum io_u_action zbd_adjust_block(struct thread_data *td, struct io_u *io_u)
                 * small.
                 */
                new_len = min((unsigned long long)io_u->buflen,
-                             ((zb + 1)->start << 9) - io_u->offset);
+                             zbd_zone_capacity_end(zb) - io_u->offset);
                new_len = new_len / min_bs * min_bs;
                if (new_len == io_u->buflen)
                        goto accept;
@@ -1161,7 +1678,7 @@ enum io_u_action zbd_adjust_block(struct thread_data *td, struct io_u *io_u)
                        goto accept;
                }
                log_err("Zone remainder %lld smaller than minimum block size %d\n",
-                       (((zb + 1)->start << 9) - io_u->offset),
+                       (zbd_zone_capacity_end(zb) - io_u->offset),
                        min_bs);
                goto eof;
        case DDIR_TRIM:
@@ -1179,14 +1696,16 @@ enum io_u_action zbd_adjust_block(struct thread_data *td, struct io_u *io_u)
 
 accept:
        assert(zb);
-       assert(zb->cond != BLK_ZONE_COND_OFFLINE);
-       assert(!io_u->post_submit);
-       io_u->post_submit = zbd_post_submit;
+       assert(zb->cond != ZBD_ZONE_COND_OFFLINE);
+       assert(!io_u->zbd_queue_io);
+       assert(!io_u->zbd_put_io);
+       io_u->zbd_queue_io = zbd_queue_io;
+       io_u->zbd_put_io = zbd_put_io;
        return io_u_accept;
 
 eof:
        if (zb)
-               pthread_mutex_unlock(&zb->mutex);
+               zone_unlock(zb);
        return io_u_eof;
 }
 
@@ -1195,7 +1714,7 @@ char *zbd_write_status(const struct thread_stat *ts)
 {
        char *res;
 
-       if (asprintf(&res, "; %ld zone resets", ts->nr_zone_resets) < 0)
+       if (asprintf(&res, "; %llu zone resets", (unsigned long long) ts->nr_zone_resets) < 0)
                return NULL;
        return res;
 }