X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=thread_options.h;h=611f8e7376fab6eff15272bb08adb62ec09270ab;hp=3f345c56b3bafaca9eb5acd1210e58633fb63f86;hb=cd8a19e614013dbdbc9ad3c7fe5c9d861a6a6834;hpb=ddf24e42b5f801e6a66f8976c97edcb88080ecdf diff --git a/thread_options.h b/thread_options.h index 3f345c56..611f8e73 100644 --- a/thread_options.h +++ b/thread_options.h @@ -3,6 +3,7 @@ #include "arch/arch.h" #include "os/os.h" +#include "options.h" #include "stat.h" #include "gettime.h" #include "lib/ieee754.h" @@ -28,8 +29,13 @@ struct bssplit { uint32_t 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 *directory; @@ -43,15 +49,17 @@ struct thread_options { 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 long long size; + unsigned long long io_limit; 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; @@ -72,6 +80,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,19 +103,28 @@ struct thread_options { 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 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_offset; + unsigned int log_gz; + unsigned int log_gz_store; 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; fio_fp64_t zipf_theta; @@ -125,6 +143,7 @@ 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 overwrite; @@ -144,20 +163,15 @@ struct thread_options { 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; + 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 iolog; unsigned int rwmixcycle; - unsigned int rwmix[2]; + unsigned int rwmix[DDIR_RWDIR_CNT]; unsigned int nice; unsigned int ioprio; unsigned int ioprio_class; @@ -168,8 +182,11 @@ struct thread_options { 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; @@ -178,7 +195,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; @@ -239,11 +255,16 @@ struct thread_options { 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; }; #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 directory[FIO_TOP_STR_MAX]; @@ -264,8 +285,10 @@ struct thread_options_pack { uint32_t iodepth_batch_complete; uint64_t size; + uint64_t io_limit; uint32_t size_percent; uint32_t fill_device; + uint32_t file_append; uint64_t file_size_low; uint64_t file_size_high; uint64_t start_offset; @@ -286,6 +309,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; @@ -308,13 +332,20 @@ 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 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_offset; + uint32_t log_gz; + uint32_t log_gz_store; uint32_t norandommap; uint32_t softrandommap; uint32_t bs_unaligned; @@ -322,6 +353,7 @@ struct thread_options_pack { uint32_t bs_is_seq_rand; uint32_t random_distribution; + uint32_t pad; fio_fp64_t zipf_theta; fio_fp64_t pareto_h; @@ -338,6 +370,7 @@ 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; uint32_t overwrite; @@ -357,12 +390,11 @@ struct thread_options_pack { uint32_t new_group; uint32_t numjobs; uint8_t cpumask[FIO_TOP_STR_MAX]; - uint32_t cpumask_set; uint8_t verify_cpumask[FIO_TOP_STR_MAX]; - uint32_t verify_cpumask_set; + 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; @@ -373,8 +405,11 @@ struct thread_options_pack { 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; @@ -383,7 +418,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; @@ -392,6 +426,7 @@ struct thread_options_pack { uint64_t trim_backlog; uint32_t clat_percentiles; uint32_t percentile_precision; + uint32_t pad2; fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN]; uint8_t read_iolog_file[FIO_TOP_STR_MAX]; @@ -444,6 +479,11 @@ struct thread_options_pack { uint64_t number_ios; uint32_t sync_file_range; + + uint64_t latency_target; + uint64_t latency_window; + uint32_t pad3; + fio_fp64_t latency_percentile; } __attribute__((packed)); extern void convert_thread_options_to_cpu(struct thread_options *o, struct thread_options_pack *top);