Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 06:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

block: Validate logical block size in blk_validate_limits()

Browse Source 
Some drivers validate that their own logical block size. It is no harm to
always do this, so validate in blk_validate_limits().

This allows us to remove the validation in most of those drivers.

Add a comment to blk_validate_block_size() to inform users that self-
validation of LBS is usually unnecessary.

Signed-off-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20240708091651.177447-3-john.g.garry@oracle.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
John Garry 2024-07-08 09:16:48 +00:00 committed by Jens Axboe
parent 4ff3d01275
commit fe3d508ba9
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/blk-settings.c
View File

@ -235,6 +235,10 @@ static int blk_validate_limits(struct queue_limits *lim)
*/ */
if (!lim->logical_block_size) if (!lim->logical_block_size)
lim->logical_block_size = SECTOR_SIZE; lim->logical_block_size = SECTOR_SIZE;
else if (blk_validate_block_size(lim->logical_block_size)) {
pr_warn("Invalid logical block size (%d)\n", lim->logical_block_size);
return -EINVAL;
}
if (lim->physical_block_size < lim->logical_block_size) if (lim->physical_block_size < lim->logical_block_size)
lim->physical_block_size = lim->logical_block_size; lim->physical_block_size = lim->logical_block_size;

1
include/linux/blkdev.h
View File

@ -268,6 +268,7 @@ static inline dev_t disk_devt(struct gendisk *disk)
return MKDEV(disk->major, disk->first_minor); return MKDEV(disk->major, disk->first_minor);
} }
/* blk_validate_limits() validates bsize, so drivers don't usually need to */
static inline int blk_validate_block_size(unsigned long bsize) static inline int blk_validate_block_size(unsigned long bsize)
{ {
if (bsize < 512 || bsize > PAGE_SIZE || !is_power_of_2(bsize)) if (bsize < 512 || bsize > PAGE_SIZE || !is_power_of_2(bsize))