Merge tag 'for-5.0/dm-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

torvalds · torvalds · commit 8b5cdbe595a0 · 2019-02-07T15:42:43.000-07:00
Pull device mapper fixes from Mike Snitzer:
 "Both of these fixes address issues in changes merged for 5.0-rc4:

   - Fix DM core's missing memory barrier before waitqueue_active()
     calls.

   - Fix DM core's clone_bio() to work when cloning a subset of a bio
     with an integrity payload; bio_integrity_trim() wasn't getting
     called due to bio_trim()'s early return"

* tag 'for-5.0/dm-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm: don't use bio_trim() afterall
  dm: add memory barrier before waitqueue_active
diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c
@@ -131,7 +131,7 @@ static void rq_end_stats(struct mapped_device *md, struct request *orig)
 static void rq_completed(struct mapped_device *md)
 {
 	/* nudge anyone waiting on suspend queue */
-	if (unlikely(waitqueue_active(&md->wait)))
+	if (unlikely(wq_has_sleeper(&md->wait)))
 		wake_up(&md->wait);
 
 	/*
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
@@ -699,7 +699,7 @@ static void end_io_acct(struct dm_io *io)
 				    true, duration, &io->stats_aux);
 
 	/* nudge anyone waiting on suspend queue */
-	if (unlikely(waitqueue_active(&md->wait)))
+	if (unlikely(wq_has_sleeper(&md->wait)))
 		wake_up(&md->wait);
 }
 
@@ -1336,7 +1336,11 @@ static int clone_bio(struct dm_target_io *tio, struct bio *bio,
 			return r;
 	}
 
-	bio_trim(clone, sector - clone->bi_iter.bi_sector, len);
+	bio_advance(clone, to_bytes(sector - clone->bi_iter.bi_sector));
+	clone->bi_iter.bi_size = to_bytes(len);
+
+	if (bio_integrity(bio))
+		bio_integrity_trim(clone);
 
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ static void rq_end_stats(struct mapped_device md, struct request orig)`
`131`	`131`	`static void rq_completed(struct mapped_device *md)`
`132`	`132`	`{`
`133`	`133`	`/* nudge anyone waiting on suspend queue */`
`134`		`- if (unlikely(waitqueue_active(&md->wait)))`
	`134`	`+ if (unlikely(wq_has_sleeper(&md->wait)))`
`135`	`135`	`wake_up(&md->wait);`
`136`	`136`
`137`	`137`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -699,7 +699,7 @@ static void end_io_acct(struct dm_io *io)`
`699`	`699`	`true, duration, &io->stats_aux);`
`700`	`700`
`701`	`701`	`/* nudge anyone waiting on suspend queue */`
`702`		`- if (unlikely(waitqueue_active(&md->wait)))`
	`702`	`+ if (unlikely(wq_has_sleeper(&md->wait)))`
`703`	`703`	`wake_up(&md->wait);`
`704`	`704`	`}`
`705`	`705`
`@@ -1336,7 +1336,11 @@ static int clone_bio(struct dm_target_io tio, struct bio bio,`
`1336`	`1336`	`return r;`
`1337`	`1337`	`}`
`1338`	`1338`
`1339`		`- bio_trim(clone, sector - clone->bi_iter.bi_sector, len);`
	`1339`	`+ bio_advance(clone, to_bytes(sector - clone->bi_iter.bi_sector));`
	`1340`	`+ clone->bi_iter.bi_size = to_bytes(len);`
	`1341`	`+`
	`1342`	`+ if (bio_integrity(bio))`
	`1343`	`+ bio_integrity_trim(clone);`
`1340`	`1344`
`1341`	`1345`	`return 0;`
`1342`	`1346`	`}`