Commit 80814b8e authored by Jinyoung Choi's avatar Jinyoung Choi Committed by Jens Axboe
Browse files

bio-integrity: update the payload size in bio_integrity_add_page() 



Previously, the bip's bi_size has been set before an integrity pages
were added. If a problem occurs in the process of adding pages for
bip, the bi_size mismatch problem must be dealt with.

When the page is successfully added to bvec, the bi_size is updated.

The parts affected by the change were also contained in this commit.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Martin K. Petersen <martin.petersen@oracle.com>

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJinyoung Choi <j-young.choi@samsung.com>
Tested-by: default avatar"Martin K. Petersen" <martin.petersen@oracle.com>
Reviewed-by: default avatar"Martin K. Petersen" <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20230803024956epcms2p38186a17392706650c582d38ef3dbcd32@epcms2p3


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 7c8998f7

block/bio-integrity.c

+1 −1
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ int bio_integrity_add_page(struct bio *bio, struct page *page, 


	bvec_set_page(&bip->bip_vec[bip->bip_vcnt], page, len, offset);

	bip->bip_vcnt++;

	bip->bip_iter.bi_size += len;



	return len;

}
@@ -244,7 +245,6 @@ bool bio_integrity_prep(struct bio *bio) 
	}



	bip->bip_flags |= BIP_BLOCK_INTEGRITY;

	bip->bip_iter.bi_size = len;

	bip_set_seed(bip, bio->bi_iter.bi_sector);



	if (bi->flags & BLK_INTEGRITY_IP_CHECKSUM)

drivers/md/dm-crypt.c

+0 −1
Original line number Diff line number Diff line
@@ -1160,7 +1160,6 @@ static int dm_crypt_integrity_io_alloc(struct dm_crypt_io *io, struct bio *bio) 


	tag_len = io->cc->on_disk_tag_size * (bio_sectors(bio) >> io->cc->sector_shift);



	bip->bip_iter.bi_size = tag_len;

	bip->bip_iter.bi_sector = io->cc->start + io->sector;



	ret = bio_integrity_add_page(bio, virt_to_page(io->integrity_metadata),

drivers/nvme/host/ioctl.c

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ static void *nvme_add_user_metadata(struct request *req, void __user *ubuf, 
		goto out_free_meta;

	}



	bip->bip_iter.bi_size = len;

	bip->bip_iter.bi_sector = seed;

	ret = bio_integrity_add_page(bio, virt_to_page(buf), len,

			offset_in_page(buf));

drivers/nvme/target/io-cmd-bdev.c

+1 −2
Original line number Diff line number Diff line
@@ -206,12 +206,11 @@ static int nvmet_bdev_alloc_bip(struct nvmet_req *req, struct bio *bio, 
		return PTR_ERR(bip);

	}



	bip->bip_iter.bi_size = bio_integrity_bytes(bi, bio_sectors(bio));

	/* virtual start sector must be in integrity interval units */

	bip_set_seed(bip, bio->bi_iter.bi_sector >>

		     (bi->interval_exp - SECTOR_SHIFT));



	resid = bip->bip_iter.bi_size;

	resid = bio_integrity_bytes(bi, bio_sectors(bio));

	while (resid > 0 && sg_miter_next(miter)) {

		len = min_t(size_t, miter->length, resid);

		rc = bio_integrity_add_page(bio, miter->page, len,

drivers/target/target_core_iblock.c

+1 −2
Original line number Diff line number Diff line
@@ -689,7 +689,6 @@ iblock_alloc_bip(struct se_cmd *cmd, struct bio *bio, 
		return PTR_ERR(bip);

	}



	bip->bip_iter.bi_size = bio_integrity_bytes(bi, bio_sectors(bio));

	/* virtual start sector must be in integrity interval units */

	bip_set_seed(bip, bio->bi_iter.bi_sector >>

				  (bi->interval_exp - SECTOR_SHIFT));
@@ -697,7 +696,7 @@ iblock_alloc_bip(struct se_cmd *cmd, struct bio *bio, 
	pr_debug("IBLOCK BIP Size: %u Sector: %llu\n", bip->bip_iter.bi_size,

		 (unsigned long long)bip->bip_iter.bi_sector);



	resid = bip->bip_iter.bi_size;

	resid = bio_integrity_bytes(bi, bio_sectors(bio));

	while (resid > 0 && sg_miter_next(miter)) {



		len = min_t(size_t, miter->length, resid);