f2fs: fix zoned block device information initialization
authorWenjie Qi <qwjhust@gmail.com>
Sun, 7 Apr 2024 07:21:23 +0000 (15:21 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Tue, 9 Apr 2024 16:17:48 +0000 (16:17 +0000)
If the max open zones of zoned devices are less than
the active logs of F2FS, the device may error due to
insufficient zone resources when multiple active logs
are being written at the same time.

Signed-off-by: Wenjie Qi <qwjhust@gmail.com>
Signed-off-by: Chao Yu <chao@kernel.org>
Reviewed-by: Daeho Jeong <daehojeong@google.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/f2fs.h
fs/f2fs/super.c

index adfce581026b86f0ae3f92c8a019d81e27336339..e9ef971f4dba6f145d70e03c8404bd4a36250f9a 100644 (file)
@@ -1557,6 +1557,7 @@ struct f2fs_sb_info {
 
 #ifdef CONFIG_BLK_DEV_ZONED
        unsigned int blocks_per_blkz;           /* F2FS blocks per zone */
+       unsigned int max_open_zones;            /* max open zone resources of the zoned device */
 #endif
 
        /* for node-related operations */
index df9765b41dac1dd41edc10569725e13d7e9e8565..8ac4734c2df6036ac088ca8fa1b4df6d8d08f904 100644 (file)
@@ -2324,6 +2324,17 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)
        if (err)
                goto restore_opts;
 
+#ifdef CONFIG_BLK_DEV_ZONED
+       if (f2fs_sb_has_blkzoned(sbi) &&
+               sbi->max_open_zones < F2FS_OPTION(sbi).active_logs) {
+               f2fs_err(sbi,
+                       "zoned: max open zones %u is too small, need at least %u open zones",
+                                sbi->max_open_zones, F2FS_OPTION(sbi).active_logs);
+               err = -EINVAL;
+               goto restore_opts;
+       }
+#endif
+
        /* flush outstanding errors before changing fs state */
        flush_work(&sbi->s_error_work);
 
@@ -3866,11 +3877,24 @@ static int init_blkz_info(struct f2fs_sb_info *sbi, int devi)
        sector_t nr_sectors = bdev_nr_sectors(bdev);
        struct f2fs_report_zones_args rep_zone_arg;
        u64 zone_sectors;
+       unsigned int max_open_zones;
        int ret;
 
        if (!f2fs_sb_has_blkzoned(sbi))
                return 0;
 
+       if (bdev_is_zoned(FDEV(devi).bdev)) {
+               max_open_zones = bdev_max_open_zones(bdev);
+               if (max_open_zones && (max_open_zones < sbi->max_open_zones))
+                       sbi->max_open_zones = max_open_zones;
+               if (sbi->max_open_zones < F2FS_OPTION(sbi).active_logs) {
+                       f2fs_err(sbi,
+                               "zoned: max open zones %u is too small, need at least %u open zones",
+                               sbi->max_open_zones, F2FS_OPTION(sbi).active_logs);
+                       return -EINVAL;
+               }
+       }
+
        zone_sectors = bdev_zone_sectors(bdev);
        if (sbi->blocks_per_blkz && sbi->blocks_per_blkz !=
                                SECTOR_TO_BLOCK(zone_sectors))
@@ -4184,6 +4208,9 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
 
        logical_blksize = bdev_logical_block_size(sbi->sb->s_bdev);
        sbi->aligned_blksize = true;
+#ifdef CONFIG_BLK_DEV_ZONED
+       sbi->max_open_zones = UINT_MAX;
+#endif
 
        for (i = 0; i < max_devices; i++) {
                if (i == 0)