Commit fe3d508b authored by John Garry's avatar John Garry Committed by Jens Axboe
Browse files

block: Validate logical block size in blk_validate_limits() 



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: default avatarJohn Garry <john.g.garry@oracle.com>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20240708091651.177447-3-john.g.garry@oracle.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 4ff3d012

block/blk-settings.c

+4 −0
Original line number Diff line number Diff line
@@ -235,6 +235,10 @@ static int blk_validate_limits(struct queue_limits *lim) 
	 */

	if (!lim->logical_block_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)

		lim->physical_block_size = lim->logical_block_size;

include/linux/blkdev.h

+1 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ static inline dev_t disk_devt(struct gendisk *disk) 
	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)

{

	if (bsize < 512 || bsize > PAGE_SIZE || !is_power_of_2(bsize))