NAB, On Thu, Feb 20, 2014 at 11:28 AM, Nicholas A. Bellinger <nab@xxxxxxxxxxxxxxx> wrote: > On Thu, 2014-02-20 at 14:16 -0500, Martin K. Petersen wrote: >> >>>>> "nab" == Nicholas A Bellinger <nab@xxxxxxxxxxxxxxx> writes: >> >> nab> Given that there is no (easy) way to ascertain what the original >> nab> value of bio_integrity->bip_iter.bi_size was post >> nab> bio_integrity_advance(), dropping this BUG_ON() probably makes the >> nab> most sense. >> >> nab> MKP + Jens, care to ACK + pickup..? >> >> Please remove total as suggested by Akinobu. >> >> Acked-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx> >> > > Thanks. Here's an updated patch for Jen's to pickup. > > --nab > > From 6bd5636cd46fe8e11de9bdecc26acac14a494f18 Mon Sep 17 00:00:00 2001 > From: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx> > Date: Thu, 20 Feb 2014 00:52:01 +0000 > Subject: [PATCH] bio-integrity: Drop bio_integrity_verify BUG_ON in post > bip->bip_iter world > > Given that bip->bip_iter.bi_size is decremented after bio_advance() -> > bio_integrity_advance() is called, the BUG_ON() in bio_integrity_verify() > ends up tripping in v3.14-rc1 code with the advent of immutable biovecs > in: > > commit d57a5f7c6605f15f3b5134837e68b448a7cea88e > Author: Kent Overstreet <kmo@xxxxxxxxxxxxx> > Date: Sat Nov 23 17:20:16 2013 -0800 > > bio-integrity: Convert to bvec_iter > > Given that there is no easy way to ascertain the original bi_size > value, go ahead and drop this BUG_ON(). > > Reported-by: Sagi Grimberg <sagig@xxxxxxxxxxxxxxxxxx> > Reported-by: Akinobu Mita <akinobu.mita@xxxxxxxxx> > Acked-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx> > Cc: Jens Axboe <axboe@xxxxxxxxx> > Cc: Kent Overstreet <kmo@xxxxxxxxxxxxx> > Signed-off-by: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx> > --- > fs/bio-integrity.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/fs/bio-integrity.c b/fs/bio-integrity.c > index 0bad24d..76e0116 100644 > --- a/fs/bio-integrity.c > +++ b/fs/bio-integrity.c > @@ -449,11 +449,10 @@ static int bio_integrity_verify(struct bio *bio) > struct blk_integrity_exchg bix; > struct bio_vec *bv; > sector_t sector = bio->bi_integrity->bip_iter.bi_sector; > - unsigned int sectors, total, ret; > + unsigned int sectors, ret = 0; > void *prot_buf = bio->bi_integrity->bip_buf; > int i; > > - ret = total = 0; Here you removed "ret = 0" as well. So if bio_for_each_segment_all() is not entered, then we return junk from bio_integrity_verify(). Regards, Muthu > bix.disk_name = bio->bi_bdev->bd_disk->disk_name; > bix.sector_size = bi->sector_size; > > @@ -475,8 +474,6 @@ static int bio_integrity_verify(struct bio *bio) > sectors = bv->bv_len / bi->sector_size; > sector += sectors; > prot_buf += sectors * bi->tuple_size; > - total += sectors * bi->tuple_size; > - BUG_ON(total > bio->bi_integrity->bip_iter.bi_size); > > kunmap_atomic(kaddr); > } > -- > 1.7.10.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-scsi" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
