From: Ming Lei <ming.lei@canonical.com> To: Jens Axboe <axboe@kernel.dk>, linux-kernel@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>, Dave Kleikamp <dave.kleikamp@oracle.com> Cc: Zach Brown <zab@zabbo.net>, Benjamin LaHaise <bcrl@kvack.org>, Christoph Hellwig <hch@infradead.org>, Kent Overstreet <kmo@daterainc.com>, linux-aio@kvack.org, linux-fsdevel@vger.kernel.org, Dave Chinner <david@fromorbit.com>, Ming Lei <ming.lei@canonical.com> Subject: [PATCH v1 6/9] block: loop: say goodby to bio Date: Thu, 14 Aug 2014 23:50:37 +0800 [thread overview] Message-ID: <1408031441-31156-7-git-send-email-ming.lei@canonical.com> (raw) In-Reply-To: <1408031441-31156-1-git-send-email-ming.lei@canonical.com> Switch to block request completely. Signed-off-by: Ming Lei <ming.lei@canonical.com> --- drivers/block/loop.c | 46 ++++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 1af5265..ad43d4b 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -287,12 +287,12 @@ static int do_lo_send_write(struct loop_device *lo, struct bio_vec *bvec, return ret; } -static int lo_send(struct loop_device *lo, struct bio *bio, loff_t pos) +static int lo_send(struct loop_device *lo, struct request *rq, loff_t pos) { int (*do_lo_send)(struct loop_device *, struct bio_vec *, loff_t, struct page *page); struct bio_vec bvec; - struct bvec_iter iter; + struct req_iterator iter; struct page *page = NULL; int ret = 0; @@ -306,7 +306,7 @@ static int lo_send(struct loop_device *lo, struct bio *bio, loff_t pos) do_lo_send = do_lo_send_direct_write; } - bio_for_each_segment(bvec, bio, iter) { + rq_for_each_segment(bvec, rq, iter) { ret = do_lo_send(lo, &bvec, pos, page); if (ret < 0) break; @@ -394,19 +394,22 @@ do_lo_receive(struct loop_device *lo, } static int -lo_receive(struct loop_device *lo, struct bio *bio, int bsize, loff_t pos) +lo_receive(struct loop_device *lo, struct request *rq, int bsize, loff_t pos) { struct bio_vec bvec; - struct bvec_iter iter; + struct req_iterator iter; ssize_t s; - bio_for_each_segment(bvec, bio, iter) { + rq_for_each_segment(bvec, rq, iter) { s = do_lo_receive(lo, &bvec, bsize, pos); if (s < 0) return s; if (s != bvec.bv_len) { - zero_fill_bio(bio); + struct bio *bio; + + __rq_for_each_bio(bio, rq) + zero_fill_bio(bio); break; } pos += bvec.bv_len; @@ -414,17 +417,17 @@ lo_receive(struct loop_device *lo, struct bio *bio, int bsize, loff_t pos) return 0; } -static int do_bio_filebacked(struct loop_device *lo, struct bio *bio) +static int do_req_filebacked(struct loop_device *lo, struct request *rq) { loff_t pos; int ret; - pos = ((loff_t) bio->bi_iter.bi_sector << 9) + lo->lo_offset; + pos = ((loff_t) blk_rq_pos(rq) << 9) + lo->lo_offset; - if (bio_rw(bio) == WRITE) { + if (rq->cmd_flags & REQ_WRITE) { struct file *file = lo->lo_backing_file; - if (bio->bi_rw & REQ_FLUSH) { + if (rq->cmd_flags & REQ_FLUSH) { ret = vfs_fsync(file, 0); if (unlikely(ret && ret != -EINVAL)) { ret = -EIO; @@ -438,7 +441,7 @@ static int do_bio_filebacked(struct loop_device *lo, struct bio *bio) * encryption is enabled, because it may give an attacker * useful information. */ - if (bio->bi_rw & REQ_DISCARD) { + if (rq->cmd_flags & REQ_DISCARD) { struct file *file = lo->lo_backing_file; int mode = FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE; @@ -448,22 +451,22 @@ static int do_bio_filebacked(struct loop_device *lo, struct bio *bio) goto out; } ret = file->f_op->fallocate(file, mode, pos, - bio->bi_iter.bi_size); + blk_rq_bytes(rq)); if (unlikely(ret && ret != -EINVAL && ret != -EOPNOTSUPP)) ret = -EIO; goto out; } - ret = lo_send(lo, bio, pos); + ret = lo_send(lo, rq, pos); - if ((bio->bi_rw & REQ_FUA) && !ret) { + if ((rq->cmd_flags & REQ_FUA) && !ret) { ret = vfs_fsync(file, 0); if (unlikely(ret && ret != -EINVAL)) ret = -EIO; } } else - ret = lo_receive(lo, bio, lo->lo_blocksize, pos); + ret = lo_receive(lo, rq, lo->lo_blocksize, pos); out: return ret; @@ -474,12 +477,6 @@ struct switch_request { struct completion wait; }; -static inline int loop_handle_bio(struct loop_device *lo, struct bio *bio) -{ - int ret = do_bio_filebacked(lo, bio); - return ret; -} - /* * Do the actual switch; called from the BIO completion routine */ @@ -1507,7 +1504,6 @@ static void loop_queue_work(struct work_struct *work) const bool write = cmd->rq->cmd_flags & REQ_WRITE; struct loop_device *lo = cmd->lo; int ret = -EIO; - struct bio *bio; if (lo->lo_state != Lo_bound) goto failed; @@ -1515,9 +1511,7 @@ static void loop_queue_work(struct work_struct *work) if (write && (lo->lo_flags & LO_FLAGS_READ_ONLY)) goto failed; - ret = 0; - __rq_for_each_bio(bio, cmd->rq) - ret |= loop_handle_bio(lo, bio); + ret = do_req_filebacked(lo, cmd->rq); failed: if (ret) -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Ming Lei <ming.lei@canonical.com> To: Jens Axboe <axboe@kernel.dk>, linux-kernel@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>, Dave Kleikamp <dave.kleikamp@oracle.com> Cc: Zach Brown <zab@zabbo.net>, Benjamin LaHaise <bcrl@kvack.org>, Christoph Hellwig <hch@infradead.org>, Kent Overstreet <kmo@daterainc.com>, linux-aio@kvack.org, linux-fsdevel@vger.kernel.org, Dave Chinner <david@fromorbit.com>, Ming Lei <ming.lei@canonical.com> Subject: [PATCH v1 6/9] block: loop: say goodby to bio Date: Thu, 14 Aug 2014 23:50:37 +0800 [thread overview] Message-ID: <1408031441-31156-7-git-send-email-ming.lei@canonical.com> (raw) In-Reply-To: <1408031441-31156-1-git-send-email-ming.lei@canonical.com> Switch to block request completely. Signed-off-by: Ming Lei <ming.lei@canonical.com> --- drivers/block/loop.c | 46 ++++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 1af5265..ad43d4b 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -287,12 +287,12 @@ static int do_lo_send_write(struct loop_device *lo, struct bio_vec *bvec, return ret; } -static int lo_send(struct loop_device *lo, struct bio *bio, loff_t pos) +static int lo_send(struct loop_device *lo, struct request *rq, loff_t pos) { int (*do_lo_send)(struct loop_device *, struct bio_vec *, loff_t, struct page *page); struct bio_vec bvec; - struct bvec_iter iter; + struct req_iterator iter; struct page *page = NULL; int ret = 0; @@ -306,7 +306,7 @@ static int lo_send(struct loop_device *lo, struct bio *bio, loff_t pos) do_lo_send = do_lo_send_direct_write; } - bio_for_each_segment(bvec, bio, iter) { + rq_for_each_segment(bvec, rq, iter) { ret = do_lo_send(lo, &bvec, pos, page); if (ret < 0) break; @@ -394,19 +394,22 @@ do_lo_receive(struct loop_device *lo, } static int -lo_receive(struct loop_device *lo, struct bio *bio, int bsize, loff_t pos) +lo_receive(struct loop_device *lo, struct request *rq, int bsize, loff_t pos) { struct bio_vec bvec; - struct bvec_iter iter; + struct req_iterator iter; ssize_t s; - bio_for_each_segment(bvec, bio, iter) { + rq_for_each_segment(bvec, rq, iter) { s = do_lo_receive(lo, &bvec, bsize, pos); if (s < 0) return s; if (s != bvec.bv_len) { - zero_fill_bio(bio); + struct bio *bio; + + __rq_for_each_bio(bio, rq) + zero_fill_bio(bio); break; } pos += bvec.bv_len; @@ -414,17 +417,17 @@ lo_receive(struct loop_device *lo, struct bio *bio, int bsize, loff_t pos) return 0; } -static int do_bio_filebacked(struct loop_device *lo, struct bio *bio) +static int do_req_filebacked(struct loop_device *lo, struct request *rq) { loff_t pos; int ret; - pos = ((loff_t) bio->bi_iter.bi_sector << 9) + lo->lo_offset; + pos = ((loff_t) blk_rq_pos(rq) << 9) + lo->lo_offset; - if (bio_rw(bio) == WRITE) { + if (rq->cmd_flags & REQ_WRITE) { struct file *file = lo->lo_backing_file; - if (bio->bi_rw & REQ_FLUSH) { + if (rq->cmd_flags & REQ_FLUSH) { ret = vfs_fsync(file, 0); if (unlikely(ret && ret != -EINVAL)) { ret = -EIO; @@ -438,7 +441,7 @@ static int do_bio_filebacked(struct loop_device *lo, struct bio *bio) * encryption is enabled, because it may give an attacker * useful information. */ - if (bio->bi_rw & REQ_DISCARD) { + if (rq->cmd_flags & REQ_DISCARD) { struct file *file = lo->lo_backing_file; int mode = FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE; @@ -448,22 +451,22 @@ static int do_bio_filebacked(struct loop_device *lo, struct bio *bio) goto out; } ret = file->f_op->fallocate(file, mode, pos, - bio->bi_iter.bi_size); + blk_rq_bytes(rq)); if (unlikely(ret && ret != -EINVAL && ret != -EOPNOTSUPP)) ret = -EIO; goto out; } - ret = lo_send(lo, bio, pos); + ret = lo_send(lo, rq, pos); - if ((bio->bi_rw & REQ_FUA) && !ret) { + if ((rq->cmd_flags & REQ_FUA) && !ret) { ret = vfs_fsync(file, 0); if (unlikely(ret && ret != -EINVAL)) ret = -EIO; } } else - ret = lo_receive(lo, bio, lo->lo_blocksize, pos); + ret = lo_receive(lo, rq, lo->lo_blocksize, pos); out: return ret; @@ -474,12 +477,6 @@ struct switch_request { struct completion wait; }; -static inline int loop_handle_bio(struct loop_device *lo, struct bio *bio) -{ - int ret = do_bio_filebacked(lo, bio); - return ret; -} - /* * Do the actual switch; called from the BIO completion routine */ @@ -1507,7 +1504,6 @@ static void loop_queue_work(struct work_struct *work) const bool write = cmd->rq->cmd_flags & REQ_WRITE; struct loop_device *lo = cmd->lo; int ret = -EIO; - struct bio *bio; if (lo->lo_state != Lo_bound) goto failed; @@ -1515,9 +1511,7 @@ static void loop_queue_work(struct work_struct *work) if (write && (lo->lo_flags & LO_FLAGS_READ_ONLY)) goto failed; - ret = 0; - __rq_for_each_bio(bio, cmd->rq) - ret |= loop_handle_bio(lo, bio); + ret = do_req_filebacked(lo, cmd->rq); failed: if (ret) -- 1.7.9.5 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to majordomo@kvack.org. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"aart@kvack.org">aart@kvack.org</a>
next prev parent reply other threads:[~2014-08-14 15:52 UTC|newest] Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-08-14 15:50 [PATCH v1 0/9] block & aio: kernel aio and loop mq conversion Ming Lei 2014-08-14 15:50 ` Ming Lei 2014-08-14 15:50 ` [PATCH v1 1/9] aio: add aio_kernel_() interface Ming Lei 2014-08-14 15:50 ` Ming Lei 2014-08-14 18:07 ` Zach Brown 2014-08-14 18:07 ` Zach Brown 2014-08-15 13:20 ` Ming Lei 2014-08-15 13:20 ` Ming Lei 2014-08-14 15:50 ` [PATCH v1 2/9] fd/direct-io: introduce should_dirty for kernel aio Ming Lei 2014-08-14 15:50 ` Ming Lei 2014-08-14 15:50 ` [PATCH v1 3/9] blk-mq: export blk_mq_freeze_queue and blk_mq_unfreeze_queue Ming Lei 2014-08-14 15:50 ` Ming Lei 2014-08-14 15:50 ` [PATCH v1 4/9] blk-mq: introduce init_flush_rq_fn callback in 'blk_mq_ops' Ming Lei 2014-08-14 15:50 ` Ming Lei 2014-08-15 16:19 ` Jens Axboe 2014-08-15 16:19 ` Jens Axboe 2014-08-16 7:49 ` Ming Lei 2014-08-16 7:49 ` Ming Lei 2014-08-17 18:39 ` Jens Axboe 2014-08-17 18:39 ` Jens Axboe 2014-08-14 15:50 ` [PATCH v1 5/9] block: loop: convert to blk-mq Ming Lei 2014-08-14 15:50 ` Ming Lei 2014-08-15 16:31 ` Christoph Hellwig 2014-08-15 16:31 ` Christoph Hellwig 2014-08-15 16:36 ` Jens Axboe 2014-08-15 16:46 ` Jens Axboe 2014-08-16 8:06 ` Ming Lei 2014-08-16 8:06 ` Ming Lei 2014-08-17 17:48 ` Jens Axboe 2014-08-17 17:48 ` Jens Axboe 2014-08-18 1:22 ` Ming Lei 2014-08-18 1:22 ` Ming Lei 2014-08-18 11:53 ` Ming Lei 2014-08-18 11:53 ` Ming Lei 2014-08-19 20:50 ` Jens Axboe 2014-08-20 1:23 ` Ming Lei 2014-08-20 16:09 ` Jens Axboe 2014-08-21 2:54 ` Ming Lei 2014-08-21 2:58 ` Jens Axboe 2014-08-21 3:13 ` Ming Lei 2014-08-21 3:15 ` Ming Lei 2014-08-21 3:16 ` Jens Axboe 2014-08-21 3:34 ` Ming Lei 2014-08-21 5:44 ` Ming Lei 2014-08-27 16:08 ` Maxim Patlasov 2014-08-27 16:08 ` Maxim Patlasov 2014-08-27 16:29 ` Benjamin LaHaise 2014-08-27 16:29 ` Benjamin LaHaise 2014-08-27 17:19 ` Maxim Patlasov 2014-08-27 17:19 ` Maxim Patlasov 2014-08-27 17:56 ` Zach Brown 2014-08-27 17:56 ` Zach Brown 2014-08-28 2:10 ` Ming Lei 2014-08-28 2:10 ` Ming Lei 2014-08-28 2:06 ` Ming Lei 2014-08-28 2:06 ` Ming Lei 2014-08-29 11:14 ` Maxim Patlasov 2014-08-29 11:14 ` Maxim Patlasov 2014-08-14 15:50 ` Ming Lei [this message] 2014-08-14 15:50 ` [PATCH v1 6/9] block: loop: say goodby to bio Ming Lei 2014-08-14 15:50 ` [PATCH v1 7/9] block: loop: introduce lo_discard() and lo_req_flush() Ming Lei 2014-08-14 15:50 ` Ming Lei 2014-08-14 15:50 ` [PATCH v1 8/9] block: loop: don't handle REQ_FUA explicitly Ming Lei 2014-08-14 15:50 ` Ming Lei 2014-08-14 15:50 ` [PATCH v1 9/9] block: loop: support to submit I/O via kernel aio based Ming Lei 2014-08-14 15:50 ` Ming Lei 2014-08-14 16:53 ` [PATCH v1 0/9] block & aio: kernel aio and loop mq conversion Jens Axboe 2014-08-14 16:53 ` Jens Axboe 2014-08-15 12:59 ` Ming Lei 2014-08-15 12:59 ` Ming Lei 2014-08-15 13:11 ` Christoph Hellwig 2014-08-15 13:11 ` Christoph Hellwig 2014-08-15 14:32 ` Ming Lei 2014-08-15 14:32 ` Ming Lei
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=1408031441-31156-7-git-send-email-ming.lei@canonical.com \ --to=ming.lei@canonical.com \ --cc=akpm@linux-foundation.org \ --cc=axboe@kernel.dk \ --cc=bcrl@kvack.org \ --cc=dave.kleikamp@oracle.com \ --cc=david@fromorbit.com \ --cc=hch@infradead.org \ --cc=kmo@daterainc.com \ --cc=linux-aio@kvack.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.