X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=15c431603718291d04b3ab50cf623ea6c83b80c7;hp=3eba27e13d24e4491c42132979e8bad917b00060;hb=22a57ba81de2c3f458797e9158da760c9e0ea435;hpb=e8670ef8b26039573fbf835b4b95ba45a1039d83

diff --git a/filesetup.c b/filesetup.c
index 3eba27e1..15c43160 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -13,6 +13,15 @@
 
 static int root_warn;
 
+static inline void clear_error(struct thread_data *td)
+{
+	td->error = 0;
+	td->verror[0] = '\0';
+}
+
+/*
+ * 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 +39,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;
@@ -56,18 +67,27 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
 	if (!new_layout)
 		goto done;
 
-	dprint(FD_FILE, "truncate file %s, size %llu\n", f->file_name,
+	/*
+	 * The size will be -1ULL when fill_device is used, so don't truncate
+	 * or fallocate this file, just write it
+	 */
+	if (!td->o.fill_device) {
+		dprint(FD_FILE, "truncate file %s, size %llu\n", f->file_name,
 							f->real_file_size);
-	if (ftruncate(f->fd, f->real_file_size) == -1) {
-		td_verror(td, errno, "ftruncate");
-		goto err;
-	}
+		if (ftruncate(f->fd, f->real_file_size) == -1) {
+			td_verror(td, errno, "ftruncate");
+			goto err;
+		}
 
-	dprint(FD_FILE, "fallocate file %s, size %llu\n", f->file_name,
+#ifdef FIO_HAVE_FALLOCATE
+		dprint(FD_FILE, "fallocate file %s, size %llu\n", f->file_name,
 							f->real_file_size);
-	if (posix_fallocate(f->fd, 0, f->real_file_size) < 0) {
-		td_verror(td, errno, "posix_fallocate");
-		goto err;
+		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]);
@@ -81,32 +101,47 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
 
 		r = write(f->fd, b, bs);
 
-		if (r == (int) bs) {
-			left -= bs;
+		if (r > 0) {
+			left -= r;
 			continue;
 		} else {
-			if (r < 0)
+			if (r < 0) {
+				int __e = errno;
+
+				if (__e == ENOSPC) {
+					if (td->o.fill_device)
+						break;
+					log_info("fio: ENOSPC on laying out "
+						 "file, stopping\n");
+					break;
+				}
 				td_verror(td, errno, "write");
-			else
+			} else
 				td_verror(td, EIO, "write");
 
 			break;
 		}
 	}
 
-	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;
 		}
 	}
+	if (td->o.fill_device && !td_write(td)) {
+		fio_file_clear_size_known(f);
+		if (td_io_get_file_size(td, f))
+			goto err;
+		if (f->io_size > f->real_file_size)
+			f->io_size = f->real_file_size;
+	}
 
 	free(b);
 done:
-	close(f->fd);
-	f->fd = -1;
 	return 0;
 err:
 	close(f->fd);
@@ -114,13 +149,63 @@ err:
 	return 1;
 }
 
+static int pre_read_file(struct thread_data *td, struct fio_file *f)
+{
+	int r, did_open = 0, old_runstate;
+	unsigned long long left;
+	unsigned int bs;
+	char *b;
+
+	if (!fio_file_open(f)) {
+		if (td->io_ops->open_file(td, f)) {
+			log_err("fio: cannot pre-read, failed to open file\n");
+			return 1;
+		}
+		did_open = 1;
+	}
+
+	old_runstate = td->runstate;
+	td_set_runstate(td, TD_PRE_READING);
+
+	bs = td->o.max_bs[DDIR_READ];
+	b = malloc(bs);
+	memset(b, 0, bs);
+
+	lseek(f->fd, f->file_offset, SEEK_SET);
+	left = f->io_size;
+
+	while (left && !td->terminate) {
+		if (bs > left)
+			bs = left;
+
+		r = read(f->fd, b, bs);
+
+		if (r == (int) bs) {
+			left -= bs;
+			continue;
+		} else {
+			td_verror(td, EIO, "pre_read");
+			break;
+		}
+	}
+
+	td_set_runstate(td, old_runstate);
+
+	if (did_open)
+		td->io_ops->close_file(td, f);
+	free(b);
+	return 0;
+}
+
 static unsigned long long get_rand_file_size(struct thread_data *td)
 {
-	unsigned long long ret;
+	unsigned long long ret, sized;
 	long r;
 
 	r = os_random_long(&td->file_size_state);
-	ret = td->o.file_size_low + (unsigned long long) ((double) (td->o.file_size_high - td->o.file_size_low) * (r / (RAND_MAX + 1.0)));
+	sized = td->o.file_size_high - td->o.file_size_low;
+	ret = (unsigned long long) ((double) sized * (r / (OS_RAND_MAX + 1.0)));
+	ret += td->o.file_size_low;
 	ret -= (ret % td->o.rw_min_bs);
 	return ret;
 }
