X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fmmap.c;h=da6906947764ba099c377be51bae7c231b070ee6;hp=27d5d25515f2016526cbca985e8bf98bc356e326;hb=2c187c0fcaab8a4c6d1ba67d2ad2460b5fb42109;hpb=b5af82930ccfd7dda6a1b11794efb452eb76d8dc

diff --git a/engines/mmap.c b/engines/mmap.c
index 27d5d255..da690694 100644
--- a/engines/mmap.c
+++ b/engines/mmap.c
@@ -1,5 +1,8 @@
 /*
- * regular read/write sync io engine
+ * mmap engine
+ *
+ * IO engine that reads/writes from files by doing memcpy to/from
+ * a memory mapped region of the file.
  *
  */
 #include <stdio.h>
@@ -22,46 +25,32 @@ static int fio_mmapio_queue(struct thread_data *td, struct io_u *io_u)
 	else if (io_u->ddir == DDIR_WRITE)
 		memcpy(f->mmap + real_off, io_u->xfer_buf, io_u->xfer_buflen);
 	else if (io_u->ddir == DDIR_SYNC) {
-		if (msync(f->mmap, f->file_size, MS_SYNC))
+		size_t len = (f->io_size + page_size - 1) & ~page_mask;
+
+		if (msync(f->mmap, len, MS_SYNC)) {
 			io_u->error = errno;
+			td_verror(td, io_u->error, "msync");
+		}
 	}
 
 	/*
 	 * not really direct, but should drop the pages from the cache
 	 */
-	if (td->odirect && io_u->ddir != DDIR_SYNC) {
-		if (msync(f->mmap + real_off, io_u->xfer_buflen, MS_SYNC) < 0)
+	if (td->o.odirect && io_u->ddir != DDIR_SYNC) {
+		size_t len = (io_u->xfer_buflen + page_size - 1) & ~page_mask;
+		unsigned long long off = real_off & ~page_mask;
+
+		if (msync(f->mmap + off, len, MS_SYNC) < 0) {
 			io_u->error = errno;
-		if (madvise(f->mmap + real_off, io_u->xfer_buflen,  MADV_DONTNEED) < 0)
+			td_verror(td, io_u->error, "msync");
+		}
+		if (madvise(f->mmap + off, len,  MADV_DONTNEED) < 0) {
 			io_u->error = errno;
-	}
-
-	if (io_u->error)
-		td_verror(td, io_u->error, "sync");
-
-	return FIO_Q_COMPLETED;
-}
-
-static int fio_mmapio_init(struct thread_data *td)
-{
-	struct fio_file *f;
-	int i;
-
-	if (!td_write(td))
-		return 0;
-
-	/*
-	 * We need to truncate the files to the right size, if
-	 * we are writing to it.
-	 */
-	for_each_file(td, f, i) {
-		if (ftruncate(f->fd, f->file_size) < 0) {
-			td_verror(td, errno, "ftruncate");
-			return 1;
+			td_verror(td, io_u->error, "madvise");
 		}
 	}
 
-	return 0;
+	return FIO_Q_COMPLETED;
 }
 
 static int fio_mmapio_open(struct thread_data *td, struct fio_file *f)
@@ -77,12 +66,12 @@ static int fio_mmapio_open(struct thread_data *td, struct fio_file *f)
 	else if (td_write(td)) {
 		flags = PROT_WRITE;
 
-		if (td->verify != VERIFY_NONE)
+		if (td->o.verify != VERIFY_NONE)
 			flags |= PROT_READ;
 	} else
 		flags = PROT_READ;
 
-	f->mmap = mmap(NULL, f->file_size, flags, MAP_SHARED, f->fd, f->file_offset);
+	f->mmap = mmap(NULL, f->io_size, flags, MAP_SHARED, f->fd, f->file_offset);
 	if (f->mmap == MAP_FAILED) {
 		f->mmap = NULL;
 		td_verror(td, errno, "mmap");
@@ -93,12 +82,12 @@ static int fio_mmapio_open(struct thread_data *td, struct fio_file *f)
 		goto err;
 
 	if (!td_random(td)) {
-		if (madvise(f->mmap, f->file_size, MADV_SEQUENTIAL) < 0) {
+		if (madvise(f->mmap, f->io_size, MADV_SEQUENTIAL) < 0) {
 			td_verror(td, errno, "madvise");
 			goto err;
 		}
 	} else {
-		if (madvise(f->mmap, f->file_size, MADV_RANDOM) < 0) {
+		if (madvise(f->mmap, f->io_size, MADV_RANDOM) < 0) {
 			td_verror(td, errno, "madvise");
 			goto err;
 		}
@@ -107,9 +96,7 @@ static int fio_mmapio_open(struct thread_data *td, struct fio_file *f)
 	return 0;
 
 err:
-	if (f->mmap)
-		munmap(f->mmap, f->file_size);
-	generic_close_file(td, f);
+	td->io_ops->close_file(td, f);
 	return 1;
 }
 
@@ -117,19 +104,19 @@ static void fio_mmapio_close(struct thread_data fio_unused *td,
 			     struct fio_file *f)
 {
 	if (f->mmap) {
-		munmap(f->mmap, f->file_size);
+		munmap(f->mmap, f->io_size);
 		f->mmap = NULL;
 	}
+	generic_close_file(td, f);
 }
 
 static struct ioengine_ops ioengine = {
 	.name		= "mmap",
 	.version	= FIO_IOOPS_VERSION,
 	.queue		= fio_mmapio_queue,
-	.init		= fio_mmapio_init,
 	.open_file	= fio_mmapio_open,
 	.close_file	= fio_mmapio_close,
-	.flags		= FIO_SYNCIO,
+	.flags		= FIO_SYNCIO | FIO_NOEXTEND,
 };
 
 static void fio_init fio_mmapio_register(void)