[PATCH 1/3] f2fs: rename flush_error_work() to f2fs_record_error_work()

[PATCH 1/3] f2fs: rename flush_error_work() to f2fs_record_error_work()

[Yangtao Li]

Since it is an f2fs module, it is best to prefix function names
with f2fs_. At the same time, there is already a flush thread
and related functions in the system, rename flush_error_work()
to f2fs_record_error_work().

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/super.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index a241e4073f1d..fc220b5c5599 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -4019,7 +4019,7 @@ void f2fs_handle_critical_error(struct f2fs_sb_info *sbi, unsigned char reason,
 	f2fs_stop_discard_thread(sbi);
 }
 
-static void flush_error_work(struct work_struct *work)
+static void f2fs_record_error_work(struct work_struct *work)
 {
 	struct f2fs_sb_info *sbi = container_of(work,
 					struct f2fs_sb_info, s_error_work);
@@ -4374,7 +4374,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
 		goto free_devices;
 	}
 
-	INIT_WORK(&sbi->s_error_work, flush_error_work);
+	INIT_WORK(&sbi->s_error_work, f2fs_record_error_work);
 	spin_lock_init(&sbi->error_lock);
 	memcpy(sbi->errors, raw_super->s_errors, MAX_F2FS_ERRORS);
 	memcpy(sbi->stop_reason, raw_super->s_stop_reason, MAX_STOP_REASON);
-- 
2.25.1

[PATCH 2/3] f2fs: export f2fs_stop_flush_thread() for external use

[Yangtao Li]

Need to stop the flush thread running externally,
so export it.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/f2fs.h    | 1 +
 fs/f2fs/segment.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index b467c0ca1118..0d072b029187 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3732,6 +3732,7 @@ unsigned int f2fs_usable_segs_in_sec(struct f2fs_sb_info *sbi,
 			unsigned int segno);
 unsigned int f2fs_usable_blks_in_seg(struct f2fs_sb_info *sbi,
 			unsigned int segno);
+void f2fs_stop_flush_thread(struct f2fs_sb_info *sbi);
 
 #define DEF_FRAGMENT_SIZE	4
 #define MIN_FRAGMENT_SIZE	1
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 282616e6852a..f0f52979397e 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -671,7 +671,7 @@ int f2fs_create_flush_cmd_control(struct f2fs_sb_info *sbi)
 	return 0;
 }
 
-void f2fs_destroy_flush_cmd_control(struct f2fs_sb_info *sbi, bool free)
+void f2fs_stop_flush_thread(struct f2fs_sb_info *sbi)
 {
 	struct flush_cmd_control *fcc = SM_I(sbi)->fcc_info;
 
@@ -681,6 +681,13 @@ void f2fs_destroy_flush_cmd_control(struct f2fs_sb_info *sbi, bool free)
 		fcc->f2fs_issue_flush = NULL;
 		kthread_stop(flush_thread);
 	}
+}
+
+void f2fs_destroy_flush_cmd_control(struct f2fs_sb_info *sbi, bool free)
+{
+	struct flush_cmd_control *fcc = SM_I(sbi)->fcc_info;
+
+	f2fs_stop_flush_thread(sbi);
 	if (free) {
 		kfree(fcc);
 		SM_I(sbi)->fcc_info = NULL;
-- 
2.25.1

[PATCH 3/3] f2fs: fix to f2fs_handle_critical_error when errors=remount-ro

[Yangtao Li]

When a fatal error occurs in the file system and it is
remounted to ro mode, the flush thread needs to be stopped.

Fixes: d81ab30e85a5 ("f2fs: support errors=remount-ro|continue|panic mountoption")
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/super.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index fc220b5c5599..3a1238a82dc9 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -4017,6 +4017,7 @@ void f2fs_handle_critical_error(struct f2fs_sb_info *sbi, unsigned char reason,
 
 	f2fs_stop_gc_thread(sbi);
 	f2fs_stop_discard_thread(sbi);
+	f2fs_stop_flush_thread(sbi);
 }
 
 static void f2fs_record_error_work(struct work_struct *work)
-- 
2.25.1

Re: [PATCH 3/3] f2fs: fix to f2fs_handle_critical_error when errors=remount-ro

[Chao Yu]

On 2022/10/27 20:08, Yangtao Li wrote:
> When a fatal error occurs in the file system and it is
> remounted to ro mode, the flush thread needs to be stopped.
> 
> Fixes: d81ab30e85a5 ("f2fs: support errors=remount-ro|continue|panic mountoption")

Do you mind letting me merge these two patches into original patch?
since original patch is still in dev branch, rather than mainline.

I guess it needs to stop ckpt thread as well...

Thanks,

> Signed-off-by: Yangtao Li <frank.li@vivo.com>
> ---
>   fs/f2fs/super.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index fc220b5c5599..3a1238a82dc9 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -4017,6 +4017,7 @@ void f2fs_handle_critical_error(struct f2fs_sb_info *sbi, unsigned char reason,
>   
>   	f2fs_stop_gc_thread(sbi);
>   	f2fs_stop_discard_thread(sbi);
> +	f2fs_stop_flush_thread(sbi);
>   }
>   
>   static void f2fs_record_error_work(struct work_struct *work)

Re: [PATCH 3/3] f2fs: fix to f2fs_handle_critical_error when errors=remount-ro

[Yangtao Li]

> It won't pollute global namespace since it's a static function just be used in f2fs/super.c...

emm, I think it would be nice to see the f2fs_record_error_work symbol
in the stack, it can be explicitly a function of f2fs. personal opinion for reference only.

> Do you mind letting me merge these two patches into original patch?
> since original patch is still in dev branch, rather than mainline.

Glad to see, if resend.

> I guess it needs to stop ckpt thread as well...

agree, :)

Thanks,

Re: [PATCH 3/3] f2fs: fix to f2fs_handle_critical_error when errors=remount-ro

[Chao Yu]

On 2022/10/28 10:33, Yangtao Li wrote:
>> It won't pollute global namespace since it's a static function just be used in f2fs/super.c...
> 
> emm, I think it would be nice to see the f2fs_record_error_work symbol
> in the stack, it can be explicitly a function of f2fs. personal opinion for reference only.

Oh, yes, let me update in original patch as well.

> 
>> Do you mind letting me merge these two patches into original patch?
>> since original patch is still in dev branch, rather than mainline.
> 
> Glad to see, if resend.

Thanks, :)