@@ -129,7 +214,7 @@ static int file_size(struct thread_data *td, struct fio_file *f)
 {
 	struct stat st;
 
-	if (fstat(f->fd, &st) == -1) {
+	if (stat(f->file_name, &st) == -1) {
 		td_verror(td, errno, "fstat");
 		return 1;
 	}
@@ -143,21 +228,36 @@ static int bdev_size(struct thread_data *td, struct fio_file *f)
 	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 = blockdev_size(f->fd, &bytes);
 	if (r) {
 		td_verror(td, r, "blockdev_size");
-		return 1;
+		goto err;
+	}
+
+	if (!bytes) {
+		log_err("%s: zero sized block 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;
 }
 
 static int get_file_size(struct thread_data *td, struct fio_file *f)
 {
 	int ret = 0;
 
-	if (f->flags & FIO_SIZE_KNOWN)
+	if (fio_file_size_known(f))
 		return 0;
 
 	if (f->filetype == FIO_TYPE_FILE)
@@ -171,35 +271,45 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
 		return ret;
 
 	if (f->file_offset > f->real_file_size) {
-		log_err("%s: offset extends end (%Lu > %Lu)\n", td->o.name, f->file_offset, f->real_file_size);
+		log_err("%s: offset extends end (%Lu > %Lu)\n", td->o.name,
+					f->file_offset, f->real_file_size);
 		return 1;
 	}
 
-	f->flags |= FIO_SIZE_KNOWN;
+	fio_file_set_size_known(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)
+	if (len == -1ULL || off == -1ULL)
 		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);
-	else if (f->filetype == FIO_TYPE_FILE)
-		ret = fadvise(f->fd, f->file_offset, f->io_size, POSIX_FADV_DONTNEED);
-	else if (f->filetype == FIO_TYPE_BD) {
+	if (f->mmap_ptr)
+		ret = madvise(f->mmap_ptr, f->mmap_sz, MADV_DONTNEED);
+	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);
 		if (ret < 0 && errno == EACCES && geteuid()) {
 			if (!root_warn) {
-				log_err("fio: only root may flush block devices. Cache flush bypassed!\n");
+				log_err("fio: only root may flush block "
+					"devices. Cache flush bypassed!\n");
 				root_warn = 1;
 			}
 			ret = 0;
@@ -210,9 +320,21 @@ 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)
+{
+	if (!fio_file_open(f))
+		return 0;
+
+	return __file_invalidate_cache(td, f, -1ULL, -1ULL);
 }
 
 int generic_close_file(struct thread_data fio_unused *td, struct fio_file *f)
@@ -282,13 +404,14 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
 	if (td->o.sync_io)
 		flags |= O_SYNC;
 	if (f->filetype != FIO_TYPE_FILE)
-		flags |= O_NOATIME;
+		flags |= FIO_O_NOATIME;
+	if (td->o.create_on_open)
+		flags |= O_CREAT;
 
 open_again:
 	if (td_write(td)) {
-		assert(!read_only);
-
-		flags |= O_RDWR;
+		if (!read_only)
+			flags |= O_RDWR;
 
 		if (f->filetype == FIO_TYPE_FILE)
 			flags |= O_CREAT;
@@ -313,8 +436,8 @@ open_again:
 		char buf[FIO_VERROR_SIZE];
 		int __e = errno;
 
-		if (errno == EPERM && (flags & O_NOATIME)) {
-			flags &= ~O_NOATIME;
+		if (errno == EPERM && (flags & FIO_O_NOATIME)) {
+			flags &= ~FIO_O_NOATIME;
 			goto open_again;
 		}
 
@@ -323,9 +446,6 @@ open_again:
 		td_verror(td, __e, buf);
 	}
 
-	if (get_file_size(td, f))
-		goto err;
-
 	if (!from_hash && f->fd != -1) {
 		if (add_file_hash(f)) {
 			int ret;
@@ -339,42 +459,11 @@ open_again:
 	}
 
 	return 0;
-err:
-	close(f->fd);
-	return 1;
 }
 
-int open_files(struct thread_data *td)
+int generic_get_file_size(struct thread_data *td, struct fio_file *f)
 {
-	struct fio_file *f;
-	unsigned int i;
-	int err = 0;
-
-	dprint(FD_FILE, "open files\n");
-
-	for_each_file(td, f, i) {
-		err = td_io_open_file(td, f);
-		if (err) {
-			if (td->error == EMFILE) {
-				log_err("fio: limited open files to: %d\n", td->nr_open_files);
-				td->o.open_files = td->nr_open_files;
-				err = 0;
-				clear_error(td);
-			}
-			break;
-		}
-
-		if (td->o.open_files == td->nr_open_files)
-			break;
-	}
-
-	if (!err)
-		return 0;
-
-	for_each_file(td, f, i)
-		td_io_close_file(td, f);
-
-	return err;
+	return get_file_size(td, f);
 }
 
 /*
@@ -387,17 +476,15 @@ static int get_file_sizes(struct thread_data *td)
 	int err = 0;
 
 	for_each_file(td, f, i) {
-		dprint(FD_FILE, "get file size for %p/%d/%p\n", f, i, f->file_name);
+		dprint(FD_FILE, "get file size for %p/%d/%p\n", f, i,
+								f->file_name);
 
-		if (td->io_ops->open_file(td, f)) {
+		if (td_io_get_file_size(td, f)) {
 			if (td->error != ENOENT) {
 				log_err("%s\n", td->verror);
 				err = 1;
 			}
 			clear_error(td);
-		} else {
-			if (td->io_ops->close_file)
-				td->io_ops->close_file(td, f);
 		}
 
 		if (f->real_file_size == -1ULL && td->o.size)
@@ -419,6 +506,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
@@ -475,16 +565,19 @@ int setup_files(struct thread_data *td)
 				f->io_size = f->real_file_size - f->file_offset;
 		} else if (f->real_file_size < td->o.file_size_low ||
 			   f->real_file_size > td->o.file_size_high) {
-			if (f->file_offset > td->o.file_size_low) 
+			if (f->file_offset > td->o.file_size_low)
 				goto err_offset;
 			/*
 			 * file size given. if it's fixed, use that. if it's a
 			 * range, generate a random size in-between.
 			 */
-			if (td->o.file_size_low == td->o.file_size_high)
-				f->io_size = td->o.file_size_low - f->file_offset;
-			else
-				f->io_size = get_rand_file_size(td) - f->file_offset;
+			if (td->o.file_size_low == td->o.file_size_high) {
+				f->io_size = td->o.file_size_low
+						- f->file_offset;
+			} else {
+				f->io_size = get_rand_file_size(td)
+						- f->file_offset;
+			}
 		} else
 			f->io_size = f->real_file_size - f->file_offset;
 
@@ -496,10 +589,13 @@ int setup_files(struct thread_data *td)
 		if (f->filetype == FIO_TYPE_FILE &&
 		    (f->io_size + f->file_offset) > f->real_file_size &&
 		    !(td->io_ops->flags & FIO_DISKLESSIO)) {
-			need_extend++;
-			extend_size += (f->io_size + f->file_offset);
-			f->flags |= FIO_FILE_EXTEND;
-		}	
+			if (!td->o.create_on_open) {
+				need_extend++;
+				extend_size += (f->io_size + f->file_offset);
+			} else
+				f->real_file_size = f->io_size + f->file_offset;
+			fio_file_set_extend(f);
+		}
 	}
 
 	if (!td->o.size || td->o.size > total_size)
@@ -510,19 +606,34 @@ int setup_files(struct thread_data *td)
 	 */
 	if (need_extend) {
 		temp_stall_ts = 1;
-		log_info("%s: Laying out IO file(s) (%u file(s) / %LuMiB)\n",
-			td->o.name, need_extend, extend_size >> 20);
+		if (!terse_output)
+			log_info("%s: Laying out IO file(s) (%u file(s) /"
+				 " %LuMiB)\n", td->o.name, need_extend,
+					extend_size >> 20);
 
 		for_each_file(td, f, i) {
-			if (!(f->flags & FIO_FILE_EXTEND))
+			unsigned long long old_len = -1ULL, extend_len = -1ULL;
+
+			if (!fio_file_extend(f))
 				continue;
 
 			assert(f->filetype == FIO_TYPE_FILE);
-			f->flags &= ~FIO_FILE_EXTEND;
+			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;
+			}
 			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;
 	}
@@ -545,6 +656,20 @@ err_offset:
 	return 1;
 }
 
