f2fs: flush error flags in workqueue
Chao Yu
maintainerPATCH v2 1/1 f2fs: flush error flags in workqueue
In IRQ context, it wakes up workqueue to record errors into on-disk superblock fields rather than in-memory fields.
Signed-off-by Chao Yu <[email protected]>
---
v2:
- make f2fs_record_errors() static.
fs/f2fs/compress.c | 2 +- fs/f2fs/f2fs.h | 1 + fs/f2fs/super.c | 26 +++++++++++++++++++++++--- 3 files changed, 25 insertions(+), 4 deletions(-)
fs/f2fs/compress.c +1 -1
@@ -744,7 +744,7 @@ void f2fs_decompress_cluster(struct decompress_io_ctx *dic, bool in_task)/* Avoid f2fs_commit_super in irq context */ if (!in_task) -f2fs_save_errors (sbi,ERROR_FAIL_DECOMPRESSION ); +f2fs_handle_error_async (sbi,ERROR_FAIL_DECOMPRESSION );else f2fs_handle_error (sbi,ERROR_FAIL_DECOMPRESSION ); goto out_release;
fs/f2fs/f2fs.h +1 -0
@@ -3563,6 +3563,7 @@ void f2fs_save_errors(struct f2fs_sb_info *sbi, unsigned char flag);void f2fs_handle_critical_error (struct f2fs_sb_info *sbi,unsigned char reason,bool irq_context);void f2fs_handle_error (struct f2fs_sb_info *sbi,unsigned char error); +void f2fs_handle_error_async (struct f2fs_sb_info *sbi,unsigned char error);int f2fs_commit_super (struct f2fs_sb_info *sbi,bool recover);int f2fs_sync_fs (struct super_block *sb,int sync);int f2fs_sanity_check_ckpt (struct f2fs_sb_info *sbi);
fs/f2fs/super.c +23 -3
@@ -3980,6 +3980,11 @@ static void f2fs_record_stop_reason(struct f2fs_sb_info *sbi)f2fs_down_write (&sbi->sb_lock);spin_lock_irqsave (&sbi->error_lock, flags); +if (sbi->error_dirty) { +memcpy (F2FS_RAW_SUPER (sbi)->s_errors, sbi->errors, +MAX_F2FS_ERRORS ); + sbi->error_dirty = false; + }memcpy (raw_super->s_stop_reason, sbi->stop_reason,MAX_STOP_REASON );spin_unlock_irqrestore (&sbi->error_lock, flags);
@@ -4019,12 +4024,10 @@ static bool f2fs_update_errors(struct f2fs_sb_info *sbi)return need_update; } -void f2fs_handle_error (struct f2fs_sb_info *sbi,unsigned char error) +static void f2fs_record_errors (struct f2fs_sb_info *sbi,unsigned char error) {int err; -f2fs_save_errors (sbi, error); -f2fs_down_write (&sbi->sb_lock);if (!f2fs_update_errors (sbi))
@@ -4038,6 +4041,23 @@ void f2fs_handle_error(struct f2fs_sb_info *sbi, unsigned char error)f2fs_up_write (&sbi->sb_lock); } +void f2fs_handle_error (struct f2fs_sb_info *sbi,unsigned char error) +{ +f2fs_save_errors (sbi, error); +f2fs_record_errors (sbi, error); +} + +void f2fs_handle_error_async (struct f2fs_sb_info *sbi,unsigned char error) +{ +f2fs_save_errors (sbi, error); + +if (!sbi->error_dirty) +return ; +if (!test_bit (error, (unsigned long *)sbi->errors)) +return ; +schedule_work (&sbi->s_error_work); +} +static bool system_going_down (void ) {return system_state ==SYSTEM_HALT || system_state ==SYSTEM_POWER_OFF
Signature · 1 line
2.25.1
Jaegeuk Kim
maintainerQuoted 3 lines · Chao Yu
In IRQ context, it wakes up workqueue to record errors into on-disk superblock fields rather than in-memory fields.
Fixes ?
Quoted 90 lines
Signed-off-by Chao Yu <[email protected]>---
v2:
- makef2fs_record_errors()static.fs/f2fs/compress.c | 2 +- fs/f2fs/f2fs.h | 1 + fs/f2fs/super.c | 26 +++++++++++++++++++++++--- 3 files changed, 25 insertions(+), 4 deletions(-)fs/f2fs/compress.c +1
-1@@ -744,7 +744,7 @@ void f2fs_decompress_cluster(struct decompress_io_ctx *dic, bool in_task)/* Avoid f2fs_commit_super in irq context */ if (!in_task) -f2fs_save_errors (sbi,ERROR_FAIL_DECOMPRESSION ); +f2fs_handle_error_async (sbi,ERROR_FAIL_DECOMPRESSION );else f2fs_handle_error (sbi,ERROR_FAIL_DECOMPRESSION ); goto out_release;fs/f2fs/f2fs.h +1
-0@@ -3563,6 +3563,7 @@ void f2fs_save_errors(struct f2fs_sb_info *sbi, unsigned char flag);void f2fs_handle_critical_error (struct f2fs_sb_info *sbi,unsigned char reason,bool irq_context);void f2fs_handle_error (struct f2fs_sb_info *sbi,unsigned char error); +void f2fs_handle_error_async (struct f2fs_sb_info *sbi,unsigned char error);int f2fs_commit_super (struct f2fs_sb_info *sbi,bool recover);int f2fs_sync_fs (struct super_block *sb,int sync);int f2fs_sanity_check_ckpt (struct f2fs_sb_info *sbi);fs/f2fs/super.c +23
-3@@ -3980,6 +3980,11 @@ static void f2fs_record_stop_reason(struct f2fs_sb_info *sbi)f2fs_down_write (&sbi->sb_lock);spin_lock_irqsave (&sbi->error_lock, flags); +if (sbi->error_dirty) { +memcpy (F2FS_RAW_SUPER (sbi)->s_errors, sbi->errors, +MAX_F2FS_ERRORS ); + sbi->error_dirty = false; + }memcpy (raw_super->s_stop_reason, sbi->stop_reason,MAX_STOP_REASON );spin_unlock_irqrestore (&sbi->error_lock, flags);@@ -4019,12 +4024,10 @@ static bool f2fs_update_errors(struct f2fs_sb_info *sbi)return need_update; } -void f2fs_handle_error (struct f2fs_sb_info *sbi,unsigned char error) +static void f2fs_record_errors (struct f2fs_sb_info *sbi,unsigned char error) {int err; -f2fs_save_errors (sbi, error); -f2fs_down_write (&sbi->sb_lock);if (!f2fs_update_errors (sbi))@@ -4038,6 +4041,23 @@ void f2fs_handle_error(struct f2fs_sb_info *sbi, unsigned char error)f2fs_up_write (&sbi->sb_lock); } +void f2fs_handle_error (struct f2fs_sb_info *sbi,unsigned char error) +{ +f2fs_save_errors (sbi, error); +f2fs_record_errors (sbi, error); +} + +void f2fs_handle_error_async (struct f2fs_sb_info *sbi,unsigned char error) +{ +f2fs_save_errors (sbi, error); + +if (!sbi->error_dirty) +return ; +if (!test_bit (error, (unsigned long *)sbi->errors)) +return ; +schedule_work (&sbi->s_error_work); +} +static bool system_going_down (void ) {return system_state ==SYSTEM_HALT || system_state ==SYSTEM_POWER_OFF Signature · 1 line
2.25.1