Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Jan 13, 2018

lore

Share & tools

lore

Jens Axboe

author

2018-01-13 13:00 UTC #0 lore raw

The following changes since commit 9d5fe300085759c0f764a62be27355fe80b5fd8f:

io/examples/fio-seq-read: use direct=1 (2018-01-10 08:30:07 -0700)

are available in the git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to 53bb5d9c037e842970b32bc828dbe809b42c144d:

Merge branch 'diskless_invalidate' of https://github.com/sitsofe/fio (2018-01-12 10:59:08 -0700)

----------------------------------------------------------------
Jens Axboe (2):
Merge branch 'fio-issue-450' of https://github.com/gvkovai/fio
Merge branch 'diskless_invalidate' of https://github.com/sitsofe/fio

Robert Elliott (1):
ioengines: don't call munmap unless size boundary is exceeded

Sitsofe Wheeler (1):
filesetup: skip fallback invalidation with diskless ioengines

gvkovai (1):
Fix zoning issue with seq-io and randommap issue

 engines/dev-dax.c |  2 +-
 engines/libpmem.c |  2 +-
 engines/mmap.c    |  2 +-
 filesetup.c       |  4 ++++
 io_u.c            | 56 +++++++++++++++++++++++++++++++++++++++++--------------
 5 files changed, 49 insertions(+), 17 deletions(-)

---

Diff of recent changes:

engines/dev-dax.c +1 -1

index b1f91a4..caae1e0 100644
@@ -157,7 +157,7 @@ static int fio_devdax_prep(struct thread_data *td, struct io_u *io_u)
 	 * It fits within existing mapping, use it
 	 */
 	if (io_u->offset >= fdd->devdax_off &&
-	    io_u->offset + io_u->buflen < fdd->devdax_off + fdd->devdax_sz)
+	    io_u->offset + io_u->buflen <= fdd->devdax_off + fdd->devdax_sz)
 		goto done;
 
 	/*

engines/libpmem.c +1 -1

index 3f4e44f..3038784 100644
@@ -430,7 +430,7 @@ static int fio_libpmem_prep(struct thread_data *td, struct io_u *io_u)
 			io_u->buflen, fdd->libpmem_sz);
 
 	if (io_u->offset >= fdd->libpmem_off &&
-	    (io_u->offset + io_u->buflen <
+	    (io_u->offset + io_u->buflen <=
 	     fdd->libpmem_off + fdd->libpmem_sz))
 		goto done;

engines/mmap.c +1 -1

index 51606e1..7755658 100644
@@ -137,7 +137,7 @@ static int fio_mmapio_prep(struct thread_data *td, struct io_u *io_u)
 	 * It fits within existing mapping, use it
 	 */
 	if (io_u->offset >= fmd->mmap_off &&
-	    io_u->offset + io_u->buflen < fmd->mmap_off + fmd->mmap_sz)
+	    io_u->offset + io_u->buflen <= fmd->mmap_off + fmd->mmap_sz)
 		goto done;
 
 	/*

filesetup.c +4 -0

index 30af085..3cda606 100644
@@ -490,6 +490,10 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
 		ret = td->io_ops->invalidate(td, f);
 		if (ret < 0)
 			errval = -ret;
+	} else if (td_ioengine_flagged(td, FIO_DISKLESSIO)) {
+		dprint(FD_IO, "invalidate not supported by ioengine %s\n",
+		       td->io_ops->name);
+		ret = 0;
 	} else if (f->filetype == FIO_TYPE_FILE) {
 		dprint(FD_IO, "declare unneeded cache %s: %llu/%llu\n",
 			f->file_name, off, len);

io_u.c +42 ~~-14~~

69 lines not on this page · raw message