block: rename and document BLK_DEF_MAX_SECTORS

Give BLK_DEF_MAX_SECTORS a _CAP postfix and document what it is used for.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20231227092305.279567-5-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-settings.c b/block/blk-settings.c
index 33b3f767b81e24b0e3de522e989713d9313635ca..ba6e0e97118c084e84d8ea98b2aca26331b248ad 100644 (file)
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -139,7 +139,7 @@ void blk_queue_max_hw_sectors(struct request_queue *q, unsigned int max_hw_secto
        if (limits->max_user_sectors)
                max_sectors = min(max_sectors, limits->max_user_sectors);
        else
-               max_sectors = min(max_sectors, BLK_DEF_MAX_SECTORS);
+               max_sectors = min(max_sectors, BLK_DEF_MAX_SECTORS_CAP);
 
        max_sectors = round_down(max_sectors,
                                 limits->logical_block_size >> SECTOR_SHIFT);

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index d5e669a401b0ccde4e4463bc3da1c3a14a334e66..40bab5975c5612343c3490b03976f7c3ca4cd624 100644 (file)
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -241,7 +241,7 @@ queue_max_sectors_store(struct request_queue *q, const char *page, size_t count)
        if (max_sectors_kb == 0) {
                q->limits.max_user_sectors = 0;
                max_sectors_kb = min(max_hw_sectors_kb,
-                                    BLK_DEF_MAX_SECTORS >> 1);
+                                    BLK_DEF_MAX_SECTORS_CAP >> 1);
        } else {
                if (max_sectors_kb > max_hw_sectors_kb ||
                    max_sectors_kb < page_kb)

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 8c8ac5cd1833b41cb0eb3ce3e068a6883299ddb8..6bedd2d5298f6d090e1d87d49c893e87070d821a 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3500,7 +3500,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
        } else {
                q->limits.io_opt = 0;
                rw_max = min_not_zero(logical_to_sectors(sdp, dev_max),
-                                     (sector_t)BLK_DEF_MAX_SECTORS);
+                                     (sector_t)BLK_DEF_MAX_SECTORS_CAP);
        }
 
        /*

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index bc236e77d85e1ca6939aa20f7100db14077798f9..94701a63ad8aa66436174e00f917a2f76e1fae4a 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1056,7 +1056,14 @@ enum blk_default_limits {
        BLK_SEG_BOUNDARY_MASK   = 0xFFFFFFFFUL,
 };
 
-#define BLK_DEF_MAX_SECTORS 2560u
+/*
+ * Default upper limit for the software max_sectors limit used for
+ * regular file system I/O.  This can be increased through sysfs.
+ *
+ * Not to be confused with the max_hw_sector limit that is entirely
+ * controlled by the driver, usually based on hardware limits.
+ */
+#define BLK_DEF_MAX_SECTORS_CAP        2560u
 
 static inline unsigned long queue_segment_boundary(const struct request_queue *q)
 {