From: Al Viro <viro@ZenIV.linux.org.uk>
To: Christoph Hellwig <hch@lst.de>
Cc: Miklos Szeredi <mszeredi@suse.cz>,
linux-aio@kvack.org, linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH 3/5] fs: remove ki_nbytes
Date: Sat, 31 Jan 2015 06:08:41 +0000 [thread overview]
Message-ID: <20150131060841.GM29656@ZenIV.linux.org.uk> (raw)
In-Reply-To: <1422381313-24034-4-git-send-email-hch@lst.de>
> @@ -717,14 +718,14 @@ ep_aio_write(struct kiocb *iocb, const struct iovec *iov,
> unsigned long nr_segs, loff_t o)
> {
> struct ep_data *epdata = iocb->ki_filp->private_data;
> + size_t len = iov_length(iov, nr_segs);
> char *buf;
> - size_t len = 0;
> int i = 0;
>
> if (unlikely(!usb_endpoint_dir_in(&epdata->desc)))
> return -EINVAL;
>
> - buf = kmalloc(iocb->ki_nbytes, GFP_KERNEL);
> + buf = kmalloc(len, GFP_KERNEL);
> if (unlikely(!buf))
> return -ENOMEM;
>
> @@ -734,7 +735,6 @@ ep_aio_write(struct kiocb *iocb, const struct iovec *iov,
> kfree(buf);
> return -EFAULT;
> }
> - len += iov[i].iov_len;
> }
> return ep_aio_rwtail(iocb, buf, len, epdata, NULL, 0);
WTF bother? Just switch it to ->write_iter():
static ssize_t
ep_write_iter(struct kiocb *iocb, struct iov_iter *from)
{
struct ep_data *epdata = iocb->ki_filp->private_data;
size_t len = iov_iter_count(from);
void *buf;
if (unlikely(!usb_endpoint_dir_in(&epdata->desc)))
return -EINVAL;
buf = kmalloc(iov_iter_count(from), GFP_KERNEL);
if (unlikely(!buf))
return -ENOMEM;
if (copy_from_iter(buf, from, len) != len) {
kfree(buf);
return -EFAULT;
}
return ep_aio_rwtail(iocb, buf, len, epdata, NULL, 0);
}
and be done with that. I'll put drivers/usb/gadget patches into a stable
branch and ask use folks to pull from it - that's the simplest of this
series, actually...
> @@ -903,10 +903,9 @@ static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
> if (pos != 0)
> return -ESPIPE;
>
> - if (iocb->ki_nbytes == 0) /* Match SYS5 behaviour */
> + if (!iov_length(iov, nr_segs)) /* Match SYS5 behaviour */
> return 0;
FWIW, it's switched to ->read_iter/->write_iter in vfs.git#for-davem.
next prev parent reply other threads:[~2015-01-31 6:08 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-27 17:55 [RFC] split struct kiocb Christoph Hellwig
2015-01-27 17:55 ` [PATCH 1/5] fs: don't allow to complete sync iocbs through aio_complete Christoph Hellwig
2015-01-28 15:30 ` Miklos Szeredi
2015-01-28 16:57 ` Christoph Hellwig
2015-01-31 3:01 ` Maxim Patlasov
2015-01-27 17:55 ` [PATCH 2/5] fs: saner aio_complete prototype Christoph Hellwig
2015-01-31 10:04 ` Al Viro
2015-01-27 17:55 ` [PATCH 3/5] fs: remove ki_nbytes Christoph Hellwig
2015-01-31 6:08 ` Al Viro [this message]
2015-02-02 8:07 ` Christoph Hellwig
2015-02-02 8:11 ` Al Viro
2015-02-02 8:14 ` Al Viro
2015-02-02 14:26 ` Christoph Hellwig
2015-02-04 8:34 ` Al Viro
2015-02-04 18:17 ` Alan Stern
2015-02-04 19:06 ` Al Viro
2015-02-04 20:30 ` Alan Stern
2015-02-04 23:07 ` Al Viro
2015-02-05 8:24 ` Robert Baldyga
2015-02-05 8:47 ` Al Viro
2015-02-05 9:03 ` Al Viro
2015-02-05 9:15 ` Robert Baldyga
[not found] ` <20150204230733.GK29656-3bDd1+5oDREiFSDQTTA3OLVCufUGDwFn@public.gmane.org>
2015-02-05 15:29 ` Alan Stern
2015-02-06 7:03 ` Al Viro
[not found] ` <20150206070350.GX29656-3bDd1+5oDREiFSDQTTA3OLVCufUGDwFn@public.gmane.org>
2015-02-06 8:44 ` Robert Baldyga
2015-02-07 5:44 ` Al Viro
2015-02-07 5:48 ` [PATCH 1/6] new helper: dup_iter() Al Viro
2015-02-07 5:48 ` [PATCH 2/6] gadget/function/f_fs.c: close leaks Al Viro
2015-02-07 5:48 ` [PATCH 3/6] gadget/function/f_fs.c: use put iov_iter into io_data Al Viro
2015-02-07 5:48 ` [PATCH 4/6] gadget/function/f_fs.c: switch to ->{read,write}_iter() Al Viro
2015-02-07 5:48 ` [PATCH 5/6] gadgetfs: use-after-free in ->aio_read() Al Viro
2015-02-07 5:48 ` [PATCH 6/6] gadget: switch ep_io_operations to ->read_iter/->write_iter Al Viro
2015-02-02 14:20 ` [PATCH 3/5] fs: remove ki_nbytes Christoph Hellwig
2015-01-27 17:55 ` [PATCH 4/5] fs: split generic and aio kiocb Christoph Hellwig
2015-01-27 17:55 ` [PATCH 5/5] fs: add async read/write interfaces Christoph Hellwig
2015-01-31 6:29 ` Al Viro
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=20150131060841.GM29656@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=hch@lst.de \
--cc=linux-aio@kvack.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=mszeredi@suse.cz \
/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).