X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=c99d5b36dad8195129d40c048eb966d36caebae0;hp=0abce8cbfe5b685d67518690eb3fcc8c675f4d96;hb=317b95d07d4921d2594a1be6e014c9c2d062fe75;hpb=1d56dfee7857b91d1805d90396f36d62ad30e186

diff --git a/filesetup.c b/filesetup.c
index 0abce8cb..c99d5b36 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -8,52 +8,50 @@
 #include <sys/types.h>
 
 #include "fio.h"
-#include "os.h"
 
-/*
- * Check if the file exists and it's large enough.
- */
-static int file_ok(struct thread_data *td, struct fio_file *f)
+static int extend_file(struct thread_data *td, struct fio_file *f)
 {
-	struct stat st;
-
-	if (f->filetype != FIO_TYPE_FILE ||
-	    (td->io_ops->flags & FIO_DISKLESSIO))
-		return 0;
-
-	if (lstat(f->file_name, &st) == -1)
-		return 1;
+	int r, new_layout = 0, unlink_file = 0, flags;
+	unsigned long long left;
+	unsigned int bs;
+	char *b;
 
 	/*
-	 * if it's a special file, size is always ok for now
+	 * check if we need to lay the file out complete again. fio
+	 * does that for operations involving reads, or for writes
+	 * where overwrite is set
 	 */
-	if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode))
-		return 0;
-	if (st.st_size < (off_t) f->file_size)
-		return 1;
-
-	return 0;
-}
+	if (td_read(td) || (td_write(td) && td->o.overwrite))
+		new_layout = 1;
+	if (td_write(td) && !td->o.overwrite)
+		unlink_file = 1;
+
+	if ((unlink_file || new_layout) && (f->flags & FIO_FILE_EXISTS)) {
+		if (unlink(f->file_name) < 0) {
+			td_verror(td, errno, "unlink");
+			return 1;
+		}
+	}
 
