Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
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) {
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->file_size + page_size - 1) & ~page_mask;
+
+ if (msync(f->mmap, len, MS_SYNC)) {
+ 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) {
}
/*
* 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)
+ 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) {
- 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) {
+ td_verror(td, io_u->error, "madvise");
+ }
- if (io_u->error)
- td_verror(td, io_u->error, "sync");
-
return FIO_Q_COMPLETED;
}
return FIO_Q_COMPLETED;
}
#include "fio.h"
#include "os.h"
#include "fio.h"
#include "os.h"
-static unsigned long page_mask;
+unsigned long page_mask;
+unsigned long page_size;
#define ALIGN(buf) \
(char *) (((unsigned long) (buf) + page_mask) & ~page_mask)
#define ALIGN(buf) \
(char *) (((unsigned long) (buf) + page_mask) & ~page_mask)
page_mask = ps - 1;
if (write_bw_log) {
page_mask = ps - 1;
if (write_bw_log) {
extern FILE *f_err;
extern int temp_stall_ts;
extern unsigned long long mlock_size;
extern FILE *f_err;
extern int temp_stall_ts;
extern unsigned long long mlock_size;
+extern unsigned long page_mask, page_size;
extern struct thread_data *threads;
extern struct thread_data *threads;