f2fs: fix to set ipu policy

For LFS mode, it should update outplace and no need inplace update.
When using LFS mode for small-volume devices, IPU will not be used,
and the OPU writing method is actually used, but F2FS_IPU_FORCE can
be read from the ipu_policy node, which is different from the actual
situation. And remount to lfs mode should be disallowed when
f2fs ipu is enabled, let's fix it.

Fixes: 84b89e5d943d ("f2fs: add auto tuning for small devices")
Signed-off-by: Yangtao Li <frank.li@vivo.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index 0f3f05cb8c29f53d55ae7253f06ac1c9d92be6ab..8ee5e5db9287c99a46e53f5c00057508d5a633e6 100644 (file)
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -670,6 +670,8 @@ static inline int utilization(struct f2fs_sb_info *sbi)
 
 #define SMALL_VOLUME_SEGMENTS  (16 * 512)      /* 16GB */
 
+#define F2FS_IPU_DISABLE       0
+
 enum {
        F2FS_IPU_FORCE,
        F2FS_IPU_SSR,
@@ -679,10 +681,16 @@ enum {
        F2FS_IPU_ASYNC,
        F2FS_IPU_NOCACHE,
        F2FS_IPU_HONOR_OPU_WRITE,
+       F2FS_IPU_MAX,
 };
 
+static inline bool IS_F2FS_IPU_DISABLE(struct f2fs_sb_info *sbi)
+{
+       return SM_I(sbi)->ipu_policy == F2FS_IPU_DISABLE;
+}
+
 #define F2FS_IPU_POLICY(name)                                  \
-static inline int IS_##name(struct f2fs_sb_info *sbi)          \
+static inline bool IS_##name(struct f2fs_sb_info *sbi)         \
 {                                                              \
        return SM_I(sbi)->ipu_policy & BIT(name);               \
 }

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 4ec2cbbc47ebee00b282e0cb6bd99dd88e8fcd9b..c11a161ba5bec73c774dfba4e3d9d144b761caf1 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1346,12 +1346,12 @@ default_check:
        }
 
        if (test_opt(sbi, DISABLE_CHECKPOINT) && f2fs_lfs_mode(sbi)) {
-               f2fs_err(sbi, "LFS not compatible with checkpoint=disable");
+               f2fs_err(sbi, "LFS is not compatible with checkpoint=disable");
                return -EINVAL;
        }
 
        if (test_opt(sbi, ATGC) && f2fs_lfs_mode(sbi)) {
-               f2fs_err(sbi, "LFS not compatible with ATGC");
+               f2fs_err(sbi, "LFS is not compatible with ATGC");
                return -EINVAL;
        }
 
@@ -2304,6 +2304,12 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)
                }
        }
 #endif
+       if (f2fs_lfs_mode(sbi) && !IS_F2FS_IPU_DISABLE(sbi)) {
+               err = -EINVAL;
+               f2fs_warn(sbi, "LFS is not compatible with IPU");
+               goto restore_opts;
+       }
+
        /* disallow enable atgc dynamically */
        if (no_atgc == !!test_opt(sbi, ATGC)) {
                err = -EINVAL;
@@ -4085,8 +4091,9 @@ static void f2fs_tuning_parameters(struct f2fs_sb_info *sbi)
                if (f2fs_block_unit_discard(sbi))
                        SM_I(sbi)->dcc_info->discard_granularity =
                                                MIN_DISCARD_GRANULARITY;
-               SM_I(sbi)->ipu_policy = BIT(F2FS_IPU_FORCE) |
-                                       BIT(F2FS_IPU_HONOR_OPU_WRITE);
+               if (!f2fs_lfs_mode(sbi))
+                       SM_I(sbi)->ipu_policy = BIT(F2FS_IPU_FORCE) |
+                                               BIT(F2FS_IPU_HONOR_OPU_WRITE);
        }
 
        sbi->readdir_ra = true;

diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index 8789b3b53fb689ccfa59635c68c6bc3076551c8a..6082e132257a35278ec478b442c880105becd376 100644 (file)
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -706,6 +706,15 @@ out:
                return count;
        }
 
+       if (!strcmp(a->attr.name, "ipu_policy")) {
+               if (t >= BIT(F2FS_IPU_MAX))
+                       return -EINVAL;
+               if (t && f2fs_lfs_mode(sbi))
+                       return -EINVAL;
+               SM_I(sbi)->ipu_policy = (unsigned int)t;
+               return count;
+       }
+
        *ui = (unsigned int)t;
 
        return count;