-static int create_file(struct thread_data *td, struct fio_file *f)
-{
-	unsigned long long left;
-	unsigned int bs;
-	char *b;
-	int r;
+	flags = O_WRONLY | O_CREAT;
+	if (new_layout)
+		flags |= O_TRUNC;
 
-	f->fd = open(f->file_name, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+	f->fd = open(f->file_name, flags, 0644);
 	if (f->fd < 0) {
 		td_verror(td, errno, "open");
 		return 1;
 	}
 
-	if (ftruncate(f->fd, f->file_size) == -1) {
+	if (ftruncate(f->fd, f->real_file_size) == -1) {
 		td_verror(td, errno, "ftruncate");
 		goto err;
 	}
 
-	if (posix_fallocate(f->fd, 0, f->file_size) < 0) {
+	if (!new_layout)
+		goto done;
+
+	if (posix_fallocate(f->fd, 0, f->real_file_size) < 0) {
 		td_verror(td, errno, "posix_fallocate");
 		goto err;
 	}
@@ -61,7 +59,7 @@ static int create_file(struct thread_data *td, struct fio_file *f)
 	b = malloc(td->o.max_bs[DDIR_WRITE]);
 	memset(b, 0, td->o.max_bs[DDIR_WRITE]);
 
-	left = f->file_size;
+	left = f->real_file_size;
 	while (left && !td->terminate) {
 		bs = td->o.max_bs[DDIR_WRITE];
 		if (bs > left)
@@ -88,6 +86,7 @@ static int create_file(struct thread_data *td, struct fio_file *f)
 		fsync(f->fd);
 
 	free(b);
+done:
 	close(f->fd);
 	f->fd = -1;
 	return 0;
@@ -97,190 +96,27 @@ err:
 	return 1;
 }
 
-static unsigned long long set_rand_file_size(struct thread_data *td,
-					     unsigned long long total_size)
+static unsigned long long get_rand_file_size(struct thread_data *td)
 {
-	unsigned long long upper = total_size;
 	unsigned long long ret;
 	long r;
 
-	if (upper > td->o.file_size_high)
-		upper = td->o.file_size_high;
-	else if (upper < td->o.file_size_low)
-		return 0;
-	else if (!upper)
-		return 0;
-
 	r = os_random_long(&td->file_size_state);
-	ret = td->o.file_size_low + (unsigned long long) ((double) upper * (r / (RAND_MAX + 1.0)));
+	ret = td->o.file_size_low + (unsigned long long) ((double) td->o.file_size_high * (r / (RAND_MAX + 1.0)));
 	ret -= (ret % td->o.rw_min_bs);
-	if (ret > upper)
-		ret = upper;
 	return ret;
 }
 
-static int fill_file_size(struct thread_data *td, struct fio_file *f,
-			  unsigned long long *file_size, int new_files)
-{
-	if (!td->o.file_size_low) {
-		f->file_size = *file_size / new_files;
-		f->real_file_size = f->file_size;
-	} else {
-		/*
-		 * If we don't have enough space left for a file
-		 * of the minimum size, bail.
-		 */
-		if (*file_size < td->o.file_size_low)
-			return 1;
-
-		f->file_size = set_rand_file_size(td, *file_size);
-		f->real_file_size = f->file_size;
-		*file_size -= f->file_size;
-	}
-
-	return 0;
-}
-
-static int create_files(struct thread_data *td)
-{
-	struct fio_file *f;
-	int err, need_create, can_extend;
-	unsigned long long total_file_size, local_file_size, create_size;
-	unsigned int i, new_files;
-
-	new_files = 0;
-	total_file_size = td->o.size;
-	for_each_file(td, f, i) {
-		unsigned long long s;
-
-		f->file_offset = td->o.start_offset;
-
-		if (!total_file_size)
-			continue;
-
-		if (f->filetype != FIO_TYPE_FILE) {
-			if (!f->file_size)
-				f->file_size = total_file_size / td->o.nr_files;
-			continue;
-		}
-
-		if (f->flags & FIO_FILE_EXISTS) {
-			if ((f->file_size > td->o.size / td->o.nr_files) ||
-			    !f->file_size)
-				f->file_size = td->o.size / td->o.nr_files;
-
-			s = f->file_size;
-			if (s > total_file_size)
-				s = total_file_size;
-
-			total_file_size -= s;
-		} else
-			new_files++;
-	}
-
-	/*
-	 * unless specifically asked for overwrite, let normal io extend it
-	 */
-	can_extend = !td->o.overwrite && !(td->io_ops->flags & FIO_NOEXTEND);
-	if (can_extend && new_files) {
-		for_each_file(td, f, i) {
-			if (fill_file_size(td, f, &total_file_size, new_files)) {
-				log_info("fio: limited to %d files\n", i);
-				td->o.nr_files = i;
-				break;
-			}
-		}
-
-		return 0;
-	}
-
-	local_file_size = total_file_size;
-	if (!local_file_size)
-		local_file_size = -1;
-
-	total_file_size = 0;
-	need_create = 0;
-	create_size = 0;
-	for_each_file(td, f, i) {
-		int file_there;
-
-		if (f->filetype != FIO_TYPE_FILE)
-			continue;
-		if (f->flags & FIO_FILE_EXISTS) {
-			total_file_size += f->file_size;
-			continue;
-		}
-
-		if (fill_file_size(td, f, &local_file_size, new_files)) {
-			log_info("fio: limited to %d files\n", i);
-			new_files -= (td->o.nr_files - i);
-			td->o.nr_files = i;
-			break;
-		}
-
-		total_file_size += f->file_size;
-		create_size += f->file_size;
-		file_there = !file_ok(td, f);
-
-		if (file_there && td_write(td) && !td->o.overwrite) {
-			unlink(f->file_name);
-			file_there = 0;
-		}
-
-		need_create += !file_there;
-	}
-
-	if (!need_create)
-		return 0;
-
-	if (!td->o.size && !total_file_size) {
-		log_err("Need size for create\n");
-		td_verror(td, EINVAL, "file_size");
-		return 1;
-	}
-
-	temp_stall_ts = 1;
-	log_info("%s: Laying out IO file(s) (%u files / %LuMiB)\n",
-				td->o.name, new_files, create_size >> 20);
-
-	err = 0;
-	for_each_file(td, f, i) {
-		/*
-		 * Only unlink files that we created.
-		 */
-		f->flags &= ~FIO_FILE_UNLINK;
-		if (file_ok(td, f)) {
-			if (td->o.unlink)
-				f->flags |= FIO_FILE_UNLINK;
-
-			f->flags |= FIO_FILE_NOSORT;
-			err = create_file(td, f);
-			if (err)
-				break;
-		}
-	}
-
-	temp_stall_ts = 0;
-	return err;
-}
-
 static int file_size(struct thread_data *td, struct fio_file *f)
 {
 	struct stat st;
 
-	if (td->o.overwrite) {
-		if (fstat(f->fd, &st) == -1) {
-			td_verror(td, errno, "fstat");
-			return 1;
-		}
-
-		f->real_file_size = st.st_size;
-
-		if (!f->file_size || f->file_size > f->real_file_size)
-			f->file_size = f->real_file_size;
-	} else
-		f->real_file_size = f->file_size;
+	if (fstat(f->fd, &st) == -1) {
+		td_verror(td, errno, "fstat");
+		return 1;
+	}
 
+	f->real_file_size = st.st_size;
 	return 0;
 }
 
@@ -296,14 +132,6 @@ static int bdev_size(struct thread_data *td, struct fio_file *f)
 	}
 
 	f->real_file_size = bytes;
-
-	/*
-	 * no extend possibilities, so limit size to device size if too large
-	 */
-	if (!f->file_size || f->file_size > f->real_file_size)
-		f->file_size = f->real_file_size;
-
-	f->file_size -= f->file_offset;
 	return 0;
 }
 
@@ -311,10 +139,12 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
 {
 	int ret = 0;
 
-	if (f->filetype == FIO_TYPE_FILE) {
-		if (!(f->flags & FIO_FILE_EXISTS))
-			ret = file_size(td, f);
-	} else if (f->filetype == FIO_TYPE_BD)
+	if (f->flags & FIO_SIZE_KNOWN)
+		return 0;
+
+	if (f->filetype == FIO_TYPE_FILE)
+		ret = file_size(td, f);
+	else if (f->filetype == FIO_TYPE_BD)
 		ret = bdev_size(td, f);
 	else
 		f->real_file_size = -1;
@@ -327,6 +157,7 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
 		return 1;
 	}
 
+	f->flags |= FIO_SIZE_KNOWN;
 	return 0;
 }
 
@@ -341,12 +172,16 @@ int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
 	 * FIXME: add blockdev flushing too
 	 */
 	if (f->mmap)
-		ret = madvise(f->mmap, f->file_size, MADV_DONTNEED);
+		ret = madvise(f->mmap, f->io_size, MADV_DONTNEED);
 	else if (f->filetype == FIO_TYPE_FILE)
-		ret = fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_DONTNEED);
-	else if (f->filetype == FIO_TYPE_BD)
+		ret = fadvise(f->fd, f->file_offset, f->io_size, POSIX_FADV_DONTNEED);
+	else if (f->filetype == FIO_TYPE_BD) {
 		ret = blockdev_invalidate_cache(f->fd);
-	else if (f->filetype == FIO_TYPE_CHAR)
+		if (ret < 0 && errno == EACCES && geteuid()) {
+			log_err("fio: only root may flush block devices. Cache flush bypassed!\n");
+			ret = 0;
+		}
+	} else if (f->filetype == FIO_TYPE_CHAR)
 		ret = 0;
 
 	if (ret < 0) {
@@ -395,34 +230,11 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
 		snprintf(buf, sizeof(buf) - 1, "open(%s)", f->file_name);
 
 		td_verror(td, __e, buf);
-		if (__e == EINVAL && td->o.odirect)
-			log_err("fio: destination does not support O_DIRECT\n");
-		if (__e == EMFILE)
-			log_err("fio: try reducing/setting openfiles (failed at %u of %u)\n", td->nr_open_files, td->o.nr_files);
-		return 1;
 	}
 
 	if (get_file_size(td, f))
 		goto err;
 
