From: Jens Axboe <axboe@kernel.dk>
To: linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-aio@kvack.org
Cc: hch@lst.de, jmoyer@redhat.com, clm@fb.com, Jens Axboe <axboe@kernel.dk>
Subject: [PATCH 23/26] fs: add support for mapping an ITER_BVEC for O_DIRECT
Date: Fri, 7 Dec 2018 15:20:13 -0700 [thread overview]
Message-ID: <20181207222016.29387-24-axboe@kernel.dk> (raw)
In-Reply-To: <20181207222016.29387-1-axboe@kernel.dk>
This adds support for sync/async O_DIRECT to make a bvec type iter
for bdev access, as well as iomap.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
fs/block_dev.c | 16 ++++++++++++----
fs/iomap.c | 10 +++++++---
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/fs/block_dev.c b/fs/block_dev.c
index b8f574615792..236c6abe649d 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -219,7 +219,10 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter,
bio.bi_end_io = blkdev_bio_end_io_simple;
bio.bi_ioprio = iocb->ki_ioprio;
- ret = bio_iov_iter_get_pages(&bio, iter);
+ if (iov_iter_is_bvec(iter))
+ ret = bio_iov_bvec_add_pages(&bio, iter);
+ else
+ ret = bio_iov_iter_get_pages(&bio, iter);
if (unlikely(ret))
goto out;
ret = bio.bi_iter.bi_size;
@@ -326,8 +329,9 @@ static void blkdev_bio_end_io(struct bio *bio)
struct bio_vec *bvec;
int i;
- bio_for_each_segment_all(bvec, bio, i)
- put_page(bvec->bv_page);
+ if (!bio_flagged(bio, BIO_HOLD_PAGES))
+ bio_for_each_segment_all(bvec, bio, i)
+ put_page(bvec->bv_page);
bio_put(bio);
}
}
@@ -381,7 +385,11 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages)
bio->bi_end_io = blkdev_bio_end_io;
bio->bi_ioprio = iocb->ki_ioprio;
- ret = bio_iov_iter_get_pages(bio, iter);
+ if (iov_iter_is_bvec(iter))
+ ret = bio_iov_bvec_add_pages(bio, iter);
+ else
+ ret = bio_iov_iter_get_pages(bio, iter);
+
if (unlikely(ret)) {
bio->bi_status = BLK_STS_IOERR;
bio_endio(bio);
diff --git a/fs/iomap.c b/fs/iomap.c
index bd483fcb7b5a..e36ad0be03f5 100644
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@ -1573,8 +1573,9 @@ static void iomap_dio_bio_end_io(struct bio *bio)
struct bio_vec *bvec;
int i;
- bio_for_each_segment_all(bvec, bio, i)
- put_page(bvec->bv_page);
+ if (!bio_flagged(bio, BIO_HOLD_PAGES))
+ bio_for_each_segment_all(bvec, bio, i)
+ put_page(bvec->bv_page);
bio_put(bio);
}
}
@@ -1673,7 +1674,10 @@ iomap_dio_bio_actor(struct inode *inode, loff_t pos, loff_t length,
bio->bi_private = dio;
bio->bi_end_io = iomap_dio_bio_end_io;
- ret = bio_iov_iter_get_pages(bio, &iter);
+ if (iov_iter_is_bvec(&iter))
+ ret = bio_iov_bvec_add_pages(bio, &iter);
+ else
+ ret = bio_iov_iter_get_pages(bio, &iter);
if (unlikely(ret)) {
/*
* We have to stop part way through an IO. We must fall
--
2.17.1
next prev parent reply other threads:[~2018-12-07 22:21 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-07 22:19 [PATCHSET v6] Support for polled aio (and more) Jens Axboe
2018-12-07 22:19 ` [PATCH 01/26] fs: add an iopoll method to struct file_operations Jens Axboe
2018-12-07 22:19 ` [PATCH 02/26] block: add REQ_HIPRI_ASYNC Jens Axboe
2018-12-07 22:19 ` [PATCH 03/26] block: wire up block device iopoll method Jens Axboe
2018-12-07 22:19 ` [PATCH 04/26] block: use REQ_HIPRI_ASYNC for non-sync polled IO Jens Axboe
2018-12-07 22:19 ` [PATCH 05/26] iomap: wire up the iopoll method Jens Axboe
2018-12-07 22:19 ` [PATCH 06/26] aio: use assigned completion handler Jens Axboe
2018-12-07 22:19 ` [PATCH 07/26] aio: separate out ring reservation from req allocation Jens Axboe
2018-12-07 22:19 ` [PATCH 08/26] aio: don't zero entire aio_kiocb aio_get_req() Jens Axboe
2018-12-07 22:19 ` [PATCH 09/26] aio: only use blk plugs for > 2 depth submissions Jens Axboe
2018-12-07 22:20 ` [PATCH 10/26] aio: use iocb_put() instead of open coding it Jens Axboe
2018-12-07 22:20 ` [PATCH 11/26] aio: split out iocb copy from io_submit_one() Jens Axboe
2018-12-07 22:20 ` [PATCH 12/26] aio: abstract out io_event filler helper Jens Axboe
2018-12-07 22:20 ` [PATCH 13/26] aio: add io_setup2() system call Jens Axboe
2018-12-09 10:12 ` Benny Halevy
2018-12-09 14:37 ` Jens Axboe
2018-12-07 22:20 ` [PATCH 14/26] aio: add support for having user mapped iocbs Jens Axboe
2018-12-07 22:20 ` [PATCH 15/26] aio: support for IO polling Jens Axboe
2018-12-09 10:02 ` Benny Halevy
2018-12-09 14:36 ` Jens Axboe
2018-12-10 8:10 ` Benny Halevy
2018-12-07 22:20 ` [PATCH 16/26] aio: add submission side request cache Jens Axboe
2018-12-07 22:20 ` [PATCH 17/26] fs: add fget_many() and fput_many() Jens Axboe
2018-12-07 22:20 ` [PATCH 18/26] aio: use fget/fput_many() for file references Jens Axboe
2018-12-07 22:20 ` [PATCH 19/26] aio: split iocb init from allocation Jens Axboe
2018-12-07 22:20 ` [PATCH 20/26] aio: batch aio_kiocb allocation Jens Axboe
2018-12-07 22:20 ` [PATCH 21/26] block: add BIO_HOLD_PAGES flag Jens Axboe
2018-12-07 22:20 ` [PATCH 22/26] block: implement bio helper to add iter bvec pages to bio Jens Axboe
2018-12-07 22:20 ` Jens Axboe [this message]
2018-12-07 22:20 ` [PATCH 24/26] aio: add support for pre-mapped user IO buffers Jens Axboe
2018-12-07 22:20 ` [PATCH 25/26] aio: split old ring complete out from aio_complete() Jens Axboe
2018-12-07 22:20 ` [PATCH 26/26] aio: add support for submission/completion rings Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2018-12-04 23:37 [PATCHSET v5] Support for polled aio Jens Axboe
2018-12-04 23:37 ` [PATCH 23/26] fs: add support for mapping an ITER_BVEC for O_DIRECT Jens Axboe
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=20181207222016.29387-24-axboe@kernel.dk \
--to=axboe@kernel.dk \
--cc=clm@fb.com \
--cc=hch@lst.de \
--cc=jmoyer@redhat.com \
--cc=linux-aio@kvack.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.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 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.