block: fix virt_boundary handling in blk_validate_limits

Don't set the default max_segment_size value when a virt_boundary is
used.

Fixes: d690cb8ae14b ("block: add an API to atomically update queue limits")
Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20240221125010.3609444-1-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-settings.c b/block/blk-settings.c
index c4406aacc0efc6fa679afb26a2ab97f68e7e32d8..2120b6f9fef8eac32c4bd301f1bc1a1ca5ba6f1e 100644 (file)
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -182,16 +182,6 @@ static int blk_validate_limits(struct queue_limits *lim)
        if (WARN_ON_ONCE(lim->seg_boundary_mask < PAGE_SIZE - 1))
                return -EINVAL;
 
-       /*
-        * The maximum segment size has an odd historic 64k default that
-        * drivers probably should override.  Just like the I/O size we
-        * require drivers to at least handle a full page per segment.
-        */
-       if (!lim->max_segment_size)
-               lim->max_segment_size = BLK_MAX_SEGMENT_SIZE;
-       if (WARN_ON_ONCE(lim->max_segment_size < PAGE_SIZE))
-               return -EINVAL;
-
        /*
         * Devices that require a virtual boundary do not support scatter/gather
         * I/O natively, but instead require a descriptor list entry for each
@@ -203,6 +193,16 @@ static int blk_validate_limits(struct queue_limits *lim)
                                 lim->max_segment_size != UINT_MAX))
                        return -EINVAL;
                lim->max_segment_size = UINT_MAX;
+       } else {
+               /*
+                * The maximum segment size has an odd historic 64k default that
+                * drivers probably should override.  Just like the I/O size we
+                * require drivers to at least handle a full page per segment.
+                */
+               if (!lim->max_segment_size)
+                       lim->max_segment_size = BLK_MAX_SEGMENT_SIZE;
+               if (WARN_ON_ONCE(lim->max_segment_size < PAGE_SIZE))
+                       return -EINVAL;
        }
 
        /*