engines/io_uring_cmd: add extended LBA support

[fio.git] / engines / io_uring.c

diff --git a/engines/io_uring.c b/engines/io_uring.c
index f10a45933ff5bb1877b072538547ee2e637a69d5..90e5a8566ae8c5b9e58ac15b0160f28a01071d90 100644 (file)
--- a/engines/io_uring.c
+++ b/engines/io_uring.c
@@ -529,6 +529,7 @@ static int fio_ioring_getevents(struct thread_data *td, unsigned int min,
                r = fio_ioring_cqring_reap(td, events, max);
                if (r) {
                        events += r;
+                       max -= r;
                        if (actual_min != 0)
                                actual_min -= r;
                        continue;
@@ -799,11 +800,10 @@ static void fio_ioring_probe(struct thread_data *td)
        /* default to off, as that's always safe */
        o->nonvectored = 0;
 
-       p = malloc(sizeof(*p) + 256 * sizeof(struct io_uring_probe_op));
+       p = calloc(1, sizeof(*p) + 256 * sizeof(struct io_uring_probe_op));
        if (!p)
                return;
 
-       memset(p, 0, sizeof(*p) + 256 * sizeof(struct io_uring_probe_op));
        ret = syscall(__NR_io_uring_register, ld->ring_fd,
                        IORING_REGISTER_PROBE, p, 256);
        if (ret < 0)
@@ -1177,22 +1177,40 @@ static int fio_ioring_cmd_open_file(struct thread_data *td, struct fio_file *f)
        if (o->cmd_type == FIO_URING_CMD_NVME) {
                struct nvme_data *data = NULL;
                unsigned int nsid, lba_size = 0;
+               __u32 ms = 0;
                __u64 nlba = 0;
                int ret;
 
                /* Store the namespace-id and lba size. */
                data = FILE_ENG_DATA(f);
                if (data == NULL) {
-                       ret = fio_nvme_get_info(f, &nsid, &lba_size, &nlba);
+                       ret = fio_nvme_get_info(f, &nsid, &lba_size, &ms, &nlba);
                        if (ret)
                                return ret;
 
                        data = calloc(1, sizeof(struct nvme_data));
                        data->nsid = nsid;
-                       data->lba_shift = ilog2(lba_size);
+                       if (ms)
+                               data->lba_ext = lba_size + ms;
+                       else
+                               data->lba_shift = ilog2(lba_size);
 
                        FILE_SET_ENG_DATA(f, data);
                }
+
+               lba_size = data->lba_ext ? data->lba_ext : (1 << data->lba_shift);
+
+               for_each_rw_ddir(ddir) {
+                       if (td->o.min_bs[ddir] % lba_size ||
+                               td->o.max_bs[ddir] % lba_size) {
+                               if (data->lba_ext)
+                                       log_err("block size must be a multiple of "
+                                               "(LBA data size + Metadata size)\n");
+                               else
+                                       log_err("block size must be a multiple of LBA data size\n");
+                               return 1;
+                       }
+                }
        }
        if (!ld || !o->registerfiles)
                return generic_open_file(td, f);
@@ -1243,16 +1261,20 @@ static int fio_ioring_cmd_get_file_size(struct thread_data *td,
        if (o->cmd_type == FIO_URING_CMD_NVME) {
                struct nvme_data *data = NULL;
                unsigned int nsid, lba_size = 0;
+               __u32 ms = 0;
                __u64 nlba = 0;
                int ret;
 
-               ret = fio_nvme_get_info(f, &nsid, &lba_size, &nlba);
+               ret = fio_nvme_get_info(f, &nsid, &lba_size, &ms, &nlba);
                if (ret)
                        return ret;
 
                data = calloc(1, sizeof(struct nvme_data));
                data->nsid = nsid;
-               data->lba_shift = ilog2(lba_size);
+               if (ms)
+                       data->lba_ext = lba_size + ms;
+               else
+                       data->lba_shift = ilog2(lba_size);
 
                f->real_file_size = lba_size * nlba;
                fio_file_set_size_known(f);