X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fwindowsaio.c;h=ee89fa128108e5346f031a750de82ee7a4eb7410;hp=96ec0f4b87622c6ba0873b1f8bc40f1a11f7c7c6;hb=5aa23eb8d6ae67c5a5e31737164307675b36518e;hpb=c73ed24623ad94a5254e8302298797aba2eb1e9a diff --git a/engines/windowsaio.c b/engines/windowsaio.c index 96ec0f4b..ee89fa12 100644 --- a/engines/windowsaio.c +++ b/engines/windowsaio.c @@ -1,6 +1,7 @@ /* - * Native Windows async IO engine - * Copyright (C) 2012 Bruce Cran + * windowsaio engine + * + * IO engine using Windows IO Completion Ports. */ #include @@ -8,7 +9,6 @@ #include #include #include -#include #include "../fio.h" @@ -24,9 +24,9 @@ struct fio_overlapped { struct windowsaio_data { struct io_u **aio_events; + HANDLE iocp; HANDLE iothread; HANDLE iocomplete_event; - CANCELIOEX pCancelIoEx; BOOL iothread_running; }; @@ -35,126 +35,44 @@ struct thread_ctx { struct windowsaio_data *wd; }; -static int fio_windowsaio_cancel(struct thread_data *td, - struct io_u *io_u); static BOOL timeout_expired(DWORD start_count, DWORD end_count); static int fio_windowsaio_getevents(struct thread_data *td, unsigned int min, - unsigned int max, struct timespec *t); + unsigned int max, struct timespec *t); static struct io_u *fio_windowsaio_event(struct thread_data *td, int event); static int fio_windowsaio_queue(struct thread_data *td, - struct io_u *io_u); + struct io_u *io_u); static void fio_windowsaio_cleanup(struct thread_data *td); static DWORD WINAPI IoCompletionRoutine(LPVOID lpParameter); static int fio_windowsaio_init(struct thread_data *td); static int fio_windowsaio_open_file(struct thread_data *td, struct fio_file *f); static int fio_windowsaio_close_file(struct thread_data fio_unused *td, struct fio_file *f); -static int win_to_poxix_error(DWORD winerr); - -static int win_to_poxix_error(DWORD winerr) -{ - switch (winerr) - { - case ERROR_FILE_NOT_FOUND: return ENOENT; - case ERROR_PATH_NOT_FOUND: return ENOENT; - case ERROR_ACCESS_DENIED: return EACCES; - case ERROR_INVALID_HANDLE: return EBADF; - case ERROR_NOT_ENOUGH_MEMORY: return ENOMEM; - case ERROR_INVALID_DATA: return EINVAL; - case ERROR_OUTOFMEMORY: return ENOMEM; - case ERROR_INVALID_DRIVE: return ENODEV; - case ERROR_NOT_SAME_DEVICE: return EXDEV; - case ERROR_WRITE_PROTECT: return EROFS; - case ERROR_BAD_UNIT: return ENODEV; - case ERROR_SHARING_VIOLATION: return EACCES; - case ERROR_LOCK_VIOLATION: return EACCES; - case ERROR_SHARING_BUFFER_EXCEEDED: return ENOLCK; - case ERROR_HANDLE_DISK_FULL: return ENOSPC; - case ERROR_NOT_SUPPORTED: return ENOSYS; - case ERROR_FILE_EXISTS: return EEXIST; - case ERROR_CANNOT_MAKE: return EPERM; - case ERROR_INVALID_PARAMETER: return EINVAL; - case ERROR_NO_PROC_SLOTS: return EAGAIN; - case ERROR_BROKEN_PIPE: return EPIPE; - case ERROR_OPEN_FAILED: return EIO; - case ERROR_NO_MORE_SEARCH_HANDLES: return ENFILE; - case ERROR_CALL_NOT_IMPLEMENTED: return ENOSYS; - case ERROR_INVALID_NAME: return ENOENT; - case ERROR_WAIT_NO_CHILDREN: return ECHILD; - case ERROR_CHILD_NOT_COMPLETE: return EBUSY; - case ERROR_DIR_NOT_EMPTY: return ENOTEMPTY; - case ERROR_SIGNAL_REFUSED: return EIO; - case ERROR_BAD_PATHNAME: return ENOENT; - case ERROR_SIGNAL_PENDING: return EBUSY; - case ERROR_MAX_THRDS_REACHED: return EAGAIN; - case ERROR_BUSY: return EBUSY; - case ERROR_ALREADY_EXISTS: return EEXIST; - case ERROR_NO_SIGNAL_SENT: return EIO; - case ERROR_FILENAME_EXCED_RANGE: return EINVAL; - case ERROR_META_EXPANSION_TOO_LONG: return EINVAL; - case ERROR_INVALID_SIGNAL_NUMBER: return EINVAL; - case ERROR_THREAD_1_INACTIVE: return EINVAL; - case ERROR_BAD_PIPE: return EINVAL; - case ERROR_PIPE_BUSY: return EBUSY; - case ERROR_NO_DATA: return EPIPE; - case ERROR_MORE_DATA: return EAGAIN; - case ERROR_DIRECTORY: return ENOTDIR; - case ERROR_PIPE_CONNECTED: return EBUSY; - case ERROR_NO_TOKEN: return EINVAL; - case ERROR_PROCESS_ABORTED: return EFAULT; - case ERROR_BAD_DEVICE: return ENODEV; - case ERROR_BAD_USERNAME: return EINVAL; - case ERROR_OPEN_FILES: return EAGAIN; - case ERROR_ACTIVE_CONNECTIONS: return EAGAIN; - case ERROR_DEVICE_IN_USE: return EAGAIN; - case ERROR_INVALID_AT_INTERRUPT_TIME: return EINTR; - case ERROR_IO_DEVICE: return EIO; - case ERROR_NOT_OWNER: return EPERM; - case ERROR_END_OF_MEDIA: return ENOSPC; - case ERROR_EOM_OVERFLOW: return ENOSPC; - case ERROR_BEGINNING_OF_MEDIA: return ESPIPE; - case ERROR_SETMARK_DETECTED: return ESPIPE; - case ERROR_NO_DATA_DETECTED: return ENOSPC; - case ERROR_POSSIBLE_DEADLOCK: return EDEADLOCK; - case ERROR_CRC: return EIO; - case ERROR_NEGATIVE_SEEK: return EINVAL; - case ERROR_DISK_FULL: return ENOSPC; - case ERROR_NOACCESS: return EFAULT; - case ERROR_FILE_INVALID: return ENXIO; - } - - return winerr; -} - -int sync_file_range(int fd, off64_t offset, off64_t nbytes, - unsigned int flags) -{ - errno = ENOSYS; - return -1; -} static int fio_windowsaio_init(struct thread_data *td) { struct windowsaio_data *wd; - HANDLE hKernel32Dll; int rc = 0; - wd = malloc(sizeof(struct windowsaio_data)); - if (wd != NULL) - ZeroMemory(wd, sizeof(struct windowsaio_data)); - else + wd = calloc(1, sizeof(struct windowsaio_data)); + if (wd == NULL) { + log_err("windowsaio: failed to allocate memory for engine data\n"); rc = 1; + } if (!rc) { wd->aio_events = malloc(td->o.iodepth * sizeof(struct io_u*)); - if (wd->aio_events == NULL) + if (wd->aio_events == NULL) { + log_err("windowsaio: failed to allocate memory for aio events list\n"); rc = 1; + } } if (!rc) { /* Create an auto-reset event */ wd->iocomplete_event = CreateEvent(NULL, FALSE, FALSE, NULL); - if (wd->iocomplete_event == NULL) + if (wd->iocomplete_event == NULL) { + log_err("windowsaio: failed to create io complete event handle\n"); rc = 1; + } } if (rc) { @@ -166,10 +84,46 @@ static int fio_windowsaio_init(struct thread_data *td) } } - hKernel32Dll = GetModuleHandle("kernel32.dll"); - wd->pCancelIoEx = (CANCELIOEX)GetProcAddress(hKernel32Dll, "CancelIoEx"); td->io_ops->data = wd; + if (!rc) { + struct thread_ctx *ctx; + struct windowsaio_data *wd; + HANDLE hFile; + + hFile = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); + if (hFile == INVALID_HANDLE_VALUE) { + log_err("windowsaio: failed to create io completion port\n"); + rc = 1; + } + + wd = td->io_ops->data; + wd->iothread_running = TRUE; + wd->iocp = hFile; + + if (!rc) + ctx = malloc(sizeof(struct thread_ctx)); + + if (!rc && ctx == NULL) + { + log_err("windowsaio: failed to allocate memory for thread context structure\n"); + CloseHandle(hFile); + rc = 1; + } + + if (!rc) + { + ctx->iocp = hFile; + ctx->wd = wd; + wd->iothread = CreateThread(NULL, 0, IoCompletionRoutine, ctx, 0, NULL); + if (wd->iothread == NULL) + log_err("windowsaio: failed to create io completion thread\n"); + } + + if (rc || wd->iothread == NULL) + rc = 1; + } + return rc; } @@ -197,7 +151,6 @@ static void fio_windowsaio_cleanup(struct thread_data *td) static int fio_windowsaio_open_file(struct thread_data *td, struct fio_file *f) { int rc = 0; - HANDLE hFile; DWORD flags = FILE_FLAG_POSIX_SEMANTICS | FILE_FLAG_OVERLAPPED; DWORD sharemode = FILE_SHARE_READ | FILE_SHARE_WRITE; DWORD openmode = OPEN_ALWAYS; @@ -206,12 +159,12 @@ static int fio_windowsaio_open_file(struct thread_data *td, struct fio_file *f) dprint(FD_FILE, "fd open %s\n", f->file_name); if (f->filetype == FIO_TYPE_PIPE) { - log_err("fio: windowsaio doesn't support pipes\n"); + log_err("windowsaio: pipes are not supported\n"); return 1; } if (!strcmp(f->file_name, "-")) { - log_err("fio: can't read/write to stdin/out\n"); + log_err("windowsaio: can't read/write to stdin/out\n"); return 1; } @@ -243,30 +196,22 @@ static int fio_windowsaio_open_file(struct thread_data *td, struct fio_file *f) f->hFile = CreateFile(f->file_name, access, sharemode, NULL, openmode, flags, NULL); - if (f->hFile == INVALID_HANDLE_VALUE) + if (f->hFile == INVALID_HANDLE_VALUE) { + log_err("windowsaio: failed to open file \"%s\"\n", f->file_name); rc = 1; + } /* Only set up the completion port and thread if we're not just * querying the device size */ if (!rc && td->io_ops->data != NULL) { - struct thread_ctx *ctx; struct windowsaio_data *wd; - hFile = CreateIoCompletionPort(f->hFile, NULL, 0, 0); - wd = td->io_ops->data; - wd->iothread_running = TRUE; - if (!rc) { - ctx = malloc(sizeof(struct thread_ctx)); - ctx->iocp = hFile; - ctx->wd = wd; - - wd->iothread = CreateThread(NULL, 0, IoCompletionRoutine, ctx, 0, NULL); - } - - if (rc || wd->iothread == NULL) + if (CreateIoCompletionPort(f->hFile, wd->iocp, 0, 0) == NULL) { + log_err("windowsaio: failed to create io completion port\n"); rc = 1; + } } return rc; @@ -279,8 +224,10 @@ static int fio_windowsaio_close_file(struct thread_data fio_unused *td, struct f dprint(FD_FILE, "fd close %s\n", f->file_name); if (f->hFile != INVALID_HANDLE_VALUE) { - if (!CloseHandle(f->hFile)) + if (!CloseHandle(f->hFile)) { + log_info("windowsaio: failed to close file handle for \"%s\"\n", f->file_name); rc = 1; + } } f->hFile = INVALID_HANDLE_VALUE; @@ -309,7 +256,7 @@ static struct io_u* fio_windowsaio_event(struct thread_data *td, int event) } static int fio_windowsaio_getevents(struct thread_data *td, unsigned int min, - unsigned int max, struct timespec *t) + unsigned int max, struct timespec *t) { struct windowsaio_data *wd = td->io_ops->data; struct flist_head *entry; @@ -346,7 +293,7 @@ static int fio_windowsaio_getevents(struct thread_data *td, unsigned int min, if (dequeued < min) { status = WaitForSingleObject(wd->iocomplete_event, mswait); if (status != WAIT_OBJECT_0 && dequeued >= min) - break; + break; } if (dequeued >= min || (t != NULL && timeout_expired(start_count, end_count))) @@ -382,13 +329,15 @@ static int fio_windowsaio_queue(struct thread_data *td, struct io_u *io_u) case DDIR_DATASYNC: case DDIR_SYNC_FILE_RANGE: success = FlushFileBuffers(io_u->file->hFile); - if (!success) - io_u->error = win_to_poxix_error(GetLastError()); + if (!success) { + log_err("windowsaio: failed to flush file buffers\n"); + io_u->error = win_to_posix_error(GetLastError()); + } return FIO_Q_COMPLETED; break; case DDIR_TRIM: - log_err("manual TRIM isn't supported on Windows"); + log_err("windowsaio: manual TRIM isn't supported on Windows\n"); io_u->error = 1; io_u->resid = io_u->xfer_buflen; return FIO_Q_COMPLETED; @@ -401,7 +350,7 @@ static int fio_windowsaio_queue(struct thread_data *td, struct io_u *io_u) if (success || GetLastError() == ERROR_IO_PENDING) rc = FIO_Q_QUEUED; else { - io_u->error = win_to_poxix_error(GetLastError()); + io_u->error = win_to_posix_error(GetLastError()); io_u->resid = io_u->xfer_buflen; } @@ -434,7 +383,7 @@ static DWORD WINAPI IoCompletionRoutine(LPVOID lpParameter) io_u->error = 0; } else { io_u->resid = io_u->xfer_buflen; - io_u->error = win_to_poxix_error(GetLastError()); + io_u->error = win_to_posix_error(GetLastError()); } fov->io_complete = TRUE; @@ -446,25 +395,6 @@ static DWORD WINAPI IoCompletionRoutine(LPVOID lpParameter) return 0; } -static int fio_windowsaio_cancel(struct thread_data *td, - struct io_u *io_u) -{ - int rc = 0; - - struct windowsaio_data *wd = td->io_ops->data; - - /* If we're running on Vista or newer, we can cancel individual IO requests */ - if (wd->pCancelIoEx != NULL) { - struct fio_overlapped *ovl = io_u->engine_data; - - if (!wd->pCancelIoEx(io_u->file->hFile, &ovl->o)) - rc = 1; - } else - rc = 1; - - return rc; -} - static void fio_windowsaio_io_u_free(struct thread_data *td, struct io_u *io_u) { struct fio_overlapped *o = io_u->engine_data; @@ -481,10 +411,11 @@ static int fio_windowsaio_io_u_init(struct thread_data *td, struct io_u *io_u) struct fio_overlapped *o; o = malloc(sizeof(*o)); - o->io_complete = FALSE: + o->io_complete = FALSE; o->io_u = io_u; o->o.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); - if (!o->o.hEvent) { + if (o->o.hEvent == NULL) { + log_err("windowsaio: failed to create event handle\n"); free(o); return 1; } @@ -498,7 +429,6 @@ static struct ioengine_ops ioengine = { .version = FIO_IOOPS_VERSION, .init = fio_windowsaio_init, .queue = fio_windowsaio_queue, - .cancel = fio_windowsaio_cancel, .getevents = fio_windowsaio_getevents, .event = fio_windowsaio_event, .cleanup = fio_windowsaio_cleanup, @@ -509,12 +439,12 @@ static struct ioengine_ops ioengine = { .io_u_free = fio_windowsaio_io_u_free, }; -static void fio_init fio_posixaio_register(void) +static void fio_init fio_windowsaio_register(void) { register_ioengine(&ioengine); } -static void fio_exit fio_posixaio_unregister(void) +static void fio_exit fio_windowsaio_unregister(void) { unregister_ioengine(&ioengine); }