Commit 15bfd21f authored Jun 26, 2018 by Keith Busch Committed by Jens Axboe Jun 26, 2018

block: Fix transfer when chunk sectors exceeds max



A device may have boundary restrictions where the number of sectors
between boundaries exceeds its max transfer size. In this case, we need
to cap the max size to the smaller of the two limits.

Reported-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
Tested-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
Cc: <stable@vger.kernel.org>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent f5e350f0

include/linux/blkdev.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1119,8 +1119,8 @@ static inline unsigned int blk_max_size_offset(struct request_queue *q,
	if (!q->limits.chunk_sectors)		if (!q->limits.chunk_sectors)
	return q->limits.max_sectors;		return q->limits.max_sectors;

	return q->limits.chunk_sectors -		return min(q->limits.max_sectors, (unsigned int)(q->limits.chunk_sectors -
	(offset & (q->limits.chunk_sectors - 1));		(offset & (q->limits.chunk_sectors - 1))));
	}		}

	static inline unsigned int blk_rq_get_max_sectors(struct request *rq,		static inline unsigned int blk_rq_get_max_sectors(struct request *rq,