fio: Fix (unsigned) integer overflow issues

[fio.git] / cconv.c

diff --git a/cconv.c b/cconv.c
index 6d8d0b3e336363c8eff7f57b4e18ad68d914ae9b..0032cc04ae06ba8cf14be26a82822db0d1ef10c7 100644 (file)
--- a/cconv.c
+++ b/cconv.c
@@ -23,6 +23,8 @@ static void __string_to_net(uint8_t *dst, const char *src, size_t dst_size)
 
 static void free_thread_options_to_cpu(struct thread_options *o)
 {
+       int i;
+
        free(o->description);
        free(o->name);
        free(o->wait_for);
@@ -37,12 +39,18 @@ static void free_thread_options_to_cpu(struct thread_options *o)
        free(o->bw_log_file);
        free(o->lat_log_file);
        free(o->iops_log_file);
+       free(o->hist_log_file);
        free(o->replay_redirect);
        free(o->exec_prerun);
        free(o->exec_postrun);
        free(o->ioscheduler);
        free(o->profile);
        free(o->cgroup);
+
+       for (i = 0; i < DDIR_RWDIR_CNT; i++) {
+               free(o->bssplit[i]);
+               free(o->zone_split[i]);
+       }
 }
 
 void convert_thread_options_to_cpu(struct thread_options *o,
@@ -67,6 +75,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        string_to_cpu(&o->bw_log_file, top->bw_log_file);
        string_to_cpu(&o->lat_log_file, top->lat_log_file);
        string_to_cpu(&o->iops_log_file, top->iops_log_file);
+       string_to_cpu(&o->hist_log_file, top->hist_log_file);
        string_to_cpu(&o->replay_redirect, top->replay_redirect);
        string_to_cpu(&o->exec_prerun, top->exec_prerun);
        string_to_cpu(&o->exec_postrun, top->exec_postrun);
@@ -111,9 +120,19 @@ void convert_thread_options_to_cpu(struct thread_options *o,
                        }
                }
 
+               o->zone_split_nr[i] = le32_to_cpu(top->zone_split_nr[i]);
+
+               if (o->zone_split_nr[i]) {
+                       o->zone_split[i] = malloc(o->zone_split_nr[i] * sizeof(struct zone_split));
+                       for (j = 0; j < o->zone_split_nr[i]; j++) {
+                               o->zone_split[i][j].access_perc = top->zone_split[i][j].access_perc;
+                               o->zone_split[i][j].size_perc = top->zone_split[i][j].size_perc;
+                       }
+               }
+
                o->rwmix[i] = le32_to_cpu(top->rwmix[i]);
-               o->rate[i] = le32_to_cpu(top->rate[i]);
-               o->ratemin[i] = le32_to_cpu(top->ratemin[i]);
+               o->rate[i] = le64_to_cpu(top->rate[i]);
+               o->ratemin[i] = le64_to_cpu(top->ratemin[i]);
                o->rate_iops[i] = le32_to_cpu(top->rate_iops[i]);
                o->rate_iops_min[i] = le32_to_cpu(top->rate_iops_min[i]);
 
@@ -122,6 +141,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
 
        o->ratecycle = le32_to_cpu(top->ratecycle);
        o->io_submit_mode = le32_to_cpu(top->io_submit_mode);
+       o->unique_filename = le32_to_cpu(top->unique_filename);
        o->nr_files = le32_to_cpu(top->nr_files);
        o->open_files = le32_to_cpu(top->open_files);
        o->file_lock_mode = le32_to_cpu(top->file_lock_mode);
@@ -154,15 +174,20 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        o->verify_batch = le32_to_cpu(top->verify_batch);
        o->use_thread = le32_to_cpu(top->use_thread);
        o->unlink = le32_to_cpu(top->unlink);
+       o->unlink_each_loop = le32_to_cpu(top->unlink_each_loop);
        o->do_disk_util = le32_to_cpu(top->do_disk_util);
        o->override_sync = le32_to_cpu(top->override_sync);
        o->rand_repeatable = le32_to_cpu(top->rand_repeatable);
        o->allrand_repeatable = le32_to_cpu(top->allrand_repeatable);
        o->rand_seed = le64_to_cpu(top->rand_seed);
        o->log_avg_msec = le32_to_cpu(top->log_avg_msec);
+       o->log_hist_msec = le32_to_cpu(top->log_hist_msec);
+       o->log_hist_coarseness = le32_to_cpu(top->log_hist_coarseness);
+       o->log_max = le32_to_cpu(top->log_max);
        o->log_offset = le32_to_cpu(top->log_offset);
        o->log_gz = le32_to_cpu(top->log_gz);
        o->log_gz_store = le32_to_cpu(top->log_gz_store);
+       o->log_unix_epoch = le32_to_cpu(top->log_unix_epoch);
        o->norandommap = le32_to_cpu(top->norandommap);
        o->softrandommap = le32_to_cpu(top->softrandommap);
        o->bs_unaligned = le32_to_cpu(top->bs_unaligned);
