From: Dave Kleikamp <dave.kleikamp@oracle.com>
To: linux-fsdevel@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Zach Brown <zab@zabbo.net>,
"Maxim V. Patlasov" <mpatlasov@parallels.com>,
Dave Kleikamp <dave.kleikamp@oracle.com>,
Alexander Viro <viro@zeniv.linux.org.uk>
Subject: [PATCH V5 17/30] fs: use read_iter and write_iter rather than aio_read and aio_write
Date: Wed, 9 Jan 2013 13:58:32 -0600 [thread overview]
Message-ID: <1357761525-22718-18-git-send-email-dave.kleikamp@oracle.com> (raw)
In-Reply-To: <1357761525-22718-1-git-send-email-dave.kleikamp@oracle.com>
File systems implementing read_iter & write_iter should not be required
to keep aio_read and aio_write as well. The vfs should always call
read/write_iter if they exist. This will make it easier to remove the
aio_read/write operation in the future.
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel@vger.kernel.org
---
fs/aio.c | 14 +++++++------
fs/bad_inode.c | 14 +++++++++++++
fs/compat.c | 6 ++++--
fs/read_write.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++-----
fs/read_write.h | 4 ++++
include/linux/fs.h | 6 ++++--
6 files changed, 87 insertions(+), 15 deletions(-)
diff --git a/fs/aio.c b/fs/aio.c
index 2c03681..08f550a 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -39,6 +39,8 @@
#include <asm/kmap_types.h>
#include <asm/uaccess.h>
+#include "read_write.h"
+
#if DEBUG > 1
#define dprintk printk
#else
@@ -1315,10 +1317,10 @@ static ssize_t aio_rw_vect_retry(struct kiocb *iocb)
if ((iocb->ki_opcode == IOCB_CMD_PREADV) ||
(iocb->ki_opcode == IOCB_CMD_PREAD)) {
- rw_op = file->f_op->aio_read;
+ rw_op = do_aio_read;
opcode = IOCB_CMD_PREADV;
} else {
- rw_op = file->f_op->aio_write;
+ rw_op = do_aio_read;
opcode = IOCB_CMD_PWRITEV;
}
@@ -1467,7 +1469,7 @@ static ssize_t aio_setup_iocb(struct kiocb *kiocb, bool compat)
if (ret)
break;
ret = -EINVAL;
- if (file->f_op->aio_read)
+ if (file->f_op->read_iter || file->f_op->aio_read)
kiocb->ki_retry = aio_rw_vect_retry;
break;
case IOCB_CMD_PWRITE:
@@ -1482,7 +1484,7 @@ static ssize_t aio_setup_iocb(struct kiocb *kiocb, bool compat)
if (ret)
break;
ret = -EINVAL;
- if (file->f_op->aio_write)
+ if (file->f_op->write_iter || file->f_op->aio_write)
kiocb->ki_retry = aio_rw_vect_retry;
break;
case IOCB_CMD_PREADV:
@@ -1493,7 +1495,7 @@ static ssize_t aio_setup_iocb(struct kiocb *kiocb, bool compat)
if (ret)
break;
ret = -EINVAL;
- if (file->f_op->aio_read)
+ if (file->f_op->read_iter || file->f_op->aio_read)
kiocb->ki_retry = aio_rw_vect_retry;
break;
case IOCB_CMD_PWRITEV:
@@ -1504,7 +1506,7 @@ static ssize_t aio_setup_iocb(struct kiocb *kiocb, bool compat)
if (ret)
break;
ret = -EINVAL;
- if (file->f_op->aio_write)
+ if (file->f_op->write_iter || file->f_op->aio_write)
kiocb->ki_retry = aio_rw_vect_retry;
break;
case IOCB_CMD_READ_ITER:
diff --git a/fs/bad_inode.c b/fs/bad_inode.c
index 922ad46..988c04a 100644
--- a/fs/bad_inode.c
+++ b/fs/bad_inode.c
@@ -39,12 +39,24 @@ static ssize_t bad_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
return -EIO;
}
+static ssize_t bad_file_read_iter(struct kiocb *iocb, struct iov_iter *iter,
+ loff_t pos)
+{
+ return -EIO;
+}
+
static ssize_t bad_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
unsigned long nr_segs, loff_t pos)
{
return -EIO;
}
+static ssize_t bad_file_write_iter(struct kiocb *iocb, struct iov_iter *iter,
+ loff_t pos)
+{
+ return -EIO;
+}
+
static int bad_file_readdir(struct file *filp, void *dirent, filldir_t filldir)
{
return -EIO;
@@ -151,7 +163,9 @@ static const struct file_operations bad_file_ops =
.read = bad_file_read,
.write = bad_file_write,
.aio_read = bad_file_aio_read,
+ .read_iter = bad_file_read_iter,
.aio_write = bad_file_aio_write,
+ .write_iter = bad_file_write_iter,
.readdir = bad_file_readdir,
.poll = bad_file_poll,
.unlocked_ioctl = bad_file_unlocked_ioctl,
diff --git a/fs/compat.c b/fs/compat.c
index 7411d66..545888b 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -1098,10 +1098,12 @@ static ssize_t compat_do_readv_writev(int type, struct file *file,
fnv = NULL;
if (type == READ) {
fn = file->f_op->read;
- fnv = file->f_op->aio_read;
+ if (file->f_op->aio_read || file->f_op->read_iter)
+ fnv = do_aio_read;
} else {
fn = (io_fn_t)file->f_op->write;
- fnv = file->f_op->aio_write;
+ if (file->f_op->aio_write || file->f_op->write_iter)
+ fnv = do_aio_write;
}
if (fnv)
diff --git a/fs/read_write.c b/fs/read_write.c
index b5d0bff..65c4846 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -23,7 +23,7 @@
const struct file_operations generic_ro_fops = {
.llseek = generic_file_llseek,
.read = do_sync_read,
- .aio_read = generic_file_aio_read,
+ .read_iter = generic_file_read_iter,
.mmap = generic_file_readonly_mmap,
.splice_read = generic_file_splice_read,
};
@@ -328,6 +328,29 @@ static void wait_on_retry_sync_kiocb(struct kiocb *iocb)
__set_current_state(TASK_RUNNING);
}
+ssize_t do_aio_read(struct kiocb *kiocb, const struct iovec *iov,
+ unsigned long nr_segs, loff_t pos)
+{
+ struct file *file = kiocb->ki_filp;
+
+ if (file->f_op->read_iter) {
+ size_t count;
+ struct iov_iter iter;
+ int ret;
+
+ count = 0;
+ ret = generic_segment_checks(iov, &nr_segs, &count,
+ VERIFY_WRITE);
+ if (ret)
+ return ret;
+
+ iov_iter_init(&iter, iov, nr_segs, count, 0);
+ return file->f_op->read_iter(kiocb, &iter, pos);
+ }
+
+ return file->f_op->aio_read(kiocb, iov, nr_segs, pos);
+}
+
ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos)
{
struct iovec iov = { .iov_base = buf, .iov_len = len };
@@ -340,7 +363,7 @@ ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *pp
kiocb.ki_nbytes = len;
for (;;) {
- ret = filp->f_op->aio_read(&kiocb, &iov, 1, kiocb.ki_pos);
+ ret = do_aio_read(&kiocb, &iov, 1, kiocb.ki_pos);
if (ret != -EIOCBRETRY)
break;
wait_on_retry_sync_kiocb(&kiocb);
@@ -384,6 +407,29 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
EXPORT_SYMBOL(vfs_read);
+ssize_t do_aio_write(struct kiocb *kiocb, const struct iovec *iov,
+ unsigned long nr_segs, loff_t pos)
+{
+ struct file *file = kiocb->ki_filp;
+
+ if (file->f_op->write_iter) {
+ size_t count;
+ struct iov_iter iter;
+ int ret;
+
+ count = 0;
+ ret = generic_segment_checks(iov, &nr_segs, &count,
+ VERIFY_READ);
+ if (ret)
+ return ret;
+
+ iov_iter_init(&iter, iov, nr_segs, count, 0);
+ return file->f_op->write_iter(kiocb, &iter, pos);
+ }
+
+ return file->f_op->aio_write(kiocb, iov, nr_segs, pos);
+}
+
ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
{
struct iovec iov = { .iov_base = (void __user *)buf, .iov_len = len };
@@ -396,7 +442,7 @@ ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, lof
kiocb.ki_nbytes = len;
for (;;) {
- ret = filp->f_op->aio_write(&kiocb, &iov, 1, kiocb.ki_pos);
+ ret = do_aio_write(&kiocb, &iov, 1, kiocb.ki_pos);
if (ret != -EIOCBRETRY)
break;
wait_on_retry_sync_kiocb(&kiocb);
@@ -720,10 +766,12 @@ static ssize_t do_readv_writev(int type, struct file *file,
fnv = NULL;
if (type == READ) {
fn = file->f_op->read;
- fnv = file->f_op->aio_read;
+ if (file->f_op->aio_read || file->f_op->read_iter)
+ fnv = do_aio_read;
} else {
fn = (io_fn_t)file->f_op->write;
- fnv = file->f_op->aio_write;
+ if (file->f_op->aio_write || file->f_op->write_iter)
+ fnv = do_aio_write;
}
if (fnv)
diff --git a/fs/read_write.h b/fs/read_write.h
index d3e00ef..4f00eb7 100644
--- a/fs/read_write.h
+++ b/fs/read_write.h
@@ -8,6 +8,10 @@ typedef ssize_t (*io_fn_t)(struct file *, char __user *, size_t, loff_t *);
typedef ssize_t (*iov_fn_t)(struct kiocb *, const struct iovec *,
unsigned long, loff_t);
+ssize_t do_aio_read(struct kiocb *kiocb, const struct iovec *iov,
+ unsigned long nr_segs, loff_t pos);
+ssize_t do_aio_write(struct kiocb *kiocb, const struct iovec *iov,
+ unsigned long nr_segs, loff_t pos);
ssize_t do_sync_readv_writev(struct file *filp, const struct iovec *iov,
unsigned long nr_segs, size_t len, loff_t *ppos, iov_fn_t fn);
ssize_t do_loop_readv_writev(struct file *filp, struct iovec *iov,
diff --git a/include/linux/fs.h b/include/linux/fs.h
index b893a4f..31d2e17 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1636,12 +1636,14 @@ struct file_operations {
static inline int file_readable(struct file *filp)
{
- return filp && (filp->f_op->read || filp->f_op->aio_read);
+ return filp && (filp->f_op->read || filp->f_op->aio_read ||
+ filp->f_op->read_iter);
}
static inline int file_writable(struct file *filp)
{
- return filp && (filp->f_op->write || filp->f_op->aio_write);
+ return filp && (filp->f_op->write || filp->f_op->aio_write ||
+ filp->f_op->write_iter);
}
struct inode_operations {
--
1.8.1
next prev parent reply other threads:[~2013-01-09 19:58 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-09 19:58 [PATCH V5 00/30] loop: Issue O_DIRECT aio using bio_vec Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 01/30] iov_iter: move into its own file Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 02/30] iov_iter: iov_iter_copy_from_user() should use non-atomic copy Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 03/30] iov_iter: add copy_to_user support Dave Kleikamp
[not found] ` <1357761525-22718-1-git-send-email-dave.kleikamp-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
2013-01-09 19:58 ` [PATCH V5 04/30] fuse: convert fuse to use iov_iter_copy_[to|from]_user Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 22/30] nfs: simplify swap Dave Kleikamp
2013-01-09 20:01 ` Rik van Riel
2013-01-09 19:58 ` [PATCH V5 05/30] iov_iter: hide iovec details behind ops function pointers Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 06/30] iov_iter: add bvec support Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 07/30] iov_iter: add a shorten call Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 08/30] iov_iter: let callers extract iovecs and bio_vecs Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 09/30] dio: Convert direct_IO to use iov_iter Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 10/30] dio: add bio_vec support to __blockdev_direct_IO() Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 11/30] fs: pull iov_iter use higher up the stack Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 12/30] aio: add aio_kernel_() interface Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 13/30] aio: add aio support for iov_iter arguments Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 14/30] bio: add bvec_length(), like iov_length() Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 15/30] loop: use aio to perform io on the underlying file Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 16/30] fs: create file_readable() and file_writable() functions Dave Kleikamp
2013-01-09 19:58 ` Dave Kleikamp [this message]
2013-01-18 21:26 ` [PATCH V5 17/30] fs: use read_iter and write_iter rather than aio_read and aio_write Jeff Moyer
2013-01-18 22:03 ` Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 18/30] fs: add read_iter and write_iter to several file systems Dave Kleikamp
2013-01-10 12:40 ` Boaz Harrosh
2013-01-09 19:58 ` [PATCH V5 19/30] ocfs2: add support for read_iter, write_iter, and direct_IO_bvec Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 20/30] ext4: add support for read_iter and write_iter Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 21/30] nfs: add support for read_iter, write_iter Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 23/30] btrfs: add support for read_iter and write_iter Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 24/30] block_dev: add support for read_iter, write_iter Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 25/30] xfs: add support for read_iter and write_iter Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 26/30] gfs2: Convert aio_read/write ops to read/write_iter Dave Kleikamp
2013-01-10 10:10 ` Steven Whitehouse
2013-01-10 14:34 ` Dave Kleikamp
2013-01-11 16:24 ` Steven Whitehouse
2013-01-09 19:58 ` [PATCH V5 27/30] udf: convert file ops from aio_read/write " Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 28/30] afs: add support for read_iter and write_iter Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 29/30] ecrpytfs: Convert aio_read/write ops to read/write_iter Dave Kleikamp
2013-01-09 19:58 ` [PATCH V5 30/30] ubifs: convert file ops from aio_read/write " Dave Kleikamp
2013-01-10 15:46 ` [PATCH V5 00/30] loop: Issue O_DIRECT aio using bio_vec Sedat Dilek
2013-01-11 21:51 ` Dave Kleikamp
2013-01-12 10:52 ` Sedat Dilek
2013-01-12 12:54 ` Sedat Dilek
2013-01-16 16:32 ` James Bottomley
2013-01-16 18:25 ` Sedat Dilek
2013-01-17 23:49 ` James Bottomley
2013-01-18 17:16 ` Jeff Moyer
2013-01-18 17:56 ` Jeff Moyer
2013-01-18 17:58 ` Dave Kleikamp
2013-01-18 21:48 ` Jeff Moyer
2013-01-18 22:33 ` Dave Kleikamp
2013-01-22 16:14 ` Jeff Moyer
2013-01-20 22:26 ` Dave Chinner
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=1357761525-22718-18-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=mpatlasov@parallels.com \
--cc=viro@zeniv.linux.org.uk \
--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).