block: factor out a bvec_set_page helper

[ Upstream commit d58cdfae6a22e5079656c487aad669597a0635c8 ]

Add a helper to initialize a bvec based of a page pointer.  This will help
removing various open code bvec initializations.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20230203150634.3199647-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Stable-dep-of: 1f0bbf28940c ("nvmet-tcp: pass iov_len instead of sg->length to bvec_set_page()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 91ffee6fc8cb447a7fea28b749aefc5ae374d80e..4533eb49166109b20cd3f3d37427c761d630ed6e 100644 (file)
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -124,23 +124,18 @@ int bio_integrity_add_page(struct bio *bio, struct page *page,
                           unsigned int len, unsigned int offset)
 {
        struct bio_integrity_payload *bip = bio_integrity(bio);
-       struct bio_vec *iv;
 
        if (bip->bip_vcnt >= bip->bip_max_vcnt) {
                printk(KERN_ERR "%s: bip_vec full\n", __func__);
                return 0;
        }
 
-       iv = bip->bip_vec + bip->bip_vcnt;
-
        if (bip->bip_vcnt &&
            bvec_gap_to_prev(&bdev_get_queue(bio->bi_bdev)->limits,
                             &bip->bip_vec[bip->bip_vcnt - 1], offset))
                return 0;
 
-       iv->bv_page = page;
-       iv->bv_len = len;
-       iv->bv_offset = offset;
+       bvec_set_page(&bip->bip_vec[bip->bip_vcnt], page, len, offset);
        bip->bip_vcnt++;
 
        return len;

diff --git a/block/bio.c b/block/bio.c
index d5cd825d6efc0fd89b93c51a449dfb0861648d90..9ec72a78f1149a1012ac23464685f683401bfc63 100644 (file)
--- a/block/bio.c
+++ b/block/bio.c
@@ -976,10 +976,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;
+       bvec_set_page(&bio->bi_io_vec[bio->bi_vcnt], page, len, offset);
        bio->bi_vcnt++;
        bio->bi_iter.bi_size += len;
        return len;
@@ -1055,15 +1052,10 @@ EXPORT_SYMBOL_GPL(bio_add_zone_append_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;
-
+       bvec_set_page(&bio->bi_io_vec[bio->bi_vcnt], page, len, off);
        bio->bi_iter.bi_size += len;
        bio->bi_vcnt++;
 }

diff --git a/include/linux/bvec.h b/include/linux/bvec.h
index 35c25dff651a5e4953acd8d9e749e2bc41535c5d..9e3dac51eb26b603ef45444309c3cb72e06cc125 100644 (file)
--- a/include/linux/bvec.h
+++ b/include/linux/bvec.h
@@ -35,6 +35,21 @@ struct bio_vec {
        unsigned int    bv_offset;
 };
 
+/**
+ * bvec_set_page - initialize a bvec based off a struct page
+ * @bv:                bvec to initialize
+ * @page:      page the bvec should point to
+ * @len:       length of the bvec
+ * @offset:    offset into the page
+ */
+static inline void bvec_set_page(struct bio_vec *bv, struct page *page,
+               unsigned int len, unsigned int offset)
+{
+       bv->bv_page = page;
+       bv->bv_len = len;
+       bv->bv_offset = offset;
+}
+
 struct bvec_iter {
        sector_t                bi_sector;      /* device address in 512 byte
                                                   sectors */