linux-bcache.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kent Overstreet <koverstreet@google.com>
To: linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org,
	dm-devel@redhat.com
Cc: Kent Overstreet <koverstreet@google.com>,
	tj@kernel.org, axboe@kernel.dk, neilb@suse.de
Subject: [PATCH v2 15/26] block: Add bio_copy_data()
Date: Mon, 15 Oct 2012 13:09:18 -0700	[thread overview]
Message-ID: <1350331769-14856-45-git-send-email-koverstreet@google.com> (raw)
In-Reply-To: <1350331769-14856-1-git-send-email-koverstreet@google.com>

This gets open coded quite a bit and it's tricky to get right, so make a
generic version and convert some existing users over to it instead.

Signed-off-by: Kent Overstreet <koverstreet@google.com>
CC: Jens Axboe <axboe@kernel.dk>
---
 fs/bio.c            | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/bio.h |  2 ++
 2 files changed, 72 insertions(+)

diff --git a/fs/bio.c b/fs/bio.c
index 1342a16..7fb9f4e 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -827,6 +827,76 @@ void bio_advance(struct bio *bio, unsigned bytes)
 }
 EXPORT_SYMBOL(bio_advance);
 
+/**
+ * bio_copy_data - copy contents of data buffers from one chain of bios to
+ * another
+ * @src: source bio list
+ * @dst: destination bio list
+ *
+ * If @src and @dst are single bios, bi_next must be NULL - otherwise, treats
+ * @src and @dst as linked lists of bios.
+ *
+ * Stops when it reaches the end of either @src or @dst - that is, copies
+ * min(src->bi_size, dst->bi_size) bytes (or the equivalent for lists of bios).
+ */
+void bio_copy_data(struct bio *dst, struct bio *src)
+{
+	struct bio_vec *src_bv, *dst_bv;
+	unsigned src_offset, dst_offset, bytes;
+	void *src_p, *dst_p;
+
+	src_bv = bio_iovec(src);
+	dst_bv = bio_iovec(dst);
+
+	src_offset = src_bv->bv_offset;
+	dst_offset = dst_bv->bv_offset;
+
+	while (1) {
+		if (src_offset == src_bv->bv_offset + src_bv->bv_len) {
+			src_bv++;
+			if (src_bv == bio_iovec_idx(src, src->bi_vcnt)) {
+				src = src->bi_next;
+				if (!src)
+					break;
+
+				src_bv = bio_iovec(src);
+			}
+
+			src_offset = src_bv->bv_offset;
+		}
+
+		if (dst_offset == dst_bv->bv_offset + dst_bv->bv_len) {
+			dst_bv++;
+			if (dst_bv == bio_iovec_idx(dst, dst->bi_vcnt)) {
+				dst = dst->bi_next;
+				if (!dst)
+					break;
+
+				dst_bv = bio_iovec(dst);
+			}
+
+			dst_offset = dst_bv->bv_offset;
+		}
+
+		bytes = min(dst_bv->bv_offset + dst_bv->bv_len - dst_offset,
+			    src_bv->bv_offset + src_bv->bv_len - src_offset);
+
+		src_p = kmap_atomic(src_bv->bv_page);
+		dst_p = kmap_atomic(dst_bv->bv_page);
+
+		memcpy(dst_p + dst_bv->bv_offset,
+		       src_p + src_bv->bv_offset,
+		       bytes);
+
+		kunmap_atomic(dst_p);
+		kunmap_atomic(src_p);
+
+		src_offset += bytes;
+		dst_offset += bytes;
+	}
+}
+EXPORT_SYMBOL(bio_copy_data);
+
 struct bio_map_data {
 	struct bio_vec *iovecs;
 	struct sg_iovec *sgvecs;
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 949c48a..92015ce 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -286,6 +286,8 @@ static inline void bio_flush_dcache_pages(struct bio *bi)
 }
 #endif
 