> 
>> I guess it needs to stop ckpt thread as well...
> 
> agree, :)
> 
> Thanks,

Re: [PATCH 3/3] f2fs: fix to f2fs_handle_critical_error when errors=remount-ro

[Jaegeuk Kim]

On 10/28, Chao Yu wrote:
> On 2022/10/28 10:33, Yangtao Li wrote:
> > > It won't pollute global namespace since it's a static function just be used in f2fs/super.c...
> > 
> > emm, I think it would be nice to see the f2fs_record_error_work symbol
> > in the stack, it can be explicitly a function of f2fs. personal opinion for reference only.
> 
> Oh, yes, let me update in original patch as well.

Chao,

It seems there're multiple bugs. Please apply this as well.

https://lore.kernel.org/linux-f2fs-devel/20221027180416.3786792-1-jaegeuk@kernel.org/T/#u

> 
> > 
> > > Do you mind letting me merge these two patches into original patch?
> > > since original patch is still in dev branch, rather than mainline.
> > 
> > Glad to see, if resend.
> 
> Thanks, :)
> 
> > 
> > > I guess it needs to stop ckpt thread as well...
> > 
> > agree, :)
> > 
> > Thanks,

Re: [PATCH 3/3] f2fs: fix to f2fs_handle_critical_error when errors=remount-ro

[Chao Yu]

On 2022/10/28 11:17, Jaegeuk Kim wrote:
> On 10/28, Chao Yu wrote:
>> On 2022/10/28 10:33, Yangtao Li wrote:
>>>> It won't pollute global namespace since it's a static function just be used in f2fs/super.c...
>>>
>>> emm, I think it would be nice to see the f2fs_record_error_work symbol
>>> in the stack, it can be explicitly a function of f2fs. personal opinion for reference only.
>>
>> Oh, yes, let me update in original patch as well.
> 
> Chao,
> 
> It seems there're multiple bugs. Please apply this as well.
> 
> https://lore.kernel.org/linux-f2fs-devel/20221027180416.3786792-1-jaegeuk@kernel.org/T/#u

Jaegeuk,

Thanks, let me merge all those patches and do the test.

Thanks,

> 
>>
>>>
>>>> Do you mind letting me merge these two patches into original patch?
>>>> since original patch is still in dev branch, rather than mainline.
>>>
>>> Glad to see, if resend.
>>
>> Thanks, :)
>>
>>>
>>>> I guess it needs to stop ckpt thread as well...
>>>
>>> agree, :)
>>>
>>> Thanks,

Re: [PATCH 1/3] f2fs: rename flush_error_work() to f2fs_record_error_work()

[Chao Yu]

On 2022/10/27 20:08, Yangtao Li wrote:
> Since it is an f2fs module, it is best to prefix function names
> with f2fs_. At the same time, there is already a flush thread
> and related functions in the system, rename flush_error_work()
> to f2fs_record_error_work().

It won't pollute global namespace since it's a static function just be
used in f2fs/super.c...

> 
> Signed-off-by: Yangtao Li <frank.li@vivo.com>
> ---
>   fs/f2fs/super.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index a241e4073f1d..fc220b5c5599 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -4019,7 +4019,7 @@ void f2fs_handle_critical_error(struct f2fs_sb_info *sbi, unsigned char reason,
>   	f2fs_stop_discard_thread(sbi);
>   }
>   
> -static void flush_error_work(struct work_struct *work)
> +static void f2fs_record_error_work(struct work_struct *work)
>   {
>   	struct f2fs_sb_info *sbi = container_of(work,
>   					struct f2fs_sb_info, s_error_work);
> @@ -4374,7 +4374,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
>   		goto free_devices;
>   	}
>   
> -	INIT_WORK(&sbi->s_error_work, flush_error_work);
> +	INIT_WORK(&sbi->s_error_work, f2fs_record_error_work);
>   	spin_lock_init(&sbi->error_lock);
>   	memcpy(sbi->errors, raw_super->s_errors, MAX_F2FS_ERRORS);
>   	memcpy(sbi->stop_reason, raw_super->s_stop_reason, MAX_STOP_REASON);