block: fix integrity offset/length conversions
Subsystems (5)
v2 cover block: fix integrity offset/length conversions
The block layer's integrity code currently sets the seed (initial reference tag) in units of 512-byte sectors but increments it in units of integrity intervals. Not only do the T10 DIF formats require ref tags to be the lower bits of the logical block address, but mixing the two units means the ref tags used for a particular logical block vary based on its offset within a read/write request. This looks to be a longstanding bug affecting block devices that support integrity with block sizes > 512 bytes; I'm surprised it wasn't noticed before.
Also fix the newly added fs_bio_integrity_verify() to pass bio_integrity_verify() a struct bdev_iter representing the data instead of the integrity. Most of the integrity data is currently being skipped.
v2:
- Reorder fixes before refactoring commits
- Use u64, SECTOR_SHIFT (Christoph)
- Don't take sector_t in bip_set_seed() (Christoph)
Caleb Sander Mateos (6):
block: use integrity interval instead of sector as seed
bio-integrity-fs: pass data iter to bio_integrity_verify()
blk-integrity: take u64 in bio_integrity_intervals()
bio-integrity-fs: use integrity interval instead of sector as seed
t10-pi: use bio_integrity_intervals() helper
blk-integrity: avoid sector_t in bip_{get,set}_seed()
block/bio-integrity-fs.c | 5 +++-- block/bio-integrity.c | 4 ++-- block/t10-pi.c | 7 ++++--- drivers/nvme/target/io-cmd-bdev.c | 3 +-- drivers/target/target_core_iblock.c | 3 +-- include/linux/bio-integrity.h | 11 ----------- include/linux/blk-integrity.h | 28 +++++++++++++++++++++------- include/linux/bvec.h | 1 + 8 files changed, 33 insertions(+), 29 deletions(-)
Signature · 1 line
2.45.2
PATCH v2 1/6 block: use integrity interval instead of sector as seed
bio_integrity_setup_default() and blk_integrity_iterate() set the integrity seed (initial reference tag) to the absolute address in the block device in units of 512-byte sectors. The seed is correctly incremented/decremented in units of integrity intervals in bio_integrity_map_iter(), bio_integrity_advance(), and blk_integrity_interval(). As a result, the ref tag written or read to a particular integrity interval on a block device with integrity interval size > 512 bytes varies with the starting offset of the read/write.
Convert the initial seed to units of integrity intervals so a consistent ref tag is used for each integrity interval.
--- block/bio-integrity.c | 3 ++- block/t10-pi.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
block/bio-integrity.c +2 -1
@@ -103,12 +103,13 @@ void bio_integrity_free_buf(struct bio_integrity_payload *bip)void bio_integrity_setup_default (struct bio *bio) {struct blk_integrity *bi =blk_get_integrity (bio->bi_bdev->bd_disk);struct bio_integrity_payload *bip =bio_integrity (bio); +u64 seed = bio->bi_iter.bi_sector >> (bi->interval_exp -SECTOR_SHIFT ); -bip_set_seed (bip, bio->bi_iter.bi_sector); +bip_set_seed (bip, seed);if (bi->csum_type) { bip->bip_flags |=BIP_CHECK_GUARD ;if (bi->csum_type ==BLK_INTEGRITY_CSUM_IP ) bip->bip_flags |=BIP_IP_CHECKSUM ;
block/t10-pi.c +2 -1
@@ -308,18 +308,19 @@ static blk_status_t blk_integrity_iterate(struct bio *bio, struct bvec_iter *data_iter, bool verify) {struct blk_integrity *bi =blk_get_integrity (bio->bi_bdev->bd_disk);struct bio_integrity_payload *bip =bio_integrity (bio); +u64 seed = data_iter->bi_sector >> (bi->interval_exp -SECTOR_SHIFT );struct blk_integrity_iter iter = { .bio = bio, .bip = bip, .bi = bi, .data_iter = *data_iter, .prot_iter = bip->bip_iter, .interval_remaining =1 << bi->interval_exp, - .seed = data_iter->bi_sector, + .seed = seed, .csum =0 , };blk_status_t ret =BLK_STS_OK ;while (iter.data_iter.bi_size && ret ==BLK_STS_OK ) {
Signature · 1 line
2.45.2
Re: [PATCH v2 1/6] block: use integrity interval instead of sector as seed
Looks good:
PATCH v2 2/6 bio-integrity-fs: pass data iter to bio_integrity_verify()
In reply to Caleb Sander Mateosbio_integrity_verify() expects the passed struct bvec_iter to be an iterator over bio data, not integrity. So construct a separate data bvec_iter without the bio_integrity_bytes() conversion and pass it to bio_integrity_verify() instead of bip_iter.
--- block/bio-integrity-fs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
block/bio-integrity-fs.c +2 -1
@@ -53,21 +53,22 @@ EXPORT_SYMBOL_GPL(fs_bio_integrity_generate);int fs_bio_integrity_verify (struct bio *bio,sector_t sector,unsigned int size) {struct blk_integrity *bi =blk_get_integrity (bio->bi_bdev->bd_disk);struct bio_integrity_payload *bip =bio_integrity (bio); +struct bvec_iter data_iter = {.bi_sector = sector, .bi_size = size};/* * Reinitialize bip->bip_iter. * * This is for use in the submitter after the driver is done with the * bio. Requires the submitter to remember the sector and the size. */ memset (&bip->bip_iter,0 ,sizeof (bip->bip_iter)); bip->bip_iter.bi_sector = sector; bip->bip_iter.bi_size =bio_integrity_bytes (bi, size >>SECTOR_SHIFT ); -return blk_status_to_errno (bio_integrity_verify (bio, &bip->bip_iter)); +return blk_status_to_errno (bio_integrity_verify (bio, &data_iter)); }static int __init fs_bio_integrity_init (void ) { fs_bio_integrity_cache = kmem_cache_create("fs_bio_integrity",
Signature · 1 line
2.45.2
Re: [PATCH v2 2/6] bio-integrity-fs: pass data iter to bio_integrity_verify()
Quoted 18 lines · Caleb Sander Mateos
bio_integrity_verify()expects the passed structbvec_iterto be an iterator over bio data, not integrity. So construct a separate databvec_iterwithout thebio_integrity_bytes()conversion and pass it tobio_integrity_verify()instead ofbip_iter.Fixes 0bde8a12b554 ("block: add fs_bio_integrity helpers")Signed-off-by Caleb Sander Mateos <[email protected]>Reviewed-by Anuj Gupta <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>--- block/bio-integrity-fs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)block/bio-integrity-fs.c +0
-0
block/bio-integrity-fs.c EXPORT_SYMBOL_GPL(fs_bio_integrity_generate); · line 58
Quoted 6 lines
block/bio-integrity-fs.c +1
-0@@ -53,21 +53,22 @@ EXPORT_SYMBOL_GPL(fs_bio_integrity_generate);int fs_bio_integrity_verify (struct bio *bio,sector_t sector,unsigned int size) {struct blk_integrity *bi =blk_get_integrity (bio->bi_bdev->bd_disk);struct bio_integrity_payload *bip =bio_integrity (bio); +struct bvec_iter data_iter = {.bi_sector = sector, .bi_size = size};
Missing spaces and too condensed. We normally use one line per field in struct initializers:
struct bvec_iter data_iter = {
.bi_sector = sector,
.bi_size = size,
};Otherwise looks good:
PATCH v2 3/6 blk-integrity: take u64 in bio_integrity_intervals()
In reply to Caleb Sander MateosTo allow bio_integrity_intervals() to convert an absolute sector to an absolute integrity interval, use u64 for its argument and return types. Also use SECTOR_SHIFT instead of the magic constant 9.
--- include/linux/blk-integrity.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
include/linux/blk-integrity.h +7 -7
@@ -64,23 +64,23 @@ queue_max_integrity_segments(const struct request_queue *q) {return q->limits.max_integrity_segments; }/** -* bio_integrity_intervals - Return number of integrity intervals for a bio +* bio_integrity_intervals - Convert sectors to integrity intervals * @bi: blk_integrity profile for device -* @sectors: Size of the bio in 512-byte sectors +* @sectors: Number of 512-byte sectors * * Description: The block layer calculates everything in 512 byte * sectors but integrity metadata is done in terms of the data integrity * interval size of the storage device. Convert the block layer sectors * to the appropriate number of integrity intervals. */ -static inline unsigned int bio_integrity_intervals (struct blk_integrity *bi, -unsigned int sectors) +static inline u64 bio_integrity_intervals (const struct blk_integrity *bi, +u64 sectors) { -return sectors >> (bi->interval_exp -9 ); +return sectors >> (bi->interval_exp -SECTOR_SHIFT ); }static inline unsigned int bio_integrity_bytes (struct blk_integrity *bi,unsigned int sectors) {
@@ -151,12 +151,12 @@ static inline unsigned short queue_max_integrity_segments(const struct request_queue *q) {return 0 ; } -static inline unsigned int bio_integrity_intervals (struct blk_integrity *bi, -unsigned int sectors) +static inline u64 bio_integrity_intervals (const struct blk_integrity *bi, +u64 sectors) {return 0 ; } static inline unsigned int bio_integrity_bytes(struct blk_integrity *bi,
Signature · 1 line
2.45.2
Re: [PATCH v2 3/6] blk-integrity: take u64 in bio_integrity_intervals()
Looks good:
PATCH v2 4/6 bio-integrity-fs: use integrity interval instead of sector as seed
In reply to Caleb Sander Mateosbip_iter.bi_sector is meant to be in units of integrity intervals rather than 512-byte sectors. bio_integrity_verify() doesn't actually use it currently (it uses the passed in struct bvec_iter's bi_sector instead). But let's set it to the expected value for consistency.
--- block/bio-integrity-fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/bio-integrity-fs.c +1 -1
@@ -62,11 +62,11 @@ int fs_bio_integrity_verify(struct bio *bio, sector_t sector, unsigned int size)* * This is for use in the submitter after the driver is done with the * bio. Requires the submitter to remember the sector and the size. */ memset (&bip->bip_iter,0 ,sizeof (bip->bip_iter)); - bip->bip_iter.bi_sector = sector; + bip->bip_iter.bi_sector =bio_integrity_intervals (bi, sector); bip->bip_iter.bi_size =bio_integrity_bytes (bi, size >>SECTOR_SHIFT );return blk_status_to_errno (bio_integrity_verify (bio, &data_iter)); }static int __init fs_bio_integrity_init (void )
Signature · 1 line
2.45.2
Re: [PATCH v2 4/6] bio-integrity-fs: use integrity interval instead of sector as seed
Looks good:
PATCH v2 5/6 t10-pi: use bio_integrity_intervals() helper
In reply to Caleb Sander MateosUse bio_integrity_intervals() to convert blk_rq_pos(rq) to integrity intervals to reduce code duplication.
--- block/t10-pi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/t10-pi.c +1 -1
@@ -541,11 +541,11 @@ static void __blk_reftag_remap(struct bio *bio, struct blk_integrity *bi,static void blk_integrity_remap (struct request *rq,unsigned int nr_bytes,bool prep) {struct blk_integrity *bi = &rq->q->limits.integrity; -u64 ref =blk_rq_pos (rq) >> (bi->interval_exp -SECTOR_SHIFT ); +u64 ref =bio_integrity_intervals (bi,blk_rq_pos (rq));unsigned intervals = nr_bytes >> bi->interval_exp;struct bio *bio;if (!(bi->flags &BLK_INTEGRITY_REF_TAG ))return ;
Signature · 1 line
2.45.2
PATCH v2 6/6 blk-integrity: avoid sector_t in bip_{get,set}_seed()
In reply to Caleb Sander Mateosbip_set_seed() and big_get_seed() take/return a sector_t value that's actually an integrity interval number. This is confusing, so pass struct blk_integrity and struct bio instead to bip_set_seed() and convert the bio's device address to integrity intervals.
Open-code the access to bip->bip_iter.bi_sector in the one caller of bip_set_seed() that doesn't use the bio device address for the seed. Open-code bip_get_seed() in its one caller.
Add a comment to struct bvec_iter's bi_sector field explaining its alternate use for bip_iter.
--- block/bio-integrity.c | 5 ++--- block/t10-pi.c | 2 +- drivers/nvme/target/io-cmd-bdev.c | 3 +-- drivers/target/target_core_iblock.c | 3 +-- include/linux/bio-integrity.h | 11 ----------- include/linux/blk-integrity.h | 14 ++++++++++++++ include/linux/bvec.h | 1 + 7 files changed, 20 insertions(+), 19 deletions(-)
block/bio-integrity.c +2 -3
@@ -103,13 +103,12 @@ void bio_integrity_free_buf(struct bio_integrity_payload *bip)void bio_integrity_setup_default (struct bio *bio) {struct blk_integrity *bi =blk_get_integrity (bio->bi_bdev->bd_disk);struct bio_integrity_payload *bip =bio_integrity (bio); -u64 seed = bio->bi_iter.bi_sector >> (bi->interval_exp -SECTOR_SHIFT ); -bip_set_seed (bip, seed); +bip_set_seed (bip, bi, bio);if (bi->csum_type) { bip->bip_flags |=BIP_CHECK_GUARD ;if (bi->csum_type ==BLK_INTEGRITY_CSUM_IP ) bip->bip_flags |=BIP_IP_CHECKSUM ;
@@ -472,11 +471,11 @@ int bio_integrity_map_iter(struct bio *bio, struct uio_meta *meta) it.count = integrity_bytes; ret =bio_integrity_map_user (bio, &it);if (!ret) {bio_uio_meta_to_bip (bio, meta); -bip_set_seed (bio_integrity (bio), meta->seed); +bio_integrity (bio)->bip_iter.bi_sector = meta->seed;iov_iter_advance (&meta->iter, integrity_bytes); meta->seed +=bio_integrity_intervals (bi,bio_sectors (bio)); }return ret; }
block/t10-pi.c +1 -1
@@ -510,11 +510,11 @@ static void blk_reftag_remap_prepare(struct blk_integrity *bi,static void __blk_reftag_remap (struct bio *bio,struct blk_integrity *bi,unsigned *intervals,u64 *ref,bool prep) {struct bio_integrity_payload *bip =bio_integrity (bio);struct bvec_iter iter = bip->bip_iter; -u64 virt =bip_get_seed (bip); +u64 virt = bip->bip_iter.bi_sector;union pi_tuple *ptuple;union pi_tuple tuple;if (prep && bip->bip_flags &BIP_MAPPED_INTEGRITY ) { *ref += bio->bi_iter.bi_size >> bi->interval_exp;
drivers/nvme/target/io-cmd-bdev.c +1 -2
@@ -218,12 +218,11 @@ static int nvmet_bdev_alloc_bip(struct nvmet_req *req, struct bio *bio,pr_err ("Unable to allocate bio_integrity_payload\n" );return PTR_ERR (bip); }/* virtual start sector must be in integrity interval units */ -bip_set_seed (bip, bio->bi_iter.bi_sector >> - (bi->interval_exp -SECTOR_SHIFT )); +bip_set_seed (bip, bi, bio); 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
@@ -706,12 +706,11 @@ iblock_alloc_bip(struct se_cmd *cmd, struct bio *bio,pr_err ("Unable to allocate bio_integrity_payload\n" );return PTR_ERR (bip); }/* virtual start sector must be in integrity interval units */ -bip_set_seed (bip, bio->bi_iter.bi_sector >> - (bi->interval_exp -SECTOR_SHIFT )); +bip_set_seed (bip, bi, bio);pr_debug ("IBLOCK BIP Size: %u Sector: %llu\n" , bip->bip_iter.bi_size, (unsigned long long )bip->bip_iter.bi_sector); resid =bio_integrity_bytes (bi,bio_sectors (bio));
include/linux/bio-integrity.h +0 -11
@@ -56,21 +56,10 @@ static inline bool bio_integrity_flagged(struct bio *bio, enum bip_flags flag)return bip->bip_flags & flag;return false; } -static inline sector_t bip_get_seed (struct bio_integrity_payload *bip) -{ -return bip->bip_iter.bi_sector; -} - -static inline void bip_set_seed (struct bio_integrity_payload *bip, -sector_t seed) -{ - bip->bip_iter.bi_sector = seed; -} -void bio_integrity_init (struct bio *bio,struct bio_integrity_payload *bip,struct bio_vec *bvecs,unsigned int nr_vecs);struct bio_integrity_payload *bio_integrity_alloc (struct bio *bio,gfp_t gfp,unsigned int nr); int bio_integrity_add_page(struct bio *bio, struct page *page, unsigned int len,
include/linux/blk-integrity.h +14 -0
@@ -85,10 +85,24 @@ static inline unsigned int bio_integrity_bytes(struct blk_integrity *bi, unsigned int sectors) {return bio_integrity_intervals (bi, sectors) * bi->metadata_size; } +/** +* bip_set_seed - Set bip reference tag seed from bio device address +* @bip: struct bio_integrity_payload whose ref tag seed to set +* @bi: struct blk_integrity profile for device +* @bio: struct bio whose device address to use for the ref tag seed +*/ +static inline void bip_set_seed (struct bio_integrity_payload *bip, +const struct blk_integrity *bi, +const struct bio *bio) +{ + bip->bip_iter.bi_sector = +bio_integrity_intervals (bi, bio->bi_iter.bi_sector); +} +static inline bool blk_integrity_rq (const struct request *rq) {return rq->cmd_flags &REQ_INTEGRITY ; }
include/linux/bvec.h +1 -0
@@ -76,10 +76,11 @@ static inline void bvec_set_virt(struct bio_vec *bv, void *vaddr,struct bvec_iter {/* * Current device address in 512 byte sectors. Only updated by the bio * iter wrappers and not the bvec iterator helpers themselves. +* For bip_iter, this is overloaded to represent the integrity interval. */ sector_t bi_sector;/* * Remaining size in bytes.
Signature · 1 line
2.45.2
Christoph Hellwig
maintainerRe: [PATCH v2 6/6] blk-integrity: avoid sector_t in bip_{get,set}_seed()
Quoted 147 lines · Caleb Sander Mateos
bip_set_seed()andbig_get_seed()take/return asector_tvalue that's actually an integrity interval number. This is confusing, so pass structblk_integrityand struct bio instead tobip_set_seed()and convert the bio's device address to integrity intervals.Open-code the access to
bip->bip_iter.bi_sectorin the one caller ofbip_set_seed()that doesn't use the bio device address for the seed. Open-codebip_get_seed()in its one caller.Add a comment to struct bvec_iter's
bi_sectorfield explaining its alternate use forbip_iter.Signed-off-by Caleb Sander Mateos <[email protected]>Suggested-by Christoph Hellwig <[email protected]>--- block/bio-integrity.c | 5 ++--- block/t10-pi.c | 2 +- drivers/nvme/target/io-cmd-bdev.c | 3 +-- drivers/target/target_core_iblock.c | 3 +-- include/linux/bio-integrity.h | 11 ----------- include/linux/blk-integrity.h | 14 ++++++++++++++ include/linux/bvec.h | 1 + 7 files changed, 20 insertions(+), 19 deletions(-)block/bio-integrity.c +2
-3@@ -103,13 +103,12 @@ void bio_integrity_free_buf(struct bio_integrity_payload *bip)void bio_integrity_setup_default (struct bio *bio) {struct blk_integrity *bi =blk_get_integrity (bio->bi_bdev->bd_disk);struct bio_integrity_payload *bip =bio_integrity (bio); -u64 seed = bio->bi_iter.bi_sector >> (bi->interval_exp -SECTOR_SHIFT ); -bip_set_seed (bip, seed); +bip_set_seed (bip, bi, bio);if (bi->csum_type) { bip->bip_flags |=BIP_CHECK_GUARD ;if (bi->csum_type ==BLK_INTEGRITY_CSUM_IP ) bip->bip_flags |=BIP_IP_CHECKSUM ;@@ -472,11 +471,11 @@ int bio_integrity_map_iter(struct bio *bio, struct uio_meta *meta) it.count = integrity_bytes; ret =bio_integrity_map_user (bio, &it);if (!ret) {bio_uio_meta_to_bip (bio, meta); -bip_set_seed (bio_integrity (bio), meta->seed); +bio_integrity (bio)->bip_iter.bi_sector = meta->seed;iov_iter_advance (&meta->iter, integrity_bytes); meta->seed +=bio_integrity_intervals (bi,bio_sectors (bio)); }return ret; }block/t10-pi.c +1
-1@@ -510,11 +510,11 @@ static void blk_reftag_remap_prepare(struct blk_integrity *bi,static void __blk_reftag_remap (struct bio *bio,struct blk_integrity *bi,unsigned *intervals,u64 *ref,bool prep) {struct bio_integrity_payload *bip =bio_integrity (bio);struct bvec_iter iter = bip->bip_iter; -u64 virt =bip_get_seed (bip); +u64 virt = bip->bip_iter.bi_sector;union pi_tuple *ptuple;union pi_tuple tuple;if (prep && bip->bip_flags &BIP_MAPPED_INTEGRITY ) { *ref += bio->bi_iter.bi_size >> bi->interval_exp;drivers/nvme/target/io-cmd-bdev.c +1
-2@@ -218,12 +218,11 @@ static int nvmet_bdev_alloc_bip(struct nvmet_req *req, struct bio *bio,pr_err ("Unable to allocate bio_integrity_payload\n" );return PTR_ERR (bip); }/* virtual start sector must be in integrity interval units */ -bip_set_seed (bip, bio->bi_iter.bi_sector >> - (bi->interval_exp -SECTOR_SHIFT )); +bip_set_seed (bip, bi, bio); 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@@ -706,12 +706,11 @@ iblock_alloc_bip(struct se_cmd *cmd, struct bio *bio,pr_err ("Unable to allocate bio_integrity_payload\n" );return PTR_ERR (bip); }/* virtual start sector must be in integrity interval units */ -bip_set_seed (bip, bio->bi_iter.bi_sector >> - (bi->interval_exp -SECTOR_SHIFT )); +bip_set_seed (bip, bi, bio);pr_debug ("IBLOCK BIP Size: %u Sector: %llu\n" , bip->bip_iter.bi_size, (unsigned long long )bip->bip_iter.bi_sector); resid =bio_integrity_bytes (bi,bio_sectors (bio));include/linux/bio-integrity.h +0
-11@@ -56,21 +56,10 @@ static inline bool bio_integrity_flagged(struct bio *bio, enum bip_flags flag)return bip->bip_flags & flag;return false; } -static inline sector_t bip_get_seed (struct bio_integrity_payload *bip) -{ -return bip->bip_iter.bi_sector; -} - -static inline void bip_set_seed (struct bio_integrity_payload *bip, -sector_t seed) -{ - bip->bip_iter.bi_sector = seed; -} -void bio_integrity_init (struct bio *bio,struct bio_integrity_payload *bip,struct bio_vec *bvecs,unsigned int nr_vecs);struct bio_integrity_payload *bio_integrity_alloc (struct bio *bio,gfp_t gfp,unsigned int nr); int bio_integrity_add_page(struct bio *bio, struct page *page, unsigned int len,include/linux/blk-integrity.h +2
-0@@ -85,10 +85,24 @@ static inline unsigned int bio_integrity_bytes(struct blk_integrity *bi, unsigned int sectors) {return bio_integrity_intervals (bi, sectors) * bi->metadata_size; } +/** +* bip_set_seed - Set bip reference tag seed from bio device address
include/linux/blk-integrity.h static inline unsigned int bio_integrity_bytes(struct blk_integrity *bi, · line 101
Quoted 10 lines
include/linux/blk-integrity.h +10
-0+* @bip: struct bio_integrity_payload whose ref tag seed to set +* @bi: struct blk_integrity profile for device +* @bio: struct bio whose device address to use for the ref tag seed +*/ +static inline void bip_set_seed (struct bio_integrity_payload *bip, +const struct blk_integrity *bi, +const struct bio *bio) +{ + bip->bip_iter.bi_sector = +bio_integrity_intervals (bi, bio->bi_iter.bi_sector);
The bip is pointed to by the bio, so we don't need to pass it separately. Same for struct blk_integrity.
Re: [PATCH v2 6/6] blk-integrity: avoid sector_t in bip_{get,set}_seed()
Quoted 147 lines · Christoph Hellwig
Quoted 145 lines · Caleb Sander Mateos
bip_set_seed()andbig_get_seed()take/return asector_tvalue that's actually an integrity interval number. This is confusing, so pass structblk_integrityand struct bio instead tobip_set_seed()and convert the bio's device address to integrity intervals.Open-code the access to
bip->bip_iter.bi_sectorin the one caller ofbip_set_seed()that doesn't use the bio device address for the seed. Open-codebip_get_seed()in its one caller.Add a comment to struct bvec_iter's
bi_sectorfield explaining its alternate use forbip_iter.Signed-off-by Caleb Sander Mateos <[email protected]>Suggested-by Christoph Hellwig <[email protected]>--- block/bio-integrity.c | 5 ++--- block/t10-pi.c | 2 +- drivers/nvme/target/io-cmd-bdev.c | 3 +-- drivers/target/target_core_iblock.c | 3 +-- include/linux/bio-integrity.h | 11 ----------- include/linux/blk-integrity.h | 14 ++++++++++++++ include/linux/bvec.h | 1 + 7 files changed, 20 insertions(+), 19 deletions(-)block/bio-integrity.c +2
-3@@ -103,13 +103,12 @@ void bio_integrity_free_buf(struct bio_integrity_payload *bip)void bio_integrity_setup_default (struct bio *bio) {struct blk_integrity *bi =blk_get_integrity (bio->bi_bdev->bd_disk);struct bio_integrity_payload *bip =bio_integrity (bio); -u64 seed = bio->bi_iter.bi_sector >> (bi->interval_exp -SECTOR_SHIFT ); -bip_set_seed (bip, seed); +bip_set_seed (bip, bi, bio);if (bi->csum_type) { bip->bip_flags |=BIP_CHECK_GUARD ;if (bi->csum_type ==BLK_INTEGRITY_CSUM_IP ) bip->bip_flags |=BIP_IP_CHECKSUM ;@@ -472,11 +471,11 @@ int bio_integrity_map_iter(struct bio *bio, struct uio_meta *meta) it.count = integrity_bytes; ret =bio_integrity_map_user (bio, &it);if (!ret) {bio_uio_meta_to_bip (bio, meta); -bip_set_seed (bio_integrity (bio), meta->seed); +bio_integrity (bio)->bip_iter.bi_sector = meta->seed;iov_iter_advance (&meta->iter, integrity_bytes); meta->seed +=bio_integrity_intervals (bi,bio_sectors (bio)); }return ret; }block/t10-pi.c +1
-1@@ -510,11 +510,11 @@ static void blk_reftag_remap_prepare(struct blk_integrity *bi,static void __blk_reftag_remap (struct bio *bio,struct blk_integrity *bi,unsigned *intervals,u64 *ref,bool prep) {struct bio_integrity_payload *bip =bio_integrity (bio);struct bvec_iter iter = bip->bip_iter; -u64 virt =bip_get_seed (bip); +u64 virt = bip->bip_iter.bi_sector;union pi_tuple *ptuple;union pi_tuple tuple;if (prep && bip->bip_flags &BIP_MAPPED_INTEGRITY ) { *ref += bio->bi_iter.bi_size >> bi->interval_exp;drivers/nvme/target/io-cmd-bdev.c +1
-2@@ -218,12 +218,11 @@ static int nvmet_bdev_alloc_bip(struct nvmet_req *req, struct bio *bio,pr_err ("Unable to allocate bio_integrity_payload\n" );return PTR_ERR (bip); }/* virtual start sector must be in integrity interval units */ -bip_set_seed (bip, bio->bi_iter.bi_sector >> - (bi->interval_exp -SECTOR_SHIFT )); +bip_set_seed (bip, bi, bio); 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@@ -706,12 +706,11 @@ iblock_alloc_bip(struct se_cmd *cmd, struct bio *bio,pr_err ("Unable to allocate bio_integrity_payload\n" );return PTR_ERR (bip); }/* virtual start sector must be in integrity interval units */ -bip_set_seed (bip, bio->bi_iter.bi_sector >> - (bi->interval_exp -SECTOR_SHIFT )); +bip_set_seed (bip, bi, bio);pr_debug ("IBLOCK BIP Size: %u Sector: %llu\n" , bip->bip_iter.bi_size, (unsigned long long )bip->bip_iter.bi_sector); resid =bio_integrity_bytes (bi,bio_sectors (bio));include/linux/bio-integrity.h +0
-11@@ -56,21 +56,10 @@ static inline bool bio_integrity_flagged(struct bio *bio, enum bip_flags flag)return bip->bip_flags & flag;return false; } -static inline sector_t bip_get_seed (struct bio_integrity_payload *bip) -{ -return bip->bip_iter.bi_sector; -} - -static inline void bip_set_seed (struct bio_integrity_payload *bip, -sector_t seed) -{ - bip->bip_iter.bi_sector = seed; -} -void bio_integrity_init (struct bio *bio,struct bio_integrity_payload *bip,struct bio_vec *bvecs,unsigned int nr_vecs);struct bio_integrity_payload *bio_integrity_alloc (struct bio *bio,gfp_t gfp,unsigned int nr); int bio_integrity_add_page(struct bio *bio, struct page *page, unsigned int len,include/linux/blk-integrity.h +0
-0@@ -85,10 +85,24 @@ static inline unsigned int bio_integrity_bytes(struct blk_integrity *bi, unsigned int sectors) {return bio_integrity_intervals (bi, sectors) * bi->metadata_size; }
Quoted 15 lines
include/linux/blk-integrity.h static inline unsigned int bio_integrity_bytes(struct blk_integrity *bi, · line 101
Quoted 12 lines
include/linux/blk-integrity.h +12
-0+/** +* bip_set_seed - Set bip reference tag seed from bio device address +* @bip: struct bio_integrity_payload whose ref tag seed to set +* @bi: struct blk_integrity profile for device +* @bio: struct bio whose device address to use for the ref tag seed +*/ +static inline void bip_set_seed (struct bio_integrity_payload *bip, +const struct blk_integrity *bi, +const struct bio *bio) +{ + bip->bip_iter.bi_sector = +bio_integrity_intervals (bi, bio->bi_iter.bi_sector);The bip is pointed to by the bio, so we don't need to pass it separately. Same for struct
blk_integrity.
I did consider that, but all callers already have bip and bi in variables that they also use elsewhere. Seemed like it might be slightly more efficient to just pass the precomputed values instead of looking them up again. Not a big deal either way. I'll go ahead and implement your suggestion.
Thanks,
Caleb
Christoph Hellwig
maintainerRe: [PATCH v2 6/6] blk-integrity: avoid sector_t in bip_{get,set}_seed()
Quoted 10 lines · Caleb Sander Mateos
Quoted 9 lines
include/linux/blk-integrity.h static inline unsigned int bio_integrity_bytes(struct blk_integrity *bi, · line 101
Quoted 6 lines
include/linux/blk-integrity.h +6
-0+static inline void bip_set_seed (struct bio_integrity_payload *bip, +const struct blk_integrity *bi, +const struct bio *bio) +{ + bip->bip_iter.bi_sector = +bio_integrity_intervals (bi, bio->bi_iter.bi_sector);The bip is pointed to by the bio, so we don't need to pass it separately. Same for struct
blk_integrity.
Quoted 5 lines
I did consider that, but all callers already have bip and bi in variables that they also use elsewhere. Seemed like it might be slightly more efficient to just pass the precomputed values instead of looking them up again. Not a big deal either way. I'll go ahead and implement your suggestion.
In general I much prefer API-simplicity over a little bit more efficiency unless we can show it makes a difference that matters. And given that this is an inline function where compiler tend to avoid duplicate dereferences anyway I doubt we'll see a difference here.