+int pre_read_files(struct thread_data *td)
+{
+	struct fio_file *f;
+	unsigned int i;
+
+	dprint(FD_FILE, "pre_read files\n");
+
+	for_each_file(td, f, i) {
+		pre_read_file(td, f);
+	}
+
+	return 1;
+}
+
 int init_random_map(struct thread_data *td)
 {
 	unsigned long long blocks, num_maps;
@@ -555,14 +680,26 @@ int init_random_map(struct thread_data *td)
 		return 0;
 
 	for_each_file(td, f, i) {
-		blocks = (f->real_file_size + td->o.rw_min_bs - 1) / (unsigned long long) td->o.rw_min_bs;
-		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) {
-			log_err("fio: failed allocating random map. If running a large number of jobs, try the 'norandommap' option\n");
+		blocks = (f->real_file_size + td->o.rw_min_bs - 1) /
+				(unsigned long long) td->o.rw_min_bs;
+		num_maps = (blocks + BLOCKS_PER_MAP - 1) /
+				(unsigned long long) BLOCKS_PER_MAP;
+		f->file_map = smalloc(num_maps * sizeof(int));
+		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 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;
@@ -585,10 +722,15 @@ 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);
+		if (fio_file_open(f))
+			td_io_close_file(td, f);
+
+		remove_file_hash(f);
 
 		sfree(f->file_name);
 		f->file_name = NULL;
@@ -636,11 +778,21 @@ int add_file(struct thread_data *td, const char *fname)
 	dprint(FD_FILE, "add file %s\n", fname);
 
 	f = smalloc(sizeof(*f));
+	if (!f) {
+		log_err("fio: smalloc OOM\n");
+		assert(0);
+	}
+		
 	f->fd = -1;
 
-	dprint(FD_FILE, "resize file array to %d files\n", cur_files + 1);
+	if (td->files_size <= td->files_index) {
+		int new_size = td->o.nr_files + 1;
 
-	td->files = realloc(td->files, (cur_files + 1) * sizeof(f));
+		dprint(FD_FILE, "resize file array to %d files\n", new_size);
+
+		td->files = realloc(td->files, new_size * sizeof(f));
+		td->files_size = new_size;
+	}
 	td->files[cur_files] = f;
 
 	/*
@@ -654,7 +806,11 @@ int add_file(struct thread_data *td, const char *fname)
 
 	sprintf(file_name + len, "%s", fname);
 	f->file_name = smalloc_strdup(file_name);
-
+	if (!f->file_name) {
+		log_err("fio: smalloc OOM\n");
+		assert(0);
+	}
+	
 	get_file_type(f);
 
 	switch (td->o.file_lock_mode) {
@@ -675,7 +831,8 @@ int add_file(struct thread_data *td, const char *fname)
 	if (f->filetype == FIO_TYPE_FILE)
 		td->nr_normal_files++;
 
-	dprint(FD_FILE, "file %p \"%s\" added at %d\n", f, f->file_name, cur_files);
+	dprint(FD_FILE, "file %p \"%s\" added at %d\n", f, f->file_name,
+							cur_files);
 
 	return cur_files;
 }
@@ -683,7 +840,7 @@ int add_file(struct thread_data *td, const char *fname)
 void get_file(struct fio_file *f)
 {
 	dprint(FD_FILE, "get file %s, ref=%d\n", f->file_name, f->references);
-	assert(f->flags & FIO_FILE_OPEN);
+	assert(fio_file_open(f));
 	f->references++;
 }
 
@@ -693,8 +850,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 (!(f->flags & FIO_FILE_OPEN))
+	if (!fio_file_open(f)) {
+		assert(f->fd == -1);
 		return 0;
+	}
 
 	assert(f->references);
 	if (--f->references)
@@ -707,10 +866,11 @@ int put_file(struct thread_data *td, struct fio_file *f)
 		ret = td->io_ops->close_file(td, f);
 
 	if (!ret)
-		ret = !f_ret;
+		ret = f_ret;
 
 	td->nr_open_files--;
-	f->flags &= ~FIO_FILE_OPEN;
+	fio_file_clear_open(f);
+	assert(f->fd == -1);
 	return ret;
 }
 
@@ -811,7 +971,8 @@ static int recurse_dir(struct thread_data *td, const char *dirname)
 		if (!S_ISDIR(sb.st_mode))
 			continue;
 
-		if ((ret = recurse_dir(td, full_path)) != 0)
+		ret = recurse_dir(td, full_path);
+		if (ret)
 			break;
 	}
 
@@ -845,9 +1006,21 @@ void dup_files(struct thread_data *td, struct thread_data *org)
 		struct fio_file *__f;
 
 		__f = smalloc(sizeof(*__f));
-
-		if (f->file_name)
+		if (!__f) {
+			log_err("fio: smalloc OOM\n");
+			assert(0);
+		}
+		__f->fd = -1;
+	
+		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;
+		}
 
 		td->files[i] = __f;
 	}