[PATCH v2] f2fs: handle newly created page when revoking inmem pages

[PATCH v2] f2fs: handle newly created page when revoking inmem pages

[Daeho Jeong]

When committing inmem pages is successful, we revoke already committed
blocks in __revoke_inmem_pages() and finally replace the committed
ones with the old blocks using f2fs_replace_block(). However, if
the committed block was newly created one, the address of the old
block is NEW_ADDR and __f2fs_replace_block() cannot handle NEW_ADDR
as new_blkaddr properly and a kernel panic occurrs.

Signed-off-by: Daeho Jeong <daeho.jeong@samsung.com>
Tested-by: Shu Tan <shu.tan@samsung.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
---
 fs/f2fs/segment.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index c117e09..0673d08 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -248,7 +248,11 @@ static int __revoke_inmem_pages(struct inode *inode,
 				goto next;
 			}
 			get_node_info(sbi, dn.nid, &ni);
-			f2fs_replace_block(sbi, &dn, dn.data_blkaddr,
+			if (cur->old_addr == NEW_ADDR) {
+				invalidate_blocks(sbi, dn.data_blkaddr);
+				f2fs_update_data_blkaddr(&dn, NEW_ADDR);
+			} else
+				f2fs_replace_block(sbi, &dn, dn.data_blkaddr,
 					cur->old_addr, ni.version, true, true);
 			f2fs_put_dnode(&dn);
 		}
-- 
1.9.1

Re: [PATCH v2] f2fs: handle newly created page when revoking inmem pages

[Yunlong Song]

Should it be "When committing inmem pages is not successful" ?

On 2018/1/11 8:17, Daeho Jeong wrote:
> When committing inmem pages is successful, we revoke already committed
> blocks in __revoke_inmem_pages() and finally replace the committed
> ones with the old blocks using f2fs_replace_block(). However, if
> the committed block was newly created one, the address of the old
> block is NEW_ADDR and __f2fs_replace_block() cannot handle NEW_ADDR
> as new_blkaddr properly and a kernel panic occurrs.
> 
> Signed-off-by: Daeho Jeong <daeho.jeong@samsung.com>
> Tested-by: Shu Tan <shu.tan@samsung.com>
> Reviewed-by: Chao Yu <yuchao0@huawei.com>
> ---
>   fs/f2fs/segment.c | 6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> index c117e09..0673d08 100644
> --- a/fs/f2fs/segment.c
> +++ b/fs/f2fs/segment.c
> @@ -248,7 +248,11 @@ static int __revoke_inmem_pages(struct inode *inode,
>   				goto next;
>   			}
>   			get_node_info(sbi, dn.nid, &ni);
> -			f2fs_replace_block(sbi, &dn, dn.data_blkaddr,
> +			if (cur->old_addr == NEW_ADDR) {
> +				invalidate_blocks(sbi, dn.data_blkaddr);
> +				f2fs_update_data_blkaddr(&dn, NEW_ADDR);
> +			} else
> +				f2fs_replace_block(sbi, &dn, dn.data_blkaddr,
>   					cur->old_addr, ni.version, true, true);
>   			f2fs_put_dnode(&dn);
>   		}
> 

-- 
Thanks,
Yunlong Song

Re: [PATCH v2] f2fs: handle newly created page when revoking inmem pages

[Chao Yu]

On 2018/1/11 14:50, Yunlong Song wrote:
> Should it be "When committing inmem pages is not successful" ?

I guess Daeho want to say "Partially successful"?

Thanks,

Re: [PATCH v2] f2fs: handle newly created page when revoking inmem pages

[정대호]

Yes, Chao, you're right. :)

 
--------- Original Message ---------
Sender : Chao Yu <yuchao0@huawei.com>
Date   : 2018-01-11 18:55 (GMT+9)
Title  : Re: [PATCH v2] f2fs: handle newly created page when revoking inmem pages
 
 
> I guess Daeho want to say "Partially successful"?
 
> Thanks,
 
 
 

[PATCH v2] f2fs: handle newly created page when revoking inmem pages

[Daeho Jeong]

When committing inmem pages is successful, we revoke already committed
blocks in __revoke_inmem_pages() and finally replace the committed
ones with the old blocks using f2fs_replace_block(). However, if
the committed block was newly created one, the address of the old
block is NEW_ADDR and __f2fs_replace_block() cannot handle NEW_ADDR
as new_blkaddr properly and a kernel panic occurrs.

Signed-off-by: Daeho Jeong <daeho.jeong@samsung.com>
Tested-by: Shu Tan <shu.tan@samsung.com>
---
 fs/f2fs/segment.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index c117e09..0673d08 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -248,7 +248,11 @@ static int __revoke_inmem_pages(struct inode *inode,
 				goto next;
 			}
 			get_node_info(sbi, dn.nid, &ni);
-			f2fs_replace_block(sbi, &dn, dn.data_blkaddr,
+			if (cur->old_addr == NEW_ADDR) {
+				invalidate_blocks(sbi, dn.data_blkaddr);
+				f2fs_update_data_blkaddr(&dn, NEW_ADDR);
+			} else
+				f2fs_replace_block(sbi, &dn, dn.data_blkaddr,
 					cur->old_addr, ni.version, true, true);
 			f2fs_put_dnode(&dn);
 		}
-- 
1.9.1