md: disable WRITE SAME if it fails in underlayer disks

shligit · shligit · commit 26483819f89c · 2017-02-13T19:24:16.000-08:00
This makes md do the same thing as dm for write same IO failure. Please see 7eee4ae(dm: disable WRITE SAME if it fails) for details why we need this. We did a little bit different than dm. Instead of disabling writesame in the first IO error, we disable it till next writesame IO coming after the first IO error. This way we don't need to clone a bio. Also reported here: https://bugzilla.kernel.org/show_bug.cgi?id=118581 Suggested-by: NeilBrown <neilb@suse.com> Acked-by: NeilBrown <neilb@suse.com> Signed-off-by: Shaohua Li <shli@fb.com>
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
@@ -291,6 +291,7 @@ static void linear_make_request(struct mddev *mddev, struct bio *bio)
 				trace_block_bio_remap(bdev_get_queue(split->bi_bdev),
 						      split, disk_devt(mddev->gendisk),
 						      bio_sector);
+			mddev_check_writesame(mddev, split);
 			generic_make_request(split);
 		}
 	} while (split != bio);
diff --git a/drivers/md/md.h b/drivers/md/md.h
@@ -710,4 +710,11 @@ static inline void mddev_clear_unsupported_flags(struct mddev *mddev,
 {
 	mddev->flags &= ~unsupported_flags;
 }
+
+static inline void mddev_check_writesame(struct mddev *mddev, struct bio *bio)
+{
+	if (bio_op(bio) == REQ_OP_WRITE_SAME &&
+	    !bdev_get_queue(bio->bi_bdev)->limits.max_write_same_sectors)
+		mddev->queue->limits.max_write_same_sectors = 0;
+}
 #endif /* _MD_MD_H */
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
@@ -138,6 +138,7 @@ static void multipath_make_request(struct mddev *mddev, struct bio * bio)
 	mp_bh->bio.bi_opf |= REQ_FAILFAST_TRANSPORT;
 	mp_bh->bio.bi_end_io = multipath_end_request;
 	mp_bh->bio.bi_private = mp_bh;
+	mddev_check_writesame(mddev, &mp_bh->bio);
 	generic_make_request(&mp_bh->bio);
 	return;
 }
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
@@ -503,6 +503,7 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio)
 				trace_block_bio_remap(bdev_get_queue(split->bi_bdev),
 						      split, disk_devt(mddev->gendisk),
 						      bio_sector);
+			mddev_check_writesame(mddev, split);
 			generic_make_request(split);
 		}
 	} while (split != bio);

Original file line number	Diff line number	Diff line change
`@@ -291,6 +291,7 @@ static void linear_make_request(struct mddev mddev, struct bio bio)`
`291`	`291`	`trace_block_bio_remap(bdev_get_queue(split->bi_bdev),`
`292`	`292`	`split, disk_devt(mddev->gendisk),`
`293`	`293`	`bio_sector);`
	`294`	`+ mddev_check_writesame(mddev, split);`
`294`	`295`	`generic_make_request(split);`
`295`	`296`	`}`
`296`	`297`	`} while (split != bio);`
Original file line number	Diff line number	Diff line change
`@@ -710,4 +710,11 @@ static inline void mddev_clear_unsupported_flags(struct mddev *mddev,`
`710`	`710`	`{`
`711`	`711`	`mddev->flags &= ~unsupported_flags;`
`712`	`712`	`}`
	`713`	`+`
	`714`	`+static inline void mddev_check_writesame(struct mddev mddev, struct bio bio)`
	`715`	`+{`
	`716`	`+ if (bio_op(bio) == REQ_OP_WRITE_SAME &&`
	`717`	`+ !bdev_get_queue(bio->bi_bdev)->limits.max_write_same_sectors)`
	`718`	`+ mddev->queue->limits.max_write_same_sectors = 0;`
	`719`	`+}`
`713`	`720`	`#endif /* _MD_MD_H */`
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,7 @@ static void multipath_make_request(struct mddev mddev, struct bio bio)`
`138`	`138`	`mp_bh->bio.bi_opf \|= REQ_FAILFAST_TRANSPORT;`
`139`	`139`	`mp_bh->bio.bi_end_io = multipath_end_request;`
`140`	`140`	`mp_bh->bio.bi_private = mp_bh;`
	`141`	`+ mddev_check_writesame(mddev, &mp_bh->bio);`
`141`	`142`	`generic_make_request(&mp_bh->bio);`
`142`	`143`	`return;`
`143`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -503,6 +503,7 @@ static void raid0_make_request(struct mddev mddev, struct bio bio)`
`503`	`503`	`trace_block_bio_remap(bdev_get_queue(split->bi_bdev),`
`504`	`504`	`split, disk_devt(mddev->gendisk),`
`505`	`505`	`bio_sector);`
	`506`	`+ mddev_check_writesame(mddev, split);`
`506`	`507`	`generic_make_request(split);`
`507`	`508`	`}`
`508`	`509`	`} while (split != bio);`