Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Async I/O (syscalls 245 - 249) #1584

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
0b2b56a
Individually stub each AIO syscall
kmeisthax Sep 27, 2021
175c52c
Add a structure in the task for AIO contexts to live in.
kmeisthax Sep 27, 2021
9c4a3f8
Implement `io_setup`
kmeisthax Sep 28, 2021
241fe79
Implement `io_destroy`.
kmeisthax Sep 30, 2021
5f041a3
Store the owning PID of each AIO context, so that resolved requests c…
kmeisthax Oct 1, 2021
9912680
Elaborate on the event structure to be able to hold pending requests,…
kmeisthax Oct 1, 2021
cce2d45
Add method for submitting a pending event.
kmeisthax Oct 1, 2021
314f335
Add functions for retrieving pending events from a context.
kmeisthax Oct 3, 2021
5390cf5
Add AIO syscalls to systrace
kmeisthax Oct 3, 2021
0cf305b
Add aioctx table method for retrieving (and retaining) a context by i…
kmeisthax Oct 3, 2021
032d31d
Half-implement io_submit.
kmeisthax Oct 3, 2021
ecfeae1
Add `aioctx_cancel_event` & other documentation fixes
kmeisthax Oct 3, 2021
da5a606
Add io_submit op so that FDs can handle asynchronous operations.
kmeisthax Oct 3, 2021
a4560f5
Add method to complete pending events.
kmeisthax Oct 4, 2021
9510f30
Add fallback for filesystems that don't yet implement true async I/O.
kmeisthax Oct 4, 2021
1dd76fe
Submitted events must retain the guest address of the IOCB structure …
kmeisthax Oct 4, 2021
8638202
Implement completion polling (io_getevents)
kmeisthax Oct 4, 2021
1c9f39a
Everything except io_setup takes a context ID directly, not a pointer…
kmeisthax Oct 4, 2021
d678aad
Properly initialize the lock and refcount in AIO contexts.
kmeisthax Oct 10, 2021
940d53d
Fix a bunch of bounds checks
kmeisthax Oct 10, 2021
21bd634
Always NULL out contexts in the task context table when removing them…
kmeisthax Oct 10, 2021
b504474
Add E2E test for AIO read and write.
kmeisthax Oct 10, 2021
867e899
Don't specify an enum impl type because gcc doesn't support that C gi…
kmeisthax Oct 11, 2021
09b2e07
In fallback code, treat FDSYNC as a full FSYNC.
kmeisthax Oct 24, 2021
fc90511
Pull the pread/pwrite emulation code out into separate functions.
kmeisthax Oct 25, 2021
8ffda31
Add E2E test for vectored async IO
kmeisthax Oct 25, 2021
f270bc1
Implement vectored async IO fallback
kmeisthax Oct 25, 2021
9769c6e
Fix incorrect/spurious failure on seeking to non-zero offsets
kmeisthax Oct 25, 2021
0a8c063
Remove implicit coercions in tests so that they don't sign-extend thi…
kmeisthax Oct 31, 2021
e8d3c9f
Add a condition variable for waiting on events, and wait for it to be…
kmeisthax Nov 21, 2021
6ea8dce
Formatting & consistency nits
kmeisthax Nov 21, 2021
1174ec7
Rip out and replace the `AIO_IOCB_` family of constants with a host s…
kmeisthax Nov 21, 2021
399265e
Also rip out the `AIO_IO_EVENT` constants for another host-compiled s…
kmeisthax Nov 21, 2021
6c09ad5
Remove e2e tests dependency on `linux/aio_abi.h` header
kmeisthax Nov 21, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
Add io_submit op so that FDs can handle asynchronous operations.
  • Loading branch information
kmeisthax committed Nov 14, 2021
commit da5a6061502cc73441ae7edeaadf3fa550e573e7
21 changes: 20 additions & 1 deletion fs/fd.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
#include "fs/proc.h"
#include "fs/sockrestart.h"

typedef sdword_t fd_t;

#include "fs/aio.h"

// FIXME almost everything that uses the structs in this file does so without any kind of sane locking

struct fd {
Expand Down Expand Up @@ -108,7 +112,6 @@ struct fd {
cond_t cond;
};

typedef sdword_t fd_t;
#define AT_FDCWD_ -100

struct fd *fd_create(const struct fd_ops *ops);
Expand Down Expand Up @@ -166,6 +169,22 @@ struct fd_ops {
int (*getflags)(struct fd *fd);
// handle F_SETFL, i.e. set O_NONBLOCK
int (*setflags)(struct fd *fd, dword_t arg);

// Submit an AIO event to the FD.
//
// The AIO context is provided to the FD in an unlocked, unretained state.
// Asynchronous usage of the AIO context must first retain it; though
// synchronous usage (i.e. before this function returns) is permitted to
// omit the retain/release step.
//
// This may return a synchronous error code (e.g. _EINVAL) for operations
// that cannot be performed on this FD. If this operation returns an error
// code, then the event ID given will be cancelled, and the FD should not
// attempt to complete it.
//
// Asynchronous error codes must be instead returned by completing the
// event with the error code as it's result.
int (*io_submit)(struct fd *fd, struct aioctx *ctx, unsigned int event_id);
};

struct fdtable {
Expand Down
15 changes: 14 additions & 1 deletion kernel/aio.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,21 @@ dword_t sys_io_submit(addr_t ctx_id, dword_t u_nr, addr_t iocbpp) {
break;
}

// TODO: Actually submit the event to the FD.
unsigned int event_id = (unsigned int)err;
if (fdp->ops->io_submit) {
err = fdp->ops->io_submit(fdp, ctx, event_id);
} else {
err = _EINVAL;
}

unlock(&current->files->lock);

if (err < 0) {
aioctx_cancel_event(ctx, event_id);

if (i == 0) goto err;
break;
}
}

aioctx_release(ctx);
Expand Down