Re: [PATCH V10 10/19] block: loop: pass multi-page bvec to iov_iter

From
Ming Lei <hidden>
Date
2018-11-19 08:25:49
Also in
dm-devel, linux-bcache, linux-block, linux-btrfs, linux-ext4, linux-fsdevel, linux-mm, linux-xfs, lkml
Reply to
Omar Sandoval, 2018-11-16
On Thu, Nov 15, 2018 at 04:40:22PM -0800, Omar Sandoval wrote:
On Thu, Nov 15, 2018 at 04:52:57PM +0800, Ming Lei wrote:
quoted
iov_iter is implemented with bvec itererator, so it is safe to pass
multipage bvec to it, and this way is much more efficient than
passing one page in each bvec.

Cc: Dave Chinner <redacted>
Cc: Kent Overstreet <redacted>
Cc: Mike Snitzer <redacted>
Cc: <redacted>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: <redacted>
Cc: Shaohua Li <shli@kernel.org>
Cc: <redacted>
Cc: <redacted>
Cc: David Sterba <dsterba@suse.com>
Cc: <redacted>
Cc: Darrick J. Wong <redacted>
Cc: <redacted>
Cc: Gao Xiang <redacted>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: <redacted>
Cc: Coly Li <redacted>
Cc: <redacted>
Cc: Boaz Harrosh <redacted>
Cc: Bob Peterson <redacted>
Cc: <redacted>
Reviewed-by: Omar Sandoval <redacted>

Comments below.
quoted
Signed-off-by: Ming Lei <redacted>
---
 drivers/block/loop.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index bf6bc35aaf88..a3fd418ec637 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -515,16 +515,16 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd,
 	struct bio *bio = rq->bio;
 	struct file *file = lo->lo_backing_file;
 	unsigned int offset;
-	int segments = 0;
+	int nr_bvec = 0;
 	int ret;
 
 	if (rq->bio != rq->biotail) {
-		struct req_iterator iter;
+		struct bvec_iter iter;
 		struct bio_vec tmp;
 
 		__rq_for_each_bio(bio, rq)
-			segments += bio_segments(bio);
-		bvec = kmalloc_array(segments, sizeof(struct bio_vec),
+			nr_bvec += bio_bvecs(bio);
+		bvec = kmalloc_array(nr_bvec, sizeof(struct bio_vec),
 				     GFP_NOIO);
 		if (!bvec)
 			return -EIO;
@@ -533,13 +533,14 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd,
 		/*
 		 * The bios of the request may be started from the middle of
 		 * the 'bvec' because of bio splitting, so we can't directly
-		 * copy bio->bi_iov_vec to new bvec. The rq_for_each_segment
+		 * copy bio->bi_iov_vec to new bvec. The bio_for_each_bvec
 		 * API will take care of all details for us.
 		 */
-		rq_for_each_segment(tmp, rq, iter) {
-			*bvec = tmp;
-			bvec++;
-		}
+		__rq_for_each_bio(bio, rq)
+			bio_for_each_bvec(tmp, bio, iter) {
+				*bvec = tmp;
+				bvec++;
+			}
Even if they're not strictly necessary, could you please include the
curly braces for __rq_for_each_bio() here?
Sure, will do it.
quoted
 		bvec = cmd->bvec;
 		offset = 0;
 	} else {
@@ -550,11 +551,11 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd,
 		 */
 		offset = bio->bi_iter.bi_bvec_done;
 		bvec = __bvec_iter_bvec(bio->bi_io_vec, bio->bi_iter);
-		segments = bio_segments(bio);
+		nr_bvec = bio_bvecs(bio);
This scared me for a second, but it's fine to do here because we haven't
actually enabled multipage bvecs yet, right?
Well, it is fine, all helpers supporting multi-page bvec actually works
well when it isn't enabled, cause single-page bvec is one special case in
which multi-page bevc helpers have to deal with.

Thanks,
Ming
Thread (102 messages) 102 messages, 8 authors, last reply 2018-11-21
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help