lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 15 Feb 2019 19:13:17 +0800 From: Ming Lei <ming.lei@...hat.com> To: Jens Axboe <axboe@...nel.dk> Cc: linux-block@...r.kernel.org, linux-kernel@...r.kernel.org, linux-mm@...ck.org, Theodore Ts'o <tytso@....edu>, Omar Sandoval <osandov@...com>, Sagi Grimberg <sagi@...mberg.me>, Dave Chinner <dchinner@...hat.com>, Kent Overstreet <kent.overstreet@...il.com>, Mike Snitzer <snitzer@...hat.com>, dm-devel@...hat.com, Alexander Viro <viro@...iv.linux.org.uk>, linux-fsdevel@...r.kernel.org, linux-raid@...r.kernel.org, David Sterba <dsterba@...e.com>, linux-btrfs@...r.kernel.org, "Darrick J . Wong" <darrick.wong@...cle.com>, linux-xfs@...r.kernel.org, Gao Xiang <gaoxiang25@...wei.com>, Christoph Hellwig <hch@....de>, linux-ext4@...r.kernel.org, Coly Li <colyli@...e.de>, linux-bcache@...r.kernel.org, Boaz Harrosh <ooo@...ctrozaur.com>, Bob Peterson <rpeterso@...hat.com>, cluster-devel@...hat.com, Ming Lei <ming.lei@...hat.com> Subject: [PATCH V15 11/18] block: loop: pass multi-page bvec to iov_iter iov_iter is implemented on bvec itererator helpers, so it is safe to pass multi-page bvec to it, and this way is much more efficient than passing one page in each bvec. Reviewed-by: Christoph Hellwig <hch@....de> Reviewed-by: Omar Sandoval <osandov@...com> Signed-off-by: Ming Lei <ming.lei@...hat.com> --- drivers/block/loop.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index cf5538942834..8ef583197414 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -511,21 +511,22 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, loff_t pos, bool rw) { struct iov_iter iter; + struct req_iterator rq_iter; struct bio_vec *bvec; struct request *rq = blk_mq_rq_from_pdu(cmd); struct bio *bio = rq->bio; struct file *file = lo->lo_backing_file; + struct bio_vec tmp; unsigned int offset; - int segments = 0; + int nr_bvec = 0; int ret; + rq_for_each_bvec(tmp, rq, rq_iter) + nr_bvec++; + if (rq->bio != rq->biotail) { - struct req_iterator iter; - struct bio_vec tmp; - __rq_for_each_bio(bio, rq) - segments += bio_segments(bio); - bvec = kmalloc_array(segments, sizeof(struct bio_vec), + bvec = kmalloc_array(nr_bvec, sizeof(struct bio_vec), GFP_NOIO); if (!bvec) return -EIO; @@ -534,10 +535,10 @@ 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 rq_for_each_bvec * API will take care of all details for us. */ - rq_for_each_segment(tmp, rq, iter) { + rq_for_each_bvec(tmp, rq, rq_iter) { *bvec = tmp; bvec++; } @@ -551,11 +552,10 @@ 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); } atomic_set(&cmd->ref, 2); - iov_iter_bvec(&iter, rw, bvec, segments, blk_rq_bytes(rq)); + iov_iter_bvec(&iter, rw, bvec, nr_bvec, blk_rq_bytes(rq)); iter.iov_offset = offset; cmd->iocb.ki_pos = pos; -- 2.9.5
Powered by blists - more mailing lists