iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: Pass blk_queue_get_max_sectors() a request pointer

Browse Source 
Currently blk_queue_get_max_sectors() is passed a enum req_op. In future
the value returned from blk_queue_get_max_sectors() may depend on certain
request flags, so pass a request pointer.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Acked-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Link: https://lore.kernel.org/r/20240620125359.2684798-2-john.g.garry@oracle.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
John Garry 2024-06-20 12:53:50 +00:00 committed by Jens Axboe
parent e821bcecdf
commit 8d1dfd51c8
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
block/blk-merge.c
View File

@ -593,7 +593,8 @@ static inline unsigned int blk_rq_get_max_sectors(struct request *rq,
if (blk_rq_is_passthrough(rq)) if (blk_rq_is_passthrough(rq))
return q->limits.max_hw_sectors; return q->limits.max_hw_sectors;
max_sectors = blk_queue_get_max_sectors(q, req_op(rq)); max_sectors = blk_queue_get_max_sectors(rq);
if (!q->limits.chunk_sectors || if (!q->limits.chunk_sectors ||
req_op(rq) == REQ_OP_DISCARD || req_op(rq) == REQ_OP_DISCARD ||
req_op(rq) == REQ_OP_SECURE_ERASE) req_op(rq) == REQ_OP_SECURE_ERASE)

2
block/blk-mq.c
View File

@ -3036,7 +3036,7 @@ queue_exit:
blk_status_t blk_insert_cloned_request(struct request *rq) blk_status_t blk_insert_cloned_request(struct request *rq)
{ {
struct request_queue *q = rq->q; struct request_queue *q = rq->q;
unsigned int max_sectors = blk_queue_get_max_sectors(q, req_op(rq)); unsigned int max_sectors = blk_queue_get_max_sectors(rq);
unsigned int max_segments = blk_rq_get_max_segments(rq); unsigned int max_segments = blk_rq_get_max_segments(rq);
blk_status_t ret; blk_status_t ret;

6
block/blk.h
View File

@ -182,9 +182,11 @@ static inline unsigned int blk_rq_get_max_segments(struct request *rq)
return queue_max_segments(rq->q); return queue_max_segments(rq->q);
} }
static inline unsigned int blk_queue_get_max_sectors(struct request_queue *q, static inline unsigned int blk_queue_get_max_sectors(struct request *rq)
enum req_op op)
{ {
struct request_queue *q = rq->q;
enum req_op op = req_op(rq);
if (unlikely(op == REQ_OP_DISCARD || op == REQ_OP_SECURE_ERASE)) if (unlikely(op == REQ_OP_DISCARD || op == REQ_OP_SECURE_ERASE))
return min(q->limits.max_discard_sectors, return min(q->limits.max_discard_sectors,
UINT_MAX >> SECTOR_SHIFT); UINT_MAX >> SECTOR_SHIFT);