2022-02-03 18:12:37

by Chao Yu

[permalink] [raw]
Subject: [PATCH] f2fs: fix to unlock page correctly in error path of is_alive()

As Pavel Machek reported in below link [1]:

After commit 77900c45ee5c ("f2fs: fix to do sanity check in is_alive()"),
node page should be unlock via calling f2fs_put_page() in the error path
of is_alive(), otherwise, f2fs may hang when it tries to lock the node
page, fix it.

[1] https://lore.kernel.org/stable/[email protected]/

Fixes: 77900c45ee5c ("f2fs: fix to do sanity check in is_alive()")
Reported-by: Pavel Machek <[email protected]>
Signed-off-by: Pavel Machek <[email protected]>
Signed-off-by: Chao Yu <[email protected]>
---
fs/f2fs/gc.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 0a6b0a8ae97e..2d53ef121e76 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -1038,8 +1038,10 @@ static bool is_alive(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,
set_sbi_flag(sbi, SBI_NEED_FSCK);
}

- if (f2fs_check_nid_range(sbi, dni->ino))
+ if (f2fs_check_nid_range(sbi, dni->ino)) {
+ f2fs_put_page(node_page, 1);
return false;
+ }

*nofs = ofs_of_node(node_page);
source_blkaddr = data_blkaddr(NULL, node_page, ofs_in_node);
--
2.32.0


2022-02-07 18:33:09

by Chao Yu

[permalink] [raw]
Subject: Re: [PATCH] f2fs: fix to unlock page correctly in error path of is_alive()

On 2022/2/4 4:03, Jaegeuk Kim wrote:
> On 02/03, Chao Yu wrote:
>> As Pavel Machek reported in below link [1]:
>>
>> After commit 77900c45ee5c ("f2fs: fix to do sanity check in is_alive()"),
>> node page should be unlock via calling f2fs_put_page() in the error path
>> of is_alive(), otherwise, f2fs may hang when it tries to lock the node
>> page, fix it.
>>
>> [1] https://lore.kernel.org/stable/[email protected]/
>
> Need -stable? It seems 4.19+?

It depends on where commit 77900c45ee5c ("f2fs: fix to do sanity check in is_alive()")
be backported to? Anyway, let me Cc stable-kernel mailing list.

Thanks,

>
>>
>> Fixes: 77900c45ee5c ("f2fs: fix to do sanity check in is_alive()")
>> Reported-by: Pavel Machek <[email protected]>
>> Signed-off-by: Pavel Machek <[email protected]>
>> Signed-off-by: Chao Yu <[email protected]>
>> ---
>> fs/f2fs/gc.c | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
>> index 0a6b0a8ae97e..2d53ef121e76 100644
>> --- a/fs/f2fs/gc.c
>> +++ b/fs/f2fs/gc.c
>> @@ -1038,8 +1038,10 @@ static bool is_alive(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,
>> set_sbi_flag(sbi, SBI_NEED_FSCK);
>> }
>>
>> - if (f2fs_check_nid_range(sbi, dni->ino))
>> + if (f2fs_check_nid_range(sbi, dni->ino)) {
>> + f2fs_put_page(node_page, 1);
>> return false;
>> + }
>>
>> *nofs = ofs_of_node(node_page);
>> source_blkaddr = data_blkaddr(NULL, node_page, ofs_in_node);
>> --
>> 2.32.0

2022-02-08 01:07:21

by Jaegeuk Kim

[permalink] [raw]
Subject: Re: [PATCH] f2fs: fix to unlock page correctly in error path of is_alive()

On 02/03, Chao Yu wrote:
> As Pavel Machek reported in below link [1]:
>
> After commit 77900c45ee5c ("f2fs: fix to do sanity check in is_alive()"),
> node page should be unlock via calling f2fs_put_page() in the error path
> of is_alive(), otherwise, f2fs may hang when it tries to lock the node
> page, fix it.
>
> [1] https://lore.kernel.org/stable/[email protected]/

Need -stable? It seems 4.19+?

>
> Fixes: 77900c45ee5c ("f2fs: fix to do sanity check in is_alive()")
> Reported-by: Pavel Machek <[email protected]>
> Signed-off-by: Pavel Machek <[email protected]>
> Signed-off-by: Chao Yu <[email protected]>
> ---
> fs/f2fs/gc.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
> index 0a6b0a8ae97e..2d53ef121e76 100644
> --- a/fs/f2fs/gc.c
> +++ b/fs/f2fs/gc.c
> @@ -1038,8 +1038,10 @@ static bool is_alive(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,
> set_sbi_flag(sbi, SBI_NEED_FSCK);
> }
>
> - if (f2fs_check_nid_range(sbi, dni->ino))
> + if (f2fs_check_nid_range(sbi, dni->ino)) {
> + f2fs_put_page(node_page, 1);
> return false;
> + }
>
> *nofs = ofs_of_node(node_page);
> source_blkaddr = data_blkaddr(NULL, node_page, ofs_in_node);
> --
> 2.32.0