Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1613092

[PATCH 3/8] bio-integrity: save original iterator for verify stage

Show all headers | View raw

In order to perform verification we need to know original data vector
But, after bio traverse io-stack it may be advanced, splited and relocated
many times so it is hard to guess original data vector.

In fact currently ->verify_fn not woks at all because at the moment
it is called bio->bi_iter.bi_size == 0

The simplest way to fix that is to save original data vector and treat is
as immutable.

Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
---
 block/bio-integrity.c | 6 ++++--
 include/linux/bio.h   | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index b5009a8..43a4476 100644
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -238,10 +238,10 @@ static int bio_integrity_process(struct bio *bio,
 
 	iter.disk_name = bio->bi_bdev->bd_disk->disk_name;
 	iter.interval = 1 << bi->interval_exp;
-	iter.seed = bip_get_seed(bip);
+	iter.seed = bip->bip_verify_iter.bi_sector;
 	iter.prot_buf = prot_buf;
 
-	bio_for_each_segment(bv, bio, bviter) {
+	__bio_for_each_segment(bv, bio, bviter, bip->bip_verify_iter) {
 		void *kaddr = kmap_atomic(bv.bv_page);
 
 		iter.data_buf = kaddr + bv.bv_offset;
@@ -310,6 +310,7 @@ int 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);
+	bip->bip_verify_iter = bio->bi_iter;
 
 	if (bi->flags & BLK_INTEGRITY_IP_CHECKSUM)
 		bip->bip_flags |= BIP_IP_CHECKSUM;
@@ -476,6 +477,7 @@ int bio_integrity_clone(struct bio *bio, struct bio *bio_src,
 
 	bip->bip_vcnt = bip_src->bip_vcnt;
 	bip->bip_iter = bip_src->bip_iter;
+	bip->bip_verify_iter = bip_src->bip_verify_iter;
 
 	return 0;
 }
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 8e52119..00b086a 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -308,6 +308,7 @@ struct bio_integrity_payload {
 	struct bio		*bip_bio;	/* parent bio */
 
 	struct bvec_iter	bip_iter;
+	struct bvec_iter	bip_verify_iter;/* saved orig data iterator */
 
 	bio_end_io_t		*bip_end_io;	/* saved I/O completion fn */
 
-- 
2.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/8] block: T10/DIF Fixes and cleanups Dmitry Monakhov <dmonakhov@openvz.org> - 2017-03-30 15:50 +0200
  [PATCH 2/8] bio-integrity: Do not allocate integrity context for bio w/o data Dmitry Monakhov <dmonakhov@openvz.org> - 2017-03-30 16:00 +0200
  [PATCH 3/8] bio-integrity: save original iterator for verify stage Dmitry Monakhov <dmonakhov@openvz.org> - 2017-03-30 16:00 +0200
  [PATCH 5/8] bio-integrity: fix interface for bio_integrity_trim Dmitry Monakhov <dmonakhov@openvz.org> - 2017-03-30 16:00 +0200
  [PATCH 6/8] bio-integrity: add bio_integrity_setup helper Dmitry Monakhov <dmonakhov@openvz.org> - 2017-03-30 16:00 +0200
    Re: [PATCH 6/8] bio-integrity: add bio_integrity_setup helper kbuild test robot <lkp@intel.com> - 2017-04-01 00:20 +0200
  [PATCH 4/8] bio-integrity: bio_trim should truncate integrity vector accordingly Dmitry Monakhov <dmonakhov@openvz.org> - 2017-03-30 16:00 +0200
  [PATCH 8/8] tcm_fileio: Prevent information leak for short reads Dmitry Monakhov <dmonakhov@openvz.org> - 2017-03-30 16:00 +0200
  [PATCH 7/8] T10: Move opencoded contants to common header Dmitry Monakhov <dmonakhov@openvz.org> - 2017-03-30 16:00 +0200
    Re: [PATCH 7/8] T10: Move opencoded contants to common header kbuild test robot <lkp@intel.com> - 2017-04-01 00:20 +0200
  [PATCH 1/8] Guard bvec iteration logic Dmitry Monakhov <dmonakhov@openvz.org> - 2017-03-30 16:00 +0200
    Re: [PATCH 1/8] Guard bvec iteration logic Ming Lei <tom.leiming@gmail.com> - 2017-03-31 10:30 +0200

csiph-web