Recent changes (master)
The following changes since commit 7aec5ac0bdd1adcaeba707f26d5bc583de6ab6c9:
test: add the test for loops option and read-verify workloads (2024-02-14 07:39:48 -0700)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 2d0debb3fca7ddc4374624acb8c70fc8292d860d:
t/run-fio-tests: add t/nvmept_trim.py (2024-02-15 14:05:12 -0500)
----------------------------------------------------------------
Ankit Kumar (3):
trim: add support for multiple ranges engines/nvme: pass offset and len instead of io_u engines/io_uring: add multi range dsm support
Jens Axboe (3):
t/io_uring: account and ignore IO errors t/io_uring: pre-calculate per-file depth
io_u: move number_trim to reclaim 8 bytes in struct io_u
Vincent Fu (2):
t/nvmept_trim.py: test multi-range trim
t/run-fio-tests: add t/nvmept_trim.py
HOWTO.rst | 9 + backend.c | 20 +- cconv.c | 2 + engines/io_uring.c | 34 +- engines/nvme.c | 72 ++-- engines/nvme.h | 7 +- examples/uring-cmd-trim-multi-range.fio | 21 ++ fio.1 | 7 + fio.h | 18 + init.c | 13 + io_u.c | 97 +++++- io_u.h | 5 + ioengines.h | 2 + options.c | 11 + server.h | 2 +- t/io_uring.c | 62 ++-- t/nvmept_trim.py | 586 ++++++++++++++++++++++++++++++++ t/run-fio-tests.py | 8 + thread_options.h | 3 + 19 files changed, 899 insertions(+), 80 deletions(-) create mode 100644 examples/uring-cmd-trim-multi-range.fio create mode 100755 t/nvmept_trim.py
---
Diff of recent changes:
HOWTO.rst +9 -0
@@ -2534,6 +2534,15 @@ with the caveat that when used on the command line, they must come after the Specifies logical block application tag mask value, if namespace is formatted to use end to end protection information. Default: 0xffff. +.. option:: num_range=int : [io_uring_cmd] + + For trim command this will be the number of ranges to trim per I/O + request. The number of logical blocks per range is determined by the + :option:`bs` option which should be a multiple of logical block size. + This cannot be used with read or write. Note that setting this + option > 1, :option:`log_offset` will not be able to log all the + offsets. Default: 1. + .. option:: cpuload=int : [cpuio] Attempt to use the specified percentage of CPU cycles. This is a mandatory
backend.c +17 -3
@@ -1333,7 +1333,7 @@ static int init_io_u(struct thread_data *td)int init_io_u_buffers (struct thread_data *td) {struct io_u *io_u; -unsigned long long max_bs, min_write; +unsigned long long max_bs, min_write, trim_bs =0 ;int i, max_units;int data_xfer =1 ;char *p;
@@ -1344,7 +1344,18 @@ int init_io_u_buffers(struct thread_data *td) td->orig_buffer_size = (unsigned long long ) max_bs * (unsigned long long ) max_units; -if (td_ioengine_flagged (td,FIO_NOIO ) || !(td_read (td) ||td_write (td))) +if (td_trim (td) && td->o.num_range >1 ) { + trim_bs = td->o.num_range *sizeof (struct trim_range ); + td->orig_buffer_size = trim_bs + * (unsigned long long ) max_units; + } + +/* +* For reads, writes, and multi-range trim operations we need a +* data buffer +*/ +if (td_ioengine_flagged (td,FIO_NOIO ) || + !(td_read (td) ||td_write (td) || (td_trim (td) && td->o.num_range >1 ))) data_xfer =0 ;/*
@@ -1396,7 +1407,10 @@ int init_io_u_buffers(struct thread_data *td)fill_verify_pattern (td, io_u->buf, max_bs, io_u,0 ,0 ); } } - p += max_bs; +if (td_trim (td) && td->o.num_range >1 ) + p += trim_bs; +else + p += max_bs; }return 0 ;
cconv.c +2 -0
@@ -111,6 +111,7 @@ int convert_thread_options_to_cpu(struct thread_options *o, o->serialize_overlap =le32_to_cpu (top->serialize_overlap); o->size =le64_to_cpu (top->size); o->io_size =le64_to_cpu (top->io_size); + o->num_range =le32_to_cpu (top->num_range); o->size_percent =le32_to_cpu (top->size_percent); o->io_size_percent =le32_to_cpu (top->io_size_percent); o->fill_device =le32_to_cpu (top->fill_device);
@@ -609,6 +610,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top, top->size =__cpu_to_le64 (o->size); top->io_size =__cpu_to_le64 (o->io_size); + top->num_range =__cpu_to_le32 (o->num_range); top->verify_backlog =__cpu_to_le64 (o->verify_backlog); top->start_delay =__cpu_to_le64 (o->start_delay); top->start_delay_high =__cpu_to_le64 (o->start_delay_high);
engines/io_uring.c +27 -7
@@ -81,7 +81,7 @@ struct ioring_data {struct cmdprio cmdprio; -struct nvme_dsm_range *dsm; +struct nvme_dsm *dsm; };struct ioring_options {
@@ -385,6 +385,9 @@ static int fio_ioring_cmd_prep(struct thread_data *td, struct io_u *io_u)struct fio_file *f = io_u->file;struct nvme_uring_cmd *cmd;struct io_uring_sqe *sqe; +struct nvme_dsm *dsm; +void *ptr = ld->dsm; +unsigned int dsm_size;/* only supports nvme_uring_cmd */ if (o->cmd_type !=FIO_URING_CMD_NVME )
@@ -423,9 +426,13 @@ static int fio_ioring_cmd_prep(struct thread_data *td, struct io_u *io_u) } cmd = (struct nvme_uring_cmd *)sqe->cmd; + dsm_size =sizeof (*ld->dsm) + td->o.num_range *sizeof (struct nvme_dsm_range ); + ptr += io_u->index * dsm_size; + dsm = (struct nvme_dsm *)ptr; +return fio_nvme_uring_cmd_prep (cmd, io_u, o->nonvectored ?NULL : &ld->iovecs[io_u->index], - &ld->dsm[io_u->index]); + dsm); }static struct io_u *fio_ioring_event (struct thread_data *td,int event)
@@ -1133,8 +1140,11 @@ static int fio_ioring_init(struct thread_data *td) {struct ioring_options *o = td->eo;struct ioring_data *ld; +struct nvme_dsm *dsm; +void *ptr; +unsigned int dsm_size;unsigned long long md_size; -int ret; +int ret, i;/* sqthread submission requires registered files */ if (o->sqpoll_thread)
@@ -1195,10 +1205,19 @@ static int fio_ioring_init(struct thread_data *td)* in zbd mode where trim means zone reset. */ if (!strcmp (td->io_ops->name,"io_uring_cmd" ) &&td_trim (td) && - td->o.zone_mode ==ZONE_MODE_ZBD ) + td->o.zone_mode ==ZONE_MODE_ZBD ) { td->io_ops->flags |=FIO_ASYNCIO_SYNC_TRIM ; -else - ld->dsm =calloc (td->o.iodepth,sizeof (*ld->dsm)); + }else { + dsm_size =sizeof (*ld->dsm) + + td->o.num_range *sizeof (struct nvme_dsm_range ); + ld->dsm =calloc (td->o.iodepth, dsm_size); + ptr = ld->dsm; +for (i =0 ; i < td->o.iodepth; i++) { + dsm = (struct nvme_dsm *)ptr; + dsm->nr_ranges = td->o.num_range; + ptr += dsm_size; + } + }return 0 ; }
@@ -1466,7 +1485,8 @@ static struct ioengine_ops ioengine_uring_cmd = { .name = "io_uring_cmd", .version = FIO_IOOPS_VERSION, .flags =FIO_NO_OFFLOAD |FIO_MEMALIGN |FIO_RAWIO | - FIO_ASYNCIO_SETS_ISSUE_TIME, +FIO_ASYNCIO_SETS_ISSUE_TIME | + FIO_MULTI_RANGE_TRIM, .init = fio_ioring_init, .post_init = fio_ioring_cmd_post_init, .io_u_init = fio_ioring_io_u_init,
engines/nvme.c +44 -28
136 lines not on this page · raw message
engines/nvme.h +6 -1
@@ -408,6 +408,11 @@ struct nvme_dsm_range {__le64 slba; }; +struct nvme_dsm { +__u32 nr_ranges; +struct nvme_dsm_range range[]; +}; +struct nvme_cmd_ext_io_opts {__u32 io_flags;__u16 apptag;
@@ -421,7 +426,7 @@ int fio_nvme_get_info(struct fio_file *f, __u64 *nlba, __u32 pi_act, struct nvme_data *data);int fio_nvme_uring_cmd_prep (struct nvme_uring_cmd *cmd,struct io_u *io_u, -struct iovec *iov,struct nvme_dsm_range *dsm); +struct iovec *iov,struct nvme_dsm *dsm);void fio_nvme_pi_fill (struct nvme_uring_cmd *cmd,struct io_u *io_u,struct nvme_cmd_ext_io_opts *opts);
examples/uring-cmd-trim-multi-range.fio new file +21 -0
@@ -0,0 +1,21 @@ +# Multi-range trim command test with io_uring_cmd I/O engine for nvme-ns +# generic character device. +# +[global] +filename=/dev/ng0n1 +ioengine=io_uring_cmd +cmd_type=nvme +size=10M +iodepth=32 +thread=1 +stonewall=1 + +[write_bs] +bs=4096 +rw=randtrim +num_range=8 + +[write_bssplit] +bssplit=4k/10:64k/50:32k/40 +rw=trim +num_range=8
fio.1 +7 -0
@@ -2293,6 +2293,13 @@ end to end protection information. Default: 0x1234. Specifies logical block application tag mask value, if namespace is formatted to use end to end protection information. Default: 0xffff. .TP +.BI (io_uring_cmd)num_range \fR=\fPint +For trim command this will be the number of ranges to trim per I/O request. +The number of logical blocks per range is determined by the \fBbs\fR option +which should be a multiple of logical block size. This cannot be used with +read or write. Note that setting this option > 1, \fBlog_offset\fR will not be +able to log all the offsets. Default: 1. +.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.
fio.h +18 -0
@@ -71,6 +71,16 @@struct fio_sem ; +#define MAX_TRIM_RANGE 256 + +/* +* Range for trim command +*/ +struct trim_range { +unsigned long long start; +unsigned long long len; +}; +/* * offset generator types */
@@ -609,6 +619,14 @@ static inline void fio_ro_check(const struct thread_data *td, struct io_u *io_u) !(io_u->ddir == DDIR_TRIM && !td_trim(td))); } +static inline bool multi_range_trim (struct thread_data *td,struct io_u *io_u) +{ +if (io_u->ddir ==DDIR_TRIM && td->o.num_range >1 ) +return true; + +return false; +} +static inline bool should_fsync (struct thread_data *td) {if (td->last_was_sync)
init.c +13 -0
@@ -618,6 +618,19 @@ static int fixup_options(struct thread_data *td) ret |=1 ; } +if (td_trimwrite (td) && o->num_range >1 ) { +log_err ("fio: trimwrite cannot be used with multiple" +" ranges.\n" ); + ret |=1 ; + } + +if (td_trim (td) && o->num_range >1 && + !td_ioengine_flagged (td,FIO_MULTI_RANGE_TRIM )) { +log_err ("fio: can't use multiple ranges with IO engine %s\n" , + td->io_ops->name); + ret |=1 ; + } +#ifndef CONFIG_PSHARED if (!o->use_thread) { log_info("fio: this platform does not support process shared"
io_u.c +81 -16
127 lines not on this page · raw message
io_u.h +5 -0
@@ -52,6 +52,11 @@ struct io_u {unsigned short ioprio;unsigned short clat_prio_index; +/* +* number of trim ranges for this IO. +*/ +unsigned int number_trim; +/* * Allocated/set buffer and length */
ioengines.h +2 -0
@@ -97,6 +97,8 @@ enum fio_ioengine_flags {FIO_RO_NEEDS_RW_OPEN =1 <<18 ,/* open files in rw mode even if we have a read job; only affects ioengines using generic_open_file */ +FIO_MULTI_RANGE_TRIM + = 1 << 19, /* ioengine supports trim with more than one range */ };/*
options.c +11 -0
@@ -2395,6 +2395,17 @@ struct fio_option fio_options[FIO_MAX_OPTS] = { .category = FIO_OPT_C_IO, .group = FIO_OPT_G_INVALID, }, + { + .name = "num_range", + .lname = "Number of ranges", + .type = FIO_OPT_INT, + .off1 = offsetof(struct thread_options, num_range), + .maxval = MAX_TRIM_RANGE, + .help = "Number of ranges for trim command", + .def = "1", + .category = FIO_OPT_C_IO, + .group = FIO_OPT_G_INVALID, + }, { .name = "bs", .lname = "Block size",
server.h +1 -1
@@ -51,7 +51,7 @@ struct fio_net_cmd_reply { };enum { -FIO_SERVER_VER =102 , +FIO_SERVER_VER =103 ,FIO_SERVER_MAX_FRAGMENT_PDU =1024 ,FIO_SERVER_MAX_CMD_MB =2048 ,
t/io_uring.c +38 -24
192 lines not on this page · raw message
t/nvmept_trim.py new file +586 -0
586 lines not on this page · raw message
t/run-fio-tests.py +8 -0
@@ -981,6 +981,14 @@ TEST_LIST = [ 'success': SUCCESS_DEFAULT, 'requirements': [Requirements.linux, Requirements.nvmecdev], }, + { + 'test_id': 1015, + 'test_class': FioExeTest, + 'exe': 't/nvmept_trim.py', + 'parameters': ['-f', '{fio_path}', '--dut', '{nvmecdev}'], + 'success': SUCCESS_DEFAULT, + 'requirements': [Requirements.linux, Requirements.nvmecdev], + }, ]
thread_options.h +3 -0
@@ -353,6 +353,8 @@ struct thread_options {unsigned long long offset_increment;unsigned long long number_ios; +unsigned int num_range; +unsigned int sync_file_range;unsigned long long latency_target;
@@ -711,6 +713,7 @@ struct thread_options_pack {uint32_t fdp_plis[FIO_MAX_PLIS ];uint32_t fdp_nrpli; +uint32_t num_range;/* * verify_pattern followed by buffer_pattern from the unpacked struct */