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

block: Add extra checks in blk_validate_atomic_write_limits() 



It is so far expected that the limits passed are valid.

In future atomic writes will be supported for stacked block devices, and
calculating the limits there will be complicated, so add extra sanity
checks to ensure that the values are always valid.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJohn Garry <john.g.garry@oracle.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20241118105018.1870052-2-john.g.garry@oracle.com


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

block/blk-settings.c

+17 −0
Original line number Diff line number Diff line
@@ -178,9 +178,26 @@ static void blk_validate_atomic_write_limits(struct queue_limits *lim) 
	if (!lim->atomic_write_hw_max)

		goto unsupported;



	if (WARN_ON_ONCE(!is_power_of_2(lim->atomic_write_hw_unit_min)))

		goto unsupported;



	if (WARN_ON_ONCE(!is_power_of_2(lim->atomic_write_hw_unit_max)))

		goto unsupported;



	if (WARN_ON_ONCE(lim->atomic_write_hw_unit_min >

			 lim->atomic_write_hw_unit_max))

		goto unsupported;



	if (WARN_ON_ONCE(lim->atomic_write_hw_unit_max >

			 lim->atomic_write_hw_max))

		goto unsupported;



	boundary_sectors = lim->atomic_write_hw_boundary >> SECTOR_SHIFT;



	if (boundary_sectors) {

		if (WARN_ON_ONCE(lim->atomic_write_hw_max >

				 lim->atomic_write_hw_boundary))

			goto unsupported;

		/*

		 * A feature of boundary support is that it disallows bios to

		 * be merged which would result in a merged request which