[patch 5/5] eventfd+KAIO - KAIO eventfd support (example/maybe-broken) ...

[patch 5/5] eventfd+KAIO - KAIO eventfd support (example/maybe-broken) ...

Post by Davide Lib » Fri, 16 Mar 2007 13:20:09


his is another example about how to add eventfd support to the current
KAIO code.
The KAIO code simply signals the eventfd fd when events are ready, and
this triggers a POLLIN in the fd.
I made a quick test program to verify the patch, and it runs fine here:

http://www.xmailserver.org/eventfd-aio-test.c

The test program uses poll(2), but it'd, of course, work with epoll too.
This can allow to schedule both block I/O and other poll-able devices
requests, and wait for results using select/poll/epoll.



Signed-off-by: Davide Libenzi < XXXX@XXXXX.COM >



- Davide



Index: linux-2.6.20.ep2/fs/aio.c
===================================================================
--- linux-2.6.20.ep2.orig/fs/aio.c 2007-03-14 20:51:32.000000000 -0700
+++ linux-2.6.20.ep2/fs/aio.c 2007-03-14 20:54:37.000000000 -0700
@@ -30,6 +30,7 @@
#include <linux/highmem.h>
#include <linux/workqueue.h>
#include <linux/security.h>
+#include <linux/eventfd.h>

#include <asm/kmap_types.h>
#include <asm/uaccess.h>
@@ -422,6 +423,7 @@
req->private = NULL;
req->ki_iovec = NULL;
INIT_LIST_HEAD(&req->ki_run_list);
+ req->ki_eventfd = ERR_PTR(-EINVAL);

/* Check if the completion queue has enough free space to
* accept an event from this io.
@@ -463,6 +465,8 @@
{
assert_spin_locked(&ctx->ctx_lock);

+ if (!IS_ERR(req->ki_eventfd))
+ fput(req->ki_eventfd);
if (req->ki_dtor)
req->ki_dtor(req);
if (req->ki_iovec != &req->ki_inline_vec)
@@ -947,6 +951,13 @@
return 1;
}

+ /*
+ * Check if the user asked us to deliver the result through an
+ * eventfd.
+ */
+ if (unlikely(!IS_ERR(iocb->ki_eventfd)))
+ eventfd_signal(iocb->ki_eventfd, 1);
+
info = &ctx->ring_info;

/* add a completion event to the ring buffer.
@@ -1556,6 +1567,18 @@
fput(file);
return -EAGAIN;
}
+ if (iocb->aio_resfd != 0) {
+ /*
+ * If the aio_resfd field of the iocb is not zero, get an
+ * instance of the file* now. This will be the place to deliver
+ * AIO results to.
+ */
+ req->ki_eventfd = eventfd_fget((int) iocb->aio_resfd);
+ if (IS_ERR(req->ki_eventfd)) {
+ ret = PTR_ERR(req->ki_eventfd);
+ goto out_put_req;
+ }
+ }

req->ki_filp = file;
ret = put_user(req->ki_key, &user_iocb->aio_key);
Index: linux-2.6.20.ep2/include/linux/aio.h
===================================================================
--- linux-2.6.20.ep2.orig/include/linux/aio.h 2007-03-14 20:51:32.000000000 -0700
+++ linux-2.6.20.ep2/include/linux/aio.h 2007-03-14 20:54:37.000000000 -0700
@@ -119,6 +119,12 @@

struct list_head ki_list; /* the aio core uses this
* for cancellation */
+
+ /*
+ * If the aio_resfd field of the userspace iocb is not zero,
+ * this is the underlying file* to deliver event to.
+ */
+ struct file *ki_eventfd;
};

#define is_sync_kiocb(iocb) ((iocb)->ki_key == KIOCB_SYNC_KEY)
Index: linux-2.6.20.ep2/include/linux/aio_abi.h
===================================================================
--- linux-2.6.20.ep2.orig/include/linux/aio_abi.h 2007-03-14 20:51:32.000000000 -0700
+++ linux-2.6.20.ep2/include/linux/aio_abi.h 2007-03-14 20:56:00.000000000 -0700
@@ -84,7 +84,11 @@

/* extra parameters */
__u64 aio_reserved2; /* TODO: use this for a (struct sigevent *) */
- __u64 aio_reserved3;
+ __u32 aio_reserved3;