X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=2e5431e99a6d21d953617154e2df9538e938dcab;hp=b1792abe46e4e9eb81898679a21a8c28bfd72536;hb=ac8931124126;hpb=417f006858ec66f0b410c83c2e13da54662048e0 diff --git a/fio.h b/fio.h index b1792abe..2e5431e9 100644 --- a/fio.h +++ b/fio.h @@ -16,7 +16,7 @@ #include #include "compiler/compiler.h" -#include "list.h" +#include "flist.h" #include "fifo.h" #include "rbtree.h" #include "arch/arch.h" @@ -75,6 +75,7 @@ struct io_sample { unsigned long time; unsigned long val; enum fio_ddir ddir; + unsigned int bs; }; /* @@ -92,7 +93,7 @@ struct io_log { struct io_piece { union { struct rb_node rb_node; - struct list_head list; + struct flist_head list; }; union { int fileno; @@ -134,6 +135,7 @@ struct io_u { #ifdef FIO_HAVE_SOLARISAIO aio_result_t resultp; #endif + void *mmap_data; }; struct timeval start_time; struct timeval issue_time; @@ -144,7 +146,6 @@ struct io_u { void *buf; unsigned long buflen; unsigned long long offset; - unsigned long long endpos; /* * IO engine state, may be different from above when we get @@ -164,13 +165,14 @@ struct io_u { union { unsigned int index; unsigned int seen; + void *engine_data; }; unsigned int flags; struct fio_file *file; - struct list_head list; + struct flist_head list; /* * Callback for io completion @@ -194,6 +196,8 @@ enum { VERIFY_MD5, /* md5 sum data blocks */ VERIFY_CRC64, /* crc64 sum data blocks */ VERIFY_CRC32, /* crc32 sum data blocks */ + VERIFY_CRC32C, /* crc32c sum data blocks */ + VERIFY_CRC32C_INTEL, /* crc32c sum data blocks with hw */ VERIFY_CRC16, /* crc16 sum data blocks */ VERIFY_CRC7, /* crc7 sum data blocks */ VERIFY_SHA256, /* sha256 sum data blocks */ @@ -295,7 +299,7 @@ enum fio_file_flags { * this structure holds state information for a single file. */ struct fio_file { - struct list_head hash_list; + struct flist_head hash_list; enum fio_filetype filetype; /* @@ -310,9 +314,12 @@ struct fio_file { * filename and possible memory mapping */ char *file_name; - void *mmap; unsigned int major, minor; + void *mmap_ptr; + size_t mmap_sz; + off_t mmap_off; + /* * size of the file, offset into file, and io size from that offset */ @@ -339,6 +346,8 @@ struct fio_file { int references; enum fio_file_flags flags; + + struct disk_util *du; }; /* @@ -417,6 +426,7 @@ struct thread_options { unsigned int iodepth; unsigned int iodepth_low; unsigned int iodepth_batch; + unsigned int iodepth_batch_complete; unsigned long long size; unsigned int fill_device; @@ -425,10 +435,11 @@ struct thread_options { unsigned long long start_offset; unsigned int bs[2]; + unsigned int ba[2]; unsigned int min_bs[2]; unsigned int max_bs[2]; - struct bssplit *bssplit; - unsigned int bssplit_nr; + struct bssplit *bssplit[2]; + unsigned int bssplit_nr[2]; unsigned int nr_files; unsigned int open_files; @@ -439,7 +450,9 @@ struct thread_options { unsigned int invalidate_cache; unsigned int create_serialize; unsigned int create_fsync; + unsigned int create_on_open; unsigned int end_fsync; + unsigned int pre_read; unsigned int sync_io; unsigned int verify; unsigned int do_verify; @@ -469,6 +482,7 @@ struct thread_options { unsigned int fsync_blocks; unsigned int start_delay; unsigned long long timeout; + unsigned long long ramp_time; unsigned int overwrite; unsigned int bw_avg_time; unsigned int loops; @@ -491,9 +505,17 @@ struct thread_options { unsigned int zero_buffers; unsigned int refill_buffers; unsigned int time_based; + unsigned int disable_clat; + unsigned int disable_slat; + unsigned int disable_bw; + unsigned int gtod_reduce; + unsigned int gtod_cpu; + unsigned int gtod_offload; char *read_iolog_file; char *write_iolog_file; + char *bw_log_file; + char *lat_log_file; /* * Pre-run and post-run shell @@ -529,6 +551,7 @@ struct thread_data { int groupid; struct thread_stat ts; struct fio_file **files; + unsigned int files_size; unsigned int files_index; unsigned int nr_open_files; unsigned int nr_done_files; @@ -556,6 +579,8 @@ struct thread_data { char *sysfs_root; + unsigned long rand_seeds[6]; + os_random_state_t bsrange_state; os_random_state_t verify_state; @@ -572,9 +597,9 @@ struct thread_data { */ unsigned int cur_depth; unsigned int io_u_queued; - struct list_head io_u_freelist; - struct list_head io_u_busylist; - struct list_head io_u_requeues; + struct flist_head io_u_freelist; + struct flist_head io_u_busylist; + struct flist_head io_u_requeues; /* * Rate state @@ -604,7 +629,11 @@ struct thread_data { struct timeval epoch; /* time job was started */ struct timeval rw_end[2]; struct timeval last_issue; + struct timeval tv_cache; + unsigned int tv_cache_nr; + unsigned int tv_cache_mask; unsigned int rw_end_set[2]; + unsigned int ramp_time_over; /* * read/write mixed workload state @@ -619,18 +648,12 @@ struct thread_data { * if we are overwriting. Otherwise just use a fifo. */ struct rb_root io_hist_tree; - struct list_head io_hist_list; + struct flist_head io_hist_list; /* * For IO replaying */ - struct list_head io_log_list; - - /* - * timeout handling - */ - struct timeval timeout_end; - struct itimerval timer; + struct flist_head io_log_list; /* * for fileservice, how often to switch to a new file @@ -646,11 +669,13 @@ struct thread_data { }; /* - * roundrobin available files, or choose one at random. + * roundrobin available files, or choose one at random, or do each one + * serially. */ enum { FIO_FSERVICE_RANDOM = 1, FIO_FSERVICE_RR = 2, + FIO_FSERVICE_SEQ = 3, }; /* @@ -662,13 +687,6 @@ enum { FIO_ETA_NEVER, }; -/* - * 30 second per-io_u timeout, with 5 second intervals to avoid resetting - * the timer on each queue operation. - */ -#define IO_U_TIMEOUT_INC 5 -#define IO_U_TIMEOUT 30 - #define __td_verror(td, err, msg, func) \ do { \ if ((td)->error) \ @@ -697,6 +715,8 @@ extern int read_only; extern int eta_print; extern unsigned long done_secs; extern char *job_section; +extern int fio_gtod_offload; +extern int fio_gtod_cpu; extern struct thread_data *threads; @@ -746,7 +766,11 @@ struct disk_util_stat { * Per-device disk util management */ struct disk_util { - struct list_head list; + struct flist_head list; + /* If this disk is a slave, hook it into the master's + * list using this head. + */ + struct flist_head slavelist; char *name; char *sysfs_root; @@ -756,10 +780,40 @@ struct disk_util { struct disk_util_stat dus; struct disk_util_stat last_dus; + /* For software raids, this entry maintains pointers to the + * entries for the slave devices. The disk_util entries for + * the slaves devices should primarily be maintained through + * the disk_list list, i.e. for memory allocation and + * de-allocation, etc. Whereas this list should be used only + * for aggregating a software RAID's disk util figures. + */ + struct flist_head slaves; + unsigned long msec; struct timeval time; + + struct fio_mutex *lock; + unsigned long users; }; +static inline void disk_util_inc(struct disk_util *du) +{ + if (du) { + fio_mutex_down(du->lock); + du->users++; + fio_mutex_up(du->lock); + } +} + +static inline void disk_util_dec(struct disk_util *du) +{ + if (du) { + fio_mutex_down(du->lock); + du->users--; + fio_mutex_up(du->lock); + } +} + #define DISK_UTIL_MSEC (250) /* @@ -784,19 +838,23 @@ extern void write_iolog_close(struct thread_data *); /* * Logging */ -extern void add_clat_sample(struct thread_data *, enum fio_ddir, unsigned long); -extern void add_slat_sample(struct thread_data *, enum fio_ddir, unsigned long); -extern void add_bw_sample(struct thread_data *, enum fio_ddir, struct timeval *); +extern void add_clat_sample(struct thread_data *, enum fio_ddir, unsigned long, + unsigned int); +extern void add_slat_sample(struct thread_data *, enum fio_ddir, unsigned long, + unsigned int); +extern void add_bw_sample(struct thread_data *, enum fio_ddir, unsigned int, + struct timeval *); extern void show_run_stats(void); extern void init_disk_util(struct thread_data *); extern void update_rusage_stat(struct thread_data *); extern void update_io_ticks(void); extern void setup_log(struct io_log **); extern void finish_log(struct thread_data *, struct io_log *, const char *); +extern void finish_log_named(struct thread_data *, struct io_log *, const char *, const char *); extern void __finish_log(struct io_log *, const char *); extern struct io_log *agg_io_log[2]; extern int write_bw_log; -extern void add_agg_sample(unsigned long, enum fio_ddir); +extern void add_agg_sample(unsigned long, enum fio_ddir, unsigned int); /* * Time functions @@ -807,24 +865,29 @@ extern unsigned long mtime_since(struct timeval *, struct timeval *); extern unsigned long mtime_since_now(struct timeval *); extern unsigned long time_since_now(struct timeval *); extern unsigned long mtime_since_genesis(void); -extern void __usec_sleep(unsigned int); +extern void usec_spin(unsigned int); extern void usec_sleep(struct thread_data *, unsigned long); extern void rate_throttle(struct thread_data *, unsigned long, unsigned int); extern void fill_start_time(struct timeval *); extern void fio_gettime(struct timeval *, void *); +extern void fio_gtod_init(void); +extern void fio_gtod_update(void); extern void set_genesis_time(void); +extern int ramp_time_over(struct thread_data *); +extern int in_ramp_time(struct thread_data *); /* * Init/option functions */ extern int __must_check parse_options(int, char **); -extern int fio_option_parse(struct thread_data *, const char *); +extern int fio_options_parse(struct thread_data *, char **, int); extern int fio_cmd_option_parse(struct thread_data *, const char *, char *); extern void fio_fill_default_options(struct thread_data *); extern int fio_show_option_help(const char *); extern void fio_options_dup_and_init(struct option *); extern void options_mem_dupe(struct thread_data *); extern void options_mem_free(struct thread_data *); +extern void td_fill_rand_seeds(struct thread_data *); #define FIO_GETOPT_JOB 0x89988998 #define FIO_NR_OPTIONS 128 @@ -834,10 +897,11 @@ extern void options_mem_free(struct thread_data *); extern void close_files(struct thread_data *); extern void close_and_free_files(struct thread_data *); extern int __must_check setup_files(struct thread_data *); -extern int __must_check open_files(struct thread_data *); extern int __must_check file_invalidate_cache(struct thread_data *, struct fio_file *); extern int __must_check generic_open_file(struct thread_data *, struct fio_file *); extern int __must_check generic_close_file(struct thread_data *, struct fio_file *); +extern int __must_check generic_get_file_size(struct thread_data *, struct fio_file *); +extern int __must_check pre_read_files(struct thread_data *); extern int add_file(struct thread_data *, const char *); extern void get_file(struct fio_file *); extern int __must_check put_file(struct thread_data *, struct fio_file *); @@ -879,13 +943,17 @@ enum { TD_NOT_CREATED = 0, TD_CREATED, TD_INITIALIZED, + TD_RAMP, TD_RUNNING, + TD_PRE_READING, TD_VERIFYING, TD_FSYNCING, TD_EXITED, TD_REAPED, }; +extern void td_set_runstate(struct thread_data *, int); + /* * Verify helpers */ @@ -904,7 +972,7 @@ extern void free_io_mem(struct thread_data *); /* * io unit handling */ -#define queue_full(td) list_empty(&(td)->io_u_freelist) +#define queue_full(td) flist_empty(&(td)->io_u_freelist) extern struct io_u *__get_io_u(struct thread_data *); extern struct io_u *get_io_u(struct thread_data *); extern void put_io_u(struct thread_data *, struct io_u *); @@ -913,13 +981,16 @@ extern long __must_check io_u_sync_complete(struct thread_data *, struct io_u *) extern long __must_check io_u_queued_complete(struct thread_data *, int); extern void io_u_queued(struct thread_data *, struct io_u *); extern void io_u_log_error(struct thread_data *, struct io_u *); -extern void io_u_init_timeout(void); -extern void io_u_set_timeout(struct thread_data *); extern void io_u_mark_depth(struct thread_data *, unsigned int); extern void io_u_fill_buffer(struct thread_data *td, struct io_u *, unsigned int); void io_u_mark_complete(struct thread_data *, unsigned int); void io_u_mark_submit(struct thread_data *, unsigned int); +/* + * Reset stats after ramp time completes + */ +extern void reset_all_stats(struct thread_data *); + /* * io engine entry points */ @@ -931,6 +1002,7 @@ extern int __must_check td_io_getevents(struct thread_data *, unsigned int, unsi extern int __must_check td_io_commit(struct thread_data *); extern int __must_check td_io_open_file(struct thread_data *, struct fio_file *); extern int td_io_close_file(struct thread_data *, struct fio_file *); +extern int __must_check td_io_get_file_size(struct thread_data *, struct fio_file *); /* * blktrace support @@ -941,7 +1013,7 @@ extern int load_blktrace(struct thread_data *, const char *); #endif struct ioengine_ops { - struct list_head list; + struct flist_head list; char name[16]; int version; int flags; @@ -956,11 +1028,12 @@ struct ioengine_ops { void (*cleanup)(struct thread_data *); int (*open_file)(struct thread_data *, struct fio_file *); int (*close_file)(struct thread_data *, struct fio_file *); + int (*get_file_size)(struct thread_data *, struct fio_file *); void *data; void *dlhandle; }; -#define FIO_IOOPS_VERSION 9 +#define FIO_IOOPS_VERSION 10 extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *); extern void register_ioengine(struct ioengine_ops *); @@ -996,6 +1069,8 @@ static inline void fio_file_reset(struct fio_file *f) { f->last_free_lookup = 0; f->last_pos = f->file_offset; + if (f->file_map) + memset(f->file_map, 0, f->num_maps * sizeof(int)); } static inline void clear_error(struct thread_data *td) @@ -1023,4 +1098,13 @@ static inline void dprint_io_u(struct io_u *io_u, const char *p) #define dprint_io_u(io_u, p) #endif +static inline int fio_fill_issue_time(struct thread_data *td) +{ + if (td->o.read_iolog_file || + !td->o.disable_clat || !td->o.disable_slat || !td->o.disable_bw) + return 1; + + return 0; +} + #endif