block: bio_integrity_process uses wrong bio_vec iterator
PATCH 1/1 block: bio_integrity_process uses wrong bio_vec iterator
bio integrity handling is broken on a system with LVM layered atop a DIF/DIX SCSI drive because device mapper clones the bio, modifies the clone, and sends the clone to the lower layers for processing. However, the clone bio has bi_vcnt == 0, which means that when the sd driver calls bio_integrity_process to attach DIX data, the for_each_segment_all() call (which uses bi_vcnt) returns immediately and random garbage is sent to the disk on a disk write. The disk of course returns error when it's fed garbage for checksums.
Therefore, teach bio_integrity_process() to use bio_for_each_segment() to iterate the bio_vecs, since the per-bio iterator tracks which bio_vecs are associated with that particular bio. The integrity handling code is effectively part of the "driver" (it's not the bio owner), so it must use the correct iterator function.
--- block/bio-integrity.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
block/bio-integrity.c +6 -5
@@ -216,7 +216,8 @@ static int bio_integrity_process(struct bio *bio, {struct blk_integrity *bi =bdev_get_integrity (bio->bi_bdev);struct blk_integrity_iter iter; -struct bio_vec *bv; +struct bvec_iter bviter; +struct bio_vec bv;struct bio_integrity_payload *bip =bio_integrity (bio);unsigned int i, ret =0 ; void *prot_buf = page_address(bip->bip_vec->bv_page) +
@@ -227,11 +228,11 @@ static int bio_integrity_process(struct bio *bio, iter.seed =bip_get_seed (bip); iter.prot_buf = prot_buf; -bio_for_each_segment_all (bv, bio, i) { -void *kaddr =kmap_atomic (bv->bv_page); +bio_for_each_segment (bv, bio, bviter) { +void *kaddr =kmap_atomic (bv.bv_page); - iter.data_buf = kaddr + bv->bv_offset; - iter.data_size = bv->bv_len; + iter.data_buf = kaddr + bv.bv_offset; + iter.data_size = bv.bv_len; ret =proc_fn (&iter);if (ret) {