Commit 37105615 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: don't reduce max_sectors based on io_opt 



Don't reduce the max_sectors value below the normal cap when the driver
advertsizes a very low io_opt.  This restores the behavior we had before
the recent changes to the max_sectors calculation.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarNitesh Shetty <nj.shetty@samsung.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20240701051800.1245240-3-hch@lst.de


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

block/blk-settings.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static int blk_validate_limits(struct queue_limits *lim) 
		if (lim->max_user_sectors < PAGE_SIZE / SECTOR_SIZE)

			return -EINVAL;

		lim->max_sectors = min(max_hw_sectors, lim->max_user_sectors);

	} else if (lim->io_opt) {

	} else if (lim->io_opt > (BLK_DEF_MAX_SECTORS_CAP << SECTOR_SHIFT)) {

		lim->max_sectors =

			min(max_hw_sectors, lim->io_opt >> SECTOR_SHIFT);

	} else if (lim->io_min > (BLK_DEF_MAX_SECTORS_CAP << SECTOR_SHIFT)) {