X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=ioengines.c;h=35471ad14d953702fca7a3d91de1c82a107421b7;hp=51cf1ba40e13cd67549d552c1a879461cb383a83;hb=78e51c7279a93d3f6200d58a72a813c3ba852c2e;hpb=7c9b1bce094d58c374b086bbb780c08265623ea4

diff --git a/ioengines.c b/ioengines.c
index 51cf1ba4..35471ad1 100644
--- a/ioengines.c
+++ b/ioengines.c
@@ -207,6 +207,9 @@ int td_io_getevents(struct thread_data *td, unsigned int min, unsigned int max,
 out:
 	if (r >= 0)
 		io_u_mark_complete(td, r);
+	else
+		td_verror(td, r, "get_events");
+
 	dprint(FD_IO, "getevents: %d\n", r);
 	return r;
 }
@@ -238,27 +241,40 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 					sizeof(struct timeval));
 	}
 
-	if (io_u->ddir != DDIR_SYNC)
+	if (ddir_rw(io_u->ddir))
 		td->io_issues[io_u->ddir]++;
 
 	ret = td->io_ops->queue(td, io_u);
 
 	unlock_file(td, io_u->file);
 
+	/*
+	 * Add warning for O_DIRECT so that users have an easier time
+	 * spotting potentially bad alignment. If this triggers for the first
+	 * IO, then it's likely an alignment problem or because the host fs
+	 * does not support O_DIRECT
+	 */
+	if (io_u->error == EINVAL && td->io_issues[io_u->ddir & 1] == 1 &&
+	    td->o.odirect) {
+		log_info("fio: first direct IO errored. File system may not "
+			 "support direct IO, or iomem_align= is bad.\n");
+	}
+
 	if (!td->io_ops->commit) {
 		io_u_mark_submit(td, 1);
 		io_u_mark_complete(td, 1);
 	}
 
 	if (ret == FIO_Q_COMPLETED) {
-		if (io_u->ddir != DDIR_SYNC) {
+		if (ddir_rw(io_u->ddir)) {
 			io_u_mark_depth(td, 1);
 			td->ts.total_io_u[io_u->ddir]++;
-		}
+		} else if (io_u->ddir == DDIR_TRIM)
+			td->ts.total_io_u[2]++;
 	} else if (ret == FIO_Q_QUEUED) {
 		int r;
 
-		if (io_u->ddir != DDIR_SYNC) {
+		if (ddir_rw(io_u->ddir)) {
 			td->io_u_queued++;
 			td->ts.total_io_u[io_u->ddir]++;
 		}
@@ -302,6 +318,8 @@ int td_io_init(struct thread_data *td)
 
 int td_io_commit(struct thread_data *td)
 {
+	int ret;
+
 	dprint(FD_IO, "calling ->commit(), depth %d\n", td->cur_depth);
 
 	if (!td->cur_depth || !td->io_u_queued)
@@ -310,14 +328,20 @@ int td_io_commit(struct thread_data *td)
 	io_u_mark_depth(td, td->io_u_queued);
 	td->io_u_queued = 0;
 
-	if (td->io_ops->commit)
-		return td->io_ops->commit(td);
+	if (td->io_ops->commit) {
+		ret = td->io_ops->commit(td);
+		if (ret)
+			td_verror(td, -ret, "io commit");
+	}
 
 	return 0;
 }
 
 int td_io_open_file(struct thread_data *td, struct fio_file *f)
 {
+	assert(!fio_file_open(f));
+	assert(f->fd == -1);
+
 	if (td->io_ops->open_file(td, f)) {
 		if (td->error == EINVAL && td->o.odirect)
 			log_err("fio: destination does not support O_DIRECT\n");
@@ -327,6 +351,8 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
 							td->o.nr_files);
 		}
 
+		assert(f->fd == -1);
+		assert(!fio_file_open(f));
 		return 1;
 	}
 
@@ -366,9 +392,6 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
 		}
 	}
 
-	if (f->file_map)
-		memset(f->file_map, 0, f->num_maps * sizeof(int));
-
 #ifdef FIO_OS_DIRECTIO
 	/*
 	 * Some OS's have a distinct call to mark the file non-buffered,
@@ -379,6 +402,7 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
 
 		if (ret) {
 			td_verror(td, ret, "fio_set_odirect");
+			log_err("fio: the file system does not seem to support direct IO\n");
 			goto err;
 		}
 	}
@@ -417,3 +441,60 @@ int td_io_get_file_size(struct thread_data *td, struct fio_file *f)
 
 	return td->io_ops->get_file_size(td, f);
 }
+
+static int do_sync_file_range(struct thread_data *td, struct fio_file *f)
+{
+	off64_t offset, nbytes;
+
+	offset = f->first_write;
+	nbytes = f->last_write - f->first_write;
+
+	if (!nbytes)
+		return 0;
+
+	return sync_file_range(f->fd, offset, nbytes, td->o.sync_file_range);
+}
+
+int do_io_u_sync(struct thread_data *td, struct io_u *io_u)
+{
+	int ret;
+
+	if (io_u->ddir == DDIR_SYNC) {
+		ret = fsync(io_u->file->fd);
+	} else if (io_u->ddir == DDIR_DATASYNC) {
+#ifdef FIO_HAVE_FDATASYNC
+		ret = fdatasync(io_u->file->fd);
+#else
+		ret = io_u->xfer_buflen;
+		io_u->error = EINVAL;
+#endif
+	} else if (io_u->ddir == DDIR_SYNC_FILE_RANGE)
+		ret = do_sync_file_range(td, io_u->file);
+	else {
+		ret = io_u->xfer_buflen;
+		io_u->error = EINVAL;
+	}
+
+	if (ret < 0)
+		io_u->error = errno;
+
+	return ret;
+}
+
+int do_io_u_trim(struct thread_data *td, struct io_u *io_u)
+{
+#ifndef FIO_HAVE_TRIM
+	io_u->error = EINVAL;
+	return 0;
+#else
+	struct fio_file *f = io_u->file;
+	int ret;
+
+	ret = os_trim(f->fd, io_u->offset, io_u->xfer_buflen);
+	if (!ret)
+		return io_u->xfer_buflen;;
+
+	io_u->error = ret;
+	return 0;
+#endif
+}