Skip to content

Commit 34b48db

Browse files
Christoph Hellwigaxboe
authored andcommitted
block: remove artifical max_hw_sectors cap
Set max_sectors to the value the drivers provides as hardware limit by default. Linux had proper I/O throttling for a long time and doesn't rely on a artifically small maximum I/O size anymore. By not limiting the I/O size by default we remove an annoying tuning step required for most Linux installation. Note that both the user, and if absolutely required the driver can still impose a limit for FS requests below max_hw_sectors_kb. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent c2661b8 commit 34b48db

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

block/blk-settings.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,7 @@ void blk_limits_max_hw_sectors(struct queue_limits *limits, unsigned int max_hw_
257257
__func__, max_hw_sectors);
258258
}
259259

260-
limits->max_hw_sectors = max_hw_sectors;
261-
limits->max_sectors = min_t(unsigned int, max_hw_sectors,
262-
BLK_DEF_MAX_SECTORS);
260+
limits->max_sectors = limits->max_hw_sectors = max_hw_sectors;
263261
}
264262
EXPORT_SYMBOL(blk_limits_max_hw_sectors);
265263

drivers/block/aoe/aoeblk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ aoeblk_gdalloc(void *vp)
395395
WARN_ON(d->flags & DEVFL_TKILL);
396396
WARN_ON(d->gd);
397397
WARN_ON(d->flags & DEVFL_UP);
398-
blk_queue_max_hw_sectors(q, BLK_DEF_MAX_SECTORS);
398+
blk_queue_max_hw_sectors(q, 1024);
399399
q->backing_dev_info.name = "aoe";
400400
q->backing_dev_info.ra_pages = READ_AHEAD / PAGE_CACHE_SIZE;
401401
d->bufpool = mp;

include/linux/blkdev.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1186,7 +1186,6 @@ extern int blk_verify_command(unsigned char *cmd, fmode_t has_write_perm);
11861186
enum blk_default_limits {
11871187
BLK_MAX_SEGMENTS = 128,
11881188
BLK_SAFE_MAX_SECTORS = 255,
1189-
BLK_DEF_MAX_SECTORS = 1024,
11901189
BLK_MAX_SEGMENT_SIZE = 65536,
11911190
BLK_SEG_BOUNDARY_MASK = 0xFFFFFFFFUL,
11921191
};

0 commit comments

Comments
 (0)