From: Dave Kleikamp <dave.kleikamp@oracle.com>
To: Zach Brown <zab@zabbo.net>
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
Dave Kleikamp <dave.kleikamp@oracle.com>
Subject: [PATCH V7 -next 15/33] aio: add aio support for iov_iter arguments
Date: Fri, 8 Mar 2013 16:52:10 -0600 [thread overview]
Message-ID: <1362783148-22736-16-git-send-email-dave.kleikamp@oracle.com> (raw)
In-Reply-To: <1362783148-22736-1-git-send-email-dave.kleikamp@oracle.com>
This adds iocb cmds which specify that memory is held in iov_iter
structures. This lets kernel callers specify memory that can be
expressed in an iov_iter, which includes pages in bio_vec arrays.
Only kernel callers can provide an iov_iter so it doesn't make a lot of
sense to expose the IOCB_CMD values for this as part of the user space
ABI.
But kernel callers should also be able to perform the usual aio
operations which suggests using the the existing operation namespace and
support code.
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Cc: Zach Brown <zab@zabbo.net>
---
fs/aio.c | 67 ++++++++++++++++++++++++++++++++++++++++++++
include/linux/aio.h | 3 ++
include/uapi/linux/aio_abi.h | 2 ++
3 files changed, 72 insertions(+)
diff --git a/fs/aio.c b/fs/aio.c
index 6dd3a4e..51d3afa 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1144,6 +1144,48 @@ static ssize_t aio_setup_single_vector(int rw, struct kiocb *kiocb)
return 0;
}
+static ssize_t aio_read_iter(struct kiocb *iocb)
+{
+ struct file *file = iocb->ki_filp;
+ ssize_t ret;
+
+ if (unlikely(!is_kernel_kiocb(iocb)))
+ return -EINVAL;
+
+ if (unlikely(!(file->f_mode & FMODE_READ)))
+ return -EBADF;
+
+ ret = security_file_permission(file, MAY_READ);
+ if (unlikely(ret))
+ return ret;
+
+ if (!file->f_op->read_iter)
+ return -EINVAL;
+
+ return file->f_op->read_iter(iocb, iocb->ki_iter, iocb->ki_pos);
+}
+
+static ssize_t aio_write_iter(struct kiocb *iocb)
+{
+ struct file *file = iocb->ki_filp;
+ ssize_t ret;
+
+ if (unlikely(!is_kernel_kiocb(iocb)))
+ return -EINVAL;
+
+ if (unlikely(!(file->f_mode & FMODE_WRITE)))
+ return -EBADF;
+
+ ret = security_file_permission(file, MAY_WRITE);
+ if (unlikely(ret))
+ return ret;
+
+ if (!file->f_op->write_iter)
+ return -EINVAL;
+
+ return file->f_op->write_iter(iocb, iocb->ki_iter, iocb->ki_pos);
+}
+
/*
* aio_setup_iocb:
* Performs the initial checks and aio retry method
@@ -1195,6 +1237,14 @@ rw_common:
ret = aio_rw_vect_retry(req, rw, rw_op);
break;
+ case IOCB_CMD_READ_ITER:
+ ret = aio_read_iter(req);
+ break;
+
+ case IOCB_CMD_WRITE_ITER:
+ ret = aio_write_iter(req);
+ break;
+
case IOCB_CMD_FDSYNC:
if (!file->f_op->aio_fsync)
return -EINVAL;
@@ -1268,6 +1318,23 @@ void aio_kernel_init_rw(struct kiocb *iocb, struct file *filp,
}
EXPORT_SYMBOL_GPL(aio_kernel_init_rw);
+/*
+ * The iter count must be set before calling here. Some filesystems uses
+ * iocb->ki_left as an indicator of the size of an IO.
+ */
+void aio_kernel_init_iter(struct kiocb *iocb, struct file *filp,
+ unsigned short op, struct iov_iter *iter, loff_t off)
+{
+ iocb->ki_filp = filp;
+ iocb->ki_iter = iter;
+ iocb->ki_opcode = op;
+ iocb->ki_pos = off;
+ iocb->ki_nbytes = iov_iter_count(iter);
+ iocb->ki_left = iocb->ki_nbytes;
+ iocb->ki_ctx = (void *)-1;
+}
+EXPORT_SYMBOL_GPL(aio_kernel_init_iter);
+
void aio_kernel_init_callback(struct kiocb *iocb,
void (*complete)(u64 user_data, long res),
u64 user_data)
diff --git a/include/linux/aio.h b/include/linux/aio.h
index eccf646..75942e1 100644
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -72,6 +72,7 @@ struct kiocb {
* this is the underlying eventfd context to deliver events to.
*/
struct eventfd_ctx *ki_eventfd;
+ struct iov_iter *ki_iter;
};
static inline bool is_sync_kiocb(struct kiocb *kiocb)
@@ -110,6 +111,8 @@ struct kiocb *aio_kernel_alloc(gfp_t gfp);
void aio_kernel_free(struct kiocb *iocb);
void aio_kernel_init_rw(struct kiocb *iocb, struct file *filp,
unsigned short op, void *ptr, size_t nr, loff_t off);
+void aio_kernel_init_iter(struct kiocb *iocb, struct file *filp,
+ unsigned short op, struct iov_iter *iter, loff_t off);
void aio_kernel_init_callback(struct kiocb *iocb,
void (*complete)(u64 user_data, long res),
u64 user_data);
diff --git a/include/uapi/linux/aio_abi.h b/include/uapi/linux/aio_abi.h
index 86fa7a7..bd39bb2 100644
--- a/include/uapi/linux/aio_abi.h
+++ b/include/uapi/linux/aio_abi.h
@@ -44,6 +44,8 @@ enum {
IOCB_CMD_NOOP = 6,
IOCB_CMD_PREADV = 7,
IOCB_CMD_PWRITEV = 8,
+ IOCB_CMD_READ_ITER = 9,
+ IOCB_CMD_WRITE_ITER = 10,
};
/*
--
1.8.1.5
next prev parent reply other threads:[~2013-03-08 22:52 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-08 22:51 [PATCH V7 -next 00/33] loop: Issue O_DIRECT aio using bio_vec Dave Kleikamp
2013-03-08 22:51 ` [PATCH V7 -next 01/33] iov_iter: move into its own file Dave Kleikamp
2013-03-08 22:51 ` [PATCH V7 -next 02/33] iov_iter: iov_iter_copy_from_user() should use non-atomic copy Dave Kleikamp
2013-03-08 22:51 ` [PATCH V7 -next 03/33] iov_iter: add copy_to_user support Dave Kleikamp
2013-03-08 22:51 ` [PATCH V7 -next 04/33] iov_iter: add __iovec_copy_to_user() Dave Kleikamp
[not found] ` <1362783148-22736-1-git-send-email-dave.kleikamp-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
2013-03-08 22:52 ` [PATCH V7 -next 05/33] fuse: convert fuse to use iov_iter_copy_[to|from]_user Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 06/33] iov_iter: hide iovec details behind ops function pointers Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 07/33] iov_iter: ii_iovec_copy_to_user should pre-fault user pages Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 08/33] iov_iter: add bvec support Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 09/33] iov_iter: add a shorten call Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 10/33] iov_iter: let callers extract iovecs and bio_vecs Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 11/33] dio: Convert direct_IO to use iov_iter Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 12/33] dio: add bio_vec support to __blockdev_direct_IO() Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 13/33] fs: pull iov_iter use higher up the stack Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 14/33] aio: add aio_kernel_() interface Dave Kleikamp
2013-03-08 22:52 ` Dave Kleikamp [this message]
2013-03-08 22:52 ` [PATCH V7 -next 16/33] bio: add bvec_length(), like iov_length() Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 17/33] loop: use aio to perform io on the underlying file Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 18/33] fs: create file_readable() and file_writable() functions Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 19/33] fs: use read_iter and write_iter rather than aio_read and aio_write Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 20/33] fs: add read_iter and write_iter to several file systems Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 21/33] ocfs2: add support for read_iter, write_iter, and direct_IO_bvec Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 22/33] ext4: add support for read_iter and write_iter Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 23/33] nfs: add support for read_iter, write_iter Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 24/33] nfs: simplify swap Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 25/33] btrfs: add support for read_iter and write_iter Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 26/33] block_dev: add support for read_iter, write_iter Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 27/33] xfs: add support for read_iter and write_iter Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 28/33] gfs2: Convert aio_read/write ops to read/write_iter Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 29/33] udf: convert file ops from aio_read/write " Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 30/33] afs: add support for read_iter and write_iter Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 31/33] ecrpytfs: Convert aio_read/write ops to read/write_iter Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 32/33] ubifs: convert file ops from aio_read/write " Dave Kleikamp
2013-03-08 22:52 ` [PATCH V7 -next 33/33] tmpfs: add support for read_iter and write_iter Dave Kleikamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1362783148-22736-16-git-send-email-dave.kleikamp@oracle.com \
--to=dave.kleikamp@oracle.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=zab@zabbo.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).