@@ -255,6 +280,10 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        o->replay_align = le32_to_cpu(top->replay_align);
        o->replay_scale = le32_to_cpu(top->replay_scale);
        o->per_job_logs = le32_to_cpu(top->per_job_logs);
+       o->write_bw_log = le32_to_cpu(top->write_bw_log);
+       o->write_lat_log = le32_to_cpu(top->write_lat_log);
+       o->write_iops_log = le32_to_cpu(top->write_iops_log);
+       o->write_hist_log = le32_to_cpu(top->write_hist_log);
 
        o->trim_backlog = le64_to_cpu(top->trim_backlog);
        o->rate_process = le32_to_cpu(top->rate_process);
@@ -290,6 +319,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        string_to_net(top->bw_log_file, o->bw_log_file);
        string_to_net(top->lat_log_file, o->lat_log_file);
        string_to_net(top->iops_log_file, o->iops_log_file);
+       string_to_net(top->hist_log_file, o->hist_log_file);
        string_to_net(top->replay_redirect, o->replay_redirect);
        string_to_net(top->exec_prerun, o->exec_prerun);
        string_to_net(top->exec_postrun, o->exec_postrun);
@@ -315,6 +345,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->ratecycle = cpu_to_le32(o->ratecycle);
        top->io_submit_mode = cpu_to_le32(o->io_submit_mode);
        top->nr_files = cpu_to_le32(o->nr_files);
+       top->unique_filename = cpu_to_le32(o->unique_filename);
        top->open_files = cpu_to_le32(o->open_files);
        top->file_lock_mode = cpu_to_le32(o->file_lock_mode);
        top->odirect = cpu_to_le32(o->odirect);
@@ -342,15 +373,18 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->verify_batch = cpu_to_le32(o->verify_batch);
        top->use_thread = cpu_to_le32(o->use_thread);
        top->unlink = cpu_to_le32(o->unlink);
+       top->unlink_each_loop = cpu_to_le32(o->unlink_each_loop);
        top->do_disk_util = cpu_to_le32(o->do_disk_util);
        top->override_sync = cpu_to_le32(o->override_sync);
        top->rand_repeatable = cpu_to_le32(o->rand_repeatable);
        top->allrand_repeatable = cpu_to_le32(o->allrand_repeatable);
        top->rand_seed = __cpu_to_le64(o->rand_seed);
        top->log_avg_msec = cpu_to_le32(o->log_avg_msec);
+       top->log_max = cpu_to_le32(o->log_max);
        top->log_offset = cpu_to_le32(o->log_offset);
        top->log_gz = cpu_to_le32(o->log_gz);
        top->log_gz_store = cpu_to_le32(o->log_gz_store);
+       top->log_unix_epoch = cpu_to_le32(o->log_unix_epoch);
        top->norandommap = cpu_to_le32(o->norandommap);
        top->softrandommap = cpu_to_le32(o->softrandommap);
        top->bs_unaligned = cpu_to_le32(o->bs_unaligned);
@@ -430,6 +464,10 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->replay_align = cpu_to_le32(o->replay_align);
        top->replay_scale = cpu_to_le32(o->replay_scale);
        top->per_job_logs = cpu_to_le32(o->per_job_logs);
+       top->write_bw_log = cpu_to_le32(o->write_bw_log);
+       top->write_lat_log = cpu_to_le32(o->write_lat_log);
+       top->write_iops_log = cpu_to_le32(o->write_iops_log);
+       top->write_hist_log = cpu_to_le32(o->write_hist_log);
 
        for (i = 0; i < DDIR_RWDIR_CNT; i++) {
                top->bs[i] = cpu_to_le32(o->bs[i]);
@@ -451,9 +489,24 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
                        }
                }
 
+               top->zone_split_nr[i] = cpu_to_le32(o->zone_split_nr[i]);
+
+               if (o->zone_split_nr[i]) {
+                       unsigned int zone_split_nr = o->zone_split_nr[i];
+
+                       if (zone_split_nr > ZONESPLIT_MAX) {
+                               log_err("fio: ZONESPLIT_MAX is too small\n");
+                               zone_split_nr = ZONESPLIT_MAX;
+                       }
+                       for (j = 0; j < zone_split_nr; j++) {
+                               top->zone_split[i][j].access_perc = o->zone_split[i][j].access_perc;
+                               top->zone_split[i][j].size_perc = o->zone_split[i][j].size_perc;
+                       }
+               }
+
                top->rwmix[i] = cpu_to_le32(o->rwmix[i]);
-               top->rate[i] = cpu_to_le32(o->rate[i]);
-               top->ratemin[i] = cpu_to_le32(o->ratemin[i]);
+               top->rate[i] = cpu_to_le64(o->rate[i]);
+               top->ratemin[i] = cpu_to_le64(o->ratemin[i]);
                top->rate_iops[i] = cpu_to_le32(o->rate_iops[i]);
                top->rate_iops_min[i] = cpu_to_le32(o->rate_iops_min[i]);