X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=filesetup.c;h=4cffd766a9f836ad910500d6f45aaece565e7da3;hb=fcef0b35e58d0d676b1560d563b518212f84e78b;hp=4d2017dbed798d045f3c2727debc64ef5d4238eb;hpb=4d4e80f2b4260f2c8b37a8612ce655502a799f7a;p=fio.git

diff --git a/filesetup.c b/filesetup.c
index 4d2017db..4cffd766 100644
--- 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,15 +99,18 @@ 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)
-		fsync(f->fd);
+	} else if (td->o.create_fsync) {
+		if (fsync(f->fd) < 0) {
+			td_verror(td, errno, "fsync");
+			goto err;
+		}
+	}
 
 	free(b);
 done:
-	close(f->fd);
-	f->fd = -1;
 	return 0;
 err:
 	close(f->fd);
@@ -112,11 +120,13 @@ err:
 
 static unsigned long long get_rand_file_size(struct thread_data *td)
 {
-	unsigned long long ret;
+	unsigned long long ret, size_d;
 	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)));
+	size_d = td->o.file_size_high - td->o.file_size_low;
+	ret = (unsigned long long) ((double) size_d * (r / (RAND_MAX + 1.0)));
+	ret += td->o.file_size_low;
 	ret -= (ret % td->o.rw_min_bs);
 	return ret;
 }
@@ -167,7 +177,8 @@ 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;
 	}
 
@@ -175,27 +186,33 @@ 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);
-	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) {
+		ret = madvise(f->mmap, len, 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;
@@ -206,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)
@@ -233,6 +259,7 @@ static int file_lookup_open(struct fio_file *f, int flags)
 
 	__f = lookup_file_hash(f->file_name);
 	if (__f) {
+		dprint(FD_FILE, "found file in hash %s\n", f->file_name);
 		/*
 		 * racy, need the __f->lock locked
 		 */
@@ -240,14 +267,13 @@ static int file_lookup_open(struct fio_file *f, int flags)
 		f->lock_owner = __f->lock_owner;
 		f->lock_batch = __f->lock_batch;
 		f->lock_ddir = __f->lock_ddir;
-		f->fd = dup(__f->fd);
-		f->references++;
 		from_hash = 1;
 	} else {
-		f->fd = open(f->file_name, flags, 0600);
+		dprint(FD_FILE, "file not found in hash %s\n", f->file_name);
 		from_hash = 0;
 	}
 
+	f->fd = open(f->file_name, flags, 0600);
 	return from_hash;
 }
 
@@ -282,9 +308,8 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
 
 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;
@@ -352,7 +377,8 @@ int open_files(struct thread_data *td)
 		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);
+				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);
@@ -383,6 +409,9 @@ 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);
+
 		if (td->io_ops->open_file(td, f)) {
 			if (td->error != ENOENT) {
 				log_err("%s\n", td->verror);
@@ -413,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
@@ -469,16 +501,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;
 
@@ -493,7 +528,7 @@ int setup_files(struct thread_data *td)
 			need_extend++;
 			extend_size += (f->io_size + f->file_offset);
 			f->flags |= FIO_FILE_EXTEND;
-		}	
+		}
 	}
 
 	if (!td->o.size || td->o.size > total_size)
@@ -508,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;
 	}
@@ -549,14 +595,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;
+		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");
+		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;
@@ -579,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);
 
@@ -596,6 +656,7 @@ void close_and_free_files(struct thread_data *td)
 
 	td->o.filename = NULL;
 	free(td->files);
+	td->files_index = 0;
 	td->files = NULL;
 	td->o.nr_files = 0;
 }
@@ -631,8 +692,9 @@ int add_file(struct thread_data *td, const char *fname)
 	f = smalloc(sizeof(*f));
 	f->fd = -1;
 
-	td->files = realloc(td->files, (cur_files + 1) * sizeof(f));
+	dprint(FD_FILE, "resize file array to %d files\n", cur_files + 1);
 
+	td->files = realloc(td->files, (cur_files + 1) * sizeof(f));
 	td->files[cur_files] = f;
 
 	/*
@@ -667,6 +729,9 @@ 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);
+
 	return cur_files;
 }
 
@@ -679,7 +744,7 @@ void get_file(struct fio_file *f)
 
 int put_file(struct thread_data *td, struct fio_file *f)
 {
-	int ret = 0;
+	int f_ret = 0, ret = 0;
 
 	dprint(FD_FILE, "put file %s, ref=%d\n", f->file_name, f->references);
 
@@ -691,11 +756,14 @@ int put_file(struct thread_data *td, struct fio_file *f)
 		return 0;
 
 	if (should_fsync(td) && td->o.fsync_on_close)
-		fsync(f->fd);
+		f_ret = fsync(f->fd);
 
 	if (td->io_ops->close_file)
 		ret = td->io_ops->close_file(td, f);
 
+	if (!ret)
+		ret = !f_ret;
+
 	td->nr_open_files--;
 	f->flags &= ~FIO_FILE_OPEN;
 	return ret;
@@ -798,7 +866,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;
 	}
 
@@ -820,16 +889,15 @@ void dup_files(struct thread_data *td, struct thread_data *org)
 {
 	struct fio_file *f;
 	unsigned int i;
-	size_t bytes;
+
+	dprint(FD_FILE, "dup files: %d\n", org->files_index);
 
 	if (!org->files)
 		return;
 
-	bytes = org->files_index * sizeof(f);
-	td->files = malloc(bytes);
-	memcpy(td->files, org->files, bytes);
+	td->files = malloc(org->files_index * sizeof(f));
 
-	for_each_file(td, f, i) {
+	for_each_file(org, f, i) {
 		struct fio_file *__f;
 
 		__f = smalloc(sizeof(*__f));