diff options
| author |   Uday Shankar <ushankar@purestorage.com> | 2023-02-28 17:06:55 -0700 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2023-03-02 21:00:20 -0700 |
| commit | 49d24398327e32265eccdeec4baeb5a6a609c0bd (patch) | |
| tree | eac5516659021cb104b90d7b398f18843ff84d8a /block/blk-merge.c | |
| parent | Merge tag 'nvme-6.3-2022-03-01' of git://git.infradead.org/nvme into for-6.3/block (diff) | |
| download | wireguard-linux-49d24398327e32265eccdeec4baeb5a6a609c0bd.tar.xz wireguard-linux-49d24398327e32265eccdeec4baeb5a6a609c0bd.zip | |
blk-mq: enforce op-specific segment limits in blk_insert_cloned_request
The block layer might merge together discard requests up until the
max_discard_segments limit is hit, but blk_insert_cloned_request checks
the segment count against max_segments regardless of the req op. This
can result in errors like the following when discards are issued through
a DM device and max_discard_segments exceeds max_segments for the queue
of the chosen underlying device.
blk_insert_cloned_request: over max segments limit. (256 > 129)
Fix this by looking at the req_op and enforcing the appropriate segment
limit - max_discard_segments for REQ_OP_DISCARDs and max_segments for
everything else.
Signed-off-by: Uday Shankar <ushankar@purestorage.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20230301000655.48112-1-ushankar@purestorage.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-merge.c')
| -rw-r--r-- | block/blk-merge.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index 808b58129d3e..ff72edd7ee03 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -586,13 +586,6 @@ int __blk_rq_map_sg(struct request_queue *q, struct request *rq, } EXPORT_SYMBOL(__blk_rq_map_sg); -static inline unsigned int blk_rq_get_max_segments(struct request *rq) -{ - if (req_op(rq) == REQ_OP_DISCARD) - return queue_max_discard_segments(rq->q); - return queue_max_segments(rq->q); -} - static inline unsigned int blk_rq_get_max_sectors(struct request *rq, sector_t offset) { |