From: John Garry Date: Tue, 29 Jul 2025 09:14:48 +0000 (+0000) Subject: block: Enforce power-of-2 physical block size X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1da67b5b1754713b8ea0c3dd847e04790cffd91f;p=users%2Fjedix%2Flinux-maple.git block: Enforce power-of-2 physical block size The merging/splitting code and other queue limits checking depends on the physical block size being a power-of-2, so enforce it. Reviewed-by: Martin K. Petersen Signed-off-by: John Garry Reviewed-by: Damien Le Moal Reviewed-by: Hannes Reinecke Link: https://lore.kernel.org/r/20250729091448.1691334-3-john.g.garry@oracle.com [axboe: add missing braces] Signed-off-by: Jens Axboe --- diff --git a/block/blk-settings.c b/block/blk-settings.c index bb192d776bdb8..a7a794baba72d 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -320,8 +320,12 @@ int blk_validate_limits(struct queue_limits *lim) 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; + } else if (!is_power_of_2(lim->physical_block_size)) { + pr_warn("Invalid physical block size (%d)\n", lim->physical_block_size); + return -EINVAL; + } /* * The minimum I/O size defaults to the physical block size unless