X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=thread_options.h;h=f3dfd42f7fbfa5df55e775606ad41f5f62c6a882;hp=d577f6176977e1dc104fa514fdadc396d5808a1c;hb=e59b9e111792bd0f5f807ed2466cf1904b5f1379;hpb=62232d0618e3f5aa4805b4be34e872895ba1beb2 diff --git a/thread_options.h b/thread_options.h index d577f617..f3dfd42f 100644 --- a/thread_options.h +++ b/thread_options.h @@ -3,8 +3,12 @@ #include "arch/arch.h" #include "os/os.h" +#include "options.h" #include "stat.h" #include "gettime.h" +#include "lib/ieee754.h" +#include "lib/pattern.h" +#include "td_error.h" /* * What type of allocation to use for io buffers @@ -15,57 +19,60 @@ enum fio_memtype { MEM_SHMHUGE, /* use shared memory segments with huge pages */ MEM_MMAP, /* use anonynomous mmap */ MEM_MMAPHUGE, /* memory mapped huge file */ -}; - -/* - * What type of errors to continue on when continue_on_error is used - */ -enum error_type_bit { - ERROR_TYPE_READ_BIT = 0, - ERROR_TYPE_WRITE_BIT = 1, - ERROR_TYPE_VERIFY_BIT = 2, - ERROR_TYPE_CNT = 3, + MEM_MMAPSHARED, /* use mmap with shared flag */ + MEM_CUDA_MALLOC,/* use GPU memory */ }; #define ERROR_STR_MAX 128 -enum error_type { - ERROR_TYPE_NONE = 0, - ERROR_TYPE_READ = 1 << ERROR_TYPE_READ_BIT, - ERROR_TYPE_WRITE = 1 << ERROR_TYPE_WRITE_BIT, - ERROR_TYPE_VERIFY = 1 << ERROR_TYPE_VERIFY_BIT, - ERROR_TYPE_ANY = 0xffff, -}; - #define BSSPLIT_MAX 64 +#define ZONESPLIT_MAX 64 struct bssplit { uint32_t bs; uint32_t perc; }; +struct zone_split { + uint8_t access_perc; + uint8_t size_perc; +}; + +#define NR_OPTS_SZ (FIO_MAX_OPTS / (8 * sizeof(uint64_t))) + +#define OPT_MAGIC 0x4f50544e + struct thread_options { - int pad; + int magic; + uint64_t set_options[NR_OPTS_SZ]; char *description; char *name; + char *wait_for; char *directory; char *filename; + char *filename_format; char *opendir; char *ioengine; char *mmapfile; enum td_ddir td_ddir; unsigned int rw_seq; unsigned int kb_base; + unsigned int unit_base; unsigned int ddir_seq_nr; - long ddir_seq_add; + long long ddir_seq_add; unsigned int iodepth; unsigned int iodepth_low; unsigned int iodepth_batch; - unsigned int iodepth_batch_complete; + unsigned int iodepth_batch_complete_min; + unsigned int iodepth_batch_complete_max; + + unsigned int unique_filename; unsigned long long size; + unsigned long long io_size; unsigned int size_percent; 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; @@ -86,6 +93,7 @@ struct thread_options { enum file_lock_mode file_lock_mode; unsigned int odirect; + unsigned int oatomic; unsigned int invalidate_cache; unsigned int create_serialize; unsigned int create_fsync; @@ -94,6 +102,7 @@ struct thread_options { unsigned int end_fsync; unsigned int pre_read; unsigned int sync_io; + unsigned int write_hint; unsigned int verify; unsigned int do_verify; unsigned int verifysort; @@ -102,30 +111,55 @@ struct thread_options { unsigned int verify_offset; char verify_pattern[MAX_PATTERN_SIZE]; unsigned int verify_pattern_bytes; + struct pattern_fmt verify_fmt[8]; + unsigned int verify_fmt_sz; unsigned int verify_fatal; unsigned int verify_dump; unsigned int verify_async; unsigned long long verify_backlog; unsigned int verify_batch; unsigned int experimental_verify; + unsigned int verify_state; + unsigned int verify_state_save; unsigned int use_thread; unsigned int unlink; + unsigned int unlink_each_loop; unsigned int do_disk_util; unsigned int override_sync; unsigned int rand_repeatable; - unsigned int use_os_rand; + unsigned int allrand_repeatable; + unsigned long long rand_seed; + unsigned int dep_use_os_rand; unsigned int log_avg_msec; + unsigned int log_hist_msec; + unsigned int log_hist_coarseness; + unsigned int log_max; + unsigned int log_offset; + unsigned int log_gz; + unsigned int log_gz_store; + unsigned int log_unix_epoch; unsigned int norandommap; unsigned int softrandommap; unsigned int bs_unaligned; unsigned int fsync_on_close; + unsigned int bs_is_seq_rand; + + unsigned int verify_only; unsigned int random_distribution; + unsigned int exitall_error; + + struct zone_split *zone_split[DDIR_RWDIR_CNT]; + unsigned int zone_split_nr[DDIR_RWDIR_CNT]; + fio_fp64_t zipf_theta; fio_fp64_t pareto_h; + fio_fp64_t gauss_dev; unsigned int random_generator; + unsigned int perc_rand[DDIR_RWDIR_CNT]; + unsigned int hugepage_size; unsigned int rw_min_bs; unsigned int thinktime; @@ -135,8 +169,13 @@ struct thread_options { unsigned int fdatasync_blocks; unsigned int barrier_blocks; unsigned long long start_delay; + unsigned long long start_delay_high; unsigned long long timeout; unsigned long long ramp_time; + unsigned int ss_state; + fio_fp64_t ss_limit; + unsigned long long ss_dur; + unsigned long long ss_ramp_time; unsigned int overwrite; unsigned int bw_avg_time; unsigned int iops_avg_time; @@ -148,38 +187,42 @@ struct thread_options { enum fio_memtype mem_type; unsigned int mem_align; - unsigned max_latency; + unsigned int max_latency; unsigned int stonewall; unsigned int new_group; unsigned int numjobs; os_cpu_mask_t cpumask; - unsigned int cpumask_set; os_cpu_mask_t verify_cpumask; - unsigned int verify_cpumask_set; -#ifdef CONFIG_LIBNUMA - struct bitmask *numa_cpunodesmask; - unsigned int numa_cpumask_set; + os_cpu_mask_t log_gz_cpumask; + unsigned int cpus_allowed_policy; + char *numa_cpunodes; unsigned short numa_mem_mode; unsigned int numa_mem_prefer_node; - struct bitmask *numa_memnodesmask; - unsigned int numa_memmask_set; -#endif + char *numa_memnodes; + unsigned int gpu_dev_id; + unsigned int start_offset_percent; + unsigned int iolog; unsigned int rwmixcycle; - unsigned int rwmix[2]; + unsigned int rwmix[DDIR_RWDIR_CNT]; unsigned int nice; unsigned int ioprio; unsigned int ioprio_class; unsigned int file_service_type; unsigned int group_reporting; + unsigned int stats; unsigned int fadvise_hint; + unsigned int fadvise_stream; enum fio_fallocate_mode fallocate_mode; unsigned int zero_buffers; unsigned int refill_buffers; unsigned int scramble_buffers; + char buffer_pattern[MAX_PATTERN_SIZE]; + unsigned int buffer_pattern_bytes; unsigned int compress_percentage; unsigned int compress_chunk; + unsigned int dedupe_percentage; unsigned int time_based; unsigned int disable_lat; unsigned int disable_clat; @@ -188,7 +231,6 @@ struct thread_options { unsigned int unified_rw_rep; unsigned int gtod_reduce; unsigned int gtod_cpu; - unsigned int gtod_offload; enum fio_cs clocksource; unsigned int no_stall; unsigned int trim_percentage; @@ -201,9 +243,16 @@ struct thread_options { char *read_iolog_file; char *write_iolog_file; + + unsigned int write_bw_log; + unsigned int write_lat_log; + unsigned int write_iops_log; + unsigned int write_hist_log; + char *bw_log_file; char *lat_log_file; char *iops_log_file; + char *hist_log_file; char *replay_redirect; /* @@ -212,11 +261,13 @@ struct thread_options { char *exec_prerun; char *exec_postrun; - unsigned int rate[DDIR_RWDIR_CNT]; - unsigned int ratemin[DDIR_RWDIR_CNT]; + uint64_t rate[DDIR_RWDIR_CNT]; + uint64_t ratemin[DDIR_RWDIR_CNT]; unsigned int ratecycle; + unsigned int io_submit_mode; unsigned int rate_iops[DDIR_RWDIR_CNT]; unsigned int rate_iops_min[DDIR_RWDIR_CNT]; + unsigned int rate_process; char *ioscheduler; @@ -246,33 +297,56 @@ struct thread_options { unsigned int flow_sleep; unsigned long long offset_increment; + unsigned long long number_ios; unsigned int sync_file_range; + + unsigned long long latency_target; + unsigned long long latency_window; + fio_fp64_t latency_percentile; + + unsigned block_error_hist; + + unsigned int replay_align; + unsigned int replay_scale; + + unsigned int per_job_logs; + + unsigned int allow_create; + unsigned int allow_mounted_write; }; #define FIO_TOP_STR_MAX 256 struct thread_options_pack { + uint64_t set_options[NR_OPTS_SZ]; uint8_t description[FIO_TOP_STR_MAX]; uint8_t name[FIO_TOP_STR_MAX]; + uint8_t wait_for[FIO_TOP_STR_MAX]; uint8_t directory[FIO_TOP_STR_MAX]; uint8_t filename[FIO_TOP_STR_MAX]; + uint8_t filename_format[FIO_TOP_STR_MAX]; uint8_t opendir[FIO_TOP_STR_MAX]; uint8_t ioengine[FIO_TOP_STR_MAX]; uint8_t mmapfile[FIO_TOP_STR_MAX]; uint32_t td_ddir; uint32_t rw_seq; uint32_t kb_base; + uint32_t unit_base; uint32_t ddir_seq_nr; uint64_t ddir_seq_add; uint32_t iodepth; uint32_t iodepth_low; uint32_t iodepth_batch; - uint32_t iodepth_batch_complete; + uint32_t iodepth_batch_complete_min; + uint32_t iodepth_batch_complete_max; uint64_t size; + uint64_t io_size; uint32_t size_percent; uint32_t fill_device; + uint32_t file_append; + uint32_t unique_filename; uint64_t file_size_low; uint64_t file_size_high; uint64_t start_offset; @@ -293,6 +367,7 @@ struct thread_options_pack { uint32_t file_lock_mode; uint32_t odirect; + uint32_t oatomic; uint32_t invalidate_cache; uint32_t create_serialize; uint32_t create_fsync; @@ -301,6 +376,7 @@ struct thread_options_pack { uint32_t end_fsync; uint32_t pre_read; uint32_t sync_io; + uint32_t write_hint; uint32_t verify; uint32_t do_verify; uint32_t verifysort; @@ -315,24 +391,46 @@ struct thread_options_pack { uint64_t verify_backlog; uint32_t verify_batch; uint32_t experimental_verify; + uint32_t verify_state; + uint32_t verify_state_save; uint32_t use_thread; uint32_t unlink; + uint32_t unlink_each_loop; uint32_t do_disk_util; uint32_t override_sync; uint32_t rand_repeatable; - uint32_t use_os_rand; + uint32_t allrand_repeatable; + uint64_t rand_seed; + uint32_t dep_use_os_rand; uint32_t log_avg_msec; + uint32_t log_hist_msec; + uint32_t log_hist_coarseness; + uint32_t log_max; + uint32_t log_offset; + uint32_t log_gz; + uint32_t log_gz_store; + uint32_t log_unix_epoch; uint32_t norandommap; uint32_t softrandommap; uint32_t bs_unaligned; uint32_t fsync_on_close; + uint32_t bs_is_seq_rand; uint32_t random_distribution; + uint32_t exitall_error; + uint32_t pad; + + struct zone_split zone_split[DDIR_RWDIR_CNT][ZONESPLIT_MAX]; + uint32_t zone_split_nr[DDIR_RWDIR_CNT]; + fio_fp64_t zipf_theta; fio_fp64_t pareto_h; + fio_fp64_t gauss_dev; uint32_t random_generator; + uint32_t perc_rand[DDIR_RWDIR_CNT]; + uint32_t hugepage_size; uint32_t rw_min_bs; uint32_t thinktime; @@ -342,8 +440,13 @@ struct thread_options_pack { uint32_t fdatasync_blocks; uint32_t barrier_blocks; uint64_t start_delay; + uint64_t start_delay_high; uint64_t timeout; uint64_t ramp_time; + uint64_t ss_dur; + uint64_t ss_ramp_time; + uint32_t ss_state; + fio_fp64_t ss_limit; uint32_t overwrite; uint32_t bw_avg_time; uint32_t iops_avg_time; @@ -360,25 +463,37 @@ struct thread_options_pack { uint32_t stonewall; uint32_t new_group; uint32_t numjobs; + /* + * We currently can't convert these, so don't enable them + */ +#if 0 uint8_t cpumask[FIO_TOP_STR_MAX]; - uint32_t cpumask_set; uint8_t verify_cpumask[FIO_TOP_STR_MAX]; - uint32_t verify_cpumask_set; + uint8_t log_gz_cpumask[FIO_TOP_STR_MAX]; +#endif + uint32_t gpu_dev_id; + uint32_t start_offset_percent; + uint32_t cpus_allowed_policy; uint32_t iolog; uint32_t rwmixcycle; - uint32_t rwmix[2]; + uint32_t rwmix[DDIR_RWDIR_CNT]; uint32_t nice; uint32_t ioprio; uint32_t ioprio_class; uint32_t file_service_type; uint32_t group_reporting; + uint32_t stats; uint32_t fadvise_hint; + uint32_t fadvise_stream; uint32_t fallocate_mode; uint32_t zero_buffers; uint32_t refill_buffers; uint32_t scramble_buffers; - unsigned int compress_percentage; - unsigned int compress_chunk; + uint8_t buffer_pattern[MAX_PATTERN_SIZE]; + uint32_t buffer_pattern_bytes; + uint32_t compress_percentage; + uint32_t compress_chunk; + uint32_t dedupe_percentage; uint32_t time_based; uint32_t disable_lat; uint32_t disable_clat; @@ -387,7 +502,6 @@ struct thread_options_pack { uint32_t unified_rw_rep; uint32_t gtod_reduce; uint32_t gtod_cpu; - uint32_t gtod_offload; uint32_t clocksource; uint32_t no_stall; uint32_t trim_percentage; @@ -400,9 +514,16 @@ struct thread_options_pack { uint8_t read_iolog_file[FIO_TOP_STR_MAX]; uint8_t write_iolog_file[FIO_TOP_STR_MAX]; + + uint32_t write_bw_log; + uint32_t write_lat_log; + uint32_t write_iops_log; + uint32_t write_hist_log; + uint8_t bw_log_file[FIO_TOP_STR_MAX]; uint8_t lat_log_file[FIO_TOP_STR_MAX]; uint8_t iops_log_file[FIO_TOP_STR_MAX]; + uint8_t hist_log_file[FIO_TOP_STR_MAX]; uint8_t replay_redirect[FIO_TOP_STR_MAX]; /* @@ -411,11 +532,13 @@ struct thread_options_pack { uint8_t exec_prerun[FIO_TOP_STR_MAX]; uint8_t exec_postrun[FIO_TOP_STR_MAX]; - uint32_t rate[DDIR_RWDIR_CNT]; - uint32_t ratemin[DDIR_RWDIR_CNT]; + uint64_t rate[DDIR_RWDIR_CNT]; + uint64_t ratemin[DDIR_RWDIR_CNT]; uint32_t ratecycle; + uint32_t io_submit_mode; uint32_t rate_iops[DDIR_RWDIR_CNT]; uint32_t rate_iops_min[DDIR_RWDIR_CNT]; + uint32_t rate_process; uint8_t ioscheduler[FIO_TOP_STR_MAX]; @@ -445,8 +568,24 @@ struct thread_options_pack { uint32_t flow_sleep; uint64_t offset_increment; + uint64_t number_ios; uint32_t sync_file_range; + uint32_t pad2; + + uint64_t latency_target; + uint64_t latency_window; + fio_fp64_t latency_percentile; + + uint32_t block_error_hist; + + uint32_t replay_align; + uint32_t replay_scale; + + uint32_t per_job_logs; + + uint32_t allow_create; + uint32_t allow_mounted_write; } __attribute__((packed)); extern void convert_thread_options_to_cpu(struct thread_options *o, struct thread_options_pack *top);