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 3/6] bio: deduplicate adding a page into bio
Date: Tue, 15 Dec 2020 00:20:22 +0000 [thread overview]
Message-ID: <189cae47946fa49318f85678def738d358e8298b.1607976425.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
Both bio_add_hw_page() mimics bio_add_page() and has a hand-coded
version of appending a page into bio's bvec. DRY
Signed-off-by: Pavel Begunkov <[email protected]>
---
block/bio.c | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/block/bio.c b/block/bio.c
index 1f2cc1fbe283..4a8f77bb3956 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -734,6 +734,22 @@ const char *bio_devname(struct bio *bio, char *buf)
}
EXPORT_SYMBOL(bio_devname);
+static void bio_add_page_noaccount(struct bio *bio, struct page *page,
+ unsigned int len, unsigned int off)
+{
+ struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt];
+
+ WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED));
+ WARN_ON_ONCE(bio_full(bio, len));
+
+ bv->bv_page = page;
+ bv->bv_offset = off;
+ bv->bv_len = len;
+
+ bio->bi_iter.bi_size += len;
+ bio->bi_vcnt++;
+}
+
static inline bool page_is_mergeable(const struct bio_vec *bv,
struct page *page, unsigned int len, unsigned int off,
bool *same_page)
@@ -818,12 +834,7 @@ int bio_add_hw_page(struct request_queue *q, struct bio *bio,
if (bio->bi_vcnt >= queue_max_segments(q))
return 0;
- bvec = &bio->bi_io_vec[bio->bi_vcnt];
- bvec->bv_page = page;
- bvec->bv_len = len;
- bvec->bv_offset = offset;
- bio->bi_vcnt++;
- bio->bi_iter.bi_size += len;
+ bio_add_page_noaccount(bio, page, len, offset);
return len;
}
@@ -903,18 +914,7 @@ EXPORT_SYMBOL_GPL(__bio_try_merge_page);
void __bio_add_page(struct bio *bio, struct page *page,
unsigned int len, unsigned int off)
{
- struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt];
-
- WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED));
- WARN_ON_ONCE(bio_full(bio, len));
-
- bv->bv_page = page;
- bv->bv_offset = off;
- bv->bv_len = len;
-
- bio->bi_iter.bi_size += len;
- bio->bi_vcnt++;
-
+ bio_add_page_noaccount(bio, page, len, off);
if (!bio_flagged(bio, BIO_WORKINGSET) && unlikely(PageWorkingset(page)))
bio_set_flag(bio, BIO_WORKINGSET);
}
--
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 ` Pavel Begunkov [this message]
2020-12-22 14:04 ` [PATCH v1 3/6] bio: deduplicate adding a page into bio 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 ` [PATCH v1 5/6] bio: add a helper calculating nr segments to alloc Pavel Begunkov
2020-12-15 1:00 ` 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=189cae47946fa49318f85678def738d358e8298b.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