| Message ID | 20260826111437.1526940-1-alex.shi@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | Revert "block: Increase BLK_DEF_MAX_SECTORS_CAP" | expand |
On 26/08/2026 13:14, Alex Shi via kernel-team wrote: > This reverts commit 9b8b84879d4adc506b0d3944e20b28d9f3f6994b to fix a OS > install failure on JBOD disk on B540d-2HS M.2 controller. > > Buglink: https://bugs.launchpad.net/bugs/2148534 > Signed-off-by: Alex Shi <alex.shi@canonical.com> > --- > block/blk.h | 9 --------- > include/linux/blkdev.h | 9 +++++++++ > 2 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/block/blk.h b/block/blk.h > index a7abf3be34ef..76da40c10fad 100644 > --- a/block/blk.h > +++ b/block/blk.h > @@ -13,15 +13,6 @@ > > struct elv_change_ctx; > > -/* > - * Default upper limit for the software max_sectors limit used for regular I/Os. > - * This can be increased through sysfs. > - * > - * This should not be confused with the max_hw_sector limit that is entirely > - * controlled by the block device driver, usually based on hardware limits. > - */ > -#define BLK_DEF_MAX_SECTORS_CAP (SZ_4M >> SECTOR_SHIFT) > - > #define BLK_DEV_MAX_SECTORS (LLONG_MAX >> 9) > #define BLK_MIN_SEGMENT_SIZE 4096 > > diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h > index ac899cd0cd70..4469f1fe409c 100644 > --- a/include/linux/blkdev.h > +++ b/include/linux/blkdev.h > @@ -1315,6 +1315,15 @@ enum blk_default_limits { > BLK_SEG_BOUNDARY_MASK = 0xFFFFFFFFUL, > }; > > +/* > + * 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 struct queue_limits *bdev_limits(struct block_device *bdev) > { > return &bdev_get_queue(bdev)->limits; Rejected for the following reasons: No cover email, no series/source target... -Stefan
diff --git a/block/blk.h b/block/blk.h index a7abf3be34ef..76da40c10fad 100644 --- a/block/blk.h +++ b/block/blk.h @@ -13,15 +13,6 @@ struct elv_change_ctx; -/* - * Default upper limit for the software max_sectors limit used for regular I/Os. - * This can be increased through sysfs. - * - * This should not be confused with the max_hw_sector limit that is entirely - * controlled by the block device driver, usually based on hardware limits. - */ -#define BLK_DEF_MAX_SECTORS_CAP (SZ_4M >> SECTOR_SHIFT) - #define BLK_DEV_MAX_SECTORS (LLONG_MAX >> 9) #define BLK_MIN_SEGMENT_SIZE 4096 diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index ac899cd0cd70..4469f1fe409c 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1315,6 +1315,15 @@ enum blk_default_limits { BLK_SEG_BOUNDARY_MASK = 0xFFFFFFFFUL, }; +/* + * 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 struct queue_limits *bdev_limits(struct block_device *bdev) { return &bdev_get_queue(bdev)->limits;
This reverts commit 9b8b84879d4adc506b0d3944e20b28d9f3f6994b to fix a OS install failure on JBOD disk on B540d-2HS M.2 controller. Buglink: https://bugs.launchpad.net/bugs/2148534 Signed-off-by: Alex Shi <alex.shi@canonical.com> --- block/blk.h | 9 --------- include/linux/blkdev.h | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-)