-	if (td->o.invalidate_cache && file_invalidate_cache(td, f))
-		goto err;
-
-	if (!td->o.fadvise_hint)
-		return 0;
-
-	if (!td_random(td)) {
-		if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_SEQUENTIAL) < 0) {
-			td_verror(td, errno, "fadvise");
-			goto err;
-		}
-	} else {
-		if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_RANDOM) < 0) {
-			td_verror(td, errno, "fadvise");
-			goto err;
-		}
-	}
-
 	return 0;
 err:
 	close(f->fd);
@@ -437,8 +249,15 @@ int open_files(struct thread_data *td)
 
 	for_each_file(td, f, i) {
 		err = td_io_open_file(td, f);
-		if (err)
+		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;
@@ -453,49 +272,151 @@ int open_files(struct thread_data *td)
 	return err;
 }
 
+/*
+ * open/close all files, so that ->real_file_size gets set
+ */
+static int get_file_sizes(struct thread_data *td)
+{
+	struct fio_file *f;
+	unsigned int i;
+	int err = 0;
+
+	for_each_file(td, f, i) {
+		if (td->io_ops->open_file(td, f)) {
+			log_err("%s\n", td->verror);
+			err = 1;
+			clear_error(td);
+		} else
+			td->io_ops->close_file(td, f);
+
+		if (f->real_file_size == -1ULL && td->o.size)
+			f->real_file_size = td->o.size / td->o.nr_files;
+	}
+
+	return err;
+}
+
+/*
+ * Open the files and setup files sizes, creating files if necessary.
+ */
 int setup_files(struct thread_data *td)
 {
+	unsigned long long total_size, extend_size;
 	struct fio_file *f;
 	unsigned int i;
-	int err;
+	int err = 0, need_extend;
 
 	/*
 	 * if ioengine defines a setup() method, it's responsible for
-	 * setting up everything in the td->files[] area.
+	 * opening the files and setting f->real_file_size to indicate
+	 * the valid range for that file.
 	 */
 	if (td->io_ops->setup)
-		return td->io_ops->setup(td);
-
-	if (create_files(td))
-		return 1;
+		err = td->io_ops->setup(td);
+	else
+		err = get_file_sizes(td);
 
-	err = open_files(td);
 	if (err)
 		return err;
 
 	/*
-	 * Recalculate the total file size now that files are set up.
+	 * check sizes. if the files/devices do not exist and the size
+	 * isn't passed to fio, abort.
 	 */
-	td->o.size = 0;
-	for_each_file(td, f, i)
-		td->o.size += f->file_size;
+	total_size = 0;
+	for_each_file(td, f, i) {
+		if (f->real_file_size == -1ULL)
+			total_size = -1ULL;
+		else
+			total_size += f->real_file_size;
+	}
 
-	td->io_size = td->o.size;
-	if (td->io_size == 0) {
-		log_err("%s: no io blocks\n", td->o.name);
+	/*
+	 * device/file sizes are zero and no size given, punt
+	 */
+	if ((!total_size || total_size == -1ULL) && !td->o.size) {
+		log_err("%s: you need to specify size=\n", td->o.name);
 		td_verror(td, EINVAL, "total_file_size");
 		return 1;
 	}
 
-	if (!td->o.zone_size)
-		td->o.zone_size = td->io_size;
+	/*
+	 * now file sizes are known, so we can set ->io_size. if size= is
+	 * not given, ->io_size is just equal to ->real_file_size. if size
+	 * is given, ->io_size is size / nr_files.
+	 */
+	extend_size = total_size = 0;
+	need_extend = 0;
+	for_each_file(td, f, i) {
+		if (!td->o.file_size_low) {
+			/*
+			 * no file size range given, file size is equal to
+			 * total size divided by number of files. if that is
+			 * zero, set it to the real file size.
+			 */
+			f->io_size = td->o.size / td->o.nr_files;
+			if (!f->io_size)
+				f->io_size = f->real_file_size;
+		} else if (f->real_file_size < td->o.file_size_low ||
+			   f->real_file_size > td->o.file_size_high) {
+			/*
+			 * 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;
+			else
+				f->io_size = get_rand_file_size(td);
+		} else
+			f->io_size = f->real_file_size;
 
-	td->total_io_size = td->io_size * td->o.loops;
+		if (f->io_size == -1ULL)
+			total_size = -1ULL;
+		else
+			total_size += f->io_size;
+
+		if (f->filetype == FIO_TYPE_FILE &&
+		    f->io_size > f->real_file_size &&
+		    !(td->io_ops->flags & FIO_DISKLESSIO)) {
+			need_extend++;
+			extend_size += f->io_size;
+			f->flags |= FIO_FILE_EXTEND;
+		}
+	}
 
-	for_each_file(td, f, i)
-		td_io_close_file(td, f);
+	if (!td->o.size)
+		td->o.size = total_size;
 
-	return err;
+	/*
+	 * See if we need to extend some files
+	 */
+	if (need_extend) {
+		temp_stall_ts = 1;
+		log_info("%s: Laying out IO file(s) (%u files / %LuMiB)\n",
+			td->o.name, need_extend, extend_size >> 20);
+
+		for_each_file(td, f, i) {
+			if (!(f->flags & FIO_FILE_EXTEND))
+				continue;
+
+			assert(f->filetype == FIO_TYPE_FILE);
+			f->flags &= ~FIO_FILE_EXTEND;
+			f->real_file_size = f->io_size;
+			err = extend_file(td, f);
+			if (err)
+				break;
+		}
+		temp_stall_ts = 0;
+	}
+
+	if (err)
+		return err;
+
+	if (!td->o.zone_size)
+		td->o.zone_size = td->o.size;
+
+	td->total_io_size = td->o.size * td->o.loops;
+	return 0;
 }
 
 int init_random_map(struct thread_data *td)
@@ -556,19 +477,10 @@ static void get_file_type(struct fio_file *f)
 	f->filetype = FIO_TYPE_FILE;
 
 	if (!lstat(f->file_name, &sb)) {
-		f->flags |= FIO_FILE_EXISTS;
-
 		if (S_ISBLK(sb.st_mode))
 			f->filetype = FIO_TYPE_BD;
 		else if (S_ISCHR(sb.st_mode))
 			f->filetype = FIO_TYPE_CHAR;
-		else {
-			/*
-			 * might as well do this here, and save a stat later on
-			 */
-			f->real_file_size = sb.st_size;
-			f->file_size = f->real_file_size;
-		}
 	}
 }
 
@@ -617,6 +529,7 @@ void put_file(struct thread_data *td, struct fio_file *f)
 
 	if (td->io_ops->close_file)
 		td->io_ops->close_file(td, f);
+
 	td->nr_open_files--;
 	f->flags &= ~FIO_FILE_OPEN;
 }
@@ -629,7 +542,10 @@ static int recurse_dir(struct thread_data *td, const char *dirname)
 
 	D = opendir(dirname);
 	if (!D) {
-		td_verror(td, errno, "opendir");
+		char buf[FIO_VERROR_SIZE];
+
+		snprintf(buf, FIO_VERROR_SIZE - 1, "opendir(%s)", dirname);
+		td_verror(td, errno, buf);
 		return 1;
 	}
 
@@ -654,6 +570,8 @@ static int recurse_dir(struct thread_data *td, const char *dirname)
 			td->o.nr_files++;
 			continue;
 		}
+		if (!S_ISDIR(sb.st_mode))
+			continue;
 
 		if ((ret = recurse_dir(td, full_path)) != 0)
 			break;
@@ -665,7 +583,12 @@ static int recurse_dir(struct thread_data *td, const char *dirname)
 
 int add_dir_files(struct thread_data *td, const char *path)
 {
-	return recurse_dir(td, path);
+	int ret = recurse_dir(td, path);
+
+	if (!ret)
+		log_info("fio: opendir added %d files\n", td->o.nr_files);
+
+	return ret;
 }
 
 void dup_files(struct thread_data *td, struct thread_data *org)