*/
#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
#include <errno.h>
#include <sys/mman.h>
#include "../verify.h"
/*
- * Limits us to 1GB of mapped files in total
+ * Limits us to 1GiB of mapped files in total
*/
#define MMAP_TOTAL_SZ (1 * 1024 * 1024 * 1024UL)
static unsigned long mmap_map_size;
-static unsigned long mmap_map_mask;
struct fio_mmap_data {
void *mmap_ptr;
off_t mmap_off;
};
+static bool fio_madvise_file(struct thread_data *td, struct fio_file *f,
+ size_t length)
+
+{
+ struct fio_mmap_data *fmd = FILE_ENG_DATA(f);
+
+ if (!td->o.fadvise_hint)
+ return true;
+
+ if (!td_random(td)) {
+ if (posix_madvise(fmd->mmap_ptr, length, POSIX_MADV_SEQUENTIAL) < 0) {
+ td_verror(td, errno, "madvise");
+ return false;
+ }
+ } else {
+ if (posix_madvise(fmd->mmap_ptr, length, POSIX_MADV_RANDOM) < 0) {
+ td_verror(td, errno, "madvise");
+ return false;
+ }
+ }
+
+ return true;
+}
+
static int fio_mmap_file(struct thread_data *td, struct fio_file *f,
size_t length, off_t off)
{
struct fio_mmap_data *fmd = FILE_ENG_DATA(f);
int flags = 0;
- if (td_rw(td))
+ if (td_rw(td) && !td->o.verify_only)
flags = PROT_READ | PROT_WRITE;
- else if (td_write(td)) {
+ else if (td_write(td) && !td->o.verify_only) {
flags = PROT_WRITE;
if (td->o.verify != VERIFY_NONE)
goto err;
}
- if (!td_random(td)) {
- if (posix_madvise(fmd->mmap_ptr, length, POSIX_MADV_SEQUENTIAL) < 0) {
- td_verror(td, errno, "madvise");
- goto err;
- }
- } else {
- if (posix_madvise(fmd->mmap_ptr, length, POSIX_MADV_RANDOM) < 0) {
- td_verror(td, errno, "madvise");
- goto err;
- }
- }
+ if (!fio_madvise_file(td, f, length))
+ goto err;
+
if (posix_madvise(fmd->mmap_ptr, length, POSIX_MADV_DONTNEED) < 0) {
td_verror(td, errno, "madvise");
goto err;
}
#ifdef FIO_MADV_FREE
- if (f->filetype == FIO_TYPE_BD)
+ if (f->filetype == FIO_TYPE_BLOCK)
(void) posix_madvise(fmd->mmap_ptr, fmd->mmap_sz, FIO_MADV_FREE);
#endif
-
err:
if (td->error && fmd->mmap_ptr)
munmap(fmd->mmap_ptr, length);
* 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;
/*
static int fio_mmapio_init(struct thread_data *td)
{
struct thread_options *o = &td->o;
- unsigned long shift, mask;
- if ((td->o.rw_min_bs & page_mask) &&
+ if ((o->rw_min_bs & page_mask) &&
(o->odirect || o->fsync_blocks || o->fdatasync_blocks)) {
log_err("fio: mmap options dictate a minimum block size of "
"%llu bytes\n", (unsigned long long) page_size);
return 1;
}
- mmap_map_size = MMAP_TOTAL_SZ / td->o.nr_files;
- mask = mmap_map_size;
- shift = 0;
- do {
- mask >>= 1;
- if (!mask)
- break;
- shift++;
- } while (1);
-
- mmap_map_mask = 1UL << shift;
+ mmap_map_size = MMAP_TOTAL_SZ / o->nr_files;
return 0;
}