Recent changes (master)
The following changes since commit ab02be41807ec9451c47b17129cf61457ef21db6:
Add a new file to gitignore (2021-02-21 06:14:40 -0700)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to ea9be958d8948cab0c5593a7afc695d17bd6ba79:
Merge branch 'clock_monotonic_unused' of https://github.com/foxeng/fio (2021-03-06 15:37:56 -0700)
----------------------------------------------------------------
Alexey Dobriyan (4):
parse: simplify parse_is_percent()
zbd: simplify zoneskip= validness check
zbd: fix check against 32-bit zone size
zbd: support 'z' suffix for zone granularity
Fotis Xenakis (1):
configure: remove unused CLOCK_MONOTONIC_* symbols
[email protected] (1):
engines/filecreate: remove improper message print
Jens Axboe (1):
Merge branch 'clock_monotonic_unused' of https://github.com/foxeng/fio
configure | 6 ------ engines/filecreate.c | 2 +- filesetup.c | 18 +++++++++++++----- fio.1 | 13 ++++++++----- options.c | 48 +++++++++++++++++++++++++++++++++++++---------- parse.c | 30 ++++++++++++++++++++++++++++- parse.h | 11 +++++++++-- server.h | 2 +- t/zbd/test-zbd-support | 48 +++++++++++++++++++++++++++++++++++++++++++++++ thread_options.h | 17 +++++++++++++---- zbd.c | 51 +++++++++++++++++++++++++++++++++++++++++++------- zbd.h | 2 ++ 12 files changed, 206 insertions(+), 42 deletions(-)
---
Diff of recent changes:
configure +0 -6
@@ -2794,12 +2794,6 @@ fi if test "$clock_monotonic" = "yes" ; then output_sym "CONFIG_CLOCK_MONOTONIC" fi -if test "$clock_monotonic_raw" = "yes" ; then - output_sym "CONFIG_CLOCK_MONOTONIC_RAW" -fi -if test "$clock_monotonic_precise" = "yes" ; then - output_sym "CONFIG_CLOCK_MONOTONIC_PRECISE" -fi if test "$clockid_t" = "yes"; then output_sym "CONFIG_CLOCKID_T" fi
engines/filecreate.c +1 -1
@@ -22,7 +22,7 @@ static int open_file(struct thread_data *td, struct fio_file *f)dprint (FD_FILE ,"fd open %s\n" , f->file_name);if (f->filetype !=FIO_TYPE_FILE ) { -log_err ("fio: only files are supported fallocate \n" ); +log_err ("fio: only files are supported\n" );return 1 ; }if (!strcmp (f->file_name,"-" )) {
filesetup.c +13 -5
@@ -1118,6 +1118,13 @@ int setup_files(struct thread_data *td)if (o->read_iolog_file) goto done; +if (td->o.zone_mode ==ZONE_MODE_ZBD ) { + err =zbd_init_files (td); +if (err) + goto err_out; + } +zbd_recalc_options_with_zone_granularity (td); +/* * check sizes. if the files/devices do not exist and the size * isn't passed to fio, abort.
@@ -1395,16 +1402,17 @@ int setup_files(struct thread_data *td) } done: -if (o->create_only) - td->done =1 ; - -td_restore_runstate (td, old_state); -if (td->o.zone_mode ==ZONE_MODE_ZBD ) { err =zbd_setup_files (td);if (err) goto err_out; } + +if (o->create_only) + td->done =1 ; + +td_restore_runstate (td, old_state); +return 0 ; err_offset:
fio.1 +8 -5
@@ -348,6 +348,9 @@ us or usec means microseconds .PD .RE .P +`z' suffix specifies that the value is measured in zones. +Value is recalculated once block device's zone size becomes known. +.P If the option accepts an upper and lower range, use a colon ':' or minus '\-' to separate such values. See \fIirange\fR parameter type. If the lower value specified happens to be larger than the upper value
@@ -783,7 +786,7 @@ If not specified it defaults to the zone size. If the target device is a zoned block device, the zone capacity is obtained from the device information and this option is ignored. .TP -.BI zoneskip \fR=\fPint +.BI zoneskip \fR=\fPint[z] For \fBzonemode\fR=strided, the number of bytes to skip after \fBzonesize\fR bytes of data have been transferred.
@@ -1033,7 +1036,7 @@ The values are all relative to each other, and no absolute meaning should be associated with them. .RE .TP -.BI offset \fR=\fPint +.BI offset \fR=\fPint[%|z] Start I/O at the provided offset in the file, given as either a fixed size in bytes or a percentage. If a percentage is given, the generated offset will be aligned to the minimum \fBblocksize\fR or to the value of \fBoffset_align\fR if
@@ -1048,7 +1051,7 @@ If set to non-zero value, the byte offset generated by a percentage \fBoffset\fR is aligned upwards to this value. Defaults to 0 meaning that a percentage offset is aligned to the minimum block size. .TP -.BI offset_increment \fR=\fPint +.BI offset_increment \fR=\fPint[%|z] If this is provided, then the real offset becomes `\fBoffset\fR + \fBoffset_increment\fR * thread_number', where the thread number is a counter that starts at 0 and is incremented for each sub-job (i.e. when \fBnumjobs\fR option is
@@ -1570,7 +1573,7 @@ Pin the specified amount of memory with \fBmlock\fR\|(2). Can be used to simulate a smaller amount of memory. The amount specified is per worker. .SS "I/O size" .TP -.BI size \fR=\fPint +.BI size \fR=\fPint[%|z] The total size of file I/O for each thread of this job. Fio will run until this many bytes has been transferred, unless runtime is limited by other options (such as \fBruntime\fR, for instance, or increased/decreased by \fBio_size\fR).
@@ -1585,7 +1588,7 @@ given, fio will use 20% of the full size of the given files or devices. Can be combined with \fBoffset\fR to constrain the start and end range that I/O will be done within. .TP -.BI io_size \fR=\fPint "\fR,\fB io_limit" \fR=\fPint +.BI io_size \fR=\fPint[%|z] "\fR,\fB io_limit" \fR=\fPint[%|z] Normally fio operates within the region set by \fBsize\fR, which means that the \fBsize\fR option sets both the region and size of I/O to be performed. Sometimes that is not what you want. With this option, it is
options.c +38 -10
131 lines not on this page · raw message
parse.c +29 -1
@@ -37,6 +37,7 @@ static const char *opt_type_names[] = {"OPT_BOOL" ,"OPT_FLOAT_LIST" ,"OPT_STR_SET" , +"OPT_STR_VAL_ZONE" ,"OPT_DEPRECATED" ,"OPT_SOFT_DEPRECATED" , "OPT_UNSUPPORTED",
@@ -599,9 +600,35 @@ static int __handle_option(const struct fio_option *o, const char *ptr, fallthrough;case FIO_OPT_ULL :case FIO_OPT_INT : -case FIO_OPT_STR_VAL : { +case FIO_OPT_STR_VAL : +case FIO_OPT_STR_VAL_ZONE : + {fio_opt_str_val_fn *fn = o->cb;char tmp[128 ], *p; +size_t len =strlen (ptr); + +if (len >0 && ptr[len -1 ] =='z' ) { +if (o->type ==FIO_OPT_STR_VAL_ZONE ) { +char *ep; +unsigned long long val; + + errno =0 ; + val =strtoul (ptr, &ep,10 ); +if (errno ==0 && ep != ptr && *ep =='z' ) { + ull =ZONE_BASE_VAL + (uint32_t )val; + ret =0 ; + goto store_option_value; + }else { +log_err ("%s: unexpected zone value '%s'\n" , + o->name, ptr); +return 1 ; + } + }else { +log_err ("%s: 'z' suffix isn't applicable\n" , + o->name); +return 1 ; + } + }if (!is_time && o->is_time) is_time = o->is_time;
@@ -655,6 +682,7 @@ static int __handle_option(const struct fio_option *o, const char *ptr, } } +store_option_value:if (fn) ret =fn (data, &ull);else {
parse.h +9 -2
@@ -21,6 +21,7 @@ enum fio_opt_type {FIO_OPT_BOOL ,FIO_OPT_FLOAT_LIST ,FIO_OPT_STR_SET , +FIO_OPT_STR_VAL_ZONE ,FIO_OPT_DEPRECATED ,FIO_OPT_SOFT_DEPRECATED , FIO_OPT_UNSUPPORTED, /* keep this last */
@@ -130,12 +131,18 @@ static inline void *td_var(void *to, const struct fio_option *o,static inline int parse_is_percent (unsigned long long val) { -return val <=-1ULL && val >= (-1ULL -100ULL ); +return val >=-101 ; } +#define ZONE_BASE_VAL ((-1ULL >> 1) + 1)static inline int parse_is_percent_uncapped (unsigned long long val) { -return (long long )val <=-1 ; +return ZONE_BASE_VAL +-1U < val; +} + +static inline int parse_is_zone (unsigned long long val) +{ +return (val -ZONE_BASE_VAL ) <=-1U ; }struct print_option {
server.h +1 -1
@@ -48,7 +48,7 @@ struct fio_net_cmd_reply { };enum { -FIO_SERVER_VER =87 , +FIO_SERVER_VER =88 ,FIO_SERVER_MAX_FRAGMENT_PDU =1024 ,FIO_SERVER_MAX_CMD_MB =2048 ,
t/zbd/test-zbd-support +48 -0
54 lines not on this page · raw message
thread_options.h +13 -4
@@ -83,13 +83,16 @@ struct thread_options {unsigned long long size;unsigned long long io_size;unsigned int size_percent; +unsigned int size_nz;unsigned int io_size_percent; +unsigned int io_size_nz;unsigned int fill_device;unsigned int file_append;unsigned long long file_size_low;unsigned long long file_size_high;unsigned long long start_offset;unsigned long long start_offset_align; +unsigned int start_offset_nz;unsigned long long bs[DDIR_RWDIR_CNT ];unsigned long long ba[DDIR_RWDIR_CNT ];
@@ -198,6 +201,7 @@ struct thread_options {unsigned long long zone_size;unsigned long long zone_capacity;unsigned long long zone_skip; +uint32_t zone_skip_nz;enum fio_zone_mode zone_mode;unsigned long long lockmem;enum fio_memtype mem_type;
@@ -315,6 +319,7 @@ struct thread_options {unsigned int gid;unsigned int offset_increment_percent; +unsigned int offset_increment_nz;unsigned long long offset_increment;unsigned long long number_ios;
@@ -384,14 +389,19 @@ struct thread_options_pack {uint64_t size;uint64_t io_size;uint32_t size_percent; +uint32_t size_nz;uint32_t io_size_percent; +uint32_t io_size_nz;uint32_t fill_device;uint32_t file_append;uint32_t unique_filename; +uint32_t pad3;uint64_t file_size_low;uint64_t file_size_high;uint64_t start_offset;uint64_t start_offset_align; +uint32_t start_offset_nz; +uint32_t pad4;uint64_t bs[DDIR_RWDIR_CNT ];uint64_t ba[DDIR_RWDIR_CNT ];
@@ -464,8 +474,6 @@ struct thread_options_pack {struct zone_split zone_split[DDIR_RWDIR_CNT ][ZONESPLIT_MAX ];uint32_t zone_split_nr[DDIR_RWDIR_CNT ]; -uint8_t pad1[4 ]; -fio_fp64_t zipf_theta;fio_fp64_t pareto_h;fio_fp64_t gauss_dev;
@@ -501,6 +509,7 @@ struct thread_options_pack {uint64_t zone_capacity;uint64_t zone_skip;uint64_t lockmem; +uint32_t zone_skip_nz;uint32_t mem_type;uint32_t mem_align;
@@ -509,8 +518,6 @@ struct thread_options_pack {uint32_t new_group;uint32_t numjobs; -uint8_t pad3[4 ]; -/* * We currently can't convert these, so don't enable them */
@@ -616,12 +623,14 @@ struct thread_options_pack {uint32_t gid;uint32_t offset_increment_percent; +uint32_t offset_increment_nz;uint64_t offset_increment;uint64_t number_ios;uint64_t latency_target;uint64_t latency_window;uint64_t max_latency; +uint32_t pad5;fio_fp64_t latency_percentile;uint32_t latency_run;
zbd.c +44 -7
86 lines not on this page · raw message
zbd.h +2 -0
@@ -87,6 +87,8 @@ struct zoned_block_device_info {struct fio_zone_info zone_info[0 ]; }; +int zbd_init_files (struct thread_data *td); +void zbd_recalc_options_with_zone_granularity (struct thread_data *td);int zbd_setup_files (struct thread_data *td);void zbd_free_zone_info (struct fio_file *f);void zbd_file_reset (struct thread_data *td,struct fio_file *f);