From: Pavel Begunkov <[email protected]>
To: [email protected]
Cc: Jens Axboe <[email protected]>,
Christoph Hellwig <[email protected]>,
Matthew Wilcox <[email protected]>,
Ming Lei <[email protected]>,
Johannes Weiner <[email protected]>,
Alexander Viro <[email protected]>,
"Darrick J . Wong" <[email protected]>,
"Martin K . Petersen" <[email protected]>,
Jonathan Corbet <[email protected]>,
[email protected], [email protected],
[email protected], [email protected],
[email protected], [email protected],
[email protected]
Subject: [PATCH v1 5/6] bio: add a helper calculating nr segments to alloc
Date: Tue, 15 Dec 2020 00:20:24 +0000 [thread overview]
Message-ID: <94b6f76d2d47569742ee47caede1504926f9807a.1607976425.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
A preparation patch. It adds a simple helper which abstracts out number
of segments we're allocating for a bio from iov_iter_npages().
Signed-off-by: Pavel Begunkov <[email protected]>
---
fs/block_dev.c | 7 ++++---
fs/iomap/direct-io.c | 9 ++++-----
include/linux/bio.h | 6 ++++++
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 9e56ee1f2652..1cbbc794edc6 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -417,7 +417,7 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages)
dio->size += bio->bi_iter.bi_size;
pos += bio->bi_iter.bi_size;
- nr_pages = iov_iter_npages(iter, BIO_MAX_PAGES);
+ nr_pages = bio_iov_vecs_to_alloc(iter, BIO_MAX_PAGES);
if (!nr_pages) {
bool polled = false;
@@ -482,9 +482,10 @@ blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
{
int nr_pages;
- nr_pages = iov_iter_npages(iter, BIO_MAX_PAGES + 1);
- if (!nr_pages)
+ if (!iov_iter_count(iter))
return 0;
+
+ nr_pages = bio_iov_vecs_to_alloc(iter, BIO_MAX_PAGES + 1);
if (is_sync_kiocb(iocb) && nr_pages <= BIO_MAX_PAGES)
return __blkdev_direct_IO_simple(iocb, iter, nr_pages);
diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c
index 933f234d5bec..ea1e8f696076 100644
--- a/fs/iomap/direct-io.c
+++ b/fs/iomap/direct-io.c
@@ -250,11 +250,8 @@ iomap_dio_bio_actor(struct inode *inode, loff_t pos, loff_t length,
orig_count = iov_iter_count(dio->submit.iter);
iov_iter_truncate(dio->submit.iter, length);
- nr_pages = iov_iter_npages(dio->submit.iter, BIO_MAX_PAGES);
- if (nr_pages <= 0) {
- ret = nr_pages;
+ if (!iov_iter_count(dio->submit.iter))
goto out;
- }
if (need_zeroout) {
/* zero out from the start of the block to the write offset */
@@ -263,6 +260,7 @@ iomap_dio_bio_actor(struct inode *inode, loff_t pos, loff_t length,
iomap_dio_zero(dio, iomap, pos - pad, pad);
}
+ nr_pages = bio_iov_vecs_to_alloc(dio->submit.iter, BIO_MAX_PAGES);
do {
size_t n;
if (dio->error) {
@@ -308,7 +306,8 @@ iomap_dio_bio_actor(struct inode *inode, loff_t pos, loff_t length,
dio->size += n;
copied += n;
- nr_pages = iov_iter_npages(dio->submit.iter, BIO_MAX_PAGES);
+ nr_pages = bio_iov_vecs_to_alloc(dio->submit.iter,
+ BIO_MAX_PAGES);
iomap_dio_submit_bio(dio, iomap, bio, pos);
pos += n;
} while (nr_pages);
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 1edda614f7ce..2a9f3f0bbe0a 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -10,6 +10,7 @@
#include <linux/ioprio.h>
/* struct bio, bio_vec and BIO_* flags are defined in blk_types.h */
#include <linux/blk_types.h>
+#include <linux/uio.h>
#define BIO_DEBUG
@@ -441,6 +442,11 @@ static inline void bio_wouldblock_error(struct bio *bio)
bio_endio(bio);
}
+static inline int bio_iov_vecs_to_alloc(struct iov_iter *iter, int max_segs)
+{
+ return iov_iter_npages(iter, max_segs);
+}
+
struct request_queue;
extern int submit_bio_wait(struct bio *bio);
--
2.24.0
next prev parent reply other threads:[~2020-12-15 0:28 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-15 0:20 [PATCH v1 0/6] no-copy bvec Pavel Begunkov
2020-12-15 0:20 ` [PATCH v1 1/6] target/file: allocate the bvec array as part of struct target_core_file_cmd Pavel Begunkov
2020-12-15 0:20 ` [PATCH v1 2/6] iov_iter: optimise bvec iov_iter_advance() Pavel Begunkov
2020-12-15 9:37 ` David Laight
2020-12-15 11:23 ` Pavel Begunkov
2020-12-15 13:54 ` David Laight
2020-12-15 13:56 ` Pavel Begunkov
2020-12-22 14:03 ` Christoph Hellwig
2020-12-15 0:20 ` [PATCH v1 3/6] bio: deduplicate adding a page into bio Pavel Begunkov
2020-12-22 14:04 ` Christoph Hellwig
2020-12-15 0:20 ` [PATCH v1 4/6] block/psi: remove PSI annotations from direct IO Pavel Begunkov
2020-12-15 0:56 ` Dave Chinner
2020-12-15 1:03 ` Pavel Begunkov
2020-12-15 1:33 ` Dave Chinner
2020-12-15 11:41 ` Pavel Begunkov
2020-12-22 14:07 ` Christoph Hellwig
2020-12-15 0:20 ` Pavel Begunkov [this message]
2020-12-15 1:00 ` [PATCH v1 5/6] bio: add a helper calculating nr segments to alloc Dave Chinner
2020-12-15 1:07 ` Pavel Begunkov
2020-12-15 1:09 ` Dave Chinner
2020-12-22 14:07 ` Christoph Hellwig
2020-12-15 0:20 ` [PATCH v1 6/6] block/iomap: don't copy bvec for direct IO Pavel Begunkov
2020-12-15 1:09 ` Dave Chinner
2020-12-15 1:15 ` Pavel Begunkov
2020-12-22 14:15 ` Christoph Hellwig
2020-12-15 1:41 ` [PATCH v1 0/6] no-copy bvec Ming Lei
2020-12-15 11:14 ` Pavel Begunkov
2020-12-15 12:03 ` Ming Lei
2020-12-15 14:05 ` Pavel Begunkov
2020-12-22 14:11 ` Christoph Hellwig
2020-12-23 12:52 ` Pavel Begunkov
2020-12-23 15:51 ` Christoph Hellwig
2020-12-23 16:04 ` James Bottomley
2020-12-23 20:23 ` Douglas Gilbert
2020-12-23 20:32 ` Pavel Begunkov
2020-12-24 6:41 ` Christoph Hellwig
2020-12-24 16:45 ` Douglas Gilbert
2020-12-24 17:30 ` James Bottomley
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=94b6f76d2d47569742ee47caede1504926f9807a.1607976425.git.asml.silence@gmail.com \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/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