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 <[email protected]>
---
v4:
-allow set 0 in lfs mode for ipu_policy node
fs/f2fs/segment.h | 10 +++++++++-
fs/f2fs/super.c | 17 +++++++++++------
fs/f2fs/sysfs.c | 9 +++++++++
3 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index 0f3f05cb8c29..8ee5e5db9287 100644
--- 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 4ec2cbbc47eb..09696fc844ab 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1346,12 +1346,12 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
}
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;
@@ -4083,10 +4089,9 @@ static void f2fs_tuning_parameters(struct f2fs_sb_info *sbi)
/* adjust parameters according to the volume size */
if (MAIN_SEGS(sbi) <= SMALL_VOLUME_SEGMENTS) {
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);
+ SM_I(sbi)->dcc_info->discard_granularity = MIN_DISCARD_GRANULARITY;
+ 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 575a5536c0e7..3c3dae3ce84e 100644
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -706,6 +706,15 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
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;
--
2.25.1
IPU policy can be disabled, let's add description for it and other policy.
Signed-off-by: Yangtao Li <[email protected]>
Reviewed-by: Chao Yu <[email protected]>
---
v4:
-add Reviewed-by tag
Documentation/ABI/testing/sysfs-fs-f2fs | 27 ++++++++++++++++---------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/Documentation/ABI/testing/sysfs-fs-f2fs b/Documentation/ABI/testing/sysfs-fs-f2fs
index 0f17adc80488..94132745ecbe 100644
--- a/Documentation/ABI/testing/sysfs-fs-f2fs
+++ b/Documentation/ABI/testing/sysfs-fs-f2fs
@@ -49,16 +49,23 @@ Contact: "Jaegeuk Kim" <[email protected]>
Description: Controls the in-place-update policy.
updates in f2fs. User can set:
- ==== =================
- 0x01 F2FS_IPU_FORCE
- 0x02 F2FS_IPU_SSR
- 0x04 F2FS_IPU_UTIL
- 0x08 F2FS_IPU_SSR_UTIL
- 0x10 F2FS_IPU_FSYNC
- 0x20 F2FS_IPU_ASYNC
- 0x40 F2FS_IPU_NOCACHE
- 0x80 F2FS_IPU_HONOR_OPU_WRITE
- ==== =================
+ ===== =============== ===================================================
+ value policy description
+ 0x00 DISABLE disable IPU(=default option in LFS mode)
+ 0x01 FORCE all the time
+ 0x02 SSR if SSR mode is activated
+ 0x04 UTIL if FS utilization is over threashold
+ 0x08 SSR_UTIL if SSR mode is activated and FS utilization is over
+ threashold
+ 0x10 FSYNC activated in fsync path only for high performance
+ flash storages. IPU will be triggered only if the
+ # of dirty pages over min_fsync_blocks.
+ (=default option)
+ 0x20 ASYNC do IPU given by asynchronous write requests
+ 0x40 NOCACHE disable IPU bio cache
+ 0x80 HONOR_OPU_WRITE use OPU write prior to IPU write if inode has
+ FI_OPU_WRITE flag
+ ===== =============== ===================================================
Refer segment.h for details.
--
2.25.1
Add a ipu_mode sysfs node to show the current ipu policy as a string
for readability, like we do in commit a3951cd199a5 ("f2fs: introduce
gc_mode sysfs node").
Since we use ipu_policy as a bitmap, and the bitmap API parameter is
unsigned long type data, let's change ipu_policy to unsigned long type.
Signed-off-by: Yangtao Li <[email protected]>
---
v4:
-rebase, no code change
Documentation/ABI/testing/sysfs-fs-f2fs | 6 ++++++
fs/f2fs/f2fs.h | 4 ++--
fs/f2fs/segment.h | 1 +
fs/f2fs/sysfs.c | 28 ++++++++++++++++++++++++-
4 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/Documentation/ABI/testing/sysfs-fs-f2fs b/Documentation/ABI/testing/sysfs-fs-f2fs
index 94132745ecbe..b2d8c1e84073 100644
--- a/Documentation/ABI/testing/sysfs-fs-f2fs
+++ b/Documentation/ABI/testing/sysfs-fs-f2fs
@@ -729,3 +729,9 @@ What: /sys/fs/f2fs/<disk>/last_age_weight
Date: January 2023
Contact: "Ping Xiong" <[email protected]>
Description: When DATA SEPARATION is on, it controls the weight of last data block age.
+
+What: /sys/fs/f2fs/<disk>/ipu_mode
+Date: February 2023
+Contact: "Yangtao Li" <[email protected]>
+Description: Show the current ipu policy as a string.
+ This is a read-only entry.
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 44f2d76525bf..b699ed74f438 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1070,7 +1070,7 @@ struct f2fs_sm_info {
struct list_head sit_entry_set; /* sit entry set list */
- unsigned int ipu_policy; /* in-place-update policy */
+ unsigned long ipu_policy; /* in-place-update policy */
unsigned int min_ipu_util; /* in-place-update threshold */
unsigned int min_fsync_blocks; /* threshold for fsync */
unsigned int min_seq_blocks; /* threshold for sequential blocks */
@@ -1322,7 +1322,7 @@ enum {
MAX_TIME,
};
-/* Note that you need to keep synchronization with this gc_mode_names array */
+/* Modification on enum should be synchronized with gc_mode_names array */
enum {
GC_NORMAL,
GC_IDLE_CB,
diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index 8ee5e5db9287..92c8be00d396 100644
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -672,6 +672,7 @@ static inline int utilization(struct f2fs_sb_info *sbi)
#define F2FS_IPU_DISABLE 0
+/* Modification on enum should be synchronized with ipu_mode_names array */
enum {
F2FS_IPU_FORCE,
F2FS_IPU_SSR,
diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index 3c3dae3ce84e..4a2d895cd52c 100644
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -51,6 +51,17 @@ static const char *gc_mode_names[MAX_GC_MODE] = {
"GC_URGENT_MID"
};
+static const char *ipu_mode_names[F2FS_IPU_MAX] = {
+ "FORCE",
+ "SSR",
+ "UTIL",
+ "SSR_UTIL",
+ "FSYNC",
+ "ASYNC",
+ "NOCACHE",
+ "HONOR_OPU_WRITE",
+};
+
struct f2fs_attr {
struct attribute attr;
ssize_t (*show)(struct f2fs_attr *a, struct f2fs_sb_info *sbi, char *buf);
@@ -149,6 +160,19 @@ static ssize_t gc_mode_show(struct f2fs_attr *a,
return sysfs_emit(buf, "%s\n", gc_mode_names[sbi->gc_mode]);
}
+static ssize_t ipu_mode_show(struct f2fs_attr *a,
+ struct f2fs_sb_info *sbi, char *buf)
+{
+ int len = 0, i = 0;
+
+ if (SM_I(sbi)->ipu_policy == F2FS_IPU_DISABLE)
+ return sysfs_emit(buf, "DISABLE\n");
+
+ for_each_set_bit(i, &SM_I(sbi)->ipu_policy, F2FS_IPU_MAX)
+ len += scnprintf(buf + len, PAGE_SIZE - len, "%s\n", ipu_mode_names[i]);
+ return len;
+}
+
static ssize_t features_show(struct f2fs_attr *a,
struct f2fs_sb_info *sbi, char *buf)
{
@@ -711,7 +735,7 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
return -EINVAL;
if (t && f2fs_lfs_mode(sbi))
return -EINVAL;
- SM_I(sbi)->ipu_policy = (unsigned int)t;
+ SM_I(sbi)->ipu_policy = t;
return count;
}
@@ -907,6 +931,7 @@ F2FS_GENERAL_RO_ATTR(mounted_time_sec);
F2FS_GENERAL_RO_ATTR(main_blkaddr);
F2FS_GENERAL_RO_ATTR(pending_discard);
F2FS_GENERAL_RO_ATTR(gc_mode);
+F2FS_GENERAL_RO_ATTR(ipu_mode);
#ifdef CONFIG_F2FS_STAT_FS
F2FS_STAT_ATTR(STAT_INFO, f2fs_stat_info, cp_foreground_calls, cp_count);
F2FS_STAT_ATTR(STAT_INFO, f2fs_stat_info, cp_background_calls, bg_cp_count);
@@ -997,6 +1022,7 @@ static struct attribute *f2fs_attrs[] = {
ATTR_LIST(max_ordered_discard),
ATTR_LIST(pending_discard),
ATTR_LIST(gc_mode),
+ ATTR_LIST(ipu_mode),
ATTR_LIST(ipu_policy),
ATTR_LIST(min_ipu_util),
ATTR_LIST(min_fsync_blocks),
--
2.25.1
On 2023/2/6 22:43, Yangtao Li wrote:
> 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 <[email protected]>
> ---
> v4:
> -allow set 0 in lfs mode for ipu_policy node
> fs/f2fs/segment.h | 10 +++++++++-
> fs/f2fs/super.c | 17 +++++++++++------
> fs/f2fs/sysfs.c | 9 +++++++++
> 3 files changed, 29 insertions(+), 7 deletions(-)
>
> diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
> index 0f3f05cb8c29..8ee5e5db9287 100644
> --- 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 4ec2cbbc47eb..09696fc844ab 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -1346,12 +1346,12 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
> }
>
> 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;
> @@ -4083,10 +4089,9 @@ static void f2fs_tuning_parameters(struct f2fs_sb_info *sbi)
> /* adjust parameters according to the volume size */
> if (MAIN_SEGS(sbi) <= SMALL_VOLUME_SEGMENTS) {
> 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);
> + SM_I(sbi)->dcc_info->discard_granularity = MIN_DISCARD_GRANULARITY;
> + if (!f2fs_lfs_mode(sbi))
> + SM_I(sbi)->ipu_policy = BIT(F2FS_IPU_FORCE) | BIT(F2FS_IPU_HONOR_OPU_WRITE);
SM_I(sbi)->ipu_policy = BIT(F2FS_IPU_FORCE) |
BIT(F2FS_IPU_HONOR_OPU_WRITE);
I prefer to not exceed 80 lines, otherwise it looks good to me.
Reviewed-by: Chao Yu <[email protected]>
Thanks,
> }
>
> sbi->readdir_ra = true;
> diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
> index 575a5536c0e7..3c3dae3ce84e 100644
> --- a/fs/f2fs/sysfs.c
> +++ b/fs/f2fs/sysfs.c
> @@ -706,6 +706,15 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
> 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;
On 02/07, Chao Yu wrote:
> On 2023/2/6 22:43, Yangtao Li wrote:
> > 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 <[email protected]>
> > ---
> > v4:
> > -allow set 0 in lfs mode for ipu_policy node
> > fs/f2fs/segment.h | 10 +++++++++-
> > fs/f2fs/super.c | 17 +++++++++++------
> > fs/f2fs/sysfs.c | 9 +++++++++
> > 3 files changed, 29 insertions(+), 7 deletions(-)
> >
> > diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
> > index 0f3f05cb8c29..8ee5e5db9287 100644
> > --- 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 4ec2cbbc47eb..09696fc844ab 100644
> > --- a/fs/f2fs/super.c
> > +++ b/fs/f2fs/super.c
> > @@ -1346,12 +1346,12 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
> > }
> > 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;
> > @@ -4083,10 +4089,9 @@ static void f2fs_tuning_parameters(struct f2fs_sb_info *sbi)
> > /* adjust parameters according to the volume size */
> > if (MAIN_SEGS(sbi) <= SMALL_VOLUME_SEGMENTS) {
> > 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);
> > + SM_I(sbi)->dcc_info->discard_granularity = MIN_DISCARD_GRANULARITY;
> > + if (!f2fs_lfs_mode(sbi))
> > + SM_I(sbi)->ipu_policy = BIT(F2FS_IPU_FORCE) | BIT(F2FS_IPU_HONOR_OPU_WRITE);
>
> SM_I(sbi)->ipu_policy = BIT(F2FS_IPU_FORCE) |
> BIT(F2FS_IPU_HONOR_OPU_WRITE);
>
> I prefer to not exceed 80 lines, otherwise it looks good to me.
Applied.
>
> Reviewed-by: Chao Yu <[email protected]>
>
> Thanks,
>
> > }
> > sbi->readdir_ra = true;
> > diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
> > index 575a5536c0e7..3c3dae3ce84e 100644
> > --- a/fs/f2fs/sysfs.c
> > +++ b/fs/f2fs/sysfs.c
> > @@ -706,6 +706,15 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
> > 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;
On 02/06, Yangtao Li wrote:
> Add a ipu_mode sysfs node to show the current ipu policy as a string
> for readability, like we do in commit a3951cd199a5 ("f2fs: introduce
> gc_mode sysfs node").
>
> Since we use ipu_policy as a bitmap, and the bitmap API parameter is
> unsigned long type data, let's change ipu_policy to unsigned long type.
>
> Signed-off-by: Yangtao Li <[email protected]>
> ---
> v4:
> -rebase, no code change
> Documentation/ABI/testing/sysfs-fs-f2fs | 6 ++++++
> fs/f2fs/f2fs.h | 4 ++--
> fs/f2fs/segment.h | 1 +
> fs/f2fs/sysfs.c | 28 ++++++++++++++++++++++++-
> 4 files changed, 36 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/ABI/testing/sysfs-fs-f2fs b/Documentation/ABI/testing/sysfs-fs-f2fs
> index 94132745ecbe..b2d8c1e84073 100644
> --- a/Documentation/ABI/testing/sysfs-fs-f2fs
> +++ b/Documentation/ABI/testing/sysfs-fs-f2fs
> @@ -729,3 +729,9 @@ What: /sys/fs/f2fs/<disk>/last_age_weight
> Date: January 2023
> Contact: "Ping Xiong" <[email protected]>
> Description: When DATA SEPARATION is on, it controls the weight of last data block age.
> +
> +What: /sys/fs/f2fs/<disk>/ipu_mode
> +Date: February 2023
> +Contact: "Yangtao Li" <[email protected]>
> +Description: Show the current ipu policy as a string.
> + This is a read-only entry.
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index 44f2d76525bf..b699ed74f438 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -1070,7 +1070,7 @@ struct f2fs_sm_info {
>
> struct list_head sit_entry_set; /* sit entry set list */
>
> - unsigned int ipu_policy; /* in-place-update policy */
> + unsigned long ipu_policy; /* in-place-update policy */
> unsigned int min_ipu_util; /* in-place-update threshold */
> unsigned int min_fsync_blocks; /* threshold for fsync */
> unsigned int min_seq_blocks; /* threshold for sequential blocks */
> @@ -1322,7 +1322,7 @@ enum {
> MAX_TIME,
> };
>
> -/* Note that you need to keep synchronization with this gc_mode_names array */
> +/* Modification on enum should be synchronized with gc_mode_names array */
> enum {
> GC_NORMAL,
> GC_IDLE_CB,
> diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
> index 8ee5e5db9287..92c8be00d396 100644
> --- a/fs/f2fs/segment.h
> +++ b/fs/f2fs/segment.h
> @@ -672,6 +672,7 @@ static inline int utilization(struct f2fs_sb_info *sbi)
>
> #define F2FS_IPU_DISABLE 0
>
> +/* Modification on enum should be synchronized with ipu_mode_names array */
> enum {
> F2FS_IPU_FORCE,
> F2FS_IPU_SSR,
> diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
> index 3c3dae3ce84e..4a2d895cd52c 100644
> --- a/fs/f2fs/sysfs.c
> +++ b/fs/f2fs/sysfs.c
> @@ -51,6 +51,17 @@ static const char *gc_mode_names[MAX_GC_MODE] = {
> "GC_URGENT_MID"
> };
>
> +static const char *ipu_mode_names[F2FS_IPU_MAX] = {
> + "FORCE",
> + "SSR",
> + "UTIL",
> + "SSR_UTIL",
> + "FSYNC",
> + "ASYNC",
> + "NOCACHE",
> + "HONOR_OPU_WRITE",
> +};
> +
> struct f2fs_attr {
> struct attribute attr;
> ssize_t (*show)(struct f2fs_attr *a, struct f2fs_sb_info *sbi, char *buf);
> @@ -149,6 +160,19 @@ static ssize_t gc_mode_show(struct f2fs_attr *a,
> return sysfs_emit(buf, "%s\n", gc_mode_names[sbi->gc_mode]);
> }
>
> +static ssize_t ipu_mode_show(struct f2fs_attr *a,
> + struct f2fs_sb_info *sbi, char *buf)
> +{
> + int len = 0, i = 0;
> +
> + if (SM_I(sbi)->ipu_policy == F2FS_IPU_DISABLE)
> + return sysfs_emit(buf, "DISABLE\n");
> +
> + for_each_set_bit(i, &SM_I(sbi)->ipu_policy, F2FS_IPU_MAX)
> + len += scnprintf(buf + len, PAGE_SIZE - len, "%s\n", ipu_mode_names[i]);
I believe this would not be a good usecase for the sysfs entry. How about
putting the info in debugfs?
> + return len;
> +}
> +
> static ssize_t features_show(struct f2fs_attr *a,
> struct f2fs_sb_info *sbi, char *buf)
> {
> @@ -711,7 +735,7 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
> return -EINVAL;
> if (t && f2fs_lfs_mode(sbi))
> return -EINVAL;
> - SM_I(sbi)->ipu_policy = (unsigned int)t;
> + SM_I(sbi)->ipu_policy = t;
> return count;
> }
>
> @@ -907,6 +931,7 @@ F2FS_GENERAL_RO_ATTR(mounted_time_sec);
> F2FS_GENERAL_RO_ATTR(main_blkaddr);
> F2FS_GENERAL_RO_ATTR(pending_discard);
> F2FS_GENERAL_RO_ATTR(gc_mode);
> +F2FS_GENERAL_RO_ATTR(ipu_mode);
> #ifdef CONFIG_F2FS_STAT_FS
> F2FS_STAT_ATTR(STAT_INFO, f2fs_stat_info, cp_foreground_calls, cp_count);
> F2FS_STAT_ATTR(STAT_INFO, f2fs_stat_info, cp_background_calls, bg_cp_count);
> @@ -997,6 +1022,7 @@ static struct attribute *f2fs_attrs[] = {
> ATTR_LIST(max_ordered_discard),
> ATTR_LIST(pending_discard),
> ATTR_LIST(gc_mode),
> + ATTR_LIST(ipu_mode),
> ATTR_LIST(ipu_policy),
> ATTR_LIST(min_ipu_util),
> ATTR_LIST(min_fsync_blocks),
> --
> 2.25.1
Hello:
This series was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:
On Mon, 6 Feb 2023 22:43:08 +0800 you wrote:
> 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.
>
> [...]
Here is the summary with links:
- [f2fs-dev,v4,1/3] f2fs: fix to set ipu policy
(no matching commit)
- [f2fs-dev,v4,2/3] f2fs: add missing description for ipu_policy node
https://git.kernel.org/jaegeuk/f2fs/c/9e615dbba41e
- [f2fs-dev,v4,3/3] f2fs: introduce ipu_mode sysfs node
(no matching commit)
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html