f2fs: fix zoned block device information initialization
BugLink: https://bugs.launchpad.net/bugs/2089884 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> (cherry picked from commit 0f9b12142be1af8555cfe53c6fbecb8e60a40dac) [koichiroden: contextual prerequisite for the subsequent commit] Signed-off-by: Koichiro Den <koichiro.den@canonical.com> Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
This commit is contained in:
committed by
Mehmet Basaran
parent
ddee17200a
commit
c688dff01b
@@ -1563,6 +1563,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 */
|
||||
|
||||
@@ -2334,6 +2334,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);
|
||||
|
||||
@@ -3876,11 +3887,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))
|
||||
@@ -4199,6 +4223,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)
|
||||
|
||||
Reference in New Issue
Block a user