X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=5a8105a6032e24b2e45a8a9d028c2a0b7e2552fe;hp=57928133369cdd520a1b89052cbc9362b773ca78;hb=aabbe9b1f5f303d0916b4484f42fd6a0707478a8;hpb=0d1cd207e409a36313784cb9596990c819775f77 diff --git a/filesetup.c b/filesetup.c index 57928133..5a8105a6 100644 --- a/filesetup.c +++ b/filesetup.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -64,6 +65,19 @@ static int extend_file(struct thread_data *td, struct fio_file *f) return 1; } +#ifdef FIO_HAVE_FALLOCATE + if (td->o.fallocate && !td->o.fill_device) { + dprint(FD_FILE, "fallocate file %s size %llu\n", f->file_name, + f->real_file_size); + + r = posix_fallocate(f->fd, 0, f->real_file_size); + if (r > 0) { + log_err("fio: posix_fallocate fails: %s\n", + strerror(r)); + } + } +#endif + if (!new_layout) goto done; @@ -78,16 +92,6 @@ static int extend_file(struct thread_data *td, struct fio_file *f) td_verror(td, errno, "ftruncate"); goto err; } - -#ifdef FIO_HAVE_FALLOCATE - dprint(FD_FILE, "fallocate file %s, size %llu\n", f->file_name, - f->real_file_size); - r = posix_fallocate(f->fd, 0, f->real_file_size); - if (r < 0) { - log_err("fio: posix_fallocate fails: %s\n", - strerror(-r)); - } -#endif } b = malloc(td->o.max_bs[DDIR_WRITE]); @@ -156,6 +160,9 @@ static int pre_read_file(struct thread_data *td, struct fio_file *f) unsigned int bs; char *b; + if (td->io_ops->flags & FIO_PIPEIO) + return 0; + if (!fio_file_open(f)) { if (td->io_ops->open_file(td, f)) { log_err("fio: cannot pre-read, failed to open file\n"); @@ -246,10 +253,46 @@ static int bdev_size(struct thread_data *td, struct fio_file *f) } f->real_file_size = bytes; + td->io_ops->close_file(td, f); + return 0; +err: + td->io_ops->close_file(td, f); + return 1; +} + +static int char_size(struct thread_data *td, struct fio_file *f) +{ +#ifdef FIO_HAVE_CHARDEV_SIZE + unsigned long long bytes; + int r; + + if (td->io_ops->open_file(td, f)) { + log_err("fio: failed opening blockdev %s for size check\n", + f->file_name); + return 1; + } + + r = chardev_size(f->fd, &bytes); + if (r) { + td_verror(td, r, "chardev_size"); + goto err; + } + + if (!bytes) { + log_err("%s: zero sized char device?\n", f->file_name); + goto err; + } + + f->real_file_size = bytes; + td->io_ops->close_file(td, f); return 0; err: td->io_ops->close_file(td, f); return 1; +#else + f->real_file_size = -1ULL; + return 0; +#endif } static int get_file_size(struct thread_data *td, struct fio_file *f) @@ -263,6 +306,8 @@ static int get_file_size(struct thread_data *td, struct fio_file *f) ret = file_size(td, f); else if (f->filetype == FIO_TYPE_BD) ret = bdev_size(td, f); + else if (f->filetype == FIO_TYPE_CHAR) + ret = char_size(td, f); else f->real_file_size = -1; @@ -299,9 +344,12 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f, /* * FIXME: add blockdev flushing too */ - if (f->mmap_ptr) + if (f->mmap_ptr) { ret = madvise(f->mmap_ptr, f->mmap_sz, MADV_DONTNEED); - else if (f->filetype == FIO_TYPE_FILE) { +#ifdef FIO_MADV_FREE + (void) madvise(f->mmap_ptr, f->mmap_sz, FIO_MADV_FREE); +#endif + } else if (f->filetype == FIO_TYPE_FILE) { ret = fadvise(f->fd, off, len, POSIX_FADV_DONTNEED); } else if (f->filetype == FIO_TYPE_BD) { ret = blockdev_invalidate_cache(f->fd); @@ -435,7 +483,7 @@ open_again: char buf[FIO_VERROR_SIZE]; int __e = errno; - if (errno == EPERM && (flags & FIO_O_NOATIME)) { + if (__e == EPERM && (flags & FIO_O_NOATIME)) { flags &= ~FIO_O_NOATIME; goto open_again; } @@ -493,6 +541,81 @@ static int get_file_sizes(struct thread_data *td) return err; } +struct fio_mount { + struct flist_head list; + const char *base; + char __base[256]; + unsigned int key; +}; + +/* + * Get free number of bytes for each file on each unique mount. + */ +static unsigned long long get_fs_free_counts(struct thread_data *td) +{ + struct flist_head *n, *tmp; + unsigned long long ret = 0; + struct fio_mount *fm; + FLIST_HEAD(list); + struct fio_file *f; + unsigned int i; + + for_each_file(td, f, i) { + struct stat sb; + char buf[256]; + + if (f->filetype == FIO_TYPE_BD || f->filetype == FIO_TYPE_CHAR) { + if (f->real_file_size != -1ULL) + ret += f->real_file_size; + continue; + } else if (f->filetype != FIO_TYPE_FILE) + continue; + + strcpy(buf, f->file_name); + + if (stat(buf, &sb) < 0) { + if (errno != ENOENT) + break; + strcpy(buf, "."); + if (stat(buf, &sb) < 0) + break; + } + + fm = NULL; + flist_for_each(n, &list) { + fm = flist_entry(n, struct fio_mount, list); + if (fm->key == sb.st_dev) + break; + + fm = NULL; + } + + if (fm) + continue; + + fm = malloc(sizeof(*fm)); + strcpy(fm->__base, buf); + fm->base = basename(fm->__base); + fm->key = sb.st_dev; + flist_add(&fm->list, &list); + } + + flist_for_each_safe(n, tmp, &list) { + unsigned long long sz; + + fm = flist_entry(n, struct fio_mount, list); + flist_del(&fm->list); + + sz = get_fs_size(fm->base); + if (sz && sz != -1ULL) + ret += sz; + + free(fm); + } + + return ret; +} + /* * Open the files and setup files sizes, creating files if necessary. */ @@ -533,6 +656,9 @@ int setup_files(struct thread_data *td) total_size += f->real_file_size; } + if (td->o.fill_device) + td->fill_device_size = get_fs_free_counts(td); + /* * device/file sizes are zero and no size given, punt */ @@ -607,7 +733,7 @@ int setup_files(struct thread_data *td) temp_stall_ts = 1; if (!terse_output) log_info("%s: Laying out IO file(s) (%u file(s) /" - " %LuMiB)\n", td->o.name, need_extend, + " %LuMB)\n", td->o.name, need_extend, extend_size >> 20); for_each_file(td, f, i) { @@ -620,7 +746,8 @@ int setup_files(struct thread_data *td) fio_file_clear_extend(f); if (!td->o.fill_device) { old_len = f->real_file_size; - extend_len = f->io_size + f->file_offset - old_len; + extend_len = f->io_size + f->file_offset - + old_len; } f->real_file_size = (f->io_size + f->file_offset); err = extend_file(td, f); @@ -709,8 +836,10 @@ void close_files(struct thread_data *td) struct fio_file *f; unsigned int i; - for_each_file(td, f, i) - td_io_close_file(td, f); + for_each_file(td, f, i) { + if (fio_file_open(f)) + td_io_close_file(td, f); + } } void close_and_free_files(struct thread_data *td) @@ -726,16 +855,15 @@ void close_and_free_files(struct thread_data *td) unlink(f->file_name); } - td_io_close_file(td, f); + if (fio_file_open(f)) + td_io_close_file(td, f); + remove_file_hash(f); sfree(f->file_name); f->file_name = NULL; - - if (f->file_map) { - sfree(f->file_map); - f->file_map = NULL; - } + sfree(f->file_map); + f->file_map = NULL; sfree(f); } @@ -755,7 +883,7 @@ static void get_file_type(struct fio_file *f) else f->filetype = FIO_TYPE_FILE; - if (!lstat(f->file_name, &sb)) { + if (!stat(f->file_name, &sb)) { if (S_ISBLK(sb.st_mode)) f->filetype = FIO_TYPE_BD; else if (S_ISCHR(sb.st_mode)) @@ -779,8 +907,9 @@ int add_file(struct thread_data *td, const char *fname) log_err("fio: smalloc OOM\n"); assert(0); } - + f->fd = -1; + fio_file_reset(f); if (td->files_size <= td->files_index) { int new_size = td->o.nr_files + 1; @@ -807,7 +936,7 @@ int add_file(struct thread_data *td, const char *fname) log_err("fio: smalloc OOM\n"); assert(0); } - + get_file_type(f); switch (td->o.file_lock_mode) { @@ -834,6 +963,19 @@ int add_file(struct thread_data *td, const char *fname) return cur_files; } +int add_file_exclusive(struct thread_data *td, const char *fname) +{ + struct fio_file *f; + unsigned int i; + + for_each_file(td, f, i) { + if (!strcmp(f->file_name, fname)) + return i; + } + + return add_file(td, fname); +} + void get_file(struct fio_file *f) { dprint(FD_FILE, "get file %s, ref=%d\n", f->file_name, f->references); @@ -847,8 +989,10 @@ int put_file(struct thread_data *td, struct fio_file *f) dprint(FD_FILE, "put file %s, ref=%d\n", f->file_name, f->references); - if (!fio_file_open(f)) + if (!fio_file_open(f)) { + assert(f->fd == -1); return 0; + } assert(f->references); if (--f->references) @@ -865,6 +1009,7 @@ int put_file(struct thread_data *td, struct fio_file *f) td->nr_open_files--; fio_file_clear_open(f); + assert(f->fd == -1); return ret; } @@ -1004,14 +1149,16 @@ void dup_files(struct thread_data *td, struct thread_data *org) log_err("fio: smalloc OOM\n"); assert(0); } - + __f->fd = -1; + fio_file_reset(__f); + if (f->file_name) { __f->file_name = smalloc_strdup(f->file_name); if (!__f->file_name) { log_err("fio: smalloc OOM\n"); assert(0); } - + __f->filetype = f->filetype; }