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, vgoyal@redhat.com,
Jiri Kosina <jkosina@suse.cz>
Subject: [PATCH v4 15/24] pktcdvd: use bio_copy_data()
Date: Mon, 15 Oct 2012 13:08:49 -0700 [thread overview]
Message-ID: <1350331769-14856-16-git-send-email-koverstreet@google.com> (raw)
In-Reply-To: <1350331769-14856-1-git-send-email-koverstreet@google.com>
Signed-off-by: Kent Overstreet <koverstreet@google.com>
CC: Jens Axboe <axboe@kernel.dk>
CC: Jiri Kosina <jkosina@suse.cz>
---
drivers/block/pktcdvd.c | 79 ++++++++-----------------------------------------
1 file changed, 12 insertions(+), 67 deletions(-)
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 2c27744..783c96c 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -948,31 +948,6 @@ static int pkt_set_segment_merging(struct pktcdvd_device *pd, struct request_que
}
/*
- * Copy CD_FRAMESIZE bytes from src_bio into a destination page
- */
-static void pkt_copy_bio_data(struct bio *src_bio, int seg, int offs, struct page *dst_page, int dst_offs)
-{
- unsigned int copy_size = CD_FRAMESIZE;
-
- while (copy_size > 0) {
- struct bio_vec *src_bvl = bio_iovec_idx(src_bio, seg);
- void *vfrom = kmap_atomic(src_bvl->bv_page) +
- src_bvl->bv_offset + offs;
- void *vto = page_address(dst_page) + dst_offs;
- int len = min_t(int, copy_size, src_bvl->bv_len - offs);
-
- BUG_ON(len < 0);
- memcpy(vto, vfrom, len);
- kunmap_atomic(vfrom);
-
- seg++;
- offs = 0;
- dst_offs += len;
- copy_size -= len;
- }
-}
-
-/*
* Copy all data for this packet to pkt->pages[], so that
* a) The number of required segments for the write bio is minimized, which
* is necessary for some scsi controllers.
@@ -1325,55 +1300,35 @@ try_next_bio:
*/
static void pkt_start_write(struct pktcdvd_device *pd, struct packet_data *pkt)
{
- struct bio *bio;
int f;
- int frames_write;
struct bio_vec *bvec = pkt->w_bio->bi_io_vec;
+ bio_reset(pkt->w_bio);
+ pkt->w_bio->bi_sector = pkt->sector;
+ pkt->w_bio->bi_bdev = pd->bdev;
+ pkt->w_bio->bi_end_io = pkt_end_io_packet_write;
+ pkt->w_bio->bi_private = pkt;
+
+ /* XXX: locking? */
for (f = 0; f < pkt->frames; f++) {
bvec[f].bv_page = pkt->pages[(f * CD_FRAMESIZE) / PAGE_SIZE];
bvec[f].bv_offset = (f * CD_FRAMESIZE) % PAGE_SIZE;
+ if (!bio_add_page(pkt->w_bio, bvec[f].bv_page, CD_FRAMESIZE, bvec[f].bv_offset))
+ BUG();
}
+ VPRINTK(DRIVER_NAME": vcnt=%d\n", pkt->w_bio->bi_vcnt);
/*
* Fill-in bvec with data from orig_bios.
*/
- frames_write = 0;
spin_lock(&pkt->lock);
- bio_list_for_each(bio, &pkt->orig_bios) {
- int segment = bio->bi_idx;
- int src_offs = 0;
- int first_frame = (bio->bi_sector - pkt->sector) / (CD_FRAMESIZE >> 9);
- int num_frames = bio->bi_size / CD_FRAMESIZE;
- BUG_ON(first_frame < 0);
- BUG_ON(first_frame + num_frames > pkt->frames);
- for (f = first_frame; f < first_frame + num_frames; f++) {
- struct bio_vec *src_bvl = bio_iovec_idx(bio, segment);
-
- while (src_offs >= src_bvl->bv_len) {
- src_offs -= src_bvl->bv_len;
- segment++;
- BUG_ON(segment >= bio->bi_vcnt);
- src_bvl = bio_iovec_idx(bio, segment);
- }
+ bio_copy_data(pkt->w_bio, pkt->orig_bios.head);
- if (src_bvl->bv_len - src_offs >= CD_FRAMESIZE) {
- bvec[f].bv_page = src_bvl->bv_page;
- bvec[f].bv_offset = src_bvl->bv_offset + src_offs;
- } else {
- pkt_copy_bio_data(bio, segment, src_offs,
- bvec[f].bv_page, bvec[f].bv_offset);
- }
- src_offs += CD_FRAMESIZE;
- frames_write++;
- }
- }
pkt_set_state(pkt, PACKET_WRITE_WAIT_STATE);
spin_unlock(&pkt->lock);
VPRINTK("pkt_start_write: Writing %d frames for zone %llx\n",
- frames_write, (unsigned long long)pkt->sector);
- BUG_ON(frames_write != pkt->write_size);
+ pkt->write_size, (unsigned long long)pkt->sector);
if (test_bit(PACKET_MERGE_SEGS, &pd->flags) || (pkt->write_size < pkt->frames)) {
pkt_make_local_copy(pkt, bvec);
@@ -1383,16 +1338,6 @@ static void pkt_start_write(struct pktcdvd_device *pd, struct packet_data *pkt)
}
/* Start the write request */
- bio_reset(pkt->w_bio);
- pkt->w_bio->bi_sector = pkt->sector;
- pkt->w_bio->bi_bdev = pd->bdev;
- pkt->w_bio->bi_end_io = pkt_end_io_packet_write;
- pkt->w_bio->bi_private = pkt;
- for (f = 0; f < pkt->frames; f++)
- if (!bio_add_page(pkt->w_bio, bvec[f].bv_page, CD_FRAMESIZE, bvec[f].bv_offset))
- BUG();
- VPRINTK(DRIVER_NAME": vcnt=%d\n", pkt->w_bio->bi_vcnt);
-
atomic_set(&pkt->io_wait, 1);
pkt->w_bio->bi_rw = WRITE;
pkt_queue_bio(pd, pkt->w_bio);
--
1.7.12
next prev parent reply other threads:[~2012-10-15 20:08 UTC|newest]
Thread overview: 71+ 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 ` Kent Overstreet [this message]
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 ` [PATCH v2 15/26] block: Add bio_copy_data() Kent Overstreet
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
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-16-git-send-email-koverstreet@google.com \
--to=koverstreet@google.com \
--cc=axboe@kernel.dk \
--cc=dm-devel@redhat.com \
--cc=jkosina@suse.cz \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=neilb@suse.de \
--cc=tj@kernel.org \
--cc=vgoyal@redhat.com \
/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).