X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=0b297641b11da6277b2b2c753c8d8cd6ccf11468;hp=6c5770b463b035b6a77cbe7300855a65967eff8f;hb=8e55e8c8bcb1a0068609df61047b7a1c3bba10f9;hpb=303032ae4e13c7ac10b8198c40df98d95a4524a6

diff --git a/filesetup.c b/filesetup.c
index 6c5770b4..0b297641 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;
@@ -65,12 +68,13 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
 		goto err;
 	}
 
+#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]);
 	memset(b, 0, td->o.max_bs[DDIR_WRITE]);
@@ -108,8 +112,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);
@@ -185,23 +187,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()) {
@@ -218,9 +224,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 (!(f->flags & FIO_FILE_OPEN))
+		return 0;
+
+	return __file_invalidate_cache(td, f, -1, -1);
 }
 
 int generic_close_file(struct thread_data fio_unused *td, struct fio_file *f)
@@ -290,7 +308,7 @@ 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;
 
 open_again:
 	if (td_write(td)) {
@@ -320,8 +338,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;
 		}
 
@@ -529,15 +547,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;
 	}
@@ -574,11 +603,18 @@ int init_random_map(struct thread_data *td)
 				(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));
+		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;
+		}
 
 		log_info("fio: file %s failed allocating random map. Running "
 			 "job without.\n", f->file_name);
@@ -730,7 +766,7 @@ 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;