f2fs: change recovery policy of xattr node block

Currently, if we call fsync after updating the xattr date belongs to the
file, f2fs needs to trigger checkpoint to keep xattr data consistent. But,
this policy cause low performance as checkpoint will block most foreground
operations and cause unneeded and unrelated IOs around checkpoint.

This patch will reuse regular file recovery policy for xattr node block,
so, we change to write xattr node block tagged with fsync flag to warm
area instead of cold area, and during recovery, we search warm node chain
for fsynced xattr block, and do the recovery.

So, for below application IO pattern, performance can be improved
obviously:
- touch file
- create/update/delete xattr entry in file
- fsync file

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index b8070f9e8285ca2b63a23118bf6dee28674370ba..28e95408089051b0310b80b4f41d080dcb94d415 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -460,7 +460,6 @@ struct f2fs_inode_info {
        f2fs_hash_t chash;              /* hash value of given file name */
        unsigned int clevel;            /* maximum level of given file name */
        nid_t i_xattr_nid;              /* node id that contains xattrs */
-       unsigned long long xattr_ver;   /* cp version of xattr modification */
        loff_t  last_disk_size;         /* lastly written file size */
 
        struct list_head dirty_list;    /* dirty list for dirs and files */
@@ -2133,7 +2132,7 @@ void alloc_nid_done(struct f2fs_sb_info *sbi, nid_t nid);
 void alloc_nid_failed(struct f2fs_sb_info *sbi, nid_t nid);
 int try_to_free_nids(struct f2fs_sb_info *sbi, int nr_shrink);
 void recover_inline_xattr(struct inode *inode, struct page *page);
-void recover_xattr_data(struct inode *inode, struct page *page,
+int recover_xattr_data(struct inode *inode, struct page *page,
                        block_t blkaddr);
 int recover_inode_page(struct f2fs_sb_info *sbi, struct page *page);
 int restore_node_summary(struct f2fs_sb_info *sbi,

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index a3808c49e326537d3ee07f489a8dea904aeed9d1..12016481503069cd2a3fa919cc251413f2f5a2eb 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -142,8 +142,6 @@ static inline bool need_do_checkpoint(struct inode *inode)
                need_cp = true;
        else if (!is_checkpointed_node(sbi, F2FS_I(inode)->i_pino))
                need_cp = true;
-       else if (F2FS_I(inode)->xattr_ver == cur_cp_version(F2FS_CKPT(sbi)))
-               need_cp = true;
        else if (test_opt(sbi, FASTBOOT))
                need_cp = true;
        else if (sbi->active_logs == 2)
@@ -169,7 +167,6 @@ static void try_to_fix_pino(struct inode *inode)
        nid_t pino;
 
        down_write(&fi->i_sem);
-       fi->xattr_ver = 0;
        if (file_wrong_pino(inode) && inode->i_nlink == 1 &&
                        get_parent_ino(inode, &pino)) {
                f2fs_i_pino_write(inode, pino);

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 8203a2f8b350ae8ff0353ae5c7efbc7853163b38..f8fb25a27b464692be4a49993c0f950e260a775a 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -971,9 +971,6 @@ int truncate_xattr_node(struct inode *inode, struct page *page)
 
        f2fs_i_xnid_write(inode, 0);
 
-       /* need to do checkpoint during fsync */
-       F2FS_I(inode)->xattr_ver = cur_cp_version(F2FS_CKPT(sbi));
-
        set_new_dnode(&dn, inode, page, npage, nid);
 
        if (page)
@@ -2054,18 +2051,18 @@ void recover_inline_xattr(struct inode *inode, struct page *page)
        f2fs_put_page(ipage, 1);
 }
 
-void recover_xattr_data(struct inode *inode, struct page *page, block_t blkaddr)
+int recover_xattr_data(struct inode *inode, struct page *page, block_t blkaddr)
 {
        struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
        nid_t prev_xnid = F2FS_I(inode)->i_xattr_nid;
        nid_t new_xnid = nid_of_node(page);
        struct node_info ni;
+       struct page *xpage;
 
-       /* 1: invalidate the previous xattr nid */
        if (!prev_xnid)
                goto recover_xnid;
 
-       /* Deallocate node address */
+       /* 1: invalidate the previous xattr nid */
        get_node_info(sbi, prev_xnid, &ni);
        f2fs_bug_on(sbi, ni.blk_addr == NULL_ADDR);
        invalidate_blocks(sbi, ni.blk_addr);
@@ -2073,19 +2070,27 @@ void recover_xattr_data(struct inode *inode, struct page *page, block_t blkaddr)
        set_node_addr(sbi, &ni, NULL_ADDR, false);
 
 recover_xnid:
-       /* 2: allocate new xattr nid */
+       /* 2: update xattr nid in inode */
+       remove_free_nid(sbi, new_xnid);
+       f2fs_i_xnid_write(inode, new_xnid);
        if (unlikely(!inc_valid_node_count(sbi, inode)))
                f2fs_bug_on(sbi, 1);
+       update_inode_page(inode);
+
+       /* 3: update and set xattr node page dirty */
+       xpage = grab_cache_page(NODE_MAPPING(sbi), new_xnid);
+       if (!xpage)
+               return -ENOMEM;
+
+       memcpy(F2FS_NODE(xpage), F2FS_NODE(page), PAGE_SIZE);
 
-       remove_free_nid(sbi, new_xnid);
        get_node_info(sbi, new_xnid, &ni);
        ni.ino = inode->i_ino;
        set_node_addr(sbi, &ni, NEW_ADDR, false);
-       f2fs_i_xnid_write(inode, new_xnid);
+       set_page_dirty(xpage);
+       f2fs_put_page(xpage, 1);
 
-       /* 3: update xattr blkaddr */
-       refresh_sit_entry(sbi, NEW_ADDR, blkaddr);
-       set_node_addr(sbi, &ni, blkaddr, false);
+       return 0;
 }
 
 int recover_inode_page(struct f2fs_sb_info *sbi, struct page *page)

diff --git a/fs/f2fs/node.h b/fs/f2fs/node.h
index 29ff783eb9c3057326b0e10073c746643c34b558..d3d2893064695005fab9fa362ce44b00fba070ce 100644 (file)
--- a/fs/f2fs/node.h
+++ b/fs/f2fs/node.h
@@ -358,7 +358,7 @@ static inline bool IS_DNODE(struct page *node_page)
        unsigned int ofs = ofs_of_node(node_page);
 
        if (f2fs_has_xattr_block(ofs))
-               return false;
+               return true;
 
        if (ofs == 3 || ofs == 4 + NIDS_PER_BLOCK ||
                        ofs == 5 + 2 * NIDS_PER_BLOCK)

diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index e93316ea8d1b44065c7d044148a5ed8e465f2ec1..d025aa83fb5bb344fcb5799f080d033895e584aa 100644 (file)
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -378,11 +378,9 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,
        if (IS_INODE(page)) {
                recover_inline_xattr(inode, page);
        } else if (f2fs_has_xattr_block(ofs_of_node(page))) {
-               /*
-                * Deprecated; xattr blocks should be found from cold log.
-                * But, we should remain this for backward compatibility.
-                */
-               recover_xattr_data(inode, page, blkaddr);
+               err = recover_xattr_data(inode, page, blkaddr);
+               if (!err)
+                       recovered++;
                goto out;
        }
 

diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c
index f7482635a57d97afbe88ba7087f607b64afa2540..b50f6b581a71b8f256a940f3a4c036992a969ea3 100644 (file)
--- a/fs/f2fs/xattr.c
+++ b/fs/f2fs/xattr.c
@@ -458,8 +458,6 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize,
        set_page_dirty(xpage);
        f2fs_put_page(xpage, 1);
 
-       /* need to checkpoint during fsync */
-       F2FS_I(inode)->xattr_ver = cur_cp_version(F2FS_CKPT(sbi));
        return 0;
 }