Fix refill buffers overwriting verify data

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 5c02f1c46408fb0e2f781f1ba15118e710935a4e..4cffd766a9f836ad910500d6f45aaece565e7da3 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -13,6 +13,9 @@
 
 static int root_warn;
 
+/*
+ * Leaves f->fd open on success, caller must close
+ */
 static int extend_file(struct thread_data *td, struct fio_file *f)
 {
        int r, new_layout = 0, unlink_file = 0, flags;
@@ -30,12 +33,14 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
         * does that for operations involving reads, or for writes
         * where overwrite is set
         */
-       if (td_read(td) || (td_write(td) && td->o.overwrite))
+       if (td_read(td) || (td_write(td) && td->o.overwrite) ||
+           (td_write(td) && td->io_ops->flags & FIO_NOEXTEND))
                new_layout = 1;
        if (td_write(td) && !td->o.overwrite)
                unlink_file = 1;
 
        if (unlink_file || new_layout) {
+               dprint(FD_FILE, "layout unlink %s\n", f->file_name);
                if ((unlink(f->file_name) < 0) && (errno != ENOENT)) {
                        td_verror(td, errno, "unlink");
                        return 1;
@@ -94,9 +99,10 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
                }
        }
 
-       if (td->terminate)
+       if (td->terminate) {
+               dprint(FD_FILE, "terminate unlink %s\n", f->file_name);
                unlink(f->file_name);
-       else if (td->o.create_fsync) {
+       } else if (td->o.create_fsync) {
                if (fsync(f->fd) < 0) {
                        td_verror(td, errno, "fsync");
                        goto err;
@@ -105,8 +111,6 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
 
        free(b);
 done:
-       close(f->fd);
-       f->fd = -1;
        return 0;
 err:
        close(f->fd);
@@ -182,23 +186,27 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
        return 0;
 }
 
-int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
+static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
+                                  unsigned long long off,
+                                  unsigned long long len)
 {
        int ret = 0;
 
-       dprint(FD_IO, "invalidate cache (%d)\n", td->o.odirect);
+       if (len == -1ULL)
+               len = f->io_size;
+       if (off == -1ULL)
+               off = f->file_offset;
 
-       if (td->o.odirect)
-               return 0;
+       dprint(FD_IO, "invalidate cache %s: %llu/%llu\n", f->file_name, off,
+                                                               len);
 
        /*
         * FIXME: add blockdev flushing too
         */
        if (f->mmap)
-               ret = madvise(f->mmap, f->io_size, MADV_DONTNEED);
+               ret = madvise(f->mmap, len, MADV_DONTNEED);
        else if (f->filetype == FIO_TYPE_FILE) {
-               ret = fadvise(f->fd, f->file_offset, f->io_size,
-                                               POSIX_FADV_DONTNEED);
+               ret = fadvise(f->fd, off, len, POSIX_FADV_DONTNEED);
        } else if (f->filetype == FIO_TYPE_BD) {
                ret = blockdev_invalidate_cache(f->fd);
                if (ret < 0 && errno == EACCES && geteuid()) {
@@ -215,9 +223,18 @@ int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
        if (ret < 0) {
                td_verror(td, errno, "invalidate_cache");
                return 1;
+       } else if (ret > 0) {
+               td_verror(td, ret, "invalidate_cache");
+               return 1;
        }
 
        return ret;
+
+}
+
+int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
+{
+       return __file_invalidate_cache(td, f, -1, -1);
 }
 
 int generic_close_file(struct thread_data fio_unused *td, struct fio_file *f)
@@ -425,6 +442,9 @@ int setup_files(struct thread_data *td)
 
        dprint(FD_FILE, "setup files\n");
 
+       if (td->o.read_iolog_file)
+               return 0;
+
        /*
         * if ioengine defines a setup() method, it's responsible for
         * opening the files and setting f->real_file_size to indicate
@@ -523,15 +543,26 @@ int setup_files(struct thread_data *td)
                        td->o.name, need_extend, extend_size >> 20);
 
                for_each_file(td, f, i) {
+                       unsigned long long old_len, extend_len;
+
                        if (!(f->flags & FIO_FILE_EXTEND))
                                continue;
 
                        assert(f->filetype == FIO_TYPE_FILE);
                        f->flags &= ~FIO_FILE_EXTEND;
+                       old_len = f->real_file_size;
+                       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);
                        if (err)
                                break;
+                       
+                       err = __file_invalidate_cache(td, f, old_len,
+                                                               extend_len);
+                       close(f->fd);
+                       f->fd = -1;
+                       if (err)
+                               break;
                }
                temp_stall_ts = 0;
        }
@@ -569,13 +600,21 @@ int init_random_map(struct thread_data *td)
                num_maps = (blocks + BLOCKS_PER_MAP - 1) /
                                (unsigned long long) BLOCKS_PER_MAP;
                f->file_map = smalloc(num_maps * sizeof(long));
-               if (!f->file_map) {
+               if (f->file_map) {
+                       f->num_maps = num_maps;
+                       continue;
+               }
+               if (!td->o.softrandommap) {
                        log_err("fio: failed allocating random map. If running"
                                " a large number of jobs, try the 'norandommap'"
-                               " option\n");
+                               " option or set 'softrandommap'. Or give"
+                               " a larger --alloc-size to fio.\n");
                        return 1;
                }
-               f->num_maps = num_maps;
+
+               log_info("fio: file %s failed allocating random map. Running "
+                        "job without.\n", f->file_name);
+               f->num_maps = 0;
        }
 
        return 0;
@@ -598,8 +637,10 @@ void close_and_free_files(struct thread_data *td)
        dprint(FD_FILE, "close files\n");
 
        for_each_file(td, f, i) {
-               if (td->o.unlink && f->filetype == FIO_TYPE_FILE)
+               if (td->o.unlink && f->filetype == FIO_TYPE_FILE) {
+                       dprint(FD_FILE, "free unlink %s\n", f->file_name);
                        unlink(f->file_name);
+               }
 
                td_io_close_file(td, f);