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 PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 15 Dec 2020 00:20:22 +0000 From: Pavel Begunkov <asml.silence@...il.com> To: linux-block@...r.kernel.org Cc: Jens Axboe <axboe@...nel.dk>, Christoph Hellwig <hch@...radead.org>, Matthew Wilcox <willy@...radead.org>, Ming Lei <ming.lei@...hat.com>, Johannes Weiner <hannes@...xchg.org>, Alexander Viro <viro@...iv.linux.org.uk>, "Darrick J . Wong" <darrick.wong@...cle.com>, "Martin K . Petersen" <martin.petersen@...cle.com>, Jonathan Corbet <corbet@....net>, linux-xfs@...r.kernel.org, linux-fsdevel@...r.kernel.org, io-uring@...r.kernel.org, linux-kernel@...r.kernel.org, target-devel@...r.kernel.org, linux-scsi@...r.kernel.org, linux-doc@...r.kernel.org Subject: [PATCH v1 3/6] bio: deduplicate adding a page into bio 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 <asml.silence@...il.com> --- 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
Powered by blists - more mailing lists