Skip to content

Commit

Permalink
aio: allow direct aio poll comletions for keyed wakeups
Browse files Browse the repository at this point in the history
If we get a keyed wakeup for a aio poll waitqueue and wake can acquire the
ctx_lock without spinning we can just complete the iocb straight from the
wakeup callback to avoid a context switch.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Avi Kivity <avi@scylladb.com>
  • Loading branch information
Christoph Hellwig committed Aug 6, 2018
1 parent bfe4037 commit e8693bc
Showing 1 changed file with 15 additions and 2 deletions.
17 changes: 15 additions & 2 deletions fs/aio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1672,13 +1672,26 @@ static int aio_poll_wake(struct wait_queue_entry *wait, unsigned mode, int sync,
void *key)
{
struct poll_iocb *req = container_of(wait, struct poll_iocb, wait);
struct aio_kiocb *iocb = container_of(req, struct aio_kiocb, poll);
__poll_t mask = key_to_poll(key);

req->woken = true;

/* for instances that support it check for an event match first: */
if (mask && !(mask & req->events))
return 0;
if (mask) {
if (!(mask & req->events))
return 0;

/* try to complete the iocb inline if we can: */
if (spin_trylock(&iocb->ki_ctx->ctx_lock)) {
list_del(&iocb->ki_list);
spin_unlock(&iocb->ki_ctx->ctx_lock);

list_del_init(&req->wait.entry);
aio_poll_complete(iocb, mask);
return 1;
}
}

list_del_init(&req->wait.entry);
schedule_work(&req->work);
Expand Down

0 comments on commit e8693bc

Please sign in to comment.