Skip to content

Commit cab8cbc

Browse files
LiBaokun96tytso
authored andcommitted
ext4: enable block size larger than page size
Since block device (See commit 3c20917 ("block/bdev: enable large folio support for large logical block sizes")) and page cache (See commit ab95d23 ("filemap: allocate mapping_min_order folios in the page cache")) has the ability to have a minimum order when allocating folio, and ext4 has supported large folio in commit 7ac6730 ("ext4: enable large folio for regular file"), now add support for block_size > PAGE_SIZE in ext4. set_blocksize() -> bdev_validate_blocksize() already validates the block size, so ext4_load_super() does not need to perform additional checks. Here we only need to add the FS_LBS bit to fs_flags. In addition, block sizes larger than the page size are currently supported only when CONFIG_TRANSPARENT_HUGEPAGE is enabled. To make this explicit, a blocksize_gt_pagesize entry has been added under /sys/fs/ext4/feature/, indicating whether bs > ps is supported. This allows mke2fs to check the interface and determine whether a warning should be issued when formatting a filesystem with block size larger than the page size. Suggested-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Baokun Li <libaokun1@huawei.com> Reviewed-by: Zhang Yi <yi.zhang@huawei.com> Reviewed-by: Jan Kara <jack@suse.cz> Reviewed-by: Pankaj Raghav <p.raghav@samsung.com> Reviewed-by: Ojaswin Mujoo <ojaswin@linux.ibm.com> Message-ID: <20251121090654.631996-25-libaokun@huaweicloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
1 parent 709f0f1 commit cab8cbc

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

fs/ext4/super.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7453,7 +7453,8 @@ static struct file_system_type ext4_fs_type = {
74537453
.init_fs_context = ext4_init_fs_context,
74547454
.parameters = ext4_param_specs,
74557455
.kill_sb = ext4_kill_sb,
7456-
.fs_flags = FS_REQUIRES_DEV | FS_ALLOW_IDMAP | FS_MGTIME,
7456+
.fs_flags = FS_REQUIRES_DEV | FS_ALLOW_IDMAP | FS_MGTIME |
7457+
FS_LBS,
74577458
};
74587459
MODULE_ALIAS_FS("ext4");
74597460

fs/ext4/sysfs.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,9 @@ EXT4_ATTR_FEATURE(fast_commit);
332332
#if IS_ENABLED(CONFIG_UNICODE) && defined(CONFIG_FS_ENCRYPTION)
333333
EXT4_ATTR_FEATURE(encrypted_casefold);
334334
#endif
335+
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
336+
EXT4_ATTR_FEATURE(blocksize_gt_pagesize);
337+
#endif
335338

336339
static struct attribute *ext4_feat_attrs[] = {
337340
ATTR_LIST(lazy_itable_init),
@@ -351,6 +354,9 @@ static struct attribute *ext4_feat_attrs[] = {
351354
ATTR_LIST(fast_commit),
352355
#if IS_ENABLED(CONFIG_UNICODE) && defined(CONFIG_FS_ENCRYPTION)
353356
ATTR_LIST(encrypted_casefold),
357+
#endif
358+
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
359+
ATTR_LIST(blocksize_gt_pagesize),
354360
#endif
355361
NULL,
356362
};

0 commit comments

Comments
 (0)