Recent changes (master)
The following changes since commit c948ee34afde7eda14adf82512772b03f6fb1d69:
Merge branch 'master' of https://github.com/celestinechen/fio (2024-04-19 13:51:05 -0600)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 349bbcb2e36658db05d5247ef8cbcb285d58dfbf:
docs: update for new data placement options (2024-04-24 13:44:09 -0400)
----------------------------------------------------------------
Vincent Fu (9):
fio: rename fdp.[c,h] to dataplacement.[c,h]
fio: create over-arching data placement option t/nvmept_fdp.py: test script for FDP
fio: support NVMe streams
options: reject placement IDs larger than the max
options: parse placement IDs as unsigned values
dataplacement: add a debug print for IOs t/nvmept_streams: test NVMe streams support
docs: update for new data placement options
HOWTO.rst | 36 ++- Makefile | 2 +- cconv.c | 18 +- fdp.c => dataplacement.c | 37 ++- dataplacement.h | 37 +++ engines/xnvme.c | 2 +- fdp.h | 29 -- filesetup.c | 4 +- fio.1 | 35 ++- init.c | 10 +- io_u.c | 4 +- ioengines.h | 2 +- options.c | 62 +++- server.h | 2 +- t/nvmept_fdp.py | 745 +++++++++++++++++++++++++++++++++++++++++++++++ t/nvmept_streams.py | 520 +++++++++++++++++++++++++++++++++ thread_options.h | 15 +- 17 files changed, 1466 insertions(+), 94 deletions(-) rename fdp.c => dataplacement.c (69%) create mode 100644 dataplacement.h delete mode 100644 fdp.h create mode 100755 t/nvmept_fdp.py create mode 100755 t/nvmept_streams.py
---
Diff of recent changes:
HOWTO.rst +27 -9
@@ -2500,7 +2500,24 @@ with the caveat that when used on the command line, they must come after the Enable Flexible Data Placement mode for write commands. -.. option:: fdp_pli_select=str : [io_uring_cmd] [xnvme] +.. option:: dataplacement=str : [io_uring_cmd] [xnvme] + + Specifies the data placement directive type to use for write commands. + The following types are supported: + + **none** + Do not use a data placement directive. This is the + default. + + **fdp** + Use Flexible Data Placement directives for write + commands. This is equivalent to specifying + :option:`fdp` =1. + + **streams** + Use Streams directives for write commands. + +.. option:: plid_select=str, fdp_pli_select=str : [io_uring_cmd] [xnvme] Defines how fio decides which placement ID to use next. The following types are defined:
@@ -2512,16 +2529,17 @@ with the caveat that when used on the command line, they must come after the Round robin over available placement IDs. This is the default. - The available placement ID index/indices is defined by the option - :option:`fdp_pli`. + The available placement ID (indices) are defined by the option + :option:`plids`. -.. option:: fdp_pli=str : [io_uring_cmd] [xnvme] +.. option:: plids=str, fdp_pli=str : [io_uring_cmd] [xnvme] - 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``. + Select which Placement IDs (streams) or Placement ID Indices (FDP) this + job is allowed to use for writes. For FDP 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 FDP placement + identifiers only at indices 0, 2 and 5 specify ``plids=0,2,5``. For + streams this should be a comma-separated list of Stream IDs. .. option:: md_per_io_size=int : [io_uring_cmd] [xnvme]
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 fdp.c + steadystate.c zone-dist.c zbd.c dedupe.c dataplacement.c ifdef CONFIG_LIBHDFS HDFSFLAGS= -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/linux -I $(FIO_LIBHDFS_INCLUDE)
cconv.c +10 -8
@@ -354,10 +354,11 @@ int convert_thread_options_to_cpu(struct thread_options *o, 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_pli_select =le32_to_cpu (top->fdp_pli_select); - 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]); + o->dp_type =le32_to_cpu (top->dp_type); + o->dp_id_select =le32_to_cpu (top->dp_id_select); + o->dp_nr_ids =le32_to_cpu (top->dp_nr_ids); +for (i =0 ; i < o->dp_nr_ids; i++) + o->dp_ids[i] =le32_to_cpu (top->dp_ids[i]);#if 0 uint8_t cpumask[FIO_TOP_STR_MAX ];uint8_t verify_cpumask[FIO_TOP_STR_MAX ];
@@ -652,10 +653,11 @@ void convert_thread_options_to_net(struct thread_options_pack *top, 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_pli_select =cpu_to_le32 (o->fdp_pli_select); - 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]); + top->dp_type =cpu_to_le32 (o->dp_type); + top->dp_id_select =cpu_to_le32 (o->dp_id_select); + top->dp_nr_ids =cpu_to_le32 (o->dp_nr_ids); +for (i =0 ; i < o->dp_nr_ids; i++) + top->dp_ids[i] =cpu_to_le32 (o->dp_ids[i]);#if 0 uint8_t cpumask[FIO_TOP_STR_MAX ];uint8_t verify_cpumask[FIO_TOP_STR_MAX ];
dataplacement.c renamed from fdp.c +26 -11
@@ -13,7 +13,7 @@#include "file.h" #include "pshared.h" -#include "fdp.h" +#include "dataplacement.h" static int fdp_ruh_info (struct thread_data *td,struct fio_file *f,struct fio_ruhs_info *ruhs)
@@ -49,6 +49,20 @@ static int init_ruh_info(struct thread_data *td, struct fio_file *f)if (!ruhs)return -ENOMEM ; +/* set up the data structure used for FDP to work with the supplied stream IDs */ +if (td->o.dp_type ==FIO_DP_STREAMS ) { +if (!td->o.dp_nr_ids) { +log_err ("fio: stream IDs must be provided for dataplacement=streams\n" ); +return -EINVAL ; + } + ruhs->nr_ruhs = td->o.dp_nr_ids; +for (int i =0 ; i < ruhs->nr_ruhs; i++) + ruhs->plis[i] = td->o.dp_ids[i]; + + f->ruhs_info = ruhs; +return 0 ; + } + ret =fdp_ruh_info (td, f, ruhs);if (ret) { log_info("fio: ruh info failed for %s (%d)\n",
@@ -59,13 +73,13 @@ static int init_ruh_info(struct thread_data *td, struct fio_file *f)if (ruhs->nr_ruhs >FDP_MAX_RUHS ) ruhs->nr_ruhs =FDP_MAX_RUHS ; -if (td->o.fdp_nrpli ==0 ) { +if (td->o.dp_nr_ids ==0 ) { f->ruhs_info = ruhs;return 0 ; } -for (i =0 ; i < td->o.fdp_nrpli; i++) { -if (td->o.fdp_plis[i] >= ruhs->nr_ruhs) { +for (i =0 ; i < td->o.dp_nr_ids; i++) { +if (td->o.dp_ids[i] >= ruhs->nr_ruhs) { ret = -EINVAL ; goto out; }
@@ -77,16 +91,16 @@ static int init_ruh_info(struct thread_data *td, struct fio_file *f) goto out; } - tmp->nr_ruhs = td->o.fdp_nrpli; -for (i =0 ; i < td->o.fdp_nrpli; i++) - tmp->plis[i] = ruhs->plis[td->o.fdp_plis[i]]; + tmp->nr_ruhs = td->o.dp_nr_ids; +for (i =0 ; i < td->o.dp_nr_ids; i++) + tmp->plis[i] = ruhs->plis[td->o.dp_ids[i]]; f->ruhs_info = tmp; out:sfree (ruhs);return ret; } -int fdp_init (struct thread_data *td) +int dp_init (struct thread_data *td) {struct fio_file *f;int i, ret =0 ;
@@ -107,7 +121,7 @@ void fdp_free_ruhs_info(struct fio_file *f) f->ruhs_info =NULL ; } -void fdp_fill_dspec_data (struct thread_data *td,struct io_u *io_u) +void dp_fill_dspec_data (struct thread_data *td,struct io_u *io_u) {struct fio_file *f = io_u->file;struct fio_ruhs_info *ruhs = f->ruhs_info;
@@ -119,7 +133,7 @@ void fdp_fill_dspec_data(struct thread_data *td, struct io_u *io_u)return ; } -if (td->o.fdp_pli_select ==FIO_FDP_RR ) { +if (td->o.dp_id_select ==FIO_DP_RR ) {if (ruhs->pli_loc >= ruhs->nr_ruhs) ruhs->pli_loc =0 ;
@@ -129,6 +143,7 @@ void fdp_fill_dspec_data(struct thread_data *td, struct io_u *io_u) dspec = ruhs->plis[ruhs->pli_loc]; } - io_u->dtype =FDP_DIR_DTYPE ; + io_u->dtype = td->o.dp_type ==FIO_DP_FDP ?FDP_DIR_DTYPE :STREAMS_DIR_DTYPE ; io_u->dspec = dspec; +dprint (FD_IO ,"dtype set to 0x%x, dspec set to 0x%x\n" , io_u->dtype, io_u->dspec); }
dataplacement.h new file +37 -0
@@ -0,0 +1,37 @@ +#ifndef FIO_DATAPLACEMENT_H +#define FIO_DATAPLACEMENT_H + +#include "io_u.h" + +#define STREAMS_DIR_DTYPE 1 +#define FDP_DIR_DTYPE 2 +#define FDP_MAX_RUHS 128 +#define FIO_MAX_DP_IDS 16 + +/* +* How fio chooses what placement identifier to use next. Choice of +* uniformly random, or roundrobin. +*/ +enum { +FIO_DP_RANDOM =0x1 , +FIO_DP_RR =0x2 , +}; + + +enum { +FIO_DP_NONE =0x0 , +FIO_DP_FDP =0x1 , +FIO_DP_STREAMS =0x2 , +}; + +struct fio_ruhs_info { +uint32_t nr_ruhs; +uint32_t pli_loc; +uint16_t plis[]; +}; + +int dp_init (struct thread_data *td); +void fdp_free_ruhs_info (struct fio_file *f); +void dp_fill_dspec_data (struct thread_data *td,struct io_u *io_u); + +#endif /* FIO_DATAPLACEMENT_H */
engines/xnvme.c +1 -1
@@ -13,7 +13,7 @@#include "fio.h" #include "verify.h" #include "zbd_types.h" -#include "fdp.h" +#include "dataplacement.h" #include "optgroup.h" static pthread_mutex_t g_serialize =PTHREAD_MUTEX_INITIALIZER ;
fdp.h deleted +0 -29
@@ -1,29 +0,0 @@ -#ifndef FIO_FDP_H -#define FIO_FDP_H - -#include "io_u.h" - -#define FDP_DIR_DTYPE 2 -#define FDP_MAX_RUHS 128 - -/* -* How fio chooses what placement identifier to use next. Choice of -* uniformly random, or roundrobin. -*/ - -enum { -FIO_FDP_RANDOM =0x1 , -FIO_FDP_RR =0x2 , -}; - -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 */
filesetup.c +2 -2
@@ -1411,8 +1411,8 @@ done:td_restore_runstate (td, old_state); -if (td->o.fdp) { - err =fdp_init (td); +if (td->o.dp_type !=FIO_DP_NONE ) { + err =dp_init (td);if (err) goto err_out; }
fio.1 +28 -7
@@ -2264,7 +2264,26 @@ file blocks are fully allocated and the disk request could be issued immediately .BI (io_uring_cmd,xnvme)fdp \fR=\fPbool Enable Flexible Data Placement mode for write commands. .TP -.BI (io_uring_cmd,xnvme)fdp_pli_select \fR=\fPstr +.BI (io_uring_cmd,xnvme)dataplacement \fR=\fPstr +Specifies the data placement directive type to use for write commands. The +following types are supported: +.RS +.RS +.TP +.B none +Do not use a data placement directive. This is the default. +.TP +.B fdp +Use Flexible Data placement directives for write commands. This is equivalent +to specifying \fBfdp\fR=1. +.TP +.B streams +Use Streams directives for write commands. +.TP +.RE +.RE +.TP +.BI (io_uring_cmd,xnvme)plid_select=str, fdp_pli_select \fR=\fPstr Defines how fio decides which placement ID to use next. The following types are defined: .RS
@@ -2277,14 +2296,16 @@ Choose a placement ID at random (uniform). Round robin over available placement IDs. This is the default. .RE .P -The available placement ID index/indices is defined by \fBfdp_pli\fR option. +The available placement ID (indices) are defined by the \fBplids\fR option. .RE .TP -.BI (io_uring_cmd,xnvme)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`. +.BI (io_uring_cmd,xnvme)plids=str, fdp_pli \fR=\fPstr +Select which Placement IDs (streams) or Placement ID Indicies (FDP) this job is +allowed to use for writes. For FDP 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 `plids=0,2,5`. For streams this should be a +comma-separated list of Stream IDs. .TP .BI (io_uring_cmd,xnvme)md_per_io_size \fR=\fPint Size in bytes for separate metadata buffer per IO. Default: 0.
init.c +9 -1
@@ -1015,7 +1015,15 @@ static int fixup_options(struct thread_data *td) ret |=1 ; } - +if (td->o.fdp) { +if (fio_option_is_set (&td->o, dp_type) && + (td->o.dp_type ==FIO_DP_STREAMS || td->o.dp_type ==FIO_DP_NONE )) { +log_err ("fio: fdp=1 is not compatible with dataplacement={streams, none}\n" ); + ret |=1 ; + }else { + td->o.dp_type =FIO_DP_FDP ; + } + }return ret; }
io_u.c +2 -2
@@ -1065,8 +1065,8 @@ 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 (td->o.dp_type !=FIO_DP_NONE ) +dp_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",
ioengines.h +1 -1
@@ -7,7 +7,7 @@#include "flist.h" #include "io_u.h" #include "zbd_types.h" -#include "fdp.h" +#include "dataplacement.h" #define FIO_IOOPS_VERSION 34
options.c +48 -14
92 lines not on this page · raw message
server.h +1 -1
@@ -51,7 +51,7 @@ struct fio_net_cmd_reply { };enum { -FIO_SERVER_VER =103 , +FIO_SERVER_VER =104 ,FIO_SERVER_MAX_FRAGMENT_PDU =1024 ,FIO_SERVER_MAX_CMD_MB =2048 ,
t/nvmept_fdp.py new file +745 -0
745 lines not on this page · raw message
t/nvmept_streams.py new file +520 -0
520 lines not on this page · raw message
thread_options.h +8 -7
@@ -391,11 +391,11 @@ struct thread_options {fio_fp64_t zrt;fio_fp64_t zrf; -#define FIO_MAX_PLIS 16unsigned int fdp; -unsigned int fdp_pli_select; -unsigned int fdp_plis[FIO_MAX_PLIS ]; -unsigned int fdp_nrpli; +unsigned int dp_type; +unsigned int dp_id_select; +unsigned int dp_ids[FIO_MAX_DP_IDS ]; +unsigned int dp_nr_ids;unsigned int log_entries;unsigned int log_prio;
@@ -709,9 +709,10 @@ struct thread_options_pack {uint32_t log_prio;uint32_t fdp; -uint32_t fdp_pli_select; -uint32_t fdp_plis[FIO_MAX_PLIS ]; -uint32_t fdp_nrpli; +uint32_t dp_type; +uint32_t dp_id_select; +uint32_t dp_ids[FIO_MAX_DP_IDS ]; +uint32_t dp_nr_ids;uint32_t num_range;/*