X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=5f813009f26f414d81a263af6858b9ef02fd467a;hp=6e9311be9517347892e1adc4dd8037f57676c31d;hb=67a1000f49db76ddb18ce9420ba03059af0214b9;hpb=687270767de17dbad53c50e03e5d73d52505405c diff --git a/fio.h b/fio.h index 6e9311be..5f813009 100644 --- a/fio.h +++ b/fio.h @@ -12,22 +12,29 @@ #include #include #include +#include +#include "compiler/compiler.h" #include "list.h" -#include "md5.h" -#include "crc32.h" -#include "arch.h" -#include "os.h" +#include "fifo.h" +#include "rbtree.h" +#include "arch/arch.h" +#include "os/os.h" #include "mutex.h" #ifdef FIO_HAVE_SYSLET #include "syslet.h" #endif +#ifdef FIO_HAVE_GUASI +#include +#endif + enum fio_ddir { DDIR_READ = 0, DDIR_WRITE, DDIR_SYNC, + DDIR_INVAL = -1, }; enum td_ddir { @@ -74,11 +81,21 @@ struct io_log { * When logging io actions, this matches a single sent io_u */ struct io_piece { - struct list_head list; - struct fio_file *file; + union { + struct rb_node rb_node; + struct list_head list; + }; + union { + int fileno; + struct fio_file *file; + }; unsigned long long offset; unsigned long len; enum fio_ddir ddir; + union { + unsigned long delay; + unsigned int file_action; + }; }; #ifdef FIO_HAVE_SYSLET @@ -94,6 +111,8 @@ enum { IO_U_F_FLIGHT = 1 << 1, }; +struct thread_data; + /* * The io unit */ @@ -110,6 +129,9 @@ struct io_u { #endif #ifdef FIO_HAVE_SYSLET struct syslet_req req; +#endif +#ifdef FIO_HAVE_GUASI + guasi_req_t greq; #endif }; struct timeval start_time; @@ -121,6 +143,7 @@ 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 @@ -151,7 +174,7 @@ struct io_u { /* * Callback for io completion */ - int (*end_io)(struct io_u *); + int (*end_io)(struct thread_data *, struct io_u *); }; /* @@ -168,20 +191,46 @@ enum { enum { VERIFY_NONE = 0, /* no verification */ VERIFY_MD5, /* md5 sum data blocks */ + VERIFY_CRC64, /* crc64 sum data blocks */ VERIFY_CRC32, /* crc32 sum data blocks */ + VERIFY_CRC16, /* crc16 sum data blocks */ + VERIFY_CRC7, /* crc7 sum data blocks */ + VERIFY_SHA256, /* sha256 sum data blocks */ + VERIFY_SHA512, /* sha512 sum data blocks */ + VERIFY_NULL, /* pretend to verify */ }; /* - * A header structure associated with each checksummed data block + * A header structure associated with each checksummed data block. It is + * followed by a checksum specific header that contains the verification + * data. */ struct verify_header { unsigned int fio_magic; unsigned int len; unsigned int verify_type; - union { - char md5_digest[MD5_HASH_WORDS * 4]; - unsigned long crc32; - }; +}; + +struct vhdr_md5 { + uint32_t md5_digest[16]; +}; +struct vhdr_sha512 { + uint8_t sha512[128]; +}; +struct vhdr_sha256 { + uint8_t sha256[128]; +}; +struct vhdr_crc64 { + uint64_t crc64; +}; +struct vhdr_crc32 { + uint32_t crc32; +}; +struct vhdr_crc16 { + uint16_t crc16; +}; +struct vhdr_crc7 { + uint8_t crc7; }; struct group_run_stats { @@ -209,6 +258,7 @@ enum fio_filetype { FIO_TYPE_FILE = 1, /* plain file */ FIO_TYPE_BD, /* block device */ FIO_TYPE_CHAR, /* character device */ + FIO_TYPE_PIPE, /* pipe */ }; enum fio_ioengine_flags { @@ -217,13 +267,17 @@ enum fio_ioengine_flags { FIO_DISKLESSIO = 1 << 2, /* no disk involved */ FIO_NOEXTEND = 1 << 3, /* engine can't extend file */ FIO_NODISKUTIL = 1 << 4, /* diskutil can't handle filename */ + FIO_UNIDIR = 1 << 5, /* engine is uni-directional */ }; enum fio_file_flags { FIO_FILE_OPEN = 1 << 0, /* file is open */ - FIO_FILE_UNLINK = 1 << 1, /* unlink on close */ - FIO_FILE_CLOSING = 1 << 2, /* file being closed */ - FIO_FILE_EXISTS = 1 << 3, /* no need to create */ + FIO_FILE_CLOSING = 1 << 1, /* file being closed */ + FIO_FILE_EXISTS = 1 << 2, /* file there */ + FIO_FILE_EXTEND = 1 << 3, /* needs extend */ + FIO_FILE_NOSORT = 1 << 4, /* don't sort verify blocks */ + FIO_FILE_DONE = 1 << 5, /* io completed to this file */ + FIO_SIZE_KNOWN = 1 << 6, /* size has been set */ }; /* @@ -240,11 +294,21 @@ struct fio_file { unsigned long file_data; int fd; }; + + /* + * filename and possible memory mapping + */ char *file_name; void *mmap; - unsigned long long file_size; + unsigned int major, minor; + + /* + * size of the file, offset into file, and io size from that offset + */ unsigned long long real_file_size; unsigned long long file_offset; + unsigned long long io_size; + unsigned long long last_pos; unsigned long long last_completed_pos; @@ -263,7 +327,8 @@ struct fio_file { * How many depth levels to log */ #define FIO_IO_U_MAP_NR 8 -#define FIO_IO_U_LAT_NR 12 +#define FIO_IO_U_LAT_U_NR 10 +#define FIO_IO_U_LAT_M_NR 12 struct thread_stat { char *name; @@ -301,8 +366,10 @@ struct thread_stat { * IO depth and latency stats */ unsigned int io_u_map[FIO_IO_U_MAP_NR]; - unsigned int io_u_lat[FIO_IO_U_LAT_NR]; + unsigned int io_u_lat_u[FIO_IO_U_LAT_U_NR]; + unsigned int io_u_lat_m[FIO_IO_U_LAT_M_NR]; unsigned long total_io_u[2]; + unsigned long short_io_u[2]; unsigned long long io_bytes[2]; unsigned long runtime[2]; @@ -318,6 +385,7 @@ struct thread_options { char *opendir; char *ioengine; enum td_ddir td_ddir; + unsigned int ddir_nr; unsigned int iodepth; unsigned int iodepth_low; unsigned int iodepth_batch; @@ -341,6 +409,11 @@ struct thread_options { unsigned int end_fsync; unsigned int sync_io; unsigned int verify; + unsigned int verifysort; + unsigned int verify_interval; + unsigned int verify_offset; + unsigned int verify_pattern; + unsigned int verify_pattern_bytes; unsigned int use_thread; unsigned int unlink; unsigned int do_disk_util; @@ -359,7 +432,7 @@ struct thread_options { unsigned int thinktime_blocks; unsigned int fsync_blocks; unsigned int start_delay; - unsigned long timeout; + unsigned long long timeout; unsigned int overwrite; unsigned int bw_avg_time; unsigned int loops; @@ -368,16 +441,19 @@ struct thread_options { enum fio_memtype mem_type; unsigned int stonewall; + unsigned int new_group; unsigned int numjobs; os_cpu_mask_t cpumask; + unsigned int cpumask_set; unsigned int iolog; - unsigned int read_iolog; unsigned int rwmixcycle; - unsigned int rwmixread; - unsigned int rwmixwrite; + unsigned int rwmix[2]; unsigned int nice; unsigned int file_service_type; unsigned int group_reporting; + unsigned int fadvise_hint; + unsigned int zero_buffers; + unsigned int time_based; char *read_iolog_file; char *write_iolog_file; @@ -403,12 +479,14 @@ struct thread_options { unsigned int cpucycle; }; +#define FIO_VERROR_SIZE 128 + /* * This describes a single thread/process executing a fio job. */ struct thread_data { struct thread_options o; - char verror[128]; + char verror[FIO_VERROR_SIZE]; pthread_t thread; int thread_number; int groupid; @@ -416,12 +494,14 @@ struct thread_data { struct fio_file *files; unsigned int files_index; unsigned int nr_open_files; + unsigned int nr_done_files; unsigned int nr_normal_files; union { unsigned int next_file; os_random_state_t next_file_state; }; int error; + int done; pid_t pid; char *orig_buffer; size_t orig_buffer_size; @@ -467,12 +547,12 @@ struct thread_data { unsigned long rate_blocks; struct timeval lastrate; - unsigned long long io_size; unsigned long long total_io_size; unsigned long io_issues[2]; unsigned long long io_blocks[2]; unsigned long long io_bytes[2]; + unsigned long long io_skip_bytes; unsigned long long this_io_bytes[2]; unsigned long long zone_bytes; struct fio_sem *mutex; @@ -484,18 +564,29 @@ struct thread_data { struct timeval start; /* start of this loop */ struct timeval epoch; /* time job was started */ + struct timeval rw_end[2]; + struct timeval last_issue; + unsigned int rw_end_set[2]; /* * read/write mixed workload state */ os_random_state_t rwmix_state; + unsigned long long rwmix_bytes; struct timeval rwmix_switch; enum fio_ddir rwmix_ddir; + unsigned int ddir_nr; /* - * IO historic logs + * IO history logs for verification. We use a tree for sorting, + * if we are overwriting. Otherwise just use a fifo. */ + struct rb_root io_hist_tree; struct list_head io_hist_list; + + /* + * For IO replaying + */ struct list_head io_log_list; /* @@ -604,8 +695,9 @@ struct disk_util { struct list_head list; char *name; + char *sysfs_root; char path[256]; - dev_t dev; + int major, minor; struct disk_util_stat dus; struct disk_util_stat last_dus; @@ -616,18 +708,18 @@ struct disk_util { #define DISK_UTIL_MSEC (250) -#ifndef min -#define min(a, b) ((a) < (b) ? (a) : (b)) -#endif -#ifndef max -#define max(a, b) ((a) > (b) ? (a) : (b)) -#endif - /* * Log exports */ +enum file_log_act { + FIO_LOG_ADD_FILE, + FIO_LOG_OPEN_FILE, + FIO_LOG_CLOSE_FILE, +}; + extern int __must_check read_iolog_get(struct thread_data *, struct io_u *); -extern void write_iolog_put(struct thread_data *, struct io_u *); +extern void log_io_u(struct thread_data *, struct io_u *); +extern void log_file(struct thread_data *, struct fio_file *, enum file_log_act); extern int __must_check init_iolog(struct thread_data *td); extern void log_io_piece(struct thread_data *, struct io_u *); extern void prune_io_piece_log(struct thread_data *); @@ -676,6 +768,8 @@ 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 *); #define FIO_GETOPT_JOB 0x89988998 #define FIO_NR_OPTIONS 128 @@ -688,11 +782,14 @@ 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 void generic_close_file(struct thread_data *, struct fio_file *); -extern void add_file(struct thread_data *, const char *); +extern int add_file(struct thread_data *, const char *); extern void get_file(struct fio_file *); extern void put_file(struct thread_data *, struct fio_file *); extern int add_dir_files(struct thread_data *, const char *); extern int init_random_map(struct thread_data *); +extern void dup_files(struct thread_data *, struct thread_data *); +extern int get_fileno(struct thread_data *, const char *); +extern void free_release_files(struct thread_data *); /* * ETA/status stuff @@ -700,6 +797,21 @@ extern int init_random_map(struct thread_data *); extern void print_thread_status(void); extern void print_status_init(int); +/* + * disk util stuff + */ +#ifdef FIO_HAVE_DISK_UTIL +extern void show_disk_util(void); +extern void disk_util_timer_arm(void); +extern void init_disk_util(struct thread_data *); +extern void update_io_ticks(void); +#else +#define show_disk_util() +#define disk_util_timer_arm() +#define init_disk_util(td) +#define update_io_ticks() +#endif + /* * Thread life cycle. Once a thread has a runstate beyond TD_INITIALIZED, it * will never back again. It may cycle between running/verififying/fsyncing. @@ -722,7 +834,7 @@ enum { */ extern void populate_verify_io_u(struct thread_data *, struct io_u *); extern int __must_check get_next_verify(struct thread_data *td, struct io_u *); -extern int __must_check verify_io_u(struct io_u *); +extern int __must_check verify_io_u(struct thread_data *, struct io_u *); /* * Memory helpers @@ -760,6 +872,14 @@ 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 void td_io_close_file(struct thread_data *, struct fio_file *); +/* + * blktrace support + */ +#ifdef FIO_HAVE_BLKTRACE +extern int is_blktrace(const char *); +extern int load_blktrace(struct thread_data *, const char *); +#endif + /* * If logging output to a file, stderr should go to both stderr and f_err */ @@ -794,7 +914,7 @@ struct ioengine_ops { void *dlhandle; }; -#define FIO_IOOPS_VERSION 6 +#define FIO_IOOPS_VERSION 7 extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *); extern void register_ioengine(struct ioengine_ops *); @@ -823,4 +943,10 @@ extern void close_ioengine(struct thread_data *); } \ } while (0) +static inline void clear_error(struct thread_data *td) +{ + td->error = 0; + td->verror[0] = '\0'; +} + #endif