X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=ioengines.c;h=e8ed871d2d96d641014cbd79e7e4df27c6b472a3;hp=3ef0d032938a11062ba513fe5154ba9b6b04d678;hb=de890a1e48d40238dac69f302708dde8719de240;hpb=62977e09a378a713b31d64c63e15adcf9f6f9d9d

diff --git a/ioengines.c b/ioengines.c
index 3ef0d032..e8ed871d 100644
--- a/ioengines.c
+++ b/ioengines.c
@@ -14,9 +14,11 @@
 #include <unistd.h>
 #include <string.h>
 #include <dlfcn.h>
+#include <fcntl.h>
 #include <assert.h>
 
 #include "fio.h"
+#include "diskutil.h"
 
 static FLIST_HEAD(engine_list);
 
@@ -150,13 +152,17 @@ struct ioengine_ops *load_ioengine(struct thread_data *td, const char *name)
 	return ret;
 }
 
-void close_ioengine(struct thread_data *td)
+/*
+ * For cleaning up an ioengine which never made it to init().
+ */
+void free_ioengine(struct thread_data *td)
 {
-	dprint(FD_IO, "close ioengine %s\n", td->io_ops->name);
+	dprint(FD_IO, "free ioengine %s\n", td->io_ops->name);
 
-	if (td->io_ops->cleanup) {
-		td->io_ops->cleanup(td);
-		td->io_ops->data = NULL;
+	if (td->eo && td->io_ops->options) {
+		options_free(td->io_ops->options, td->eo);
+		free(td->eo);
+		td->eo = NULL;
 	}
 
 	if (td->io_ops->dlhandle)
@@ -166,6 +172,18 @@ void close_ioengine(struct thread_data *td)
 	td->io_ops = NULL;
 }
 
+void close_ioengine(struct thread_data *td)
+{
+	dprint(FD_IO, "close ioengine %s\n", td->io_ops->name);
+
+	if (td->io_ops->cleanup) {
+		td->io_ops->cleanup(td);
+		td->io_ops->data = NULL;
+	}
+
+	free_ioengine(td);
+}
+
 int td_io_prep(struct thread_data *td, struct io_u *io_u)
 {
 	dprint_io_u(io_u, "prep");
@@ -206,6 +224,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;
 }
@@ -220,13 +241,14 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 	assert((io_u->flags & IO_U_F_FLIGHT) == 0);
 	io_u->flags |= IO_U_F_FLIGHT;
 
-	assert(io_u->file->flags & FIO_FILE_OPEN);
+	assert(fio_file_open(io_u->file));
 
 	io_u->error = 0;
 	io_u->resid = 0;
 
 	if (td->io_ops->flags & FIO_SYNCIO) {
-		fio_gettime(&io_u->issue_time, NULL);
+		if (fio_fill_issue_time(td))
+			fio_gettime(&io_u->issue_time, NULL);
 
 		/*
 		 * only used for iolog
@@ -236,27 +258,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]++;
 		}
@@ -269,7 +304,8 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 	}
 
 	if ((td->io_ops->flags & FIO_SYNCIO) == 0) {
-		fio_gettime(&io_u->issue_time, NULL);
+		if (fio_fill_issue_time(td))
+			fio_gettime(&io_u->issue_time, NULL);
 
 		/*
 		 * only used for iolog
@@ -292,6 +328,8 @@ int td_io_init(struct thread_data *td)
 			log_err("fio: io engine init failed. Perhaps try"
 				" reducing io depth?\n");
 		}
+		if (!td->error)
+			td->error = ret;
 	}
 
 	return ret;
@@ -299,6 +337,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)
@@ -307,14 +347,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");
@@ -324,12 +370,15 @@ 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;
 	}
 
 	fio_file_reset(f);
-	f->flags |= FIO_FILE_OPEN;
-	f->flags &= ~FIO_FILE_CLOSING;
+	fio_file_set_open(f);
+	fio_file_clear_closing(f);
+	disk_util_inc(f->du);
 
 	td->nr_open_files++;
 	get_file(f);
@@ -356,15 +405,12 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
 		else
 			flags = POSIX_FADV_SEQUENTIAL;
 
-		if (fadvise(f->fd, f->file_offset, f->io_size, flags) < 0) {
+		if (posix_fadvise(f->fd, f->file_offset, f->io_size, flags) < 0) {
 			td_verror(td, errno, "fadvise");
 			goto err;
 		}
 	}
 
-	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,
@@ -375,6 +421,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;
 		}
 	}
@@ -384,6 +431,7 @@ done:
 	log_file(td, f, FIO_LOG_OPEN_FILE);
 	return 0;
 err:
+	disk_util_dec(f->du);
 	if (td->io_ops->close_file)
 		td->io_ops->close_file(td, f);
 	return 1;
@@ -391,15 +439,121 @@ err:
 
 int td_io_close_file(struct thread_data *td, struct fio_file *f)
 {
-	if (!(f->flags & FIO_FILE_CLOSING))
+	if (!fio_file_closing(f))
 		log_file(td, f, FIO_LOG_CLOSE_FILE);
 
 	/*
 	 * mark as closing, do real close when last io on it has completed
 	 */
-	f->flags |= FIO_FILE_CLOSING;
+	fio_file_set_closing(f);
 
+	disk_util_dec(f->du);
 	unlock_file_all(td, f);
 
 	return put_file(td, f);
 }
+
+int td_io_get_file_size(struct thread_data *td, struct fio_file *f)
+{
+	if (!td->io_ops->get_file_size)
+		return 0;
+
+	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
+}
+
+int fio_show_ioengine_help(const char *engine)
+{
+	struct flist_head *entry;
+	struct thread_data td;
+	char *sep;
+	int ret = 1;
+
+	if (!engine || !*engine) {
+		log_info("Available IO engines:\n");
+		flist_for_each(entry, &engine_list) {
+			td.io_ops = flist_entry(entry, struct ioengine_ops,
+						list);
+			log_info("\t%s\n", td.io_ops->name);
+		}
+		return 0;
+	}
+	sep = strchr(engine, ',');
+	if (sep) {
+		*sep = 0;
+		sep++;
+	}
+
+	memset(&td, 0, sizeof(td));
+
+	td.io_ops = load_ioengine(&td, engine);
+	if (!td.io_ops) {
+		log_info("IO engine %s not found\n", engine);
+		return 1;
+	}
+
+	if (td.io_ops->options)
+		ret = show_cmd_help(td.io_ops->options, sep);
+	else
+		log_info("IO engine %s has no options\n", td.io_ops->name);
+
+	free_ioengine(&td);
+
+	return ret;
+}