+extern void bio_copy_data(struct bio *dst, struct bio *src);
+
 extern struct bio *bio_copy_user(struct request_queue *, struct rq_map_data *,
 				 unsigned long, unsigned int, int, gfp_t);
 extern struct bio *bio_copy_user_iov(struct request_queue *,
-- 
1.7.12

  parent reply	other threads:[~2012-10-15 20:09 UTC|newest]

Thread overview: 77+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-15 20:08 [PATCH v4 00/24] Prep work for immutable bio vecs Kent Overstreet
2012-10-15 20:08 ` [PATCH v4 02/24] block: Refactor blk_update_request() Kent Overstreet
2012-10-15 20:08 ` [PATCH v4 05/24] block: Use bio_sectors() more consistently Kent Overstreet
2012-10-16  1:54   ` Ed Cashin
2012-10-15 20:08 ` [PATCH v4 06/24] block: Change bio_split() to respect the current value of bi_idx Kent Overstreet
2012-10-15 20:08 ` [PATCH v4 07/24] block: Remove bi_idx references Kent Overstreet
2012-10-15 20:08 ` [PATCH v4 08/24] block: Remove some unnecessary bi_vcnt usage Kent Overstreet
2012-11-06 11:19   ` Reddy, Sreekanth
     [not found]   ` <1350331769-14856-9-git-send-email-koverstreet-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2012-11-07  6:05     ` Reddy, Sreekanth
2012-10-15 20:08 ` [PATCH v4 10/24] raid10: Use bio_reset() Kent Overstreet
2012-10-15 20:08 ` [PATCH v4 11/24] raid1: use bio_reset() Kent Overstreet
2012-10-15 20:08 ` [PATCH v4 12/24] raid5: " Kent Overstreet
2012-10-15 20:08 ` [PATCH v4 13/24] raid1: Refactor narrow_write_error() to not use bi_idx Kent Overstreet
2012-10-15 20:08 ` [PATCH v4 14/24] block: Add bio_copy_data() Kent Overstreet
2012-10-15 20:08 ` [PATCH v4 15/24] pktcdvd: use bio_copy_data() Kent Overstreet
2012-10-15 20:08 ` [PATCH v4 16/24] pktcdvd: Use bio_reset() in disabled code to kill bi_idx usage Kent Overstreet
2012-10-15 20:08 ` [PATCH v4 17/24] raid1: use bio_copy_data() Kent Overstreet
2012-10-15 20:08 ` [PATCH v4 18/24] bounce: Refactor __blk_queue_bounce to not use bi_io_vec Kent Overstreet
2012-10-15 20:08 ` [PATCH v4 20/24] block: Convert some code to bio_for_each_segment_all() Kent Overstreet
2012-10-15 20:08 ` [PATCH v4 21/24] block: Add bio_alloc_pages() Kent Overstreet
2012-10-15 20:08 ` [PATCH v4 22/24] block: Add an explicit bio flag for bios that own their bvec Kent Overstreet
2012-10-15 20:08 ` [PATCH v4 24/24] block: Add BIO_SUBMITTED flag, kill BIO_CLONED Kent Overstreet
2012-10-15 20:08 ` [PATCH v4 1/2] block: Reorder struct bio_set Kent Overstreet
     [not found]   ` <1350331769-14856-26-git-send-email-koverstreet-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2012-10-19  1:14     ` Tejun Heo
2012-10-15 20:09 ` [PATCH v4 2/2] block: Avoid deadlocks with bio allocation by stacking drivers Kent Overstreet
2012-10-15 20:09 ` [PATCH v4 1/2] block: Fix a buffer overrun in bio_integrity_split() Kent Overstreet
     [not found]   ` <1350331769-14856-28-git-send-email-koverstreet-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2012-10-19 20:30     ` Tejun Heo
2012-10-22 15:39       ` Vivek Goyal
2012-10-24 16:34         ` Martin K. Petersen
     [not found]           ` <yq1mwzbbzi1.fsf-+q57XtR/GgMb6DWv4sQWN6xOck334EZe@public.gmane.org>
2012-10-24 16:42             ` Tejun Heo
     [not found]               ` <CAOS58YPFq_rt1Pw-v1XtX7-tnPGceXP5Chpp9JhkkMtnWnNQsg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-10-24 16:57                 ` Martin K. Petersen
2012-10-15 20:09 ` [PATCH v4 2/2] block: Convert integrity to bvec_alloc_bs() Kent Overstreet
     [not found]   ` <1350331769-14856-29-git-send-email-koverstreet-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2012-10-19 18:11     ` Vivek Goyal
2012-10-24 16:54     ` Martin K. Petersen
2012-10-15 20:09 ` [PATCH v2 00/26] Prep work for immutable bio vecs Kent Overstreet
2012-10-15 20:09 ` [PATCH v2 01/26] block: Convert integrity to bvec_alloc_bs(), and a bugfix Kent Overstreet
     [not found]   ` <1350331769-14856-31-git-send-email-koverstreet-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2012-10-19 20:34     ` Tejun Heo
     [not found]       ` <20121019203421.GT13370-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2012-10-19 20:36         ` Tejun Heo
2012-10-15 20:09 ` [PATCH v2 02/26] block: Add bio_advance() Kent Overstreet
2012-10-15 20:09 ` [PATCH v2 03/26] block: Refactor blk_update_request() Kent Overstreet
2012-10-15 20:09 ` [PATCH v2 04/26] md: Convert md_trim_bio() to use bio_advance() Kent Overstreet
2012-10-15 20:09 ` [PATCH v2 05/26] block: Add bio_end() Kent Overstreet
2012-10-15 20:09 ` [PATCH v2 06/26] block: Use bio_sectors() more consistently Kent Overstreet
2012-10-15 20:09 ` [PATCH v2 08/26] block: Remove bi_idx references Kent Overstreet
2012-10-15 20:09 ` [PATCH v2 09/26] block: Remove some unnecessary bi_vcnt usage Kent Overstreet
2012-10-15 20:09 ` [PATCH v2 10/26] block: Add submit_bio_wait(), remove from md Kent Overstreet
2012-10-15 20:09 ` [PATCH v2 12/26] raid1: use bio_reset() Kent Overstreet
2012-10-15 20:09 ` [PATCH v2 13/26] raid5: " Kent Overstreet
2012-10-15 20:09 ` [PATCH v2 14/26] raid1: Refactor narrow_write_error() to not use bi_idx Kent Overstreet
2012-10-15 20:09 ` Kent Overstreet [this message]
2012-10-15 20:09 ` [PATCH v2 17/26] pktcdvd: Use bio_reset() in disabled code to kill bi_idx usage Kent Overstreet
2012-10-15 20:09 ` [PATCH v2 18/26] raid1: use bio_copy_data() Kent Overstreet
2012-10-15 20:09 ` [PATCH v2 19/26] bounce: Refactor __blk_queue_bounce to not use bi_io_vec Kent Overstreet
2012-10-15 20:09 ` [PATCH v2 20/26] block: Add bio_for_each_segment_all() Kent Overstreet
2012-10-15 20:09 ` [PATCH v2 22/26] block: Add bio_alloc_pages() Kent Overstreet
2012-10-15 20:09 ` [PATCH v2 23/26] raid1: use bio_alloc_pages() Kent Overstreet
     [not found] ` <1350331769-14856-1-git-send-email-koverstreet-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2012-10-15 20:08   ` [PATCH v4 01/24] block: Add bio_advance() Kent Overstreet
2012-10-15 20:08   ` [PATCH v4 03/24] md: Convert md_trim_bio() to use bio_advance() Kent Overstreet
2012-10-15 20:08   ` [PATCH v4 04/24] block: Add bio_end_sector() Kent Overstreet
2012-10-15 20:08   ` [PATCH v4 09/24] block: Add submit_bio_wait(), remove from md Kent Overstreet
2012-10-15 20:08   ` [PATCH v4 19/24] block: Add bio_for_each_segment_all() Kent Overstreet
2012-10-15 20:08   ` [PATCH v4 23/24] bio-integrity: Add explicit field for owner of bip_buf Kent Overstreet
2012-10-15 20:09   ` [PATCH v2 07/26] block: Don't use bi_idx in bio_split() or require it to be 0 Kent Overstreet
2012-10-15 20:09   ` [PATCH v2 11/26] raid10: Use bio_reset() Kent Overstreet
2012-10-15 20:09   ` [PATCH v2 16/26] pktcdvd: use bio_copy_data() Kent Overstreet
2012-10-15 20:09   ` [PATCH v2 21/26] block: Convert some code to bio_for_each_segment_all() Kent Overstreet
2012-10-15 20:09   ` [PATCH v2 24/26] block: Add an explicit bio flag for bios that own their bvec Kent Overstreet
2012-10-15 20:09   ` [PATCH v2 25/26] bio-integrity: Add explicit field for owner of bip_buf Kent Overstreet
2012-10-15 20:09   ` [PATCH v2 26/26] block: Add BIO_SUBMITTED flag, kill BIO_CLONED Kent Overstreet
2012-10-19  1:14   ` [PATCH v4 00/24] Prep work for immutable bio vecs Tejun Heo
     [not found]     ` <20121019011445.GJ13370-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2012-10-19 15:16       ` Mike Snitzer
  -- strict thread matches above, loose matches on Subject: below --
2012-09-11  0:22 [PATCH v2 00/26] " Kent Overstreet
2012-09-11  0:22 ` [PATCH v2 15/26] block: Add bio_copy_data() Kent Overstreet
     [not found]   ` <1347322957-25260-16-git-send-email-koverstreet-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2012-09-21  0:06     ` Tejun Heo
2012-09-21  0:09       ` Kent Overstreet
     [not found]         ` <20120921000945.GK5519-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2012-09-21  0:15           ` Tejun Heo
2012-09-21  0:09       ` Tejun Heo
     [not found]         ` <20120921000947.GT7264-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2012-09-21  0:13           ` Kent Overstreet

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=1350331769-14856-45-git-send-email-koverstreet@google.com \
    --to=koverstreet@google.com \
    --cc=axboe@kernel.dk \
    --cc=dm-devel@redhat.com \
    --cc=linux-bcache@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=neilb@suse.de \
    --cc=tj@kernel.org \
    /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).