* [PATCH v2 1/2] f2fs: add a proc entry show inject stats
@ 2025-03-20 2:22 Chao Yu
2025-03-20 2:22 ` [PATCH v2 2/2] f2fs: fix to update injection attrs according to fault_option Chao Yu
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Chao Yu @ 2025-03-20 2:22 UTC (permalink / raw)
To: jaegeuk; +Cc: linux-f2fs-devel, linux-kernel, Chao Yu
This patch adds a proc entry named inject_stats to show total injected
count for each fault type.
cat /proc/fs/f2fs/<dev>/inject_stats
fault_type injected_count
kmalloc 0
kvmalloc 0
page alloc 0
page get 0
alloc bio(obsolete) 0
alloc nid 0
orphan 0
no more block 0
too big dir depth 0
evict_inode fail 0
truncate fail 0
read IO error 0
checkpoint error 0
discard error 0
write IO error 0
slab alloc 0
dquot initialize 0
lock_op 0
invalid blkaddr 0
inconsistent blkaddr 0
no free segment 0
inconsistent footer 0
Signed-off-by: Chao Yu <chao@kernel.org>
---
v2:
- add missing CONFIG_F2FS_FAULT_INJECTION
fs/f2fs/f2fs.h | 3 +++
fs/f2fs/super.c | 1 +
fs/f2fs/sysfs.c | 22 ++++++++++++++++++++++
3 files changed, 26 insertions(+)
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index f1576dc6ec67..986ee5b9326d 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -73,6 +73,8 @@ struct f2fs_fault_info {
atomic_t inject_ops;
int inject_rate;
unsigned int inject_type;
+ /* Used to account total count of injection for each type */
+ unsigned int inject_count[FAULT_MAX];
};
extern const char *f2fs_fault_name[FAULT_MAX];
@@ -1902,6 +1904,7 @@ static inline bool __time_to_inject(struct f2fs_sb_info *sbi, int type,
atomic_inc(&ffi->inject_ops);
if (atomic_read(&ffi->inject_ops) >= ffi->inject_rate) {
atomic_set(&ffi->inject_ops, 0);
+ ffi->inject_count[type]++;
f2fs_info_ratelimited(sbi, "inject %s in %s of %pS",
f2fs_fault_name[type], func, parent_func);
return true;
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index f087b2b71c89..dfe0604ab558 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -47,6 +47,7 @@ const char *f2fs_fault_name[FAULT_MAX] = {
[FAULT_KVMALLOC] = "kvmalloc",
[FAULT_PAGE_ALLOC] = "page alloc",
[FAULT_PAGE_GET] = "page get",
+ [FAULT_ALLOC_BIO] = "alloc bio(obsolete)",
[FAULT_ALLOC_NID] = "alloc nid",
[FAULT_ORPHAN] = "orphan",
[FAULT_BLOCK] = "no more block",
diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index c69161366467..46fa94db08a8 100644
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -1679,6 +1679,24 @@ static int __maybe_unused disk_map_seq_show(struct seq_file *seq,
return 0;
}
+#ifdef CONFIG_F2FS_FAULT_INJECTION
+static int __maybe_unused inject_stats_seq_show(struct seq_file *seq,
+ void *offset)
+{
+ struct super_block *sb = seq->private;
+ struct f2fs_sb_info *sbi = F2FS_SB(sb);
+ struct f2fs_fault_info *ffi = &F2FS_OPTION(sbi).fault_info;
+ int i;
+
+ seq_puts(seq, "fault_type injected_count\n");
+
+ for (i = 0; i < FAULT_MAX; i++)
+ seq_printf(seq, "%-24s%-10u\n", f2fs_fault_name[i],
+ ffi->inject_count[i]);
+ return 0;
+}
+#endif
+
int __init f2fs_init_sysfs(void)
{
int ret;
@@ -1770,6 +1788,10 @@ int f2fs_register_sysfs(struct f2fs_sb_info *sbi)
discard_plist_seq_show, sb);
proc_create_single_data("disk_map", 0444, sbi->s_proc,
disk_map_seq_show, sb);
+#ifdef CONFIG_F2FS_FAULT_INJECTION
+ proc_create_single_data("inject_stats", 0444, sbi->s_proc,
+ inject_stats_seq_show, sb);
+#endif
return 0;
put_feature_list_kobj:
kobject_put(&sbi->s_feature_list_kobj);
--
2.48.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] f2fs: fix to update injection attrs according to fault_option
2025-03-20 2:22 [PATCH v2 1/2] f2fs: add a proc entry show inject stats Chao Yu
@ 2025-03-20 2:22 ` Chao Yu
2025-03-20 3:32 ` [f2fs-dev] [PATCH v2 1/2] f2fs: add a proc entry show inject stats Zhiguo Niu
2025-04-10 4:10 ` patchwork-bot+f2fs
2 siblings, 0 replies; 4+ messages in thread
From: Chao Yu @ 2025-03-20 2:22 UTC (permalink / raw)
To: jaegeuk; +Cc: linux-f2fs-devel, linux-kernel, Chao Yu
When we update inject type via sysfs, it shows wrong rate value as
below, there is a same problem when we update inject rate, fix it.
Before:
F2FS-fs (vdd): build fault injection attr: rate: 0, type: 0xffff
F2FS-fs (vdd): build fault injection attr: rate: 1, type: 0x0
After:
F2FS-fs (vdd): build fault injection type: 0x1
F2FS-fs (vdd): build fault injection rate: 1
Meanwhile, let's avoid turning on all fault types when we enable fault
injection via fault_injection mount option, it will lead to shutdown
filesystem or fail the mount() easily.
mount -o fault_injection=4 /dev/vdd /mnt/f2fs
F2FS-fs (vdd): build fault injection attr: rate: 4, type: 0x7fffff
F2FS-fs (vdd): inject kmalloc in f2fs_kmalloc of f2fs_fill_super+0xbdf/0x27c0
Signed-off-by: Chao Yu <chao@kernel.org>
---
v2
- no changes
fs/f2fs/checkpoint.c | 2 +-
fs/f2fs/f2fs.h | 14 ++++++++++----
fs/f2fs/super.c | 26 +++++++++++++-------------
fs/f2fs/sysfs.c | 4 ++--
4 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index cf77987d0698..85b7141f0d89 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -29,7 +29,7 @@ struct kmem_cache *f2fs_inode_entry_slab;
void f2fs_stop_checkpoint(struct f2fs_sb_info *sbi, bool end_io,
unsigned char reason)
{
- f2fs_build_fault_attr(sbi, 0, 0);
+ f2fs_build_fault_attr(sbi, 0, 0, FAULT_ALL);
if (!end_io)
f2fs_flush_merged_writes(sbi);
f2fs_handle_critical_error(sbi, reason);
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 986ee5b9326d..ca884e39a5ff 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -66,9 +66,14 @@ enum {
FAULT_MAX,
};
-#ifdef CONFIG_F2FS_FAULT_INJECTION
-#define F2FS_ALL_FAULT_TYPE (GENMASK(FAULT_MAX - 1, 0))
+/* indicate which option to update */
+enum fault_option {
+ FAULT_RATE = 1, /* only update fault rate */
+ FAULT_TYPE = 2, /* only update fault type */
+ FAULT_ALL = 4, /* reset all fault injection options/stats */
+};
+#ifdef CONFIG_F2FS_FAULT_INJECTION
struct f2fs_fault_info {
atomic_t inject_ops;
int inject_rate;
@@ -4765,10 +4770,11 @@ static inline bool f2fs_need_verity(const struct inode *inode, pgoff_t idx)
#ifdef CONFIG_F2FS_FAULT_INJECTION
extern int f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned long rate,
- unsigned long type);
+ unsigned long type, enum fault_option fo);
#else
static inline int f2fs_build_fault_attr(struct f2fs_sb_info *sbi,
- unsigned long rate, unsigned long type)
+ unsigned long rate, unsigned long type,
+ enum fault_option fo)
{
return 0;
}
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index dfe0604ab558..011925ee54f8 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -68,29 +68,30 @@ const char *f2fs_fault_name[FAULT_MAX] = {
};
int f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned long rate,
- unsigned long type)
+ unsigned long type, enum fault_option fo)
{
struct f2fs_fault_info *ffi = &F2FS_OPTION(sbi).fault_info;
- if (rate) {
+ if (fo & FAULT_ALL) {
+ memset(ffi, 0, sizeof(struct f2fs_fault_info));
+ return 0;
+ }
+
+ if (fo & FAULT_RATE) {
if (rate > INT_MAX)
return -EINVAL;
atomic_set(&ffi->inject_ops, 0);
ffi->inject_rate = (int)rate;
+ f2fs_info(sbi, "build fault injection rate: %lu", rate);
}
- if (type) {
+ if (fo & FAULT_TYPE) {
if (type >= BIT(FAULT_MAX))
return -EINVAL;
ffi->inject_type = (unsigned int)type;
+ f2fs_info(sbi, "build fault injection type: 0x%lx", type);
}
- if (!rate && !type)
- memset(ffi, 0, sizeof(struct f2fs_fault_info));
- else
- f2fs_info(sbi,
- "build fault injection attr: rate: %lu, type: 0x%lx",
- rate, type);
return 0;
}
#endif
@@ -897,8 +898,7 @@ static int parse_options(struct f2fs_sb_info *sbi, char *options, bool is_remoun
case Opt_fault_injection:
if (args->from && match_int(args, &arg))
return -EINVAL;
- if (f2fs_build_fault_attr(sbi, arg,
- F2FS_ALL_FAULT_TYPE))
+ if (f2fs_build_fault_attr(sbi, arg, 0, FAULT_RATE))
return -EINVAL;
set_opt(sbi, FAULT_INJECTION);
break;
@@ -906,7 +906,7 @@ static int parse_options(struct f2fs_sb_info *sbi, char *options, bool is_remoun
case Opt_fault_type:
if (args->from && match_int(args, &arg))
return -EINVAL;
- if (f2fs_build_fault_attr(sbi, 0, arg))
+ if (f2fs_build_fault_attr(sbi, 0, arg, FAULT_TYPE))
return -EINVAL;
set_opt(sbi, FAULT_INJECTION);
break;
@@ -2209,7 +2209,7 @@ static void default_options(struct f2fs_sb_info *sbi, bool remount)
set_opt(sbi, POSIX_ACL);
#endif
- f2fs_build_fault_attr(sbi, 0, 0);
+ f2fs_build_fault_attr(sbi, 0, 0, FAULT_ALL);
}
#ifdef CONFIG_QUOTA
diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index 46fa94db08a8..3a3485622691 100644
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -494,12 +494,12 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
return ret;
#ifdef CONFIG_F2FS_FAULT_INJECTION
if (a->struct_type == FAULT_INFO_TYPE) {
- if (f2fs_build_fault_attr(sbi, 0, t))
+ if (f2fs_build_fault_attr(sbi, 0, t, FAULT_TYPE))
return -EINVAL;
return count;
}
if (a->struct_type == FAULT_INFO_RATE) {
- if (f2fs_build_fault_attr(sbi, t, 0))
+ if (f2fs_build_fault_attr(sbi, t, 0, FAULT_RATE))
return -EINVAL;
return count;
}
--
2.48.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [f2fs-dev] [PATCH v2 1/2] f2fs: add a proc entry show inject stats
2025-03-20 2:22 [PATCH v2 1/2] f2fs: add a proc entry show inject stats Chao Yu
2025-03-20 2:22 ` [PATCH v2 2/2] f2fs: fix to update injection attrs according to fault_option Chao Yu
@ 2025-03-20 3:32 ` Zhiguo Niu
2025-04-10 4:10 ` patchwork-bot+f2fs
2 siblings, 0 replies; 4+ messages in thread
From: Zhiguo Niu @ 2025-03-20 3:32 UTC (permalink / raw)
To: Chao Yu; +Cc: jaegeuk, linux-kernel, linux-f2fs-devel
Chao Yu via Linux-f2fs-devel <linux-f2fs-devel@lists.sourceforge.net>
于2025年3月20日周四 10:27写道：
>
> This patch adds a proc entry named inject_stats to show total injected
> count for each fault type.
>
> cat /proc/fs/f2fs/<dev>/inject_stats
> fault_type injected_count
> kmalloc 0
> kvmalloc 0
> page alloc 0
> page get 0
> alloc bio(obsolete) 0
> alloc nid 0
> orphan 0
> no more block 0
> too big dir depth 0
> evict_inode fail 0
> truncate fail 0
> read IO error 0
> checkpoint error 0
> discard error 0
> write IO error 0
> slab alloc 0
> dquot initialize 0
> lock_op 0
> invalid blkaddr 0
> inconsistent blkaddr 0
> no free segment 0
> inconsistent footer 0
>
> Signed-off-by: Chao Yu <chao@kernel.org>
Reviewed-by: Zhiguo Niu <zhiguo.niu@unisoc.com>
thanks！
> ---
> v2:
> - add missing CONFIG_F2FS_FAULT_INJECTION
> fs/f2fs/f2fs.h | 3 +++
> fs/f2fs/super.c | 1 +
> fs/f2fs/sysfs.c | 22 ++++++++++++++++++++++
> 3 files changed, 26 insertions(+)
>
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index f1576dc6ec67..986ee5b9326d 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -73,6 +73,8 @@ struct f2fs_fault_info {
> atomic_t inject_ops;
> int inject_rate;
> unsigned int inject_type;
> + /* Used to account total count of injection for each type */
> + unsigned int inject_count[FAULT_MAX];
> };
>
> extern const char *f2fs_fault_name[FAULT_MAX];
> @@ -1902,6 +1904,7 @@ static inline bool __time_to_inject(struct f2fs_sb_info *sbi, int type,
> atomic_inc(&ffi->inject_ops);
> if (atomic_read(&ffi->inject_ops) >= ffi->inject_rate) {
> atomic_set(&ffi->inject_ops, 0);
> + ffi->inject_count[type]++;
> f2fs_info_ratelimited(sbi, "inject %s in %s of %pS",
> f2fs_fault_name[type], func, parent_func);
> return true;
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index f087b2b71c89..dfe0604ab558 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -47,6 +47,7 @@ const char *f2fs_fault_name[FAULT_MAX] = {
> [FAULT_KVMALLOC] = "kvmalloc",
> [FAULT_PAGE_ALLOC] = "page alloc",
> [FAULT_PAGE_GET] = "page get",
> + [FAULT_ALLOC_BIO] = "alloc bio(obsolete)",
> [FAULT_ALLOC_NID] = "alloc nid",
> [FAULT_ORPHAN] = "orphan",
> [FAULT_BLOCK] = "no more block",
> diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
> index c69161366467..46fa94db08a8 100644
> --- a/fs/f2fs/sysfs.c
> +++ b/fs/f2fs/sysfs.c
> @@ -1679,6 +1679,24 @@ static int __maybe_unused disk_map_seq_show(struct seq_file *seq,
> return 0;
> }
>
> +#ifdef CONFIG_F2FS_FAULT_INJECTION
> +static int __maybe_unused inject_stats_seq_show(struct seq_file *seq,
> + void *offset)
> +{
> + struct super_block *sb = seq->private;
> + struct f2fs_sb_info *sbi = F2FS_SB(sb);
> + struct f2fs_fault_info *ffi = &F2FS_OPTION(sbi).fault_info;
> + int i;
> +
> + seq_puts(seq, "fault_type injected_count\n");
> +
> + for (i = 0; i < FAULT_MAX; i++)
> + seq_printf(seq, "%-24s%-10u\n", f2fs_fault_name[i],
> + ffi->inject_count[i]);
> + return 0;
> +}
> +#endif
> +
> int __init f2fs_init_sysfs(void)
> {
> int ret;
> @@ -1770,6 +1788,10 @@ int f2fs_register_sysfs(struct f2fs_sb_info *sbi)
> discard_plist_seq_show, sb);
> proc_create_single_data("disk_map", 0444, sbi->s_proc,
> disk_map_seq_show, sb);
> +#ifdef CONFIG_F2FS_FAULT_INJECTION
> + proc_create_single_data("inject_stats", 0444, sbi->s_proc,
> + inject_stats_seq_show, sb);
> +#endif
> return 0;
> put_feature_list_kobj:
> kobject_put(&sbi->s_feature_list_kobj);
> --
> 2.48.1
>
>
>
> _______________________________________________
> Linux-f2fs-devel mailing list
> Linux-f2fs-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [f2fs-dev] [PATCH v2 1/2] f2fs: add a proc entry show inject stats
2025-03-20 2:22 [PATCH v2 1/2] f2fs: add a proc entry show inject stats Chao Yu
2025-03-20 2:22 ` [PATCH v2 2/2] f2fs: fix to update injection attrs according to fault_option Chao Yu
2025-03-20 3:32 ` [f2fs-dev] [PATCH v2 1/2] f2fs: add a proc entry show inject stats Zhiguo Niu
@ 2025-04-10 4:10 ` patchwork-bot+f2fs
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+f2fs @ 2025-04-10 4:10 UTC (permalink / raw)
To: Chao Yu; +Cc: jaegeuk, linux-kernel, linux-f2fs-devel
Hello:
This series was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <jaegeuk@kernel.org>:
On Thu, 20 Mar 2025 10:22:29 +0800 you wrote:
> This patch adds a proc entry named inject_stats to show total injected
> count for each fault type.
>
> cat /proc/fs/f2fs/<dev>/inject_stats
> fault_type injected_count
> kmalloc 0
> kvmalloc 0
> page alloc 0
> page get 0
> alloc bio(obsolete) 0
> alloc nid 0
> orphan 0
> no more block 0
> too big dir depth 0
> evict_inode fail 0
> truncate fail 0
> read IO error 0
> checkpoint error 0
> discard error 0
> write IO error 0
> slab alloc 0
> dquot initialize 0
> lock_op 0
> invalid blkaddr 0
> inconsistent blkaddr 0
> no free segment 0
> inconsistent footer 0
>
> [...]
Here is the summary with links:
- [f2fs-dev,v2,1/2] f2fs: add a proc entry show inject stats
https://git.kernel.org/jaegeuk/f2fs/c/e073e9278983
- [f2fs-dev,v2,2/2] f2fs: fix to update injection attrs according to fault_option
https://git.kernel.org/jaegeuk/f2fs/c/2be96c2147e2
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-04-10 4:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-20 2:22 [PATCH v2 1/2] f2fs: add a proc entry show inject stats Chao Yu
2025-03-20 2:22 ` [PATCH v2 2/2] f2fs: fix to update injection attrs according to fault_option Chao Yu
2025-03-20 3:32 ` [f2fs-dev] [PATCH v2 1/2] f2fs: add a proc entry show inject stats Zhiguo Niu
2025-04-10 4:10 ` patchwork-bot+f2fs
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox