Commit e993db2d authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Jens Axboe

block: check for max_hw_sectors underflow

The logical block size need to be smaller than the max_hw_sector
setting, otherwise we can't even transfer a single LBA.
Signed-off-by: default avatarHannes Reinecke <hare@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e528bede
...@@ -104,6 +104,7 @@ static int blk_validate_zoned_limits(struct queue_limits *lim) ...@@ -104,6 +104,7 @@ static int blk_validate_zoned_limits(struct queue_limits *lim)
static int blk_validate_limits(struct queue_limits *lim) static int blk_validate_limits(struct queue_limits *lim)
{ {
unsigned int max_hw_sectors; unsigned int max_hw_sectors;
unsigned int logical_block_sectors;
/* /*
* Unless otherwise specified, default to 512 byte logical blocks and a * Unless otherwise specified, default to 512 byte logical blocks and a
...@@ -134,8 +135,11 @@ static int blk_validate_limits(struct queue_limits *lim) ...@@ -134,8 +135,11 @@ static int blk_validate_limits(struct queue_limits *lim)
lim->max_hw_sectors = BLK_SAFE_MAX_SECTORS; lim->max_hw_sectors = BLK_SAFE_MAX_SECTORS;
if (WARN_ON_ONCE(lim->max_hw_sectors < PAGE_SECTORS)) if (WARN_ON_ONCE(lim->max_hw_sectors < PAGE_SECTORS))
return -EINVAL; return -EINVAL;
logical_block_sectors = lim->logical_block_size >> SECTOR_SHIFT;
if (WARN_ON_ONCE(logical_block_sectors > lim->max_hw_sectors))
return -EINVAL;
lim->max_hw_sectors = round_down(lim->max_hw_sectors, lim->max_hw_sectors = round_down(lim->max_hw_sectors,
lim->logical_block_size >> SECTOR_SHIFT); logical_block_sectors);
/* /*
* The actual max_sectors value is a complex beast and also takes the * The actual max_sectors value is a complex beast and also takes the
...@@ -153,7 +157,7 @@ static int blk_validate_limits(struct queue_limits *lim) ...@@ -153,7 +157,7 @@ static int blk_validate_limits(struct queue_limits *lim)
lim->max_sectors = min(max_hw_sectors, BLK_DEF_MAX_SECTORS_CAP); lim->max_sectors = min(max_hw_sectors, BLK_DEF_MAX_SECTORS_CAP);
} }
lim->max_sectors = round_down(lim->max_sectors, lim->max_sectors = round_down(lim->max_sectors,
lim->logical_block_size >> SECTOR_SHIFT); logical_block_sectors);
/* /*
* Random default for the maximum number of segments. Driver should not * Random default for the maximum number of segments. Driver should not
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment