block: Replace bi_integrity with bi_special

For commands like REQ_COPY we need a way to pass extra information along
with each bio. Like integrity metadata this information must be
available at the bottom of the stack so bi_private does not suffice.

Rename the existing bi_integrity field to bi_special and make it a union
so we can have different bio extensions for each class of command.

We previously used bi_integrity != NULL as a way to identify whether a
bio had integrity metadata or not. Introduce a REQ_INTEGRITY to be the
indicator now that bi_special can contain different things.

In addition, bio_integrity(bio) will now return a pointer to the
integrity payload (when applicable).

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

1 files changed, 10 insertions, 9 deletions

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 36b788552c3e..bd3125c3c124 100644
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -79,6 +79,7 @@ struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio,
         bip->bip_slab = idx;
         bip->bip_bio = bio;
         bio->bi_integrity = bip;
+        bio->bi_rw |= REQ_INTEGRITY;
 
         return bip;
 err:
@@ -96,7 +97,7 @@ EXPORT_SYMBOL(bio_integrity_alloc);
  */
 void bio_integrity_free(struct bio *bio)
 {
-        struct bio_integrity_payload *bip = bio->bi_integrity;
+        struct bio_integrity_payload *bip = bio_integrity(bio);
         struct bio_set *bs = bio->bi_pool;
 
         if (bip->bip_owns_buf)
@@ -128,7 +129,7 @@ EXPORT_SYMBOL(bio_integrity_free);
 int bio_integrity_add_page(struct bio *bio, struct page *page,
                            unsigned int len, unsigned int offset)
 {
-        struct bio_integrity_payload *bip = bio->bi_integrity;
+        struct bio_integrity_payload *bip = bio_integrity(bio);
         struct bio_vec *iv;
 
         if (bip->bip_vcnt >= bip->bip_max_vcnt) {
@@ -229,7 +230,7 @@ EXPORT_SYMBOL(bio_integrity_tag_size);
 static int bio_integrity_tag(struct bio *bio, void *tag_buf, unsigned int len,
                              int set)
 {
-        struct bio_integrity_payload *bip = bio->bi_integrity;
+        struct bio_integrity_payload *bip = bio_integrity(bio);
         struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev);
         unsigned int nr_sectors;
 
@@ -304,12 +305,12 @@ static int bio_integrity_generate_verify(struct bio *bio, int operate)
         struct bio_vec *bv;
         sector_t sector;
         unsigned int sectors, ret = 0, i;
-        void *prot_buf = bio->bi_integrity->bip_buf;
+        void *prot_buf = bio_integrity(bio)->bip_buf;
 
         if (operate)
                 sector = bio->bi_iter.bi_sector;
         else
-                sector = bio->bi_integrity->bip_iter.bi_sector;
+                sector = bio_integrity(bio)->bip_iter.bi_sector;
 
         bix.disk_name = bio->bi_bdev->bd_disk->disk_name;
         bix.sector_size = bi->sector_size;
@@ -505,7 +506,7 @@ static void bio_integrity_verify_fn(struct work_struct *work)
  */
 void bio_integrity_endio(struct bio *bio, int error)
 {
-        struct bio_integrity_payload *bip = bio->bi_integrity;
+        struct bio_integrity_payload *bip = bio_integrity(bio);
 
         BUG_ON(bip->bip_bio != bio);
 
@@ -536,7 +537,7 @@ EXPORT_SYMBOL(bio_integrity_endio);
  */
 void bio_integrity_advance(struct bio *bio, unsigned int bytes_done)
 {
-        struct bio_integrity_payload *bip = bio->bi_integrity;
+        struct bio_integrity_payload *bip = bio_integrity(bio);
         struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev);
         unsigned bytes = bio_integrity_bytes(bi, bytes_done >> 9);
 
@@ -558,7 +559,7 @@ EXPORT_SYMBOL(bio_integrity_advance);
 void bio_integrity_trim(struct bio *bio, unsigned int offset,
                         unsigned int sectors)
 {
-        struct bio_integrity_payload *bip = bio->bi_integrity;
+        struct bio_integrity_payload *bip = bio_integrity(bio);
         struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev);
 
         bio_integrity_advance(bio, offset << 9);
@@ -577,7 +578,7 @@ EXPORT_SYMBOL(bio_integrity_trim);
 int bio_integrity_clone(struct bio *bio, struct bio *bio_src,
                         gfp_t gfp_mask)
 {
-        struct bio_integrity_payload *bip_src = bio_src->bi_integrity;
+        struct bio_integrity_payload *bip_src = bio_integrity(bio_src);
         struct bio_integrity_payload *bip;
 
         BUG_ON(bip_src == NULL);