* [PATCH] block: Fix transfer when chuck sectors exceeds max
@ 2018-06-26 15:14 ` Keith Busch
0 siblings, 0 replies; 6+ messages in thread
From: Keith Busch @ 2018-06-26 15:14 UTC (permalink / raw)
To: Jens Axboe, linux-block; +Cc: linux-nvme, Jitendra Bhivare, Keith Busch, stable
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>
Signed-off-by: Keith Busch <keith.busch@intel.com>
---
include/linux/blkdev.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 9154570edf29..79226ca8f80f 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1119,8 +1119,8 @@ static inline unsigned int blk_max_size_offset(struct request_queue *q,
if (!q->limits.chunk_sectors)
return q->limits.max_sectors;
- return q->limits.chunk_sectors -
- (offset & (q->limits.chunk_sectors - 1));
+ return min(q->limits.max_sectors, (unsigned int)(q->limits.chunk_sectors -
+ (offset & (q->limits.chunk_sectors - 1))));
}
static inline unsigned int blk_rq_get_max_sectors(struct request *rq,
--
2.14.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] block: Fix transfer when chuck sectors exceeds max
@ 2018-06-26 15:14 ` Keith Busch
0 siblings, 0 replies; 6+ messages in thread
From: Keith Busch @ 2018-06-26 15:14 UTC (permalink / raw)
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 at broadcom.com>
Tested-by: Jitendra Bhivare <jitendra.bhivare at broadcom.com>
Cc: <stable at vger.kernel.org>
Signed-off-by: Keith Busch <keith.busch at intel.com>
---
include/linux/blkdev.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 9154570edf29..79226ca8f80f 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1119,8 +1119,8 @@ static inline unsigned int blk_max_size_offset(struct request_queue *q,
if (!q->limits.chunk_sectors)
return q->limits.max_sectors;
- return q->limits.chunk_sectors -
- (offset & (q->limits.chunk_sectors - 1));
+ return min(q->limits.max_sectors, (unsigned int)(q->limits.chunk_sectors -
+ (offset & (q->limits.chunk_sectors - 1))));
}
static inline unsigned int blk_rq_get_max_sectors(struct request *rq,
--
2.14.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] block: Fix transfer when chuck sectors exceeds max
2018-06-26 15:14 ` Keith Busch
@ 2018-06-26 15:54 ` Martin K. Petersen
-1 siblings, 0 replies; 6+ messages in thread
From: Martin K. Petersen @ 2018-06-26 15:54 UTC (permalink / raw)
To: Keith Busch; +Cc: Jens Axboe, linux-block, linux-nvme, Jitendra Bhivare, stable
Keith,
> 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.
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] block: Fix transfer when chuck sectors exceeds max
@ 2018-06-26 15:54 ` Martin K. Petersen
0 siblings, 0 replies; 6+ messages in thread
From: Martin K. Petersen @ 2018-06-26 15:54 UTC (permalink / raw)
Keith,
> 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.
Reviewed-by: Martin K. Petersen <martin.petersen at oracle.com>
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] block: Fix transfer when chuck sectors exceeds max
2018-06-26 15:14 ` Keith Busch
@ 2018-06-26 18:18 ` Jens Axboe
-1 siblings, 0 replies; 6+ messages in thread
From: Jens Axboe @ 2018-06-26 18:18 UTC (permalink / raw)
To: Keith Busch, linux-block; +Cc: linux-nvme, Jitendra Bhivare, stable
On 6/26/18 9:14 AM, Keith Busch wrote:
> 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.
Applied, with the subject typo fixed.
--
Jens Axboe
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] block: Fix transfer when chuck sectors exceeds max
@ 2018-06-26 18:18 ` Jens Axboe
0 siblings, 0 replies; 6+ messages in thread
From: Jens Axboe @ 2018-06-26 18:18 UTC (permalink / raw)
On 6/26/18 9:14 AM, Keith Busch wrote:
> 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.
Applied, with the subject typo fixed.
--
Jens Axboe
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-06-26 18:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-26 15:14 [PATCH] block: Fix transfer when chuck sectors exceeds max Keith Busch
2018-06-26 15:14 ` Keith Busch
2018-06-26 15:54 ` Martin K. Petersen
2018-06-26 15:54 ` Martin K. Petersen
2018-06-26 18:18 ` Jens Axboe
2018-06-26 18:18 ` Jens Axboe
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.