linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>
Subject: [PATCH v4 06/31] iov_iter: add bvec support
Date: Wed, 21 Nov 2012 16:40:46 -0600	[thread overview]
Message-ID: <1353537671-26284-7-git-send-email-dave.kleikamp@oracle.com> (raw)
In-Reply-To: <1353537671-26284-1-git-send-email-dave.kleikamp@oracle.com>

From: Zach Brown <zab@zabbo.net>

This adds a set of iov_iter_ops calls which work with memory which is
specified by an array of bio_vec structs instead of an array of iovec
structs.

The big difference is that the pages referenced by the bio_vec elements
are pinned.  They don't need to be faulted in and we can always use
kmap_atomic() to map them one at a time.

Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Cc: Zach Brown <zab@zabbo.net>
---
 include/linux/fs.h |  17 ++++++++
 mm/iov-iter.c      | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 143 insertions(+)

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 6cece28..0d7f42f 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -342,6 +342,23 @@ static inline size_t iov_iter_single_seg_count(struct iov_iter *i)
 	return i->ops->ii_single_seg_count(i);
 }
 
+extern struct iov_iter_ops ii_bvec_ops;
+
+struct bio_vec;
+static inline void iov_iter_init_bvec(struct iov_iter *i,
+				      struct bio_vec *bvec,
+				      unsigned long nr_segs,
+				      size_t count, size_t written)
+{
+	i->ops = &ii_bvec_ops;
+	i->data = (unsigned long)bvec;
+	i->nr_segs = nr_segs;
+	i->iov_offset = 0;
+	i->count = count + written;
+
+	iov_iter_advance(i, written);
+}
+
 extern struct iov_iter_ops ii_iovec_ops;
 
 static inline void iov_iter_init(struct iov_iter *i,
diff --git a/mm/iov-iter.c b/mm/iov-iter.c
index bae1553..c5d0a9e 100644
--- a/mm/iov-iter.c
+++ b/mm/iov-iter.c
@@ -5,6 +5,7 @@
 #include <linux/hardirq.h>
 #include <linux/highmem.h>
 #include <linux/pagemap.h>
+#include <linux/bio.h>
 
 static size_t __iovec_copy_to_user(char *vaddr, const struct iovec *iov,
 				   size_t base, size_t bytes, int atomic)
@@ -86,6 +87,131 @@ static size_t ii_iovec_copy_to_user(struct page *page,
 	return copied;
 }
 
+/*
+ * As an easily verifiable first pass, we implement all the methods that
+ * copy data to and from bvec pages with one function.  We implement it
+ * all with kmap_atomic().
+ */
+static size_t bvec_copy_tofrom_page(struct iov_iter *iter, struct page *page,
+				    unsigned long page_offset, size_t bytes,
+				    int topage)
+{
+	struct bio_vec *bvec = (struct bio_vec *)iter->data;
+	size_t bvec_offset = iter->iov_offset;
+	size_t remaining = bytes;
+	void *bvec_map;
+	void *page_map;
+	size_t copy;
+
+	page_map = kmap_atomic(page);
+
+	BUG_ON(bytes > iter->count);
+	while (remaining) {
+		BUG_ON(bvec->bv_len == 0);
+		BUG_ON(bvec_offset >= bvec->bv_len);
+		copy = min(remaining, bvec->bv_len - bvec_offset);
+		bvec_map = kmap_atomic(bvec->bv_page);
+		if (topage)
+			memcpy(page_map + page_offset,
+			       bvec_map + bvec->bv_offset + bvec_offset,
+			       copy);
+		else
+			memcpy(bvec_map + bvec->bv_offset + bvec_offset,
+			       page_map + page_offset,
+			       copy);
+		kunmap_atomic(bvec_map);
+		remaining -= copy;
+		bvec_offset += copy;
+		page_offset += copy;
+		if (bvec_offset == bvec->bv_len) {
+			bvec_offset = 0;
+			bvec++;
+		}
+	}
+
+	kunmap_atomic(page_map);
+
+	return bytes;
+}
+
+static size_t ii_bvec_copy_to_user_atomic(struct page *page, struct iov_iter *i,
+					  unsigned long offset, size_t bytes)
+{
+	return bvec_copy_tofrom_page(i, page, offset, bytes, 0);
+}
+static size_t ii_bvec_copy_to_user(struct page *page, struct iov_iter *i,
+				   unsigned long offset, size_t bytes)
+{
+	return bvec_copy_tofrom_page(i, page, offset, bytes, 0);
+}
+static size_t ii_bvec_copy_from_user_atomic(struct page *page,
+					    struct iov_iter *i,
+					    unsigned long offset, size_t bytes)
+{
+	return bvec_copy_tofrom_page(i, page, offset, bytes, 1);
+}
+static size_t ii_bvec_copy_from_user(struct page *page, struct iov_iter *i,
+				     unsigned long offset, size_t bytes)
+{
+	return bvec_copy_tofrom_page(i, page, offset, bytes, 1);
+}
+
+/*
+ * bio_vecs have a stricter structure than iovecs that might have
+ * come from userspace.  There are no zero length bio_vec elements.
+ */
+static void ii_bvec_advance(struct iov_iter *i, size_t bytes)
+{
+	struct bio_vec *bvec = (struct bio_vec *)i->data;
+	size_t offset = i->iov_offset;
+	size_t delta;
+
+	BUG_ON(i->count < bytes);
+	while (bytes) {
+		BUG_ON(bvec->bv_len == 0);
+		BUG_ON(bvec->bv_len <= offset);
+		delta = min(bytes, bvec->bv_len - offset);
+		offset += delta;
+		i->count -= delta;
+		bytes -= delta;
+		if (offset == bvec->bv_len) {
+			bvec++;
+			offset = 0;
+		}
+	}
+
+	i->data = (unsigned long)bvec;
+	i->iov_offset = offset;
+}
+
+/*
+ * pages pointed to by bio_vecs are always pinned.
+ */
+static int ii_bvec_fault_in_readable(struct iov_iter *i, size_t bytes)
+{
+	return 0;
+}
+
+static size_t ii_bvec_single_seg_count(struct iov_iter *i)
+{
+	const struct bio_vec *bvec = (struct bio_vec *)i->data;
+	if (i->nr_segs == 1)
+		return i->count;
+	else
+		return min(i->count, bvec->bv_len - i->iov_offset);
+}
+
+struct iov_iter_ops ii_bvec_ops = {
+	.ii_copy_to_user_atomic = ii_bvec_copy_to_user_atomic,
+	.ii_copy_to_user = ii_bvec_copy_to_user,
+	.ii_copy_from_user_atomic = ii_bvec_copy_from_user_atomic,
+	.ii_copy_from_user = ii_bvec_copy_from_user,
+	.ii_advance = ii_bvec_advance,
+	.ii_fault_in_readable = ii_bvec_fault_in_readable,
+	.ii_single_seg_count = ii_bvec_single_seg_count,
+};
+EXPORT_SYMBOL(ii_bvec_ops);
+
 static size_t __iovec_copy_from_user(char *vaddr, const struct iovec *iov,
 				     size_t base, size_t bytes, int atomic)
 {
-- 
1.8.0

  parent reply	other threads:[~2012-11-21 22:40 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-21 22:40 [PATCH v4 00/31] loop: Issue O_DIRECT aio using bio_vec Dave Kleikamp
2012-11-21 22:40 ` [PATCH v4 01/31] iov_iter: move into its own file Dave Kleikamp
2012-11-23  8:14   ` Christoph Hellwig
2012-11-23 17:34     ` Dave Kleikamp
2012-11-21 22:40 ` [PATCH v4 02/31] iov_iter: iov_iter_copy_from_user() should use non-atomic copy Dave Kleikamp
2012-11-21 22:40 ` [PATCH v4 03/31] iov_iter: add copy_to_user support Dave Kleikamp
     [not found] ` <1353537671-26284-1-git-send-email-dave.kleikamp-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
2012-11-21 22:40   ` [PATCH v4 04/31] fuse: convert fuse to use iov_iter_copy_[to|from]_user Dave Kleikamp
2012-11-21 22:40 ` [PATCH v4 05/31] iov_iter: hide iovec details behind ops function pointers Dave Kleikamp
2012-11-21 22:40 ` Dave Kleikamp [this message]
2012-11-21 22:40 ` [PATCH v4 07/31] iov_iter: add a shorten call Dave Kleikamp
2012-11-21 22:40 ` [PATCH v4 08/31] iov_iter: let callers extract iovecs and bio_vecs Dave Kleikamp
2012-11-21 22:40 ` [PATCH v4 09/31] dio: create a dio_aligned() helper function Dave Kleikamp
2012-11-23  8:19   ` Christoph Hellwig
2012-11-23 17:45     ` Dave Kleikamp
2012-12-03 22:06     ` Dave Kleikamp
     [not found]       ` <50BD6C3E.8020809@oracle.com>
2012-12-04  3:39         ` Andi Kleen
2012-12-04  3:55           ` Dave Kleikamp
2012-11-21 22:40 ` [PATCH v4 10/31] dio: Convert direct_IO to use iov_iter Dave Kleikamp
2012-11-21 22:40 ` [PATCH v4 11/31] dio: add bio_vec support to __blockdev_direct_IO() Dave Kleikamp
2012-11-21 22:40 ` [PATCH v4 12/31] fs: pull iov_iter use higher up the stack Dave Kleikamp
2012-11-21 22:40 ` [PATCH v4 13/31] aio: add aio_kernel_() interface Dave Kleikamp
2012-11-21 22:40 ` [PATCH v4 14/31] aio: add aio support for iov_iter arguments Dave Kleikamp
2012-11-21 22:40 ` [PATCH v4 15/31] bio: add bvec_length(), like iov_length() Dave Kleikamp
2012-11-21 22:40 ` [PATCH v4 16/31] loop: use aio to perform io on the underlying file Dave Kleikamp
2012-11-22 23:06   ` Dave Chinner
2012-12-03 16:59     ` Dave Kleikamp
2012-12-04  2:52       ` Dave Chinner
2012-12-04  2:58         ` Dave Kleikamp
2012-11-21 22:40 ` [PATCH v4 17/31] fs: create file_readable() and file_writable() functions Dave Kleikamp
2012-11-21 22:40 ` [PATCH v4 18/31] fs: use read_iter and write_iter rather than aio_read and aio_write Dave Kleikamp
2012-11-21 22:40 ` [PATCH v4 19/31] fs: add read_iter and write_iter to several file systems Dave Kleikamp
2012-11-21 22:41 ` [PATCH v4 20/31] ocfs2: add support for read_iter, write_iter, and direct_IO_bvec Dave Kleikamp
2012-11-21 22:41 ` [PATCH v4 21/31] ext4: add support for read_iter and write_iter Dave Kleikamp
2012-11-21 22:41 ` [PATCH v4 22/31] nfs: add support for read_iter, write_iter Dave Kleikamp
2012-11-21 22:41 ` [PATCH v4 23/31] nfs: simplify swap Dave Kleikamp
     [not found]   ` <1353537671-26284-24-git-send-email-dave.kleikamp-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
2012-11-23  8:21     ` Christoph Hellwig
2012-11-23 17:50       ` Dave Kleikamp
2012-11-21 22:41 ` [PATCH v4 24/31] btrfs: add support for read_iter and write_iter Dave Kleikamp
2012-11-21 22:41 ` [PATCH v4 25/31] block_dev: add support for read_iter, write_iter Dave Kleikamp
2012-11-21 22:41 ` [PATCH v4 26/31] xfs: add support for read_iter and write_iter Dave Kleikamp
2012-11-21 22:41 ` [PATCH v4 27/31] gfs2: Convert aio_read/write ops to read/write_iter Dave Kleikamp
2012-11-22  9:51   ` Steven Whitehouse
2012-11-22 22:59     ` Dave Chinner
2012-11-23 17:59       ` Dave Kleikamp
2012-12-03 19:14         ` Dave Kleikamp
2012-11-21 22:41 ` [PATCH v4 28/31] udf: convert file ops from aio_read/write " Dave Kleikamp
2012-11-21 22:41 ` [PATCH v4 29/31] afs: add support for read_iter and write_iter Dave Kleikamp
2012-11-21 22:41 ` [PATCH v4 30/31] ecrpytfs: Convert aio_read/write ops to read/write_iter Dave Kleikamp
2012-11-21 22:41 ` [PATCH v4 31/31] ubifs: convert file ops from aio_read/write " Dave Kleikamp
2012-11-22 19:47 ` [PATCH v4 00/31] loop: Issue O_DIRECT aio using bio_vec Christoph Hellwig
2012-11-23 17:33   ` 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=1353537671-26284-7-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=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).