diff mbox series

block: skip bio_check_eod for partition-remapped bios

Message ID 20210125183957.1674124-1-hch@lst.de (mailing list archive)
State New, archived
Headers show
Series block: skip bio_check_eod for partition-remapped bios | expand

Commit Message

Christoph Hellwig Jan. 25, 2021, 6:39 p.m. UTC
When an already remapped bio is resubmitted (e.g. by blk_queue_split),
bio_check_eod will compare the remapped bi_sector against the size
of the partition, leading to spurious I/O failures.

Skip the EOD check in this case.

Fixes: 309dca309fc3 ("block: store a block_device pointer in struct bio")
Reported-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 block/blk-core.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Comments

Jens Axboe Jan. 25, 2021, 6:42 p.m. UTC | #1
On 1/25/21 11:39 AM, Christoph Hellwig wrote:
> When an already remapped bio is resubmitted (e.g. by blk_queue_split),
> bio_check_eod will compare the remapped bi_sector against the size
> of the partition, leading to spurious I/O failures.
> 
> Skip the EOD check in this case.

Applied, thanks.
diff mbox series

Patch

diff --git a/block/blk-core.c b/block/blk-core.c
index 88f60890443264..5e752840b41a1f 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -815,11 +815,12 @@  static noinline_for_stack bool submit_bio_checks(struct bio *bio)
 		goto end_io;
 	if (unlikely(bio_check_ro(bio)))
 		goto end_io;
-	if (unlikely(bio_check_eod(bio)))
-		goto end_io;
-	if (bio->bi_bdev->bd_partno && !bio_flagged(bio, BIO_REMAPPED) &&
-	    unlikely(blk_partition_remap(bio)))
-		goto end_io;
+	if (!bio_flagged(bio, BIO_REMAPPED)) {
+		if (unlikely(bio_check_eod(bio)))
+			goto end_io;
+		if (bdev->bd_partno && unlikely(blk_partition_remap(bio)))
+			goto end_io;
+	}
 
 	/*
 	 * Filter flush bio's early so that bio based drivers without flush