Recent changes (master)
The following changes since commit 8d94106730d11047f313caadda87e450f242f53c:
Merge branch 'master' of https://github.com/Cuelive/fio (2023-02-28 05:55:55 -0700)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 5a37211238f995657c50e5d0ea6e5e22ff3ca69e:
examples: add fiograph diagram for uring-cmd-fdp.fio (2023-02-28 13:58:58 -0500)
----------------------------------------------------------------
Horshack (3):
ioengines.c:346: td_io_queue: Assertion `res == 0' failed Fix "verify bad_hdr rand_seed" for requeued I/Os Clarify documentation for runtime parameter
Jens Axboe (5):
Merge branch 'Fix_Bad_Hdr_Rand_Seed_For_Requeued_IO' of https://github.com/horshack-dpreview/fio
Merge branch 'Fix_Assert_TdIoQueue_Serialize_Overlap_Offload' of https://github.com/horshack-dpreview/fio
fdp: cleanup init
Revert "ioengines.c:346: td_io_queue: Assertion `res == 0' failed"
Merge branch 'doc-Clarify_Runtime_Param' of https://github.com/horshack-dpreview/fio
Keith Busch (1):
fio: add fdp support for io_uring_cmd nvme engine
Vincent Fu (2):
fdp: change the order of includes to fix Windows build error
examples: add fiograph diagram for uring-cmd-fdp.fio
HOWTO.rst | 22 ++++++-- Makefile | 2 +- backend.c | 7 ++- cconv.c | 10 ++++ engines/io_uring.c | 24 +++++++++ engines/nvme.c | 40 ++++++++++++++- engines/nvme.h | 18 +++++++ examples/uring-cmd-fdp.fio | 37 ++++++++++++++ examples/uring-cmd-fdp.png | Bin 0 -> 50265 bytes fdp.c | 125 +++++++++++++++++++++++++++++++++++++++++++++ fdp.h | 16 ++++++ file.h | 3 ++ filesetup.c | 9 ++++ fio.1 | 19 +++++-- io_u.c | 5 +- io_u.h | 4 ++ ioengines.h | 5 +- options.c | 49 ++++++++++++++++++ server.h | 2 +- thread_options.h | 9 ++++ 20 files changed, 391 insertions(+), 15 deletions(-) create mode 100644 examples/uring-cmd-fdp.fio create mode 100644 examples/uring-cmd-fdp.png create mode 100644 fdp.c create mode 100644 fdp.h
---
Diff of recent changes:
HOWTO.rst +18 -4
@@ -686,10 +686,12 @@ Time related parameters .. option:: runtime=time - Tell fio to terminate processing after the specified period of time. It - can be quite hard to determine for how long a specified job will run, so - this parameter is handy to cap the total runtime to a given time. When - the unit is omitted, the value is interpreted in seconds. + Limit runtime. The test will run until it completes the configured I/O + workload or until it has run for this specified amount of time, whichever + occurs first. It can be quite hard to determine for how long a specified + job will run, so this parameter is handy to cap the total runtime to a + given time. When the unit is omitted, the value is interpreted in + seconds. .. option:: time_based
@@ -2423,6 +2425,18 @@ with the caveat that when used on the command line, they must come after the For direct I/O, requests will only succeed if cache invalidation isn't required, file blocks are fully allocated and the disk request could be issued immediately. +.. option:: fdp=bool : [io_uring_cmd] + + Enable Flexible Data Placement mode for write commands. + +.. option:: fdp_pli=str : [io_uring_cmd] + + Select which Placement ID Index/Indicies this job is allowed to use for + writes. By default, the job will cycle through all available Placement + IDs, so use this to isolate these identifiers to specific jobs. If you + want fio to use placement identifier only at indices 0, 2 and 5 specify + ``fdp_pli=0,2,5``. + .. option:: cpuload=int : [cpuio] Attempt to use the specified percentage of CPU cycles. This is a mandatory
Makefile +1 -1
@@ -62,7 +62,7 @@ SOURCE := $(sort $(patsubst $(SRCDIR)/%,%,$(wildcard $(SRCDIR)/crc/*.c)) \ gettime-thread.c helpers.c json.c idletime.c td_error.c \ profiles/tiobench.c profiles/act.c io_u_queue.c filelock.c \ workqueue.c rate-submit.c optgroup.c helper_thread.c \ - steadystate.c zone-dist.c zbd.c dedupe.c + steadystate.c zone-dist.c zbd.c dedupe.c fdp.c ifdef CONFIG_LIBHDFS HDFSFLAGS= -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/linux -I $(FIO_LIBHDFS_INCLUDE)
backend.c +5 -2
@@ -1040,8 +1040,11 @@ static void do_io(struct thread_data *td, uint64_t *bytes_done) }if (io_u->ddir ==DDIR_WRITE && td->flags &TD_F_DO_VERIFY ) { - io_u->numberio = td->io_issues[io_u->ddir]; -populate_verify_io_u (td, io_u); +if (!(io_u->flags &IO_U_F_PATTERN_DONE )) { +io_u_set (td, io_u,IO_U_F_PATTERN_DONE ); + io_u->numberio = td->io_issues[io_u->ddir]; +populate_verify_io_u (td, io_u); + } } ddir = io_u->ddir;
cconv.c +10 -0
@@ -349,6 +349,11 @@ int convert_thread_options_to_cpu(struct thread_options *o,for (i =0 ; i <FIO_IO_U_LIST_MAX_LEN ; i++) o->merge_blktrace_iters[i].u.f =fio_uint64_to_double (le64_to_cpu (top->merge_blktrace_iters[i].u.i)); + + o->fdp =le32_to_cpu (top->fdp); + o->fdp_nrpli =le32_to_cpu (top->fdp_nrpli); +for (i =0 ; i < o->fdp_nrpli; i++) + o->fdp_plis[i] =le32_to_cpu (top->fdp_plis[i]);#if 0 uint8_t cpumask[FIO_TOP_STR_MAX ];uint8_t verify_cpumask[FIO_TOP_STR_MAX ];
@@ -638,6 +643,11 @@ void convert_thread_options_to_net(struct thread_options_pack *top,for (i =0 ; i <FIO_IO_U_LIST_MAX_LEN ; i++) top->merge_blktrace_iters[i].u.i =__cpu_to_le64 (fio_double_to_uint64 (o->merge_blktrace_iters[i].u.f)); + + top->fdp =cpu_to_le32 (o->fdp); + top->fdp_nrpli =cpu_to_le32 (o->fdp_nrpli); +for (i =0 ; i < o->fdp_nrpli; i++) + top->fdp_plis[i] =cpu_to_le32 (o->fdp_plis[i]);#if 0 uint8_t cpumask[FIO_TOP_STR_MAX ];uint8_t verify_cpumask[FIO_TOP_STR_MAX ];
engines/io_uring.c +24 -0
@@ -1262,6 +1262,29 @@ static int fio_ioring_cmd_get_max_open_zones(struct thread_data *td,return fio_nvme_get_max_open_zones (td, f, max_open_zones); } +static int fio_ioring_cmd_fetch_ruhs (struct thread_data *td,struct fio_file *f, +struct fio_ruhs_info *fruhs_info) +{ +struct nvme_fdp_ruh_status *ruhs; +int bytes, ret, i; + + bytes =sizeof (*ruhs) +128 *sizeof (struct nvme_fdp_ruh_status_desc ); + ruhs =scalloc (1 , bytes); +if (!ruhs) +return -ENOMEM ; + + ret =fio_nvme_iomgmt_ruhs (td, f, ruhs, bytes); +if (ret) + goto free; + + fruhs_info->nr_ruhs =le16_to_cpu (ruhs->nruhsd); +for (i =0 ; i < fruhs_info->nr_ruhs; i++) + fruhs_info->plis[i] =le16_to_cpu (ruhs->ruhss[i].pid); +free: +sfree (ruhs); +return ret; +} +static struct ioengine_ops ioengine_uring = { .name ="io_uring" , .version =FIO_IOOPS_VERSION ,
@@ -1307,6 +1330,7 @@ static struct ioengine_ops ioengine_uring_cmd = { .get_max_open_zones = fio_ioring_cmd_get_max_open_zones, .options = options, .option_struct_size = sizeof(struct ioring_options), + .fdp_fetch_ruhs = fio_ioring_cmd_fetch_ruhs, }; static void fio_init fio_ioring_register(void)
engines/nvme.c +39 -1
@@ -28,7 +28,8 @@ int fio_nvme_uring_cmd_prep(struct nvme_uring_cmd *cmd, struct io_u *io_u, cmd->cdw10 = slba &0xffffffff ; cmd->cdw11 = slba >>32 ;/* cdw12 represent number of lba's for read/write */ - cmd->cdw12 = nlb; + cmd->cdw12 = nlb | (io_u->dtype <<20 ); + cmd->cdw13 = io_u->dspec <<16 ;if (iov) { iov->iov_base = io_u->xfer_buf; iov->iov_len = io_u->xfer_buflen;
@@ -345,3 +346,40 @@ out:close (fd);return ret; } + +static inline int nvme_fdp_reclaim_unit_handle_status (int fd,__u32 nsid, +__u32 data_len,void *data) +{ +struct nvme_passthru_cmd cmd = { + .opcode = nvme_cmd_io_mgmt_recv, + .nsid = nsid, + .addr = (__u64 )(uintptr_t )data, + .data_len = data_len, + .cdw10 =1 , + .cdw11 = (data_len >>2 ) -1 , + }; + +return ioctl (fd,NVME_IOCTL_IO_CMD , &cmd); +} + +int fio_nvme_iomgmt_ruhs (struct thread_data *td,struct fio_file *f, +struct nvme_fdp_ruh_status *ruhs,__u32 bytes) +{ +struct nvme_data *data =FILE_ENG_DATA (f); +int fd, ret; + + fd =open (f->file_name,O_RDONLY |O_LARGEFILE ); +if (fd <0 ) +return -errno; + + ret =nvme_fdp_reclaim_unit_handle_status (fd, data->nsid, bytes, ruhs); +if (ret) { +log_err ("%s: nvme_fdp_reclaim_unit_handle_status failed, err=%d\n" , + f->file_name, ret); + errno =ENOTSUP ; + }else + errno =0 ; + +close (fd); +return -errno; +}
engines/nvme.h +18 -0
@@ -67,6 +67,7 @@ enum nvme_admin_opcode {enum nvme_io_opcode { nvme_cmd_write =0x01 , nvme_cmd_read =0x02 , + nvme_cmd_io_mgmt_recv =0x12 , nvme_zns_cmd_mgmt_send =0x79 , nvme_zns_cmd_mgmt_recv =0x7a , };
@@ -192,6 +193,23 @@ struct nvme_zone_report {struct nvme_zns_desc entries[]; }; +struct nvme_fdp_ruh_status_desc { +__u16 pid; +__u16 ruhid; +__u32 earutr; +__u64 ruamw; +__u8 rsvd16[16 ]; +}; + +struct nvme_fdp_ruh_status { +__u8 rsvd0[14 ]; +__le16 nruhsd; +struct nvme_fdp_ruh_status_desc ruhss[]; +}; + +int fio_nvme_iomgmt_ruhs (struct thread_data *td,struct fio_file *f, +struct nvme_fdp_ruh_status *ruhs,__u32 bytes); +int fio_nvme_get_info (struct fio_file *f,__u32 *nsid,__u32 *lba_sz,__u64 *nlba);
examples/uring-cmd-fdp.fio new file +37 -0
@@ -0,0 +1,37 @@ +# io_uring_cmd I/O engine for nvme-ns generic character device with FDP enabled +# This assumes the namespace is already configured with FDP support and has at +# least 8 available reclaim units. +# +# Each job targets different ranges of LBAs with different placement +# identifiers, and has different write intensity. + +[global] +filename=/dev/ng0n1 +ioengine=io_uring_cmd +cmd_type=nvme +iodepth=32 +bs=4K +fdp=1 +time_based=1 +runtime=1000 + +[write-heavy] +rw=randrw +rwmixwrite=90 +fdp_pli=0,1,2,3 +offset=0% +size=30% + +[write-mid] +rw=randrw +rwmixwrite=30 +fdp_pli=4,5 +offset=30% +size=30% + +[write-light] +rw=randrw +rwmixwrite=10 +fdp_pli=6 +offset=60% +size=30%
examples/uring-cmd-fdp.png new file binary +0 -0
fdp.c new file +125 -0
125 lines not on this page · raw message
fdp.h new file +16 -0
@@ -0,0 +1,16 @@ +#ifndef FIO_FDP_H +#define FIO_FDP_H + +#include "io_u.h" + +struct fio_ruhs_info { +uint32_t nr_ruhs; +uint32_t pli_loc; +uint16_t plis[]; +}; + +int fdp_init (struct thread_data *td); +void fdp_free_ruhs_info (struct fio_file *f); +void fdp_fill_dspec_data (struct thread_data *td,struct io_u *io_u); + +#endif /* FIO_FDP_H */
file.h +3 -0
@@ -12,6 +12,7 @@/* Forward declarations */ struct zoned_block_device_info ; +struct fdp_ruh_info ;/* * The type of object we are working on
@@ -101,6 +102,8 @@ struct fio_file {uint64_t file_offset;uint64_t io_size; +struct fio_ruhs_info *ruhs_info; +/* * Zoned block device information. See also zonemode=zbd. */
filesetup.c +9 -0
@@ -1407,6 +1407,12 @@ done:td_restore_runstate (td, old_state); +if (td->o.fdp) { + err =fdp_init (td); +if (err) + goto err_out; + } +return 0 ; err_offset:
@@ -1584,6 +1590,8 @@ void fio_file_free(struct fio_file *f) {if (fio_file_axmap (f))axmap_free (f->io_axmap); +if (f->ruhs_info) +sfree (f->ruhs_info);if (!fio_file_smalloc (f)) {free (f->file_name);free (f);
@@ -1617,6 +1625,7 @@ void close_and_free_files(struct thread_data *td) }zbd_close_file (f); +fdp_free_ruhs_info (f);fio_file_free (f); }
fio.1 +15 -4
@@ -471,10 +471,12 @@ See \fB\-\-max\-jobs\fR. Default: 1. .SS "Time related parameters" .TP .BI runtime \fR=\fPtime -Tell fio to terminate processing after the specified period of time. It -can be quite hard to determine for how long a specified job will run, so -this parameter is handy to cap the total runtime to a given time. When -the unit is omitted, the value is interpreted in seconds. +Limit runtime. The test will run until it completes the configured I/O +workload or until it has run for this specified amount of time, whichever +occurs first. It can be quite hard to determine for how long a specified +job will run, so this parameter is handy to cap the total runtime to a +given time. When the unit is omitted, the value is interpreted in +seconds. .TP .BI time_based If set, fio will run for the duration of the \fBruntime\fR specified
@@ -2184,6 +2186,15 @@ cached data. Currently the RWF_NOWAIT flag does not supported for cached write. For direct I/O, requests will only succeed if cache invalidation isn't required, file blocks are fully allocated and the disk request could be issued immediately. .TP +.BI (io_uring_cmd)fdp \fR=\fPbool +Enable Flexible Data Placement mode for write commands. +.TP +.BI (io_uring_cmd)fdp_pli \fR=\fPstr +Select which Placement ID Index/Indicies this job is allowed to use for writes. +By default, the job will cycle through all available Placement IDs, so use this +to isolate these identifiers to specific jobs. If you want fio to use placement +identifier only at indices 0, 2 and 5 specify, you would set `fdp_pli=0,2,5`. +.TP .BI (cpuio)cpuload \fR=\fPint Attempt to use the specified percentage of CPU cycles. This is a mandatory option when using cpuio I/O engine.
io_u.c +4 -1
@@ -990,6 +990,9 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u) } } +if (td->o.fdp) +fdp_fill_dspec_data (td, io_u); +if (io_u->offset + io_u->buflen > io_u->file->real_file_size) { dprint(FD_IO, "io_u %p, off=0x%llx + len=0x%llx exceeds file size=0x%llx\n", io_u,
@@ -2006,7 +2009,7 @@ static void io_completed(struct thread_data *td, struct io_u **io_u_ptr,dprint_io_u (io_u,"complete" );assert (io_u->flags &IO_U_F_FLIGHT ); -io_u_clear (td, io_u,IO_U_F_FLIGHT |IO_U_F_BUSY_OK ); +io_u_clear (td, io_u,IO_U_F_FLIGHT |IO_U_F_BUSY_OK |IO_U_F_PATTERN_DONE );/* * Mark IO ok to verify
io_u.h +4 -0
@@ -21,6 +21,7 @@ enum {IO_U_F_TRIMMED =1 <<5 ,IO_U_F_BARRIER =1 <<6 ,IO_U_F_VER_LIST =1 <<7 , + IO_U_F_PATTERN_DONE = 1 << 8, };/*
@@ -117,6 +118,9 @@ struct io_u {*/ int (*end_io)(struct thread_data *,struct io_u **); +uint32_t dtype; +uint32_t dspec; +union {#ifdef CONFIG_LIBAIO struct iocb iocb;
ioengines.h +4 -1
@@ -7,8 +7,9 @@#include "flist.h" #include "io_u.h" #include "zbd_types.h" +#include "fdp.h" -#define FIO_IOOPS_VERSION 31 +#define FIO_IOOPS_VERSION 32#ifndef CONFIG_DYNAMIC_ENGINES #define FIO_STATIC static
@@ -63,6 +64,8 @@ struct ioengine_ops { unsigned int *);int (*finish_zone)(struct thread_data *,struct fio_file *,uint64_t ,uint64_t ); +int (*fdp_fetch_ruhs)(struct thread_data *,struct fio_file *, +struct fio_ruhs_info *);int option_struct_size;struct fio_option *options; };
options.c +49 -0
61 lines not on this page · raw message
server.h +1 -1
@@ -51,7 +51,7 @@ struct fio_net_cmd_reply { };enum { -FIO_SERVER_VER =98 , +FIO_SERVER_VER =99 ,FIO_SERVER_MAX_FRAGMENT_PDU =1024 ,FIO_SERVER_MAX_CMD_MB =2048 ,
thread_options.h +9 -0
@@ -386,6 +386,11 @@ struct thread_options {fio_fp64_t zrt;fio_fp64_t zrf; +#define FIO_MAX_PLIS 16 +unsigned int fdp; +unsigned int fdp_plis[FIO_MAX_PLIS ]; +unsigned int fdp_nrpli; +unsigned int log_entries;unsigned int log_prio; };
@@ -698,6 +703,10 @@ struct thread_options_pack {uint32_t log_entries;uint32_t log_prio; +uint32_t fdp; +uint32_t fdp_plis[FIO_MAX_PLIS ]; +uint32_t fdp_nrpli; +/* * verify_pattern followed by buffer_pattern from the unpacked struct */