lkml.org 
[lkml]   [2006]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH 1/3] Vectorize aio_read/aio_write methods
If you apply this one, then the NFS client no longer builds.

I think you might need to stub out vectored direct I/O support for the
NFS client temporarily with something like the attached patch.



Badari Pulavarty wrote:
> This patch vectorizes aio_read() and aio_write() methods to prepare
> for collapsing all the vectored & aio operations into one interface -
> which is aio_read()/aio_write().
>
>
> Signed-off-by: Badari Pulavarty <pbadari@us.ibm.com>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
>
> Documentation/filesystems/Locking | 5 +-
> Documentation/filesystems/vfs.txt | 4 +-
> drivers/char/raw.c | 14 -------
> drivers/usb/gadget/inode.c | 71 +++++++++++++++++++++++++++-----------
> fs/aio.c | 15 +++++---
> fs/block_dev.c | 10 -----
> fs/cifs/cifsfs.c | 6 +--
> fs/ext3/file.c | 5 +-
> fs/read_write.c | 20 ++++++++--
> fs/reiserfs/file.c | 8 ----
> fs/xfs/linux-2.6/xfs_file.c | 44 +++++++++++------------
> include/linux/aio.h | 2 +
> include/linux/fs.h | 10 ++---
> include/net/sock.h | 1
> mm/filemap.c | 39 ++++++++++----------
> net/socket.c | 48 ++++++++++++-------------
> 16 files changed, 163 insertions(+), 139 deletions(-)
>
> Index: linux-2.6.17-rc3/Documentation/filesystems/Locking
> ===================================================================
> --- linux-2.6.17-rc3.orig/Documentation/filesystems/Locking 2006-04-26 19:19:25.000000000 -0700
> +++ linux-2.6.17-rc3/Documentation/filesystems/Locking 2006-05-02 07:53:58.000000000 -0700
> @@ -355,10 +355,9 @@ The last two are called only from check_
> prototypes:
> loff_t (*llseek) (struct file *, loff_t, int);
> ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
> - ssize_t (*aio_read) (struct kiocb *, char __user *, size_t, loff_t);
> ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
> - ssize_t (*aio_write) (struct kiocb *, const char __user *, size_t,
> - loff_t);
> + ssize_t (*aio_read) (struct kiocb *, const struct iovec *, unsigned long, loff_t);
> + ssize_t (*aio_write) (struct kiocb *, const struct iovec *, unsigned long, loff_t);
> int (*readdir) (struct file *, void *, filldir_t);
> unsigned int (*poll) (struct file *, struct poll_table_struct *);
> int (*ioctl) (struct inode *, struct file *, unsigned int,
> Index: linux-2.6.17-rc3/Documentation/filesystems/vfs.txt
> ===================================================================
> --- linux-2.6.17-rc3.orig/Documentation/filesystems/vfs.txt 2006-04-26 19:19:25.000000000 -0700
> +++ linux-2.6.17-rc3/Documentation/filesystems/vfs.txt 2006-05-02 07:53:58.000000000 -0700
> @@ -699,9 +699,9 @@ This describes how the VFS can manipulat
> struct file_operations {
> loff_t (*llseek) (struct file *, loff_t, int);
> ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
> - ssize_t (*aio_read) (struct kiocb *, char __user *, size_t, loff_t);
> ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
> - ssize_t (*aio_write) (struct kiocb *, const char __user *, size_t, loff_t);
> + ssize_t (*aio_read) (struct kiocb *, const struct iovec *, unsigned long, loff_t);
> + ssize_t (*aio_write) (struct kiocb *, const struct iovec *, unsigned long, loff_t);
> int (*readdir) (struct file *, void *, filldir_t);
> unsigned int (*poll) (struct file *, struct poll_table_struct *);
> int (*ioctl) (struct inode *, struct file *, unsigned int, unsigned long);
> Index: linux-2.6.17-rc3/drivers/char/raw.c
> ===================================================================
> --- linux-2.6.17-rc3.orig/drivers/char/raw.c 2006-04-26 19:19:25.000000000 -0700
> +++ linux-2.6.17-rc3/drivers/char/raw.c 2006-05-02 07:53:58.000000000 -0700
> @@ -250,23 +250,11 @@ static ssize_t raw_file_write(struct fil
> return generic_file_write_nolock(file, &local_iov, 1, ppos);
> }
>
> -static ssize_t raw_file_aio_write(struct kiocb *iocb, const char __user *buf,
> - size_t count, loff_t pos)
> -{
> - struct iovec local_iov = {
> - .iov_base = (char __user *)buf,
> - .iov_len = count
> - };
> -
> - return generic_file_aio_write_nolock(iocb, &local_iov, 1, &iocb->ki_pos);
> -}
> -
> -
> static struct file_operations raw_fops = {
> .read = generic_file_read,
> .aio_read = generic_file_aio_read,
> .write = raw_file_write,
> - .aio_write = raw_file_aio_write,
> + .aio_write = generic_file_aio_write_nolock,
> .open = raw_open,
> .release= raw_release,
> .ioctl = raw_ioctl,
> Index: linux-2.6.17-rc3/fs/aio.c
> ===================================================================
> --- linux-2.6.17-rc3.orig/fs/aio.c 2006-04-26 19:19:25.000000000 -0700
> +++ linux-2.6.17-rc3/fs/aio.c 2006-05-02 07:53:58.000000000 -0700
> @@ -15,6 +15,7 @@
> #include <linux/aio_abi.h>
> #include <linux/module.h>
> #include <linux/syscalls.h>
> +#include <linux/uio.h>
>
> #define DEBUG 0
>
> @@ -1315,8 +1316,11 @@ static ssize_t aio_pread(struct kiocb *i
> ssize_t ret = 0;
>
> do {
> - ret = file->f_op->aio_read(iocb, iocb->ki_buf,
> - iocb->ki_left, iocb->ki_pos);
> + iocb->ki_inline_vec.iov_base = iocb->ki_buf;
> + iocb->ki_inline_vec.iov_len = iocb->ki_left;
> +
> + ret = file->f_op->aio_read(iocb, &iocb->ki_inline_vec,
> + 1, iocb->ki_pos);
> /*
> * Can't just depend on iocb->ki_left to determine
> * whether we are done. This may have been a short read.
> @@ -1349,8 +1353,11 @@ static ssize_t aio_pwrite(struct kiocb *
> ssize_t ret = 0;
>
> do {
> - ret = file->f_op->aio_write(iocb, iocb->ki_buf,
> - iocb->ki_left, iocb->ki_pos);
> + iocb->ki_inline_vec.iov_base = iocb->ki_buf;
> + iocb->ki_inline_vec.iov_len = iocb->ki_left;
> +
> + ret = file->f_op->aio_write(iocb, &iocb->ki_inline_vec,
> + 1, iocb->ki_pos);
> if (ret > 0) {
> iocb->ki_buf += ret;
> iocb->ki_left -= ret;
> Index: linux-2.6.17-rc3/fs/block_dev.c
> ===================================================================
> --- linux-2.6.17-rc3.orig/fs/block_dev.c 2006-04-26 19:19:25.000000000 -0700
> +++ linux-2.6.17-rc3/fs/block_dev.c 2006-05-02 07:53:58.000000000 -0700
> @@ -1064,14 +1064,6 @@ static ssize_t blkdev_file_write(struct
> return generic_file_write_nolock(file, &local_iov, 1, ppos);
> }
>
> -static ssize_t blkdev_file_aio_write(struct kiocb *iocb, const char __user *buf,
> - size_t count, loff_t pos)
> -{
> - struct iovec local_iov = { .iov_base = (void __user *)buf, .iov_len = count };
> -
> - return generic_file_aio_write_nolock(iocb, &local_iov, 1, &iocb->ki_pos);
> -}
> -
> static long block_ioctl(struct file *file, unsigned cmd, unsigned long arg)
> {
> return blkdev_ioctl(file->f_mapping->host, file, cmd, arg);
> @@ -1094,7 +1086,7 @@ const struct file_operations def_blk_fop
> .read = generic_file_read,
> .write = blkdev_file_write,
> .aio_read = generic_file_aio_read,
> - .aio_write = blkdev_file_aio_write,
> + .aio_write = generic_file_aio_write_nolock,
> .mmap = generic_file_mmap,
> .fsync = block_fsync,
> .unlocked_ioctl = block_ioctl,
> Index: linux-2.6.17-rc3/fs/cifs/cifsfs.c
> ===================================================================
> --- linux-2.6.17-rc3.orig/fs/cifs/cifsfs.c 2006-04-26 19:19:25.000000000 -0700
> +++ linux-2.6.17-rc3/fs/cifs/cifsfs.c 2006-05-02 07:53:58.000000000 -0700
> @@ -496,13 +496,13 @@ static ssize_t cifs_file_writev(struct f
> return written;
> }
>
> -static ssize_t cifs_file_aio_write(struct kiocb *iocb, const char __user *buf,
> - size_t count, loff_t pos)
> +static ssize_t cifs_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
> + unsigned long nr_segs, loff_t pos)
> {
> struct inode *inode = iocb->ki_filp->f_dentry->d_inode;
> ssize_t written;
>
> - written = generic_file_aio_write(iocb, buf, count, pos);
> + written = generic_file_aio_write(iocb, iov, nr_segs, pos);
> if (!CIFS_I(inode)->clientCanCacheAll)
> filemap_fdatawrite(inode->i_mapping);
> return written;
> Index: linux-2.6.17-rc3/fs/ext3/file.c
> ===================================================================
> --- linux-2.6.17-rc3.orig/fs/ext3/file.c 2006-04-26 19:19:25.000000000 -0700
> +++ linux-2.6.17-rc3/fs/ext3/file.c 2006-05-02 07:53:58.000000000 -0700
> @@ -48,14 +48,15 @@ static int ext3_release_file (struct ino
> }
>
> static ssize_t
> -ext3_file_write(struct kiocb *iocb, const char __user *buf, size_t count, loff_t pos)
> +ext3_file_write(struct kiocb *iocb, const struct iovec *iov,
> + unsigned long nr_segs, loff_t pos)
> {
> struct file *file = iocb->ki_filp;
> struct inode *inode = file->f_dentry->d_inode;
> ssize_t ret;
> int err;
>
> - ret = generic_file_aio_write(iocb, buf, count, pos);
> + ret = generic_file_aio_write(iocb, iov, nr_segs, pos);
>
> /*
> * Skip flushing if there was an error, or if nothing was written.
> Index: linux-2.6.17-rc3/fs/read_write.c
> ===================================================================
> --- linux-2.6.17-rc3.orig/fs/read_write.c 2006-04-26 19:19:25.000000000 -0700
> +++ linux-2.6.17-rc3/fs/read_write.c 2006-05-02 07:53:58.000000000 -0700
> @@ -227,14 +227,20 @@ static void wait_on_retry_sync_kiocb(str
>
> 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 };
> struct kiocb kiocb;
> ssize_t ret;
>
> init_sync_kiocb(&kiocb, filp);
> kiocb.ki_pos = *ppos;
> - while (-EIOCBRETRY ==
> - (ret = filp->f_op->aio_read(&kiocb, buf, len, kiocb.ki_pos)))
> + kiocb.ki_left = len;
> +
> + for (;;) {
> + ret = filp->f_op->aio_read(&kiocb, &iov, 1, kiocb.ki_pos);
> + if (ret != -EIOCBRETRY)
> + break;
> wait_on_retry_sync_kiocb(&kiocb);
> + }
>
> if (-EIOCBQUEUED == ret)
> ret = wait_on_sync_kiocb(&kiocb);
> @@ -279,14 +285,20 @@ EXPORT_SYMBOL(vfs_read);
>
> 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 };
> struct kiocb kiocb;
> ssize_t ret;
>
> init_sync_kiocb(&kiocb, filp);
> kiocb.ki_pos = *ppos;
> - while (-EIOCBRETRY ==
> - (ret = filp->f_op->aio_write(&kiocb, buf, len, kiocb.ki_pos)))
> + kiocb.ki_left = len;
> +
> + for (;;) {
> + ret = filp->f_op->aio_write(&kiocb, &iov, 1, kiocb.ki_pos);
> + if (ret != -EIOCBRETRY)
> + break;
> wait_on_retry_sync_kiocb(&kiocb);
> + }
>
> if (-EIOCBQUEUED == ret)
> ret = wait_on_sync_kiocb(&kiocb);
> Index: linux-2.6.17-rc3/fs/reiserfs/file.c
> ===================================================================
> --- linux-2.6.17-rc3.orig/fs/reiserfs/file.c 2006-04-26 19:19:25.000000000 -0700
> +++ linux-2.6.17-rc3/fs/reiserfs/file.c 2006-05-02 07:53:58.000000000 -0700
> @@ -1560,12 +1560,6 @@ static ssize_t reiserfs_file_write(struc
> return res;
> }
>
> -static ssize_t reiserfs_aio_write(struct kiocb *iocb, const char __user * buf,
> - size_t count, loff_t pos)
> -{
> - return generic_file_aio_write(iocb, buf, count, pos);
> -}
> -
> const struct file_operations reiserfs_file_operations = {
> .read = generic_file_read,
> .write = reiserfs_file_write,
> @@ -1575,7 +1569,7 @@ const struct file_operations reiserfs_fi
> .fsync = reiserfs_sync_file,
> .sendfile = generic_file_sendfile,
> .aio_read = generic_file_aio_read,
> - .aio_write = reiserfs_aio_write,
> + .aio_write = generic_file_aio_write,
> .splice_read = generic_file_splice_read,
> .splice_write = generic_file_splice_write,
> };
> Index: linux-2.6.17-rc3/fs/xfs/linux-2.6/xfs_file.c
> ===================================================================
> --- linux-2.6.17-rc3.orig/fs/xfs/linux-2.6/xfs_file.c 2006-04-26 19:19:25.000000000 -0700
> +++ linux-2.6.17-rc3/fs/xfs/linux-2.6/xfs_file.c 2006-05-02 07:53:58.000000000 -0700
> @@ -51,12 +51,11 @@ static struct vm_operations_struct xfs_d
> STATIC inline ssize_t
> __xfs_file_read(
> struct kiocb *iocb,
> - char __user *buf,
> + const struct iovec *iov,
> + unsigned long nr_segs,
> int ioflags,
> - size_t count,
> loff_t pos)
> {
> - struct iovec iov = {buf, count};
> struct file *file = iocb->ki_filp;
> vnode_t *vp = vn_from_inode(file->f_dentry->d_inode);
> ssize_t rval;
> @@ -65,39 +64,38 @@ __xfs_file_read(
>
> if (unlikely(file->f_flags & O_DIRECT))
> ioflags |= IO_ISDIRECT;
> - VOP_READ(vp, iocb, &iov, 1, &iocb->ki_pos, ioflags, NULL, rval);
> + VOP_READ(vp, iocb, iov, nr_segs, &iocb->ki_pos, ioflags, NULL, rval);
> return rval;
> }
>
> STATIC ssize_t
> xfs_file_aio_read(
> struct kiocb *iocb,
> - char __user *buf,
> - size_t count,
> + const struct iovec *iov,
> + unsigned long nr_segs,
> loff_t pos)
> {
> - return __xfs_file_read(iocb, buf, IO_ISAIO, count, pos);
> + return __xfs_file_read(iocb, iov, nr_segs, IO_ISAIO, pos);
> }
>
> STATIC ssize_t
> xfs_file_aio_read_invis(
> struct kiocb *iocb,
> - char __user *buf,
> - size_t count,
> + const struct iovec *iov,
> + unsigned long nr_segs,
> loff_t pos)
> {
> - return __xfs_file_read(iocb, buf, IO_ISAIO|IO_INVIS, count, pos);
> + return __xfs_file_read(iocb, iov, nr_segs, IO_ISAIO|IO_INVIS, pos);
> }
>
> STATIC inline ssize_t
> __xfs_file_write(
> - struct kiocb *iocb,
> - const char __user *buf,
> - int ioflags,
> - size_t count,
> - loff_t pos)
> + struct kiocb *iocb,
> + const struct iovec *iov,
> + unsigned long nr_segs,
> + int ioflags,
> + loff_t pos)
> {
> - struct iovec iov = {(void __user *)buf, count};
> struct file *file = iocb->ki_filp;
> struct inode *inode = file->f_mapping->host;
> vnode_t *vp = vn_from_inode(inode);
> @@ -107,28 +105,28 @@ __xfs_file_write(
> if (unlikely(file->f_flags & O_DIRECT))
> ioflags |= IO_ISDIRECT;
>
> - VOP_WRITE(vp, iocb, &iov, 1, &iocb->ki_pos, ioflags, NULL, rval);
> + VOP_WRITE(vp, iocb, iov, nr_segs, &iocb->ki_pos, ioflags, NULL, rval);
> return rval;
> }
>
> STATIC ssize_t
> xfs_file_aio_write(
> struct kiocb *iocb,
> - const char __user *buf,
> - size_t count,
> + const struct iovec *iov,
> + unsigned long nr_segs,
> loff_t pos)
> {
> - return __xfs_file_write(iocb, buf, IO_ISAIO, count, pos);
> + return __xfs_file_write(iocb, iov, nr_segs, IO_ISAIO, pos);
> }
>
> STATIC ssize_t
> xfs_file_aio_write_invis(
> struct kiocb *iocb,
> - const char __user *buf,
> - size_t count,
> + const struct iovec *iov,
> + unsigned long nr_segs,
> loff_t pos)
> {
> - return __xfs_file_write(iocb, buf, IO_ISAIO|IO_INVIS, count, pos);
> + return __xfs_file_write(iocb, iov, nr_segs, IO_ISAIO|IO_INVIS, pos);
> }
>
> STATIC inline ssize_t
> Index: linux-2.6.17-rc3/include/linux/fs.h
> ===================================================================
> --- linux-2.6.17-rc3.orig/include/linux/fs.h 2006-04-26 19:19:25.000000000 -0700
> +++ linux-2.6.17-rc3/include/linux/fs.h 2006-05-02 07:53:58.000000000 -0700
> @@ -1015,9 +1015,9 @@ struct file_operations {
> struct module *owner;
> loff_t (*llseek) (struct file *, loff_t, int);
> ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
> - ssize_t (*aio_read) (struct kiocb *, char __user *, size_t, loff_t);
> ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
> - ssize_t (*aio_write) (struct kiocb *, const char __user *, size_t, loff_t);
> + ssize_t (*aio_read) (struct kiocb *, const struct iovec *, unsigned long, loff_t);
> + ssize_t (*aio_write) (struct kiocb *, const struct iovec *, unsigned long, loff_t);
> int (*readdir) (struct file *, void *, filldir_t);
> unsigned int (*poll) (struct file *, struct poll_table_struct *);
> int (*ioctl) (struct inode *, struct file *, unsigned int, unsigned long);
> @@ -1594,11 +1594,11 @@ extern int file_send_actor(read_descript
> extern ssize_t generic_file_read(struct file *, char __user *, size_t, loff_t *);
> int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk);
> extern ssize_t generic_file_write(struct file *, const char __user *, size_t, loff_t *);
> -extern ssize_t generic_file_aio_read(struct kiocb *, char __user *, size_t, loff_t);
> +extern ssize_t generic_file_aio_read(struct kiocb *, const struct iovec *, unsigned long, loff_t);
> extern ssize_t __generic_file_aio_read(struct kiocb *, const struct iovec *, unsigned long, loff_t *);
> -extern ssize_t generic_file_aio_write(struct kiocb *, const char __user *, size_t, loff_t);
> +extern ssize_t generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long, loff_t);
> extern ssize_t generic_file_aio_write_nolock(struct kiocb *, const struct iovec *,
> - unsigned long, loff_t *);
> + unsigned long, loff_t);
> extern ssize_t generic_file_direct_write(struct kiocb *, const struct iovec *,
> unsigned long *, loff_t, loff_t *, size_t, size_t);
> extern ssize_t generic_file_buffered_write(struct kiocb *, const struct iovec *,
> Index: linux-2.6.17-rc3/include/net/sock.h
> ===================================================================
> --- linux-2.6.17-rc3.orig/include/net/sock.h 2006-04-26 19:19:25.000000000 -0700
> +++ linux-2.6.17-rc3/include/net/sock.h 2006-05-02 07:53:58.000000000 -0700
> @@ -659,7 +659,6 @@ struct sock_iocb {
> struct sock *sk;
> struct scm_cookie *scm;
> struct msghdr *msg, async_msg;
> - struct iovec async_iov;
> struct kiocb *kiocb;
> };
>
> Index: linux-2.6.17-rc3/mm/filemap.c
> ===================================================================
> --- linux-2.6.17-rc3.orig/mm/filemap.c 2006-04-26 19:19:25.000000000 -0700
> +++ linux-2.6.17-rc3/mm/filemap.c 2006-05-02 07:53:58.000000000 -0700
> @@ -1096,14 +1096,12 @@ out:
> EXPORT_SYMBOL(__generic_file_aio_read);
>
> ssize_t
> -generic_file_aio_read(struct kiocb *iocb, char __user *buf, size_t count, loff_t pos)
> +generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
> + unsigned long nr_segs, loff_t pos)
> {
> - struct iovec local_iov = { .iov_base = buf, .iov_len = count };
> -
> BUG_ON(iocb->ki_pos != pos);
> - return __generic_file_aio_read(iocb, &local_iov, 1, &iocb->ki_pos);
> + return __generic_file_aio_read(iocb, iov, nr_segs, &iocb->ki_pos);
> }
> -
> EXPORT_SYMBOL(generic_file_aio_read);
>
> ssize_t
> @@ -2163,22 +2161,21 @@ out:
> current->backing_dev_info = NULL;
> return written ? written : err;
> }
> -EXPORT_SYMBOL(generic_file_aio_write_nolock);
>
> -ssize_t
> -generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov,
> - unsigned long nr_segs, loff_t *ppos)
> +ssize_t generic_file_aio_write_nolock(struct kiocb *iocb,
> + const struct iovec *iov, unsigned long nr_segs, loff_t pos)
> {
> struct file *file = iocb->ki_filp;
> struct address_space *mapping = file->f_mapping;
> struct inode *inode = mapping->host;
> ssize_t ret;
> - loff_t pos = *ppos;
>
> - ret = __generic_file_aio_write_nolock(iocb, iov, nr_segs, ppos);
> + BUG_ON(iocb->ki_pos != pos);
> +
> + ret = __generic_file_aio_write_nolock(iocb, iov, nr_segs, &iocb->ki_pos);
>
> if (ret > 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) {
> - int err;
> + ssize_t err;
>
> err = sync_page_range_nolock(inode, mapping, pos, ret);
> if (err < 0)
> @@ -2186,6 +2183,7 @@ generic_file_aio_write_nolock(struct kio
> }
> return ret;
> }
> +EXPORT_SYMBOL(generic_file_aio_write_nolock);
>
> static ssize_t
> __generic_file_write_nolock(struct file *file, const struct iovec *iov,
> @@ -2195,9 +2193,11 @@ __generic_file_write_nolock(struct file
> ssize_t ret;
>
> init_sync_kiocb(&kiocb, file);
> + kiocb.ki_pos = *ppos;
> ret = __generic_file_aio_write_nolock(&kiocb, iov, nr_segs, ppos);
> - if (ret == -EIOCBQUEUED)
> + if (-EIOCBQUEUED == ret)
> ret = wait_on_sync_kiocb(&kiocb);
> + *ppos = kiocb.ki_pos;
> return ret;
> }
>
> @@ -2209,28 +2209,27 @@ generic_file_write_nolock(struct file *f
> ssize_t ret;
>
> init_sync_kiocb(&kiocb, file);
> - ret = generic_file_aio_write_nolock(&kiocb, iov, nr_segs, ppos);
> + kiocb.ki_pos = *ppos;
> + ret = generic_file_aio_write_nolock(&kiocb, iov, nr_segs, *ppos);
> if (-EIOCBQUEUED == ret)
> ret = wait_on_sync_kiocb(&kiocb);
> + *ppos = kiocb.ki_pos;
> return ret;
> }
> EXPORT_SYMBOL(generic_file_write_nolock);
>
> -ssize_t generic_file_aio_write(struct kiocb *iocb, const char __user *buf,
> - size_t count, loff_t pos)
> +ssize_t generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
> + unsigned long nr_segs, loff_t pos)
> {
> struct file *file = iocb->ki_filp;
> struct address_space *mapping = file->f_mapping;
> struct inode *inode = mapping->host;
> ssize_t ret;
> - struct iovec local_iov = { .iov_base = (void __user *)buf,
> - .iov_len = count };
>
> BUG_ON(iocb->ki_pos != pos);
>
> mutex_lock(&inode->i_mutex);
> - ret = __generic_file_aio_write_nolock(iocb, &local_iov, 1,
> - &iocb->ki_pos);
> + ret = __generic_file_aio_write_nolock(iocb, iov, nr_segs, &iocb->ki_pos);
> mutex_unlock(&inode->i_mutex);
>
> if (ret > 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) {
> Index: linux-2.6.17-rc3/net/socket.c
> ===================================================================
> --- linux-2.6.17-rc3.orig/net/socket.c 2006-04-26 19:19:25.000000000 -0700
> +++ linux-2.6.17-rc3/net/socket.c 2006-05-02 07:53:58.000000000 -0700
> @@ -96,10 +96,10 @@
> #include <linux/netfilter.h>
>
> static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
> -static ssize_t sock_aio_read(struct kiocb *iocb, char __user *buf,
> - size_t size, loff_t pos);
> -static ssize_t sock_aio_write(struct kiocb *iocb, const char __user *buf,
> - size_t size, loff_t pos);
> +static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
> + unsigned long nr_segs, loff_t pos);
> +static ssize_t sock_aio_write(struct kiocb *iocb, const struct iovec *iov,
> + unsigned long nr_segs, loff_t pos);
> static int sock_mmap(struct file *file, struct vm_area_struct * vma);
>
> static int sock_close(struct inode *inode, struct file *file);
> @@ -700,7 +700,7 @@ static ssize_t sock_sendpage(struct file
> }
>
> static struct sock_iocb *alloc_sock_iocb(struct kiocb *iocb,
> - char __user *ubuf, size_t size, struct sock_iocb *siocb)
> + struct sock_iocb *siocb)
> {
> if (!is_sync_kiocb(iocb)) {
> siocb = kmalloc(sizeof(*siocb), GFP_KERNEL);
> @@ -710,15 +710,13 @@ static struct sock_iocb *alloc_sock_iocb
> }
>
> siocb->kiocb = iocb;
> - siocb->async_iov.iov_base = ubuf;
> - siocb->async_iov.iov_len = size;
> -
> iocb->private = siocb;
> return siocb;
> }
>
> static ssize_t do_sock_read(struct msghdr *msg, struct kiocb *iocb,
> - struct file *file, struct iovec *iov, unsigned long nr_segs)
> + struct file *file, const struct iovec *iov,
> + unsigned long nr_segs)
> {
> struct socket *sock = file->private_data;
> size_t size = 0;
> @@ -749,31 +747,33 @@ static ssize_t sock_readv(struct file *f
> init_sync_kiocb(&iocb, NULL);
> iocb.private = &siocb;
>
> - ret = do_sock_read(&msg, &iocb, file, (struct iovec *)iov, nr_segs);
> + ret = do_sock_read(&msg, &iocb, file, iov, nr_segs);
> if (-EIOCBQUEUED == ret)
> ret = wait_on_sync_kiocb(&iocb);
> return ret;
> }
>
> -static ssize_t sock_aio_read(struct kiocb *iocb, char __user *ubuf,
> - size_t count, loff_t pos)
> +static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
> + unsigned long nr_segs, loff_t pos)
> {
> struct sock_iocb siocb, *x;
>
> if (pos != 0)
> return -ESPIPE;
> - if (count == 0) /* Match SYS5 behaviour */
> +
> + if (iocb->ki_left == 0) /* Match SYS5 behaviour */
> return 0;
>
> - x = alloc_sock_iocb(iocb, ubuf, count, &siocb);
> +
> + x = alloc_sock_iocb(iocb, &siocb);
> if (!x)
> return -ENOMEM;
> - return do_sock_read(&x->async_msg, iocb, iocb->ki_filp,
> - &x->async_iov, 1);
> + return do_sock_read(&x->async_msg, iocb, iocb->ki_filp, iov, nr_segs);
> }
>
> static ssize_t do_sock_write(struct msghdr *msg, struct kiocb *iocb,
> - struct file *file, struct iovec *iov, unsigned long nr_segs)
> + struct file *file, const struct iovec *iov,
> + unsigned long nr_segs)
> {
> struct socket *sock = file->private_data;
> size_t size = 0;
> @@ -806,28 +806,28 @@ static ssize_t sock_writev(struct file *
> init_sync_kiocb(&iocb, NULL);
> iocb.private = &siocb;
>
> - ret = do_sock_write(&msg, &iocb, file, (struct iovec *)iov, nr_segs);
> + ret = do_sock_write(&msg, &iocb, file, iov, nr_segs);
> if (-EIOCBQUEUED == ret)
> ret = wait_on_sync_kiocb(&iocb);
> return ret;
> }
>
> -static ssize_t sock_aio_write(struct kiocb *iocb, const char __user *ubuf,
> - size_t count, loff_t pos)
> +static ssize_t sock_aio_write(struct kiocb *iocb, const struct iovec *iov,
> + unsigned long nr_segs, loff_t pos)
> {
> struct sock_iocb siocb, *x;
>
> if (pos != 0)
> return -ESPIPE;
> - if (count == 0) /* Match SYS5 behaviour */
> +
> + if (iocb->ki_left == 0) /* Match SYS5 behaviour */
> return 0;
>
> - x = alloc_sock_iocb(iocb, (void __user *)ubuf, count, &siocb);
> + x = alloc_sock_iocb(iocb, &siocb);
> if (!x)
> return -ENOMEM;
>
> - return do_sock_write(&x->async_msg, iocb, iocb->ki_filp,
> - &x->async_iov, 1);
> + return do_sock_write(&x->async_msg, iocb, iocb->ki_filp, iov, nr_segs);
> }
>
>
> Index: linux-2.6.17-rc3/drivers/usb/gadget/inode.c
> ===================================================================
> --- linux-2.6.17-rc3.orig/drivers/usb/gadget/inode.c 2006-04-26 19:19:25.000000000 -0700
> +++ linux-2.6.17-rc3/drivers/usb/gadget/inode.c 2006-05-02 07:53:58.000000000 -0700
> @@ -528,7 +528,8 @@ struct kiocb_priv {
> struct usb_request *req;
> struct ep_data *epdata;
> void *buf;
> - char __user *ubuf;
> + struct iovec *iv;
> + unsigned long count;
> unsigned actual;
> };
>
> @@ -556,18 +557,32 @@ static int ep_aio_cancel(struct kiocb *i
> static ssize_t ep_aio_read_retry(struct kiocb *iocb)
> {
> struct kiocb_priv *priv = iocb->private;
> - ssize_t status = priv->actual;
> + ssize_t len, total;
>
> /* we "retry" to get the right mm context for this: */
> - status = copy_to_user(priv->ubuf, priv->buf, priv->actual);
> - if (unlikely(0 != status))
> - status = -EFAULT;
> - else
> - status = priv->actual;
> +
> + /* copy stuff into user buffers */
> + total = priv->actual;
> + len = 0;
> + for (i=0; i < priv->count; i++) {
> + ssize_t this = min(priv->iv[i].iov_len, (size_t)total);
> +
> + if (copy_to_user(priv->iv[i].iov_buf, priv->buf, this))
> + break;
> +
> + total -= this;
> + len += this;
> + if (total <= 0)
> + break;
> + }
> +
> + if (unlikely(len != 0))
> + len = -EFAULT;
> +
> kfree(priv->buf);
> kfree(priv);
> aio_put_req(iocb);
> - return status;
> + return len;
> }
>
> static void ep_aio_complete(struct usb_ep *ep, struct usb_request *req)
> @@ -615,7 +630,8 @@ ep_aio_rwtail(
> char *buf,
> size_t len,
> struct ep_data *epdata,
> - char __user *ubuf
> + const struct iovec *iv,
> + unsigned long count
> )
> {
> struct kiocb_priv *priv = (void *) &iocb->private;
> @@ -630,7 +646,8 @@ fail:
> return value;
> }
> iocb->private = priv;
> - priv->ubuf = ubuf;
> + priv->iovec = iv;
> + priv->count = count;
>
> value = get_ready_ep(iocb->ki_filp->f_flags, epdata);
> if (unlikely(value < 0)) {
> @@ -675,36 +692,52 @@ fail:
> }
>
> static ssize_t
> -ep_aio_read(struct kiocb *iocb, char __user *ubuf, size_t len, loff_t o)
> +ep_aio_read(struct kiocb *iocb, const struct iovec *iv,
> + unsigned long count, loff_t o)
> {
> struct ep_data *epdata = iocb->ki_filp->private_data;
> char *buf;
> + size_t len;
> + int i = 0;
> + ssize_t ret;
>
> if (unlikely(epdata->desc.bEndpointAddress & USB_DIR_IN))
> return -EINVAL;
> - buf = kmalloc(len, GFP_KERNEL);
> +
> + buf = kmalloc(iocb->ki_left, GFP_KERNEL);
> if (unlikely(!buf))
> return -ENOMEM;
> +
> iocb->ki_retry = ep_aio_read_retry;
> - return ep_aio_rwtail(iocb, buf, len, epdata, ubuf);
> + return ep_aio_rwtail(iocb, buf, len, epdata, iv, count);
> }
>
> static ssize_t
> -ep_aio_write(struct kiocb *iocb, const char __user *ubuf, size_t len, loff_t o)
> +ep_aio_write(struct kiocb *iocb, const struct iovec *iv,
> + unsigned long count, loff_t o)
> {
> struct ep_data *epdata = iocb->ki_filp->private_data;
> char *buf;
> + size_t len = 0;
> + int i = 0;
> + ssize_t ret;
>
> if (unlikely(!(epdata->desc.bEndpointAddress & USB_DIR_IN)))
> return -EINVAL;
> - buf = kmalloc(len, GFP_KERNEL);
> +
> + buf = kmalloc(iocb->ki_left, GFP_KERNEL);
> if (unlikely(!buf))
> return -ENOMEM;
> - if (unlikely(copy_from_user(buf, ubuf, len) != 0)) {
> - kfree(buf);
> - return -EFAULT;
> +
> + for (i=0; i < count; i++) {
> + if (unlikely(copy_from_user(&buf[len], iv[i]->iov_base,
> + iv[i]->iov_len) != 0)) {
> + kfree(buf);
> + return -EFAULT;
> + }
> + len += iv[i]->iov_len;
> }
> - return ep_aio_rwtail(iocb, buf, len, epdata, NULL);
> + return ep_aio_rwtail(iocb, buf, len, epdata, NULL, 0);
> }
>
> /*----------------------------------------------------------------------*/
> Index: linux-2.6.17-rc3/include/linux/aio.h
> ===================================================================
> --- linux-2.6.17-rc3.orig/include/linux/aio.h 2006-04-26 19:19:25.000000000 -0700
> +++ linux-2.6.17-rc3/include/linux/aio.h 2006-05-02 07:53:58.000000000 -0700
> @@ -4,6 +4,7 @@
> #include <linux/list.h>
> #include <linux/workqueue.h>
> #include <linux/aio_abi.h>
> +#include <linux/uio.h>
>
> #include <asm/atomic.h>
>
> @@ -112,6 +113,7 @@ struct kiocb {
> long ki_retried; /* just for testing */
> long ki_kicked; /* just for testing */
> long ki_queued; /* just for testing */
> + struct iovec ki_inline_vec; /* inline vector */
>
> struct list_head ki_list; /* the aio core uses this
> * for cancellation */
>


--
corporate: <cel at netapp dot com>
personal: <chucklever at bigfoot dot com>
nfs: update nfs_file_read and nfs_file_write to the new vectored API

From: Chuck Lever <cel@netapp.com>

Migrate NFS client's read and write file operations to use the new vectored
I/O API. Note that the direct I/O path supports only standard non-vectored
I/O for now.

Also fix some tab damage in the definition of nfs_file_operations, and
update dprintk's to reflect the true size of loff_t.

Test plan:
Standard read- and write- intensive workloads.

Signed-off-by: Chuck Lever <cel@netapp.com>
---

fs/nfs/direct.c | 24 ++++++++++++++++++------
fs/nfs/file.c | 43 ++++++++++++++++++++++++-------------------
include/linux/nfs_fs.h | 8 ++++----
3 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 3c72b0c..e5707b3 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -745,8 +745,8 @@ static ssize_t nfs_direct_write(struct k
/**
* nfs_file_direct_read - file direct read operation for NFS files
* @iocb: target I/O control block
- * @buf: user's buffer into which to read data
- * @count: number of bytes to read
+ * @iov: vector of user buffers into which to read data
+ * @nr_segs: size of iov vector
* @pos: byte offset in file where reading starts
*
* We use this function for direct reads instead of calling
@@ -763,19 +763,25 @@ static ssize_t nfs_direct_write(struct k
* client must read the updated atime from the server back into its
* cache.
*/
-ssize_t nfs_file_direct_read(struct kiocb *iocb, char __user *buf, size_t count, loff_t pos)
+ssize_t nfs_file_direct_read(struct kiocb *iocb, const struct iovec *iov, unsigned long nr_segs, loff_t pos)
{
ssize_t retval = -EINVAL;
int page_count;
struct page **pages;
struct file *file = iocb->ki_filp;
struct address_space *mapping = file->f_mapping;
+ /* XXX: temporary */
+ const char __user *buf = iov[0].iov_base;
+ size_t count = iov[0].iov_len;

dprintk("nfs: direct read(%s/%s, %lu@%Ld)\n",
file->f_dentry->d_parent->d_name.name,
file->f_dentry->d_name.name,
(unsigned long) count, (long long) pos);

+ if (nr_segs != 1)
+ return -EINVAL;
+
if (count < 0)
goto out;
retval = -EFAULT;
@@ -807,8 +813,8 @@ out:
/**
* nfs_file_direct_write - file direct write operation for NFS files
* @iocb: target I/O control block
- * @buf: user's buffer from which to write data
- * @count: number of bytes to write
+ * @iov: vector of user buffers from which to write data
+ * @nr_segs: size of iov vector
* @pos: byte offset in file where writing starts
*
* We use this function for direct writes instead of calling
@@ -829,19 +835,25 @@ out:
* Note that O_APPEND is not supported for NFS direct writes, as there
* is no atomic O_APPEND write facility in the NFS protocol.
*/
-ssize_t nfs_file_direct_write(struct kiocb *iocb, const char __user *buf, size_t count, loff_t pos)
+ssize_t nfs_file_direct_write(struct kiocb *iocb, const struct iovec *iov, unsigned long nr_segs, loff_t pos)
{
ssize_t retval;
int page_count;
struct page **pages;
struct file *file = iocb->ki_filp;
struct address_space *mapping = file->f_mapping;
+ /* XXX: temporary */
+ const char __user *buf = iov[0].iov_base;
+ size_t count = iov[0].iov_len;

dfprintk(VFS, "nfs: direct write(%s/%s, %lu@%Ld)\n",
file->f_dentry->d_parent->d_name.name,
file->f_dentry->d_name.name,
(unsigned long) count, (long long) pos);

+ if (nr_segs != 1)
+ return -EINVAL;
+
retval = generic_write_checks(file, &pos, &count, 0);
if (retval)
goto out;
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index fade02c..4fea6aa 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -41,8 +41,8 @@ static int nfs_file_release(struct inode
static loff_t nfs_file_llseek(struct file *file, loff_t offset, int origin);
static int nfs_file_mmap(struct file *, struct vm_area_struct *);
static ssize_t nfs_file_sendfile(struct file *, loff_t *, size_t, read_actor_t, void *);
-static ssize_t nfs_file_read(struct kiocb *, char __user *, size_t, loff_t);
-static ssize_t nfs_file_write(struct kiocb *, const char __user *, size_t, loff_t);
+static ssize_t nfs_file_read(struct kiocb *iocb, const struct iovec *iov, unsigned long nr_segs, loff_t pos);
+static ssize_t nfs_file_write(struct kiocb *iocb, const struct iovec *iov, unsigned long nr_segs, loff_t pos);
static int nfs_file_flush(struct file *);
static int nfs_fsync(struct file *, struct dentry *dentry, int datasync);
static int nfs_check_flags(int flags);
@@ -53,8 +53,8 @@ const struct file_operations nfs_file_op
.llseek = nfs_file_llseek,
.read = do_sync_read,
.write = do_sync_write,
- .aio_read = nfs_file_read,
- .aio_write = nfs_file_write,
+ .aio_read = nfs_file_read,
+ .aio_write = nfs_file_write,
.mmap = nfs_file_mmap,
.open = nfs_file_open,
.flush = nfs_file_flush,
@@ -212,26 +212,30 @@ nfs_file_flush(struct file *file)
return status;
}

-static ssize_t
-nfs_file_read(struct kiocb *iocb, char __user * buf, size_t count, loff_t pos)
+static ssize_t nfs_file_read(struct kiocb *iocb, const struct iovec *iov, unsigned long nr_segs, loff_t pos)
{
struct dentry * dentry = iocb->ki_filp->f_dentry;
struct inode * inode = dentry->d_inode;
ssize_t result;
+ unsigned long seg;
+ size_t count = 0;
+
+ for (seg = 0; seg < nr_segs; seg++)
+ count += iov[seg].iov_len;

#ifdef CONFIG_NFS_DIRECTIO
if (iocb->ki_filp->f_flags & O_DIRECT)
- return nfs_file_direct_read(iocb, buf, count, pos);
+ return nfs_file_direct_read(iocb, iov, nr_segs, pos);
#endif

- dfprintk(VFS, "nfs: read(%s/%s, %lu@%lu)\n",
+ dfprintk(VFS, "nfs: read(%s/%s, %lu@%Ld)\n",
dentry->d_parent->d_name.name, dentry->d_name.name,
- (unsigned long) count, (unsigned long) pos);
+ (unsigned long) count, (long long) pos);

result = nfs_revalidate_file(inode, iocb->ki_filp);
nfs_add_stats(inode, NFSIOS_NORMALREADBYTES, count);
if (!result)
- result = generic_file_aio_read(iocb, buf, count, pos);
+ result = generic_file_aio_read(iocb, iov, nr_segs, pos);
return result;
}

@@ -343,24 +347,25 @@ struct address_space_operations nfs_file
#endif
};

-/*
- * Write to a file (through the page cache).
- */
-static ssize_t
-nfs_file_write(struct kiocb *iocb, const char __user *buf, size_t count, loff_t pos)
+static ssize_t nfs_file_write(struct kiocb *iocb, const struct iovec *iov, unsigned long nr_segs, loff_t pos)
{
struct dentry * dentry = iocb->ki_filp->f_dentry;
struct inode * inode = dentry->d_inode;
ssize_t result;
+ unsigned long seg;
+ size_t count = 0;
+
+ for (seg = 0; seg < nr_segs; seg++)
+ count += iov[seg].iov_len;

#ifdef CONFIG_NFS_DIRECTIO
if (iocb->ki_filp->f_flags & O_DIRECT)
- return nfs_file_direct_write(iocb, buf, count, pos);
+ return nfs_file_direct_write(iocb, iov, nr_segs, pos);
#endif

- dfprintk(VFS, "nfs: write(%s/%s(%ld), %lu@%lu)\n",
+ dfprintk(VFS, "nfs: write(%s/%s(%ld), %lu@%Ld)\n",
dentry->d_parent->d_name.name, dentry->d_name.name,
- inode->i_ino, (unsigned long) count, (unsigned long) pos);
+ inode->i_ino, (unsigned long) count, (long long) pos);

result = -EBUSY;
if (IS_SWAPFILE(inode))
@@ -380,7 +385,7 @@ nfs_file_write(struct kiocb *iocb, const
goto out;

nfs_add_stats(inode, NFSIOS_NORMALWRITTENBYTES, count);
- result = generic_file_aio_write(iocb, buf, count, pos);
+ result = generic_file_aio_write(iocb, iov, nr_segs, pos);
out:
return result;

diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index c71227d..f590a87 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -359,10 +359,10 @@ extern int nfs3_removexattr (struct dent
*/
extern ssize_t nfs_direct_IO(int, struct kiocb *, const struct iovec *, loff_t,
unsigned long);
-extern ssize_t nfs_file_direct_read(struct kiocb *iocb, char __user *buf,
- size_t count, loff_t pos);
-extern ssize_t nfs_file_direct_write(struct kiocb *iocb, const char __user *buf,
- size_t count, loff_t pos);
+extern ssize_t nfs_file_direct_read(struct kiocb *iocb, const struct iovec *iov,
+ unsigned long nr_segs, loff_t pos);
+extern ssize_t nfs_file_direct_write(struct kiocb *iocb, const struct iovec *iov,
+ unsigned long nr_segs, loff_t pos);

/*
* linux/fs/nfs/dir.c
\
 
 \ /
  Last update: 2006-05-02 17:23    [W:0.659 / U:0.108 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site