X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=42a9f4155fbf13a8a284c9070de8f110d80c6001;hp=51efdf768d3068b1ac6a895b03adfaa4678f54c6;hb=2442c9353bdc597301dfa75a5da78dcce3708a75;hpb=37fbd7e9dd4f041b858507b3db06753614083770 diff --git a/filesetup.c b/filesetup.c index 51efdf76..42a9f415 100644 --- a/filesetup.c +++ b/filesetup.c @@ -58,8 +58,12 @@ static int extend_file(struct thread_data *td, struct fio_file *f) unlink_file = 1; if (unlink_file || new_layout) { + int ret; + dprint(FD_FILE, "layout unlink %s\n", f->file_name); - if ((td_io_unlink_file(td, f) < 0) && (errno != ENOENT)) { + + ret = td_io_unlink_file(td, f); + if (ret != 0 && ret != ENOENT) { td_verror(td, errno, "unlink"); return 1; } @@ -264,7 +268,7 @@ error: return ret; } -static unsigned long long get_rand_file_size(struct thread_data *td) +unsigned long long get_rand_file_size(struct thread_data *td) { unsigned long long ret, sized; uint64_t frand_max; @@ -329,7 +333,7 @@ static int char_size(struct thread_data *td, struct fio_file *f) int r; if (td->io_ops->open_file(td, f)) { - log_err("fio: failed opening blockdev %s for size check\n", + log_err("fio: failed opening chardev %s for size check\n", f->file_name); return 1; } @@ -391,7 +395,7 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f, unsigned long long off, unsigned long long len) { - int ret = 0; + int errval = 0, ret = 0; #ifdef CONFIG_ESX return 0; @@ -408,12 +412,28 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f, dprint(FD_IO, "invalidate cache %s: %llu/%llu\n", f->file_name, off, len); - if (td->io_ops->invalidate) + if (td->io_ops->invalidate) { ret = td->io_ops->invalidate(td, f); - else if (f->filetype == FIO_TYPE_FILE) + if (ret < 0) + errval = ret; + } else if (f->filetype == FIO_TYPE_FILE) { ret = posix_fadvise(f->fd, off, len, POSIX_FADV_DONTNEED); - else if (f->filetype == FIO_TYPE_BD) { + if (ret) + errval = ret; + } else if (f->filetype == FIO_TYPE_BD) { + int retry_count = 0; + ret = blockdev_invalidate_cache(f); + while (ret < 0 && errno == EAGAIN && retry_count++ < 25) { + /* + * Linux multipath devices reject ioctl while + * the maps are being updated. That window can + * last tens of milliseconds; we'll try up to + * a quarter of a second. + */ + usleep(10000); + ret = blockdev_invalidate_cache(f); + } if (ret < 0 && errno == EACCES && geteuid()) { if (!root_warn) { log_err("fio: only root may flush block " @@ -422,6 +442,8 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f, } ret = 0; } + if (ret < 0) + errval = errno; } else if (f->filetype == FIO_TYPE_CHAR || f->filetype == FIO_TYPE_PIPE) ret = 0; @@ -431,10 +453,8 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f, * function to flush eg block device caches. So just warn and * continue on our way. */ - if (ret) { - log_info("fio: cache invalidation of %s failed: %s\n", f->file_name, strerror(errno)); - ret = 0; - } + if (errval) + log_info("fio: cache invalidation of %s failed: %s\n", f->file_name, strerror(errval)); return 0; @@ -732,7 +752,7 @@ static unsigned long long get_fs_free_counts(struct thread_data *td) fm = flist_entry(n, struct fio_mount, list); flist_del(&fm->list); - sz = get_fs_size(fm->base); + sz = get_fs_free_size(fm->base); if (sz && sz != -1ULL) ret += sz; @@ -793,6 +813,7 @@ int setup_files(struct thread_data *td) */ total_size = 0; for_each_file(td, f, i) { + f->fileno = i; if (f->real_file_size == -1ULL) total_size = -1ULL; else @@ -873,8 +894,10 @@ int setup_files(struct thread_data *td) if (f->io_size == -1ULL) total_size = -1ULL; else { - if (o->size_percent) - f->io_size = (f->io_size * o->size_percent) / 100; + if (o->size_percent) { + f->io_size = (f->io_size * o->size_percent) / 100; + f->io_size -= (f->io_size % td_min_bs(td)); + } total_size += f->io_size; } @@ -905,7 +928,7 @@ int setup_files(struct thread_data *td) } td->ts.nr_block_infos = len; - for (int i = 0; i < len; i++) + for (i = 0; i < len; i++) td->ts.block_infos[i] = BLOCK_INFO(0, BLOCK_STATE_UNINIT); } else @@ -924,7 +947,7 @@ int setup_files(struct thread_data *td) */ if (need_extend) { temp_stall_ts = 1; - if (output_format == FIO_OUTPUT_NORMAL) + if (output_format & FIO_OUTPUT_NORMAL) log_info("%s: Laying out IO file(s) (%u file(s) /" " %lluMB)\n", o->name, need_extend, extend_size >> 20); @@ -1051,6 +1074,43 @@ static int init_rand_distribution(struct thread_data *td) return 1; } +/* + * Check if the number of blocks exceeds the randomness capability of + * the selected generator. Tausworthe is 32-bit, the others are fullly + * 64-bit capable. + */ +static int check_rand_gen_limits(struct thread_data *td, struct fio_file *f, + uint64_t blocks) +{ + if (blocks <= FRAND32_MAX) + return 0; + if (td->o.random_generator != FIO_RAND_GEN_TAUSWORTHE) + return 0; + + /* + * If the user hasn't specified a random generator, switch + * to tausworthe64 with informational warning. If the user did + * specify one, just warn. + */ + log_info("fio: file %s exceeds 32-bit tausworthe random generator.\n", + f->file_name); + + if (!fio_option_is_set(&td->o, random_generator)) { + log_info("fio: Switching to tausworthe64. Use the " + "random_generator= option to get rid of this " + " warning.\n"); + td->o.random_generator = FIO_RAND_GEN_TAUSWORTHE64; + return 0; + } + + /* + * Just make this information to avoid breaking scripts. + */ + log_info("fio: Use the random_generator= option to switch to lfsr or " + "tausworthe64.\n"); + return 0; +} + int init_random_map(struct thread_data *td) { unsigned long long blocks; @@ -1067,15 +1127,8 @@ int init_random_map(struct thread_data *td) blocks = fsize / (unsigned long long) td->o.rw_min_bs; - if (blocks > FRAND32_MAX && - td->o.random_generator == FIO_RAND_GEN_TAUSWORTHE && - !fio_option_is_set(&td->o, random_generator)) { - log_err("fio: file %s exceeds 32-bit tausworthe " - "random generator. Use lfsr or " - "tausworthe64.\n", f->file_name); - td_verror(td, EINVAL, "init file random"); + if (check_rand_gen_limits(td, f, blocks)) return 1; - } if (td->o.random_generator == FIO_RAND_GEN_LFSR) { unsigned long seed; @@ -1172,10 +1225,12 @@ static void get_file_type(struct fio_file *f) else f->filetype = FIO_TYPE_FILE; +#ifdef WIN32 /* \\.\ is the device namespace in Windows, where every file is * a block device */ if (strncmp(f->file_name, "\\\\.\\", 4) == 0) f->filetype = FIO_TYPE_BD; +#endif if (!stat(f->file_name, &sb)) { if (S_ISBLK(sb.st_mode)) @@ -1282,7 +1337,8 @@ int add_file(struct thread_data *td, const char *fname, int numjob, int inc) dprint(FD_FILE, "add file %s\n", fname); if (td->o.directory) - len = set_name_idx(file_name, PATH_MAX, td->o.directory, numjob); + len = set_name_idx(file_name, PATH_MAX, td->o.directory, numjob, + td->o.unique_filename); sprintf(file_name + len, "%s", fname);