From: Dave Kleikamp <dave.kleikamp@oracle.com>
To: linux-kernel@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
"Maxim V. Patlasov" <mpatlasov@parallels.com>,
Zach Brown <zab@zabbo.net>, Christoph Hellwig <hch@infradead.org>,
Dave Kleikamp <dave.kleikamp@oracle.com>
Subject: [PATCH V9 03/33] iov_iter: add copy_to_user support
Date: Wed, 16 Oct 2013 09:04:16 -0500 [thread overview]
Message-ID: <1381932286-14978-4-git-send-email-dave.kleikamp@oracle.com> (raw)
In-Reply-To: <1381932286-14978-1-git-send-email-dave.kleikamp@oracle.com>
From: Zach Brown <zab@zabbo.net>
This adds iov_iter wrappers around copy_to_user() to match the existing
wrappers around copy_from_user().
This will be used by the generic file system buffered read path.
Signed-off-by: Zach Brown <zab@zabbo.net>
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
---
fs/iov-iter.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
include/linux/fs.h | 4 +++
2 files changed, 84 insertions(+)
diff --git a/fs/iov-iter.c b/fs/iov-iter.c
index 563a6ba..0b2407e 100644
--- a/fs/iov-iter.c
+++ b/fs/iov-iter.c
@@ -6,6 +6,86 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
+static size_t __iovec_copy_to_user(char *vaddr, const struct iovec *iov,
+ size_t base, size_t bytes, int atomic)
+{
+ size_t copied = 0, left = 0;
+
+ while (bytes) {
+ char __user *buf = iov->iov_base + base;
+ int copy = min(bytes, iov->iov_len - base);
+
+ base = 0;
+ if (atomic)
+ left = __copy_to_user_inatomic(buf, vaddr, copy);
+ else
+ left = copy_to_user(buf, vaddr, copy);
+ copied += copy;
+ bytes -= copy;
+ vaddr += copy;
+ iov++;
+
+ if (unlikely(left))
+ break;
+ }
+ return copied - left;
+}
+
+/*
+ * Copy as much as we can into the page and return the number of bytes which
+ * were sucessfully copied. If a fault is encountered then return the number of
+ * bytes which were copied.
+ */
+size_t iov_iter_copy_to_user_atomic(struct page *page,
+ struct iov_iter *i, unsigned long offset, size_t bytes)
+{
+ char *kaddr;
+ size_t copied;
+
+ BUG_ON(!in_atomic());
+ kaddr = kmap_atomic(page);
+ if (likely(i->nr_segs == 1)) {
+ int left;
+ char __user *buf = i->iov->iov_base + i->iov_offset;
+ left = __copy_to_user_inatomic(buf, kaddr + offset, bytes);
+ copied = bytes - left;
+ } else {
+ copied = __iovec_copy_to_user(kaddr + offset, i->iov,
+ i->iov_offset, bytes, 1);
+ }
+ kunmap_atomic(kaddr);
+
+ return copied;
+}
+EXPORT_SYMBOL(iov_iter_copy_to_user_atomic);
+
+/*
+ * This has the same sideeffects and return value as
+ * iov_iter_copy_to_user_atomic().
+ * The difference is that it attempts to resolve faults.
+ * Page must not be locked.
+ */
+size_t iov_iter_copy_to_user(struct page *page,
+ struct iov_iter *i, unsigned long offset, size_t bytes)
+{
+ char *kaddr;
+ size_t copied;
+
+ kaddr = kmap(page);
+ if (likely(i->nr_segs == 1)) {
+ int left;
+ char __user *buf = i->iov->iov_base + i->iov_offset;
+ left = copy_to_user(buf, kaddr + offset, bytes);
+ copied = bytes - left;
+ } else {
+ copied = __iovec_copy_to_user(kaddr + offset, i->iov,
+ i->iov_offset, bytes, 0);
+ }
+ kunmap(page);
+ return copied;
+}
+EXPORT_SYMBOL(iov_iter_copy_to_user);
+
static size_t __iovec_copy_from_user(char *vaddr, const struct iovec *iov,
size_t base, size_t bytes, int atomic)
{
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 3f40547..11647fe 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -297,6 +297,10 @@ struct iov_iter {
size_t count;
};
+size_t iov_iter_copy_to_user_atomic(struct page *page,
+ struct iov_iter *i, unsigned long offset, size_t bytes);
+size_t iov_iter_copy_to_user(struct page *page,
+ struct iov_iter *i, unsigned long offset, size_t bytes);
size_t iov_iter_copy_from_user_atomic(struct page *page,
struct iov_iter *i, unsigned long offset, size_t bytes);
size_t iov_iter_copy_from_user(struct page *page,
--
1.8.4
next prev parent reply other threads:[~2013-10-16 14:04 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-16 14:04 [PATCH V9 00/33] loop: Issue O_DIRECT aio using bio_vec Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 01/33] iov_iter: move into its own file Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 02/33] iov_iter: iov_iter_copy_from_user() should use non-atomic copy Dave Kleikamp
2013-10-16 14:04 ` Dave Kleikamp [this message]
2013-10-16 14:04 ` [PATCH V9 04/33] iov_iter: add __iovec_copy_to_user() Dave Kleikamp
[not found] ` <1381932286-14978-1-git-send-email-dave.kleikamp-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
2013-10-16 14:04 ` [PATCH V9 05/33] fuse: convert fuse to use iov_iter_copy_[to|from]_user Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 06/33] iov_iter: hide iovec details behind ops function pointers Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 07/33] iov_iter: ii_iovec_copy_to_user should pre-fault user pages Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 08/33] iov_iter: add bvec support Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 09/33] iov_iter: add a shorten call Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 10/33] iov_iter: let callers extract iovecs and bio_vecs Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 11/33] dio: Convert direct_IO to use iov_iter Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 12/33] dio: add bio_vec support to __blockdev_direct_IO() Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 13/33] fs: pull iov_iter use higher up the stack Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 14/33] aio: add aio_kernel_() interface Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 15/33] aio: add aio support for iov_iter arguments Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 16/33] bio: add bvec_length(), like iov_length() Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 17/33] loop: use aio to perform io on the underlying file Dave Kleikamp
2013-10-18 17:55 ` [PATCH V9.1 " Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 18/33] fs: create file_readable() and file_writable() functions Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 19/33] fs: use read_iter and write_iter rather than aio_read and aio_write Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 20/33] fs: add read_iter and write_iter to several file systems Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 21/33] ocfs2: add support for read_iter and write_iter Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 22/33] ext4: " Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 23/33] nfs: add support for read_iter, write_iter Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 24/33] nfs: simplify swap Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 25/33] btrfs: add support for read_iter and write_iter Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 26/33] block_dev: add support for read_iter, write_iter Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 27/33] xfs: add support for read_iter and write_iter Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 28/33] gfs2: Convert aio_read/write ops to read/write_iter Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 29/33] udf: convert file ops from aio_read/write " Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 30/33] afs: add support for read_iter and write_iter Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 31/33] ecrpytfs: Convert aio_read/write ops to read/write_iter Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 32/33] ubifs: convert file ops from aio_read/write " Dave Kleikamp
2013-10-16 14:04 ` [PATCH V9 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=1381932286-14978-4-git-send-email-dave.kleikamp@oracle.com \
--to=dave.kleikamp@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mpatlasov@parallels.com \
--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).