f2fs: check inline_data flag at converting time
Subsystems (2)
Jaegeuk Kim
maintainerPATCH 1/4 f2fs: check inline_data flag at converting time
We can check inode's inline_data flag when calling to convert it.
--- fs/f2fs/data.c | 8 +++----- fs/f2fs/file.c | 58 ++++++++++++++++++++++---------------------------------- fs/f2fs/inline.c | 3 +++ 3 files changed, 29 insertions(+), 40 deletions(-)
fs/f2fs/data.c +3 -5
@@ -1573,11 +1573,9 @@ static ssize_t f2fs_direct_IO(struct kiocb *iocb, struct iov_iter *iter,int err;/* we don't need to use inline_data strictly */ -if (f2fs_has_inline_data (inode)) { - err =f2fs_convert_inline_inode (inode); -if (err) -return err; - } + err =f2fs_convert_inline_inode (inode); +if (err) +return err;if (f2fs_encrypted_inode (inode) &&S_ISREG (inode->i_mode))return 0 ;
fs/f2fs/file.c +23 -35
114 lines not on this page · raw message
fs/f2fs/inline.c +3 -0
@@ -177,6 +177,9 @@ int f2fs_convert_inline_inode(struct inode *inode)struct page *ipage, *page;int err =0 ; +if (!f2fs_has_inline_data (inode)) +return 0 ; + page =grab_cache_page (inode->i_mapping,0 );if (!page)return -ENOMEM ;
Signature · 1 line
2.5.4 (Apple Git-61)
Jaegeuk Kim
maintainerPATCH 2/4 f2fs: avoid unnecessary f2fs_gc for dir operations
The f2fs_balance_fs doesn't need to cover f2fs_new_inode or f2fs_find_entry works.
--- fs/f2fs/namei.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
fs/f2fs/namei.c +8 -7
@@ -128,8 +128,6 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode,nid_t ino =0 ;int err; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir, mode);if (IS_ERR (inode))return PTR_ERR (inode);
@@ -142,6 +140,8 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode, inode->i_mapping->a_ops = &f2fs_dblock_aops; ino = inode->i_ino; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =f2fs_add_link (dentry, inode);if (err)
@@ -288,12 +288,13 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry)int err = -ENOENT ;trace_f2fs_unlink_enter (dir, dentry); -f2fs_balance_fs (sbi); de =f2fs_find_entry (dir, &dentry->d_name, &page);if (!de) goto fail; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =acquire_orphan_inode (sbi);if (err) {
@@ -341,8 +342,6 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry,if (len > dir->i_sb->s_blocksize)return -ENAMETOOLONG ; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir,S_IFLNK |S_IRWXUGO );if (IS_ERR (inode))return PTR_ERR (inode);
@@ -353,6 +352,8 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry, inode->i_op = &f2fs_symlink_inode_operations; inode->i_mapping->a_ops = &f2fs_dblock_aops; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =f2fs_add_link (dentry, inode);if (err)
@@ -433,8 +434,6 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)struct inode *inode;int err; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir,S_IFDIR | mode);if (IS_ERR (inode))return PTR_ERR (inode);
@@ -444,6 +443,8 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) inode->i_mapping->a_ops = &f2fs_dblock_aops;mapping_set_gfp_mask (inode->i_mapping,GFP_F2FS_HIGH_ZERO ); +f2fs_balance_fs (sbi); +set_inode_flag (F2FS_I (inode),FI_INC_LINK );f2fs_lock_op (sbi); err =f2fs_add_link (dentry, inode);
Signature · 1 line
2.5.4 (Apple Git-61)
RE: [f2fs-dev] [PATCH 2/4] f2fs: avoid unnecessary f2fs_gc for dir operations
Hi Jaegeuk,
Quoted 10 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Wednesday, December 23, 2015 9:00 AM
To: [email protected]; [email protected]; [email protected]
Cc: Jaegeuk Kim
Subject: [f2fs-dev] [PATCH 2/4] f2fs: avoid unnecessaryf2fs_gcfor dir operationsThe
f2fs_balance_fsdoesn't need to coverf2fs_new_inodeorf2fs_find_entryworks.
So this avoids some unneeded overhead in f2fs_balance_fs for scenario where f2fs_new_inode and f2fs_find_entry will fail for most of the time?
Shouldn't cover f2fs_find_entry in rename or rename2 case?
Thanks,
Quoted 92 lines
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/namei.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)fs/f2fs/namei.c +0
-2@@ -128,8 +128,6 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode, nid_t ino = 0;int err; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir, mode);if (IS_ERR (inode))fs/f2fs/namei.c +2
-0return PTR_ERR (inode);@@ -142,6 +140,8 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode, inode->i_mapping->a_ops = &f2fs_dblock_aops; ino = inode->i_ino; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =f2fs_add_link (dentry, inode);fs/f2fs/namei.c +4
-5if (err)@@ -288,12 +288,13 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry)int err = -ENOENT ;trace_f2fs_unlink_enter (dir, dentry); -f2fs_balance_fs (sbi); de =f2fs_find_entry (dir, &dentry->d_name, &page);if (!de) goto fail; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =acquire_orphan_inode (sbi);if (err) {@@ -341,8 +342,6 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry,if (len > dir->i_sb->s_blocksize)return -ENAMETOOLONG ; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir,S_IFLNK |S_IRWXUGO );if (IS_ERR (inode))return PTR_ERR (inode);@@ -353,6 +352,8 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry, inode->i_op = &f2fs_symlink_inode_operations; inode->i_mapping->a_ops = &f2fs_dblock_aops; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =f2fs_add_link (dentry, inode);if (err)@@ -433,8 +434,6 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)struct inode *inode;int err; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir,S_IFDIR | mode);if (IS_ERR (inode))fs/f2fs/namei.c +2
-0return PTR_ERR (inode);@@ -444,6 +443,8 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) inode->i_mapping->a_ops = &f2fs_dblock_aops;mapping_set_gfp_mask (inode->i_mapping,GFP_F2FS_HIGH_ZERO ); +f2fs_balance_fs (sbi); +set_inode_flag (F2FS_I (inode),FI_INC_LINK );f2fs_lock_op (sbi);err =
f2fs_add_link(dentry, inode);
--
2.5.4 (Apple Git-61)------------------------------------------------------------------------------
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Jaegeuk Kim
maintainerRe: [f2fs-dev] [PATCH 2/4 v2] f2fs: avoid unnecessary f2fs_gc for dir operations
Chang log from v1:
- add more cases
Quoted 1 line
From
9fea6346f5dd2992525e853e27a4fe899d122379Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <[email protected]>
Date: Tue, 22 Dec 2015 11:56:08 -0800
Subject: [PATCH] f2fs: avoid unnecessary f2fs_gc for dir operations
The f2fs_balance_fs doesn't need to cover f2fs_new_inode or f2fs_find_entry works.
--- fs/f2fs/namei.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-)
fs/f2fs/namei.c +18 -16
@@ -128,8 +128,6 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode,nid_t ino =0 ;int err; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir, mode);if (IS_ERR (inode))return PTR_ERR (inode);
@@ -142,6 +140,8 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode, inode->i_mapping->a_ops = &f2fs_dblock_aops; ino = inode->i_ino; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =f2fs_add_link (dentry, inode);if (err)
@@ -288,12 +288,13 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry)int err = -ENOENT ;trace_f2fs_unlink_enter (dir, dentry); -f2fs_balance_fs (sbi); de =f2fs_find_entry (dir, &dentry->d_name, &page);if (!de) goto fail; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =acquire_orphan_inode (sbi);if (err) {
@@ -341,8 +342,6 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry,if (len > dir->i_sb->s_blocksize)return -ENAMETOOLONG ; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir,S_IFLNK |S_IRWXUGO );if (IS_ERR (inode))return PTR_ERR (inode);
@@ -353,6 +352,8 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry, inode->i_op = &f2fs_symlink_inode_operations; inode->i_mapping->a_ops = &f2fs_dblock_aops; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =f2fs_add_link (dentry, inode);if (err)
@@ -433,8 +434,6 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)struct inode *inode;int err; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir,S_IFDIR | mode);if (IS_ERR (inode))return PTR_ERR (inode);
@@ -444,6 +443,8 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) inode->i_mapping->a_ops = &f2fs_dblock_aops;mapping_set_gfp_mask (inode->i_mapping,GFP_F2FS_HIGH_ZERO ); +f2fs_balance_fs (sbi); +set_inode_flag (F2FS_I (inode),FI_INC_LINK );f2fs_lock_op (sbi); err =f2fs_add_link (dentry, inode);
@@ -481,8 +482,6 @@ static int f2fs_mknod(struct inode *dir, struct dentry *dentry,struct inode *inode;int err =0 ; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir, mode);if (IS_ERR (inode))return PTR_ERR (inode);
@@ -490,6 +489,8 @@ static int f2fs_mknod(struct inode *dir, struct dentry *dentry,init_special_inode (inode, inode->i_mode, rdev); inode->i_op = &f2fs_special_inode_operations; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =f2fs_add_link (dentry, inode);if (err)
@@ -516,9 +517,6 @@ static int __f2fs_tmpfile(struct inode *dir, struct dentry *dentry,struct inode *inode;int err; -if (!whiteout) -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir, mode);if (IS_ERR (inode))return PTR_ERR (inode);
@@ -530,6 +528,8 @@ static int __f2fs_tmpfile(struct inode *dir, struct dentry *dentry, inode->i_op = &f2fs_file_inode_operations; inode->i_fop = &f2fs_file_operations; inode->i_mapping->a_ops = &f2fs_dblock_aops; + +f2fs_balance_fs (sbi); }f2fs_lock_op (sbi);
@@ -604,8 +604,6 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, goto out; } -f2fs_balance_fs (sbi); - old_entry =f2fs_find_entry (old_dir, &old_dentry->d_name, &old_page);if (!old_entry) goto out;
@@ -635,6 +633,8 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,if (!new_entry) goto out_whiteout; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =acquire_orphan_inode (sbi);
@@ -666,6 +666,8 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,update_inode_page (old_inode);update_inode_page (new_inode); }else { +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =f2fs_add_link (new_dentry, old_inode);
@@ -763,8 +765,6 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, new_inode)))return -EPERM ; -f2fs_balance_fs (sbi); - old_entry =f2fs_find_entry (old_dir, &old_dentry->d_name, &old_page);if (!old_entry) goto out;
@@ -807,6 +807,8 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, goto out_new_dir; } +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =update_dent_inode (old_inode, new_inode, &new_dentry->d_name);
Signature · 1 line
2.5.4 (Apple Git-61)
RE: [f2fs-dev] [PATCH 2/4 v2] f2fs: avoid unnecessary f2fs_gc for dir operations
Hi Jaegeuk,
Quoted 148 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Thursday, December 24, 2015 2:55 AM
To: Chao Yu
Cc: [email protected]; [email protected]; [email protected]
Subject: Re: [f2fs-dev] [PATCH 2/4 v2] f2fs: avoid unnecessaryf2fs_gcfor dir operationsChang log from v1:
- add more casesFrom
9fea6346f5dd2992525e853e27a4fe899d122379Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <[email protected]>
Date: Tue, 22 Dec 2015 11:56:08 -0800
Subject: [PATCH] f2fs: avoid unnecessaryf2fs_gcfor dir operationsThe
f2fs_balance_fsdoesn't need to coverf2fs_new_inodeorf2fs_find_entryworks.Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/namei.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-)fs/f2fs/namei.c +0
-2@@ -128,8 +128,6 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode, nid_t ino = 0;int err; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir, mode);if (IS_ERR (inode))fs/f2fs/namei.c +2
-0return PTR_ERR (inode);@@ -142,6 +140,8 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode, inode->i_mapping->a_ops = &f2fs_dblock_aops; ino = inode->i_ino; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =f2fs_add_link (dentry, inode);fs/f2fs/namei.c +4
-5if (err)@@ -288,12 +288,13 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry)int err = -ENOENT ;trace_f2fs_unlink_enter (dir, dentry); -f2fs_balance_fs (sbi); de =f2fs_find_entry (dir, &dentry->d_name, &page);if (!de) goto fail; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =acquire_orphan_inode (sbi);if (err) {@@ -341,8 +342,6 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry,if (len > dir->i_sb->s_blocksize)return -ENAMETOOLONG ; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir,S_IFLNK |S_IRWXUGO );if (IS_ERR (inode))return PTR_ERR (inode);@@ -353,6 +352,8 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry, inode->i_op = &f2fs_symlink_inode_operations; inode->i_mapping->a_ops = &f2fs_dblock_aops; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =f2fs_add_link (dentry, inode);if (err)@@ -433,8 +434,6 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)struct inode *inode;int err; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir,S_IFDIR | mode);if (IS_ERR (inode))fs/f2fs/namei.c +2
-0return PTR_ERR (inode);@@ -444,6 +443,8 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) inode->i_mapping->a_ops = &f2fs_dblock_aops;mapping_set_gfp_mask (inode->i_mapping,GFP_F2FS_HIGH_ZERO ); +f2fs_balance_fs (sbi); +set_inode_flag (F2FS_I (inode),FI_INC_LINK );f2fs_lock_op (sbi);fs/f2fs/namei.c +4
-7err =f2fs_add_link (dentry, inode);@@ -481,8 +482,6 @@ static int f2fs_mknod(struct inode *dir, struct dentry *dentry,struct inode *inode;int err =0 ; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir, mode);if (IS_ERR (inode))return PTR_ERR (inode);@@ -490,6 +489,8 @@ static int f2fs_mknod(struct inode *dir, struct dentry *dentry,init_special_inode (inode, inode->i_mode, rdev); inode->i_op = &f2fs_special_inode_operations; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =f2fs_add_link (dentry, inode);if (err)@@ -516,9 +517,6 @@ static int __f2fs_tmpfile(struct inode *dir, struct dentry *dentry,struct inode *inode;int err; -if (!whiteout) -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir, mode);if (IS_ERR (inode))return PTR_ERR (inode);@@ -530,6 +528,8 @@ static int __f2fs_tmpfile(struct inode *dir, struct dentry *dentry, inode->i_op = &f2fs_file_inode_operations; inode->i_fop = &f2fs_file_operations; inode->i_mapping->a_ops = &f2fs_dblock_aops; + +f2fs_balance_fs (sbi); }f2fs_lock_op (sbi);@@ -604,8 +604,6 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, goto out; } -f2fs_balance_fs (sbi); - old_entry =f2fs_find_entry (old_dir, &old_dentry->d_name, &old_page);if (!old_entry) goto out;
fs/f2fs/namei.c static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, · line 636
Quoted 4 lines
fs/f2fs/namei.c +1
-0@@ -635,6 +633,8 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,if (!new_entry) goto out_whiteout; +f2fs_balance_fs (sbi);
If we are in RENAME_WHITEOUT case, move f2fs_balance_fs here seems a bit late. How about let __f2fs_tmpfile do reclaim for both whiteout and tmpfile case itself, and do reclaim exclude whiteout case here?
Thanks,
Quoted 35 lines
fs/f2fs/namei.c +3
-2+f2fs_lock_op (sbi); err =acquire_orphan_inode (sbi);@@ -666,6 +666,8 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,update_inode_page (old_inode);update_inode_page (new_inode); }else { +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =f2fs_add_link (new_dentry, old_inode);@@ -763,8 +765,6 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, new_inode)))return -EPERM ; -f2fs_balance_fs (sbi); - old_entry =f2fs_find_entry (old_dir, &old_dentry->d_name, &old_page);if (!old_entry)fs/f2fs/namei.c +2
-0goto out;@@ -807,6 +807,8 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, goto out_new_dir; } +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi);err =
update_dent_inode(old_inode, new_inode, &new_dentry->d_name);
--
2.5.4 (Apple Git-61)
Jaegeuk Kim
maintainerRe: [f2fs-dev] [PATCH 2/4 v2] f2fs: avoid unnecessary f2fs_gc for dir operations
Hi Chao,
Right.
But, in the rename path, we still need to do f2fs_balance_fs, since it produces another dirty node page in the mean time.
How about this?
Quoted 1 line
From
bbc5bf8f6c940cd75a4d71ce40ce4bd3f647a823Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <[email protected]>
Date: Tue, 22 Dec 2015 11:56:08 -0800
Subject: [PATCH] f2fs: avoid unnecessary f2fs_gc for dir operations
The f2fs_balance_fs doesn't need to cover f2fs_new_inode or f2fs_find_entry works.
--- fs/f2fs/namei.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-)
fs/f2fs/namei.c +18 -16
@@ -128,8 +128,6 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode,nid_t ino =0 ;int err; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir, mode);if (IS_ERR (inode))return PTR_ERR (inode);
@@ -142,6 +140,8 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode, inode->i_mapping->a_ops = &f2fs_dblock_aops; ino = inode->i_ino; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =f2fs_add_link (dentry, inode);if (err)
@@ -288,12 +288,13 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry)int err = -ENOENT ;trace_f2fs_unlink_enter (dir, dentry); -f2fs_balance_fs (sbi); de =f2fs_find_entry (dir, &dentry->d_name, &page);if (!de) goto fail; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =acquire_orphan_inode (sbi);if (err) {
@@ -341,8 +342,6 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry,if (len > dir->i_sb->s_blocksize)return -ENAMETOOLONG ; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir,S_IFLNK |S_IRWXUGO );if (IS_ERR (inode))return PTR_ERR (inode);
@@ -353,6 +352,8 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry, inode->i_op = &f2fs_symlink_inode_operations; inode->i_mapping->a_ops = &f2fs_dblock_aops; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =f2fs_add_link (dentry, inode);if (err)
@@ -433,8 +434,6 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)struct inode *inode;int err; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir,S_IFDIR | mode);if (IS_ERR (inode))return PTR_ERR (inode);
@@ -444,6 +443,8 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) inode->i_mapping->a_ops = &f2fs_dblock_aops;mapping_set_gfp_mask (inode->i_mapping,GFP_F2FS_HIGH_ZERO ); +f2fs_balance_fs (sbi); +set_inode_flag (F2FS_I (inode),FI_INC_LINK );f2fs_lock_op (sbi); err =f2fs_add_link (dentry, inode);
@@ -481,8 +482,6 @@ static int f2fs_mknod(struct inode *dir, struct dentry *dentry,struct inode *inode;int err =0 ; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir, mode);if (IS_ERR (inode))return PTR_ERR (inode);
@@ -490,6 +489,8 @@ static int f2fs_mknod(struct inode *dir, struct dentry *dentry,init_special_inode (inode, inode->i_mode, rdev); inode->i_op = &f2fs_special_inode_operations; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =f2fs_add_link (dentry, inode);if (err)
@@ -516,9 +517,6 @@ static int __f2fs_tmpfile(struct inode *dir, struct dentry *dentry,struct inode *inode;int err; -if (!whiteout) -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir, mode);if (IS_ERR (inode))return PTR_ERR (inode);
@@ -532,6 +530,8 @@ static int __f2fs_tmpfile(struct inode *dir, struct dentry *dentry, inode->i_mapping->a_ops = &f2fs_dblock_aops; } +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =acquire_orphan_inode (sbi);if (err)
@@ -604,8 +604,6 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, goto out; } -f2fs_balance_fs (sbi); - old_entry =f2fs_find_entry (old_dir, &old_dentry->d_name, &old_page);if (!old_entry) goto out;
@@ -635,6 +633,8 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,if (!new_entry) goto out_whiteout; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =acquire_orphan_inode (sbi);
@@ -666,6 +666,8 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,update_inode_page (old_inode);update_inode_page (new_inode); }else { +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =f2fs_add_link (new_dentry, old_inode);
@@ -763,8 +765,6 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, new_inode)))return -EPERM ; -f2fs_balance_fs (sbi); - old_entry =f2fs_find_entry (old_dir, &old_dentry->d_name, &old_page);if (!old_entry) goto out;
@@ -807,6 +807,8 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, goto out_new_dir; } +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =update_dent_inode (old_inode, new_inode, &new_dentry->d_name);
Signature · 1 line
2.5.4 (Apple Git-61)
Chao Yu
Reviewed-byRE: [f2fs-dev] [PATCH 2/4 v2] f2fs: avoid unnecessary f2fs_gc for dir operations
Quoted 8 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Thursday, December 24, 2015 10:13 AM
To: Chao Yu
Cc: [email protected]; [email protected]; [email protected]
Subject: Re: [f2fs-dev] [PATCH 2/4 v2] f2fs: avoid unnecessaryf2fs_gcfor dir operations
Quoted 5 lines
Hi Chao,
Right.
But, in the rename path, we still need to dof2fs_balance_fs, since it produces another dirty node page in the mean time.
That's right.
Quoted 8 lines
How about this?
From
bbc5bf8f6c940cd75a4d71ce40ce4bd3f647a823Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <[email protected]>
Date: Tue, 22 Dec 2015 11:56:08 -0800
Subject: [PATCH] f2fs: avoid unnecessaryf2fs_gcfor dir operations
Quoted 4 lines
The
f2fs_balance_fsdoesn't need to coverf2fs_new_inodeorf2fs_find_entryworks.Signed-off-by Jaegeuk Kim <[email protected]>
Thanks,
Quoted 167 lines
--- fs/f2fs/namei.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-)fs/f2fs/namei.c +0
-2@@ -128,8 +128,6 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode, nid_t ino = 0;int err; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir, mode);if (IS_ERR (inode))fs/f2fs/namei.c +2
-0return PTR_ERR (inode);@@ -142,6 +140,8 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode, inode->i_mapping->a_ops = &f2fs_dblock_aops; ino = inode->i_ino; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =f2fs_add_link (dentry, inode);fs/f2fs/namei.c +4
-5if (err)@@ -288,12 +288,13 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry)int err = -ENOENT ;trace_f2fs_unlink_enter (dir, dentry); -f2fs_balance_fs (sbi); de =f2fs_find_entry (dir, &dentry->d_name, &page);if (!de) goto fail; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =acquire_orphan_inode (sbi);if (err) {@@ -341,8 +342,6 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry,if (len > dir->i_sb->s_blocksize)return -ENAMETOOLONG ; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir,S_IFLNK |S_IRWXUGO );if (IS_ERR (inode))return PTR_ERR (inode);@@ -353,6 +352,8 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry, inode->i_op = &f2fs_symlink_inode_operations; inode->i_mapping->a_ops = &f2fs_dblock_aops; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =f2fs_add_link (dentry, inode);if (err)@@ -433,8 +434,6 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)struct inode *inode;int err; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir,S_IFDIR | mode);if (IS_ERR (inode))fs/f2fs/namei.c +2
-0return PTR_ERR (inode);@@ -444,6 +443,8 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) inode->i_mapping->a_ops = &f2fs_dblock_aops;mapping_set_gfp_mask (inode->i_mapping,GFP_F2FS_HIGH_ZERO ); +f2fs_balance_fs (sbi); +set_inode_flag (F2FS_I (inode),FI_INC_LINK );f2fs_lock_op (sbi);fs/f2fs/namei.c +8
-9err =f2fs_add_link (dentry, inode);@@ -481,8 +482,6 @@ static int f2fs_mknod(struct inode *dir, struct dentry *dentry,struct inode *inode;int err =0 ; -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir, mode);if (IS_ERR (inode))return PTR_ERR (inode);@@ -490,6 +489,8 @@ static int f2fs_mknod(struct inode *dir, struct dentry *dentry,init_special_inode (inode, inode->i_mode, rdev); inode->i_op = &f2fs_special_inode_operations; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =f2fs_add_link (dentry, inode);if (err)@@ -516,9 +517,6 @@ static int __f2fs_tmpfile(struct inode *dir, struct dentry *dentry,struct inode *inode;int err; -if (!whiteout) -f2fs_balance_fs (sbi); - inode =f2fs_new_inode (dir, mode);if (IS_ERR (inode))return PTR_ERR (inode);@@ -532,6 +530,8 @@ static int __f2fs_tmpfile(struct inode *dir, struct dentry *dentry, inode->i_mapping->a_ops = &f2fs_dblock_aops; } +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =acquire_orphan_inode (sbi);if (err)@@ -604,8 +604,6 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, goto out; } -f2fs_balance_fs (sbi); - old_entry =f2fs_find_entry (old_dir, &old_dentry->d_name, &old_page);if (!old_entry) goto out;@@ -635,6 +633,8 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,if (!new_entry) goto out_whiteout; +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =acquire_orphan_inode (sbi);@@ -666,6 +666,8 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,update_inode_page (old_inode);update_inode_page (new_inode); }else { +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi); err =f2fs_add_link (new_dentry, old_inode);@@ -763,8 +765,6 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, new_inode)))return -EPERM ; -f2fs_balance_fs (sbi); - old_entry =f2fs_find_entry (old_dir, &old_dentry->d_name, &old_page);if (!old_entry)fs/f2fs/namei.c +2
-0goto out;@@ -807,6 +807,8 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, goto out_new_dir; } +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi);err =
update_dent_inode(old_inode, new_inode, &new_dentry->d_name);
--
2.5.4 (Apple Git-61)
Jaegeuk Kim
maintainerPATCH 3/4 f2fs: record node block allocation in dnode_of_data
In reply to Jaegeuk KimThis patch introduces recording node block allocation in dnode_of_data. This information helps to figure out whether any node block is allocated during specific file operations.
--- fs/f2fs/data.c | 1 + fs/f2fs/f2fs.h | 1 + fs/f2fs/file.c | 1 + fs/f2fs/node.c | 4 ++++ 4 files changed, 7 insertions(+)
fs/f2fs/data.c +1 -0
@@ -226,6 +226,7 @@ void set_data_blkaddr(struct dnode_of_data *dn) addr_array =blkaddr_in_node (rn); addr_array[ofs_in_node] =cpu_to_le32 (dn->data_blkaddr);set_page_dirty (node_page); + dn->node_changed = true; }int reserve_new_block (struct dnode_of_data *dn)
fs/f2fs/f2fs.h +1 -0
@@ -547,6 +547,7 @@ struct dnode_of_data {unsigned int ofs_in_node;/* data offset in the node page */ bool inode_page_locked;/* inode page is locked or not */ block_t data_blkaddr;/* block address of the node block */ +bool node_changed;/* is node block changed */ }; static inline void set_new_dnode(struct dnode_of_data *dn, struct inode *inode,
fs/f2fs/file.c +1 -0
@@ -484,6 +484,7 @@ int truncate_data_blocks_range(struct dnode_of_data *dn, int count)dec_valid_block_count (sbi, dn->inode, nr_free);set_page_dirty (dn->node_page);sync_inode_page (dn); + dn->node_changed = true; } dn->ofs_in_node = ofs;
fs/f2fs/node.c +4 -0
@@ -542,6 +542,7 @@ int get_dnode_of_data(struct dnode_of_data *dn, pgoff_t index, int mode)set_nid (parent, offset[i -1 ], nids[i], i ==1 );alloc_nid_done (sbi, nids[i]); + dn->node_changed = true; done = true; }else if (mode ==LOOKUP_NODE_RA && i == level && level >1 ) { npage[i] =get_node_page_ra (parent, offset[i -1 ]);
@@ -678,6 +679,7 @@ static int truncate_nodes(struct dnode_of_data *dn, unsigned int nofs,if (ret <0 ) goto out_err;set_nid (page, i,0 , false); + dn->node_changed = true; } }else { child_nofs = nofs + ofs * (NIDS_PER_BLOCK +1 ) +1 ;
@@ -691,6 +693,7 @@ static int truncate_nodes(struct dnode_of_data *dn, unsigned int nofs, ret =truncate_nodes (&rdn, child_nofs,0 , depth -1 );if (ret == (NIDS_PER_BLOCK +1 )) {set_nid (page, i,0 , false); + dn->node_changed = true; child_nofs += ret; }else if (ret <0 && ret != -ENOENT ) { goto out_err;
@@ -752,6 +755,7 @@ static int truncate_partial_nodes(struct dnode_of_data *dn,if (err <0 ) goto fail;set_nid (pages[idx], i,0 , false); + dn->node_changed = true; }if (offset[idx +1 ] ==0 ) {
Signature · 1 line
2.5.4 (Apple Git-61)
RE: [f2fs-dev] [PATCH 3/4] f2fs: record node block allocation in dnode_of_data
Hi Jaegeuk,
Quoted 37 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Wednesday, December 23, 2015 9:00 AM
To: [email protected]; [email protected]; [email protected]
Cc: Jaegeuk Kim
Subject: [f2fs-dev] [PATCH 3/4] f2fs: record node block allocation indnode_of_dataThis patch introduces recording node block allocation in
dnode_of_data. This information helps to figure out whether any node block is allocated during specific file operations.Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/data.c | 1 + fs/f2fs/f2fs.h | 1 + fs/f2fs/file.c | 1 + fs/f2fs/node.c | 4 ++++ 4 files changed, 7 insertions(+)fs/f2fs/data.c +1
-0@@ -226,6 +226,7 @@ void set_data_blkaddr(struct dnode_of_data *dn) addr_array =blkaddr_in_node (rn); addr_array[ofs_in_node] =cpu_to_le32 (dn->data_blkaddr);set_page_dirty (node_page); + dn->node_changed = true; }int reserve_new_block (struct dnode_of_data *dn)fs/f2fs/f2fs.h +0
-0
fs/f2fs/f2fs.h struct dnode_of_data { · line 548
Quoted 2 lines
fs/f2fs/f2fs.h +0
-0@@ -547,6 +547,7 @@ struct dnode_of_data {unsigned int ofs_in_node;/* data offset in the node page */ bool inode_page_locked;/* inode page is locked or not */
Better to add node_changed here to avoid holes generated by compiler due to alignment.
fs/f2fs/f2fs.h struct dnode_of_data { · line 550
Quoted 2 lines
fs/f2fs/f2fs.h +1
-0block_t data_blkaddr;/* block address of the node block */ +bool node_changed;/* is node block changed */
How about reset it in set_new_dnode?
fs/f2fs/file.c int truncate_data_blocks_range(struct dnode_of_data *dn, int count) · line 487
Quoted 12 lines
fs/f2fs/f2fs.h +0
-0}; static inline void set_new_dnode(struct dnode_of_data *dn, struct inode *inode,fs/f2fs/file.c +1
-0@@ -484,6 +484,7 @@ int truncate_data_blocks_range(struct dnode_of_data *dn, int count)dec_valid_block_count (sbi, dn->inode, nr_free);set_page_dirty (dn->node_page);sync_inode_page (dn); + dn->node_changed = true;
dn->node_changed should have been set in set_data_blkaddr, so no needed to set here.
Thanks,
Quoted 48 lines
fs/f2fs/file.c +0
-0} dn->ofs_in_node = ofs;fs/f2fs/node.c +4
-1@@ -542,6 +542,7 @@ int get_dnode_of_data(struct dnode_of_data *dn, pgoff_t index, int mode)set_nid (parent, offset[i -1 ], nids[i], i ==1 );alloc_nid_done (sbi, nids[i]); + dn->node_changed = true; done = true; }else if (mode ==LOOKUP_NODE_RA && i == level && level >1 ) { npage[i] =get_node_page_ra (parent, offset[i -1 ]);@@ -678,6 +679,7 @@ static int truncate_nodes(struct dnode_of_data *dn, unsigned int nofs,if (ret <0 ) goto out_err;set_nid (page, i,0 , false); + dn->node_changed = true; } }else { child_nofs = nofs + ofs * (NIDS_PER_BLOCK +1 ) +1 ;@@ -691,6 +693,7 @@ static int truncate_nodes(struct dnode_of_data *dn, unsigned int nofs, ret =truncate_nodes (&rdn, child_nofs,0 , depth -1 );if (ret == (NIDS_PER_BLOCK +1 )) {set_nid (page, i,0 , false); + dn->node_changed = true; child_nofs += ret; }else if (ret <0 && ret != -ENOENT ) { goto out_err;@@ -752,6 +755,7 @@ static int truncate_partial_nodes(struct dnode_of_data *dn,if (err <0 ) goto fail;set_nid (pages[idx], i,0 , false); + dn->node_changed = true; }if (offset[idx +1 ] ==0 ) { --2.5.4 (Apple Git-61)
------------------------------------------------------------------------------
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Jaegeuk Kim
maintainerRe: [f2fs-dev] [PATCH 3/4] f2fs: record node block allocation in dnode_of_data
Hi Chao,
Quoted 33 lines · Chao Yu
Hi Jaegeuk,
Quoted 31 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Wednesday, December 23, 2015 9:00 AM
To: [email protected]; [email protected]; [email protected]
Cc: Jaegeuk Kim
Subject: [f2fs-dev] [PATCH 3/4] f2fs: record node block allocation indnode_of_dataThis patch introduces recording node block allocation in
dnode_of_data. This information helps to figure out whether any node block is allocated during specific file operations.Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/data.c | 1 + fs/f2fs/f2fs.h | 1 + fs/f2fs/file.c | 1 + fs/f2fs/node.c | 4 ++++ 4 files changed, 7 insertions(+)fs/f2fs/data.c +1
-0@@ -226,6 +226,7 @@ void set_data_blkaddr(struct dnode_of_data *dn) addr_array =blkaddr_in_node (rn); addr_array[ofs_in_node] =cpu_to_le32 (dn->data_blkaddr);set_page_dirty (node_page); + dn->node_changed = true; }
Quoted 11 lines
fs/f2fs/f2fs.h struct dnode_of_data { · line 548
Quoted 8 lines
fs/f2fs/data.c +0
-0int reserve_new_block (struct dnode_of_data *dn)fs/f2fs/f2fs.h +0
-0@@ -547,6 +547,7 @@ struct dnode_of_data {unsigned int ofs_in_node;/* data offset in the node page */ bool inode_page_locked;/* inode page is locked or not */ Better to add
node_changedhere to avoid holes generated by compiler due to alignment.
Ok.
Quoted 5 lines
fs/f2fs/f2fs.h struct dnode_of_data { · line 550
Quoted 3 lines
fs/f2fs/f2fs.h +1
-0block_t data_blkaddr;/* block address of the node block */ +bool node_changed;/* is node block changed */ How about reset it in
set_new_dnode?
In set_new_dnode(), memset() is called.
Quoted 16 lines
fs/f2fs/file.c int truncate_data_blocks_range(struct dnode_of_data *dn, int count) · line 487
Quoted 13 lines
fs/f2fs/f2fs.h +0
-0}; static inline void set_new_dnode(struct dnode_of_data *dn, struct inode *inode,fs/f2fs/file.c +1
-0@@ -484,6 +484,7 @@ int truncate_data_blocks_range(struct dnode_of_data *dn, int count)dec_valid_block_count (sbi, dn->inode, nr_free);set_page_dirty (dn->node_page);sync_inode_page (dn); + dn->node_changed = true;
dn->node_changedshould have been set inset_data_blkaddr, so no needed to set here.
Right. :)
Thanks,
Quoted 51 lines
Thanks,
Quoted 48 lines
fs/f2fs/file.c +0
-0} dn->ofs_in_node = ofs;fs/f2fs/node.c +4
-1@@ -542,6 +542,7 @@ int get_dnode_of_data(struct dnode_of_data *dn, pgoff_t index, int mode)set_nid (parent, offset[i -1 ], nids[i], i ==1 );alloc_nid_done (sbi, nids[i]); + dn->node_changed = true; done = true; }else if (mode ==LOOKUP_NODE_RA && i == level && level >1 ) { npage[i] =get_node_page_ra (parent, offset[i -1 ]);@@ -678,6 +679,7 @@ static int truncate_nodes(struct dnode_of_data *dn, unsigned int nofs,if (ret <0 ) goto out_err;set_nid (page, i,0 , false); + dn->node_changed = true; } }else { child_nofs = nofs + ofs * (NIDS_PER_BLOCK +1 ) +1 ;@@ -691,6 +693,7 @@ static int truncate_nodes(struct dnode_of_data *dn, unsigned int nofs, ret =truncate_nodes (&rdn, child_nofs,0 , depth -1 );if (ret == (NIDS_PER_BLOCK +1 )) {set_nid (page, i,0 , false); + dn->node_changed = true; child_nofs += ret; }else if (ret <0 && ret != -ENOENT ) { goto out_err;@@ -752,6 +755,7 @@ static int truncate_partial_nodes(struct dnode_of_data *dn,if (err <0 ) goto fail;set_nid (pages[idx], i,0 , false); + dn->node_changed = true; }if (offset[idx +1 ] ==0 ) { --2.5.4 (Apple Git-61)
------------------------------------------------------------------------------
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Jaegeuk Kim
maintainerRe: [PATCH 3/4 v2] f2fs: record node block allocation in dnode_of_data
In reply to Jaegeuk KimChange log from v1:
- remove redundant set
- adjust memory alignment
Quoted 1 line
From
60c6a898094535e850268dd77701255a37cce3d3Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <[email protected]>
Date: Tue, 22 Dec 2015 12:59:54 -0800
Subject: [PATCH] f2fs: record node block allocation in dnode_of_data
This patch introduces recording node block allocation in dnode_of_data. This information helps to figure out whether any node block is allocated during specific file operations.
--- fs/f2fs/data.c | 1 + fs/f2fs/f2fs.h | 1 + fs/f2fs/node.c | 4 ++++ 3 files changed, 6 insertions(+)
fs/f2fs/data.c +1 -0
@@ -226,6 +226,7 @@ void set_data_blkaddr(struct dnode_of_data *dn) addr_array =blkaddr_in_node (rn); addr_array[ofs_in_node] =cpu_to_le32 (dn->data_blkaddr);set_page_dirty (node_page); + dn->node_changed = true; }int reserve_new_block (struct dnode_of_data *dn)
fs/f2fs/f2fs.h +1 -0
@@ -546,6 +546,7 @@ struct dnode_of_data {nid_t nid;/* node id of the direct node block */ unsigned int ofs_in_node;/* data offset in the node page */ bool inode_page_locked;/* inode page is locked or not */ +bool node_changed;/* is node block changed */ block_t data_blkaddr;/* block address of the node block */ };
fs/f2fs/node.c +4 -0
@@ -542,6 +542,7 @@ int get_dnode_of_data(struct dnode_of_data *dn, pgoff_t index, int mode)set_nid (parent, offset[i -1 ], nids[i], i ==1 );alloc_nid_done (sbi, nids[i]); + dn->node_changed = true; done = true; }else if (mode ==LOOKUP_NODE_RA && i == level && level >1 ) { npage[i] =get_node_page_ra (parent, offset[i -1 ]);
@@ -678,6 +679,7 @@ static int truncate_nodes(struct dnode_of_data *dn, unsigned int nofs,if (ret <0 ) goto out_err;set_nid (page, i,0 , false); + dn->node_changed = true; } }else { child_nofs = nofs + ofs * (NIDS_PER_BLOCK +1 ) +1 ;
@@ -691,6 +693,7 @@ static int truncate_nodes(struct dnode_of_data *dn, unsigned int nofs, ret =truncate_nodes (&rdn, child_nofs,0 , depth -1 );if (ret == (NIDS_PER_BLOCK +1 )) {set_nid (page, i,0 , false); + dn->node_changed = true; child_nofs += ret; }else if (ret <0 && ret != -ENOENT ) { goto out_err;
@@ -752,6 +755,7 @@ static int truncate_partial_nodes(struct dnode_of_data *dn,if (err <0 ) goto fail;set_nid (pages[idx], i,0 , false); + dn->node_changed = true; }if (offset[idx +1 ] ==0 ) {
Signature · 1 line
2.5.4 (Apple Git-61)
Chao Yu
Reviewed-byRE: [f2fs-dev] [PATCH 3/4 v2] f2fs: record node block allocation in dnode_of_data
Quoted 16 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Thursday, December 24, 2015 3:00 AM
To: [email protected]; [email protected]; [email protected]
Subject: Re: [f2fs-dev] [PATCH 3/4 v2] f2fs: record node block allocation indnode_of_dataChange log from v1:
- remove redundant set
- adjust memory alignmentQuoted 1 line
From
60c6a898094535e850268dd77701255a37cce3d3Mon Sep 17 00:00:00 2001From: Jaegeuk Kim <[email protected]>
Date: Tue, 22 Dec 2015 12:59:54 -0800
Subject: [PATCH] f2fs: record node block allocation indnode_of_data
Quoted 5 lines
This patch introduces recording node block allocation in
dnode_of_data. This information helps to figure out whether any node block is allocated during specific file operations.Signed-off-by Jaegeuk Kim <[email protected]>
Jaegeuk Kim
maintainerPATCH 4/4 f2fs: call f2fs_balance_fs only when node was changed
In reply to Jaegeuk KimIf user tries to update or read data, we don't need to call f2fs_balance_fs which triggers f2fs_gc, which increases unnecessary long latency.
--- fs/f2fs/data.c | 19 ++++++++++++++++--- fs/f2fs/file.c | 26 +++++++++----------------- fs/f2fs/inline.c | 4 ++++ 3 files changed, 29 insertions(+), 20 deletions(-)
fs/f2fs/data.c +16 -3
@@ -509,7 +509,6 @@ static void __allocate_data_blocks(struct inode *inode, loff_t offset,u64 end_offset;while (len) { -f2fs_balance_fs (sbi);f2fs_lock_op (sbi);/* When reading holes, we need its node page */
@@ -542,6 +541,9 @@ static void __allocate_data_blocks(struct inode *inode, loff_t offset,f2fs_put_dnode (&dn);f2fs_unlock_op (sbi); + +if (dn.node_changed) +f2fs_balance_fs (sbi); }return ;
@@ -551,6 +553,8 @@ sync_out:f2fs_put_dnode (&dn); out:f2fs_unlock_op (sbi); +if (dn.node_changed) +f2fs_balance_fs (sbi);return ; }
@@ -1410,8 +1414,6 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping,trace_f2fs_write_begin (inode, pos, len, flags); -f2fs_balance_fs (sbi); -/* * We should check this at this moment to avoid deadlock on inode page * and #0 page. The locking rule for inline_data conversion should be:
@@ -1461,6 +1463,17 @@ put_next:f2fs_put_dnode (&dn);f2fs_unlock_op (sbi); +if (dn.node_changed &&has_not_enough_free_secs (sbi,0 )) { +unlock_page (page); +f2fs_balance_fs (sbi); +lock_page (page); +if (page->mapping != mapping) { +/* The page got truncated from under us */ +f2fs_put_page (page,1 ); + goto repeat; + } + } +f2fs_wait_on_page_writeback (page,DATA );/* wait for GCed encrypted page writeback */
fs/f2fs/file.c +9 -17
@@ -40,8 +40,6 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma,struct dnode_of_data dn;int err; -f2fs_balance_fs (sbi); -sb_start_pagefault (inode->i_sb);f2fs_bug_on (sbi,f2fs_has_inline_data (inode));
@@ -57,6 +55,9 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma,f2fs_put_dnode (&dn);f2fs_unlock_op (sbi); +if (dn.node_changed) +f2fs_balance_fs (sbi); +file_update_time (vma->vm_file);lock_page (page); if (unlikely(page->mapping != inode->i_mapping ||
@@ -233,9 +234,6 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) goto out; } go_write: -/* guarantee free sections for fsync */ -f2fs_balance_fs (sbi); -/* * Both of fdatasync() and fsync() are able to be recovered from * sudden-power-off.
@@ -267,6 +265,8 @@ sync_nodes:if (need_inode_block_update (sbi, ino)) {mark_inode_dirty_sync (inode);f2fs_write_inode (inode,NULL ); + +f2fs_balance_fs (sbi); goto sync_nodes; }
@@ -946,8 +946,6 @@ static int f2fs_collapse_range(struct inode *inode, loff_t offset, loff_t len)if (offset & (F2FS_BLKSIZE -1 ) || len & (F2FS_BLKSIZE -1 ))return -EINVAL ; -f2fs_balance_fs (F2FS_I_SB (inode)); - ret =f2fs_convert_inline_inode (inode);if (ret)return ret;
@@ -994,8 +992,6 @@ static int f2fs_zero_range(struct inode *inode, loff_t offset, loff_t len,if (ret)return ret; -f2fs_balance_fs (sbi); - ret =f2fs_convert_inline_inode (inode);if (ret)return ret;
@@ -1105,12 +1101,12 @@ static int f2fs_insert_range(struct inode *inode, loff_t offset, loff_t len)if (offset & (F2FS_BLKSIZE -1 ) || len & (F2FS_BLKSIZE -1 ))return -EINVAL ; -f2fs_balance_fs (sbi); - ret =f2fs_convert_inline_inode (inode);if (ret)return ret; +f2fs_balance_fs (sbi); + ret =truncate_blocks (inode,i_size_read (inode), true);if (ret)return ret;
@@ -1153,8 +1149,6 @@ static int expand_inode_data(struct inode *inode, loff_t offset,loff_t off_start, off_end;int ret =0 ; -f2fs_balance_fs (sbi); - ret =inode_newsize_ok (inode, (len + offset));if (ret)return ret;
@@ -1163,6 +1157,8 @@ static int expand_inode_data(struct inode *inode, loff_t offset,if (ret)return ret; +f2fs_balance_fs (sbi); + pg_start = ((unsigned long long ) offset) >>PAGE_CACHE_SHIFT ; pg_end = ((unsigned long long ) offset + len) >>PAGE_CACHE_SHIFT ;
@@ -1350,8 +1346,6 @@ static int f2fs_ioc_start_atomic_write(struct file *filp)if (!inode_owner_or_capable (inode))return -EACCES ; -f2fs_balance_fs (F2FS_I_SB (inode)); -if (f2fs_is_atomic_file (inode))return 0 ;
@@ -1438,8 +1432,6 @@ static int f2fs_ioc_abort_volatile_write(struct file *filp)if (ret)return ret; -f2fs_balance_fs (F2FS_I_SB (inode)); -clear_inode_flag (F2FS_I (inode),FI_ATOMIC_FILE );clear_inode_flag (F2FS_I (inode),FI_VOLATILE_FILE );commit_inmem_pages (inode, true);
fs/f2fs/inline.c +4 -0
@@ -202,6 +202,10 @@ out:f2fs_unlock_op (sbi);f2fs_put_page (page,1 ); + +if (dn.node_changed) +f2fs_balance_fs (sbi); +return err; }
Signature · 1 line
2.5.4 (Apple Git-61)
RE: [f2fs-dev] [PATCH 4/4] f2fs: call f2fs_balance_fs only when node was changed
Hi Jaegeuk,
Quoted 10 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Wednesday, December 23, 2015 9:00 AM
To: [email protected]; [email protected]; [email protected]
Cc: Jaegeuk Kim
Subject: [f2fs-dev] [PATCH 4/4] f2fs: callf2fs_balance_fsonly when node was changedIf user tries to update or read data, we don't need to call
f2fs_balance_fswhich triggersf2fs_gc, which increases unnecessary long latency.
One missing case is get_data_block_dio, how about also covering it based on following patch?
Quoted 1 line
From
7175efac7473e7a04285055c69edfb7432f8ca4eMon Sep 17 00:00:00 2001
From: Chao Yu <[email protected]>
Date: Wed, 23 Dec 2015 17:11:43 +0800
Subject: [PATCH] f2fs: reduce covered region of sbi->cp_rwsem in
f2fs_map_blocks
Only cover sbi->cp_rwsem on one dnode page's allocation and modification instead of multiple's in f2fs_map_blocks, it can reduce the covered region of cp_rwsem, then we can avoid potential long time delay for concurrent checkpointer.
--- fs/f2fs/data.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
fs/f2fs/data.c +7 -2
@@ -594,7 +594,7 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, }if (create) -f2fs_lock_op (F2FS_I_SB (inode)); +f2fs_lock_op (sbi);/* When reading holes, we need its node page */ set_new_dnode (&dn, inode,NULL ,NULL ,0 );
@@ -651,6 +651,11 @@ get_next: allocated = false;f2fs_put_dnode (&dn); +if (create) { +f2fs_unlock_op (sbi); +f2fs_lock_op (sbi); + } +set_new_dnode (&dn, inode,NULL ,NULL ,0 ); err =get_dnode_of_data (&dn, pgofs, mode);if (err) {
@@ -706,7 +711,7 @@ put_out:f2fs_put_dnode (&dn); unlock_out:if (create) -f2fs_unlock_op (F2FS_I_SB (inode)); +f2fs_unlock_op (sbi); out:trace_f2fs_map_blocks (inode, map, err);return err;
Signature · 1 line
2.6.3
Jaegeuk Kim
maintainerRe: [f2fs-dev] [PATCH 4/4] f2fs: call f2fs_balance_fs only when node was changed
Hi Chao,
Quoted 10 lines · Chao Yu
Hi Jaegeuk,
Quoted 8 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Wednesday, December 23, 2015 9:00 AM
To: [email protected]; [email protected]; [email protected]
Cc: Jaegeuk Kim
Subject: [f2fs-dev] [PATCH 4/4] f2fs: callf2fs_balance_fsonly when node was changed
Quoted 5 lines
Quoted 2 lines
If user tries to update or read data, we don't need to call
f2fs_balance_fswhich triggersf2fs_gc, which increases unnecessary long latency.One missing case is
get_data_block_dio, how about also covering it based on following patch?
It makes sense.
I'll submit v2.
Thanks,
Quoted 55 lines
Quoted 3 lines
From
7175efac7473e7a04285055c69edfb7432f8ca4eMon Sep 17 00:00:00 2001From: Chao Yu <[email protected]>
Date: Wed, 23 Dec 2015 17:11:43 +0800
Subject: [PATCH] f2fs: reduce covered region ofsbi->cp_rwsemin
f2fs_map_blocksOnly cover
sbi->cp_rwsemon one dnode page's allocation and modification instead of multiple's inf2fs_map_blocks, it can reduce the covered region ofcp_rwsem, then we can avoid potential long time delay for concurrent checkpointer.Signed-off-by Chao Yu <[email protected]>--- fs/f2fs/data.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)fs/f2fs/data.c +7
-2@@ -594,7 +594,7 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, }if (create) -f2fs_lock_op (F2FS_I_SB (inode)); +f2fs_lock_op (sbi);/* When reading holes, we need its node page */ set_new_dnode (&dn, inode,NULL ,NULL ,0 );@@ -651,6 +651,11 @@ get_next: allocated = false;f2fs_put_dnode (&dn); +if (create) { +f2fs_unlock_op (sbi); +f2fs_lock_op (sbi); + } +set_new_dnode (&dn, inode,NULL ,NULL ,0 ); err =get_dnode_of_data (&dn, pgofs, mode);if (err) {@@ -706,7 +711,7 @@ put_out:f2fs_put_dnode (&dn); unlock_out:if (create) -f2fs_unlock_op (F2FS_I_SB (inode)); +f2fs_unlock_op (sbi); out:trace_f2fs_map_blocks (inode, map, err);return err;Signature · 1 line
2.6.3
RE: [f2fs-dev] [PATCH 4/4] f2fs: call f2fs_balance_fs only when node was changed
In reply to Chao YuHi Jaegeuk,
Quoted 25 lines
-----Original Message-----
From: Chao Yu [mailto:[email protected]]
Sent: Wednesday, December 23, 2015 5:47 PM
To: 'Jaegeuk Kim'
Cc: [email protected]; [email protected]; [email protected]
Subject: Re: [f2fs-dev] [PATCH 4/4] f2fs: callf2fs_balance_fsonly when node was changedHi Jaegeuk,
Quoted 10 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Wednesday, December 23, 2015 9:00 AM
To: [email protected]; [email protected]; [email protected]
Cc: Jaegeuk Kim
Subject: [f2fs-dev] [PATCH 4/4] f2fs: callf2fs_balance_fsonly when node was changedIf user tries to update or read data, we don't need to call
f2fs_balance_fswhich triggersf2fs_gc, which increases unnecessary long latency.One missing case is
get_data_block_dio, how about also covering it based on following patch?
Quoted 5 lines
Quoted 1 line
From
7175efac7473e7a04285055c69edfb7432f8ca4eMon Sep 17 00:00:00 2001From: Chao Yu <[email protected]>
Date: Wed, 23 Dec 2015 17:11:43 +0800
Subject: [PATCH] f2fs: reduce covered region ofsbi->cp_rwsemin
f2fs_map_blocks
Title of this commit log was not merged into dev-test branch correctly, could you please reedit it? :)
Thanks,
Jaegeuk Kim
maintainerRe: [PATCH 4/4] f2fs: call f2fs_balance_fs only when node was changed
In reply to Jaegeuk KimChange log v2:
- add dio case
Quoted 1 line
From
c2d16a526371954671f9c8cff5f09f9d230f7993Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <[email protected]>
Date: Tue, 22 Dec 2015 13:23:35 -0800
Subject: [PATCH] f2fs: call f2fs_balance_fs only when node was changed
If user tries to update or read data, we don't need to call f2fs_balance_fs which triggers f2fs_gc, which increases unnecessary long latency.
--- fs/f2fs/data.c | 26 ++++++++++++++++++++++---- fs/f2fs/file.c | 26 +++++++++----------------- fs/f2fs/inline.c | 4 ++++ 3 files changed, 35 insertions(+), 21 deletions(-)
fs/f2fs/data.c +22 -4
@@ -509,7 +509,6 @@ static void __allocate_data_blocks(struct inode *inode, loff_t offset,u64 end_offset;while (len) { -f2fs_balance_fs (sbi);f2fs_lock_op (sbi);/* When reading holes, we need its node page */
@@ -542,6 +541,9 @@ static void __allocate_data_blocks(struct inode *inode, loff_t offset,f2fs_put_dnode (&dn);f2fs_unlock_op (sbi); + +if (dn.node_changed) +f2fs_balance_fs (sbi); }return ;
@@ -551,6 +553,8 @@ sync_out:f2fs_put_dnode (&dn); out:f2fs_unlock_op (sbi); +if (dn.node_changed) +f2fs_balance_fs (sbi);return ; }
@@ -649,6 +653,8 @@ get_next:if (create) {f2fs_unlock_op (sbi); +if (dn.node_changed) +f2fs_balance_fs (sbi);f2fs_lock_op (sbi); }
@@ -706,8 +712,11 @@ sync_out: put_out:f2fs_put_dnode (&dn); unlock_out: -if (create) +if (create) {f2fs_unlock_op (sbi); +if (dn.node_changed) +f2fs_balance_fs (sbi); + } out:trace_f2fs_map_blocks (inode, map, err);return err;
@@ -1415,8 +1424,6 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping,trace_f2fs_write_begin (inode, pos, len, flags); -f2fs_balance_fs (sbi); -/* * We should check this at this moment to avoid deadlock on inode page * and #0 page. The locking rule for inline_data conversion should be:
@@ -1466,6 +1473,17 @@ put_next:f2fs_put_dnode (&dn);f2fs_unlock_op (sbi); +if (dn.node_changed &&has_not_enough_free_secs (sbi,0 )) { +unlock_page (page); +f2fs_balance_fs (sbi); +lock_page (page); +if (page->mapping != mapping) { +/* The page got truncated from under us */ +f2fs_put_page (page,1 ); + goto repeat; + } + } +f2fs_wait_on_page_writeback (page,DATA );/* wait for GCed encrypted page writeback */
fs/f2fs/file.c +9 -17
@@ -40,8 +40,6 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma,struct dnode_of_data dn;int err; -f2fs_balance_fs (sbi); -sb_start_pagefault (inode->i_sb);f2fs_bug_on (sbi,f2fs_has_inline_data (inode));
@@ -57,6 +55,9 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma,f2fs_put_dnode (&dn);f2fs_unlock_op (sbi); +if (dn.node_changed) +f2fs_balance_fs (sbi); +file_update_time (vma->vm_file);lock_page (page); if (unlikely(page->mapping != inode->i_mapping ||
@@ -233,9 +234,6 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) goto out; } go_write: -/* guarantee free sections for fsync */ -f2fs_balance_fs (sbi); -/* * Both of fdatasync() and fsync() are able to be recovered from * sudden-power-off.
@@ -267,6 +265,8 @@ sync_nodes:if (need_inode_block_update (sbi, ino)) {mark_inode_dirty_sync (inode);f2fs_write_inode (inode,NULL ); + +f2fs_balance_fs (sbi); goto sync_nodes; }
@@ -945,8 +945,6 @@ static int f2fs_collapse_range(struct inode *inode, loff_t offset, loff_t len)if (offset & (F2FS_BLKSIZE -1 ) || len & (F2FS_BLKSIZE -1 ))return -EINVAL ; -f2fs_balance_fs (F2FS_I_SB (inode)); - ret =f2fs_convert_inline_inode (inode);if (ret)return ret;
@@ -993,8 +991,6 @@ static int f2fs_zero_range(struct inode *inode, loff_t offset, loff_t len,if (ret)return ret; -f2fs_balance_fs (sbi); - ret =f2fs_convert_inline_inode (inode);if (ret)return ret;
@@ -1104,12 +1100,12 @@ static int f2fs_insert_range(struct inode *inode, loff_t offset, loff_t len)if (offset & (F2FS_BLKSIZE -1 ) || len & (F2FS_BLKSIZE -1 ))return -EINVAL ; -f2fs_balance_fs (sbi); - ret =f2fs_convert_inline_inode (inode);if (ret)return ret; +f2fs_balance_fs (sbi); + ret =truncate_blocks (inode,i_size_read (inode), true);if (ret)return ret;
@@ -1152,8 +1148,6 @@ static int expand_inode_data(struct inode *inode, loff_t offset,loff_t off_start, off_end;int ret =0 ; -f2fs_balance_fs (sbi); - ret =inode_newsize_ok (inode, (len + offset));if (ret)return ret;
@@ -1162,6 +1156,8 @@ static int expand_inode_data(struct inode *inode, loff_t offset,if (ret)return ret; +f2fs_balance_fs (sbi); + pg_start = ((unsigned long long ) offset) >>PAGE_CACHE_SHIFT ; pg_end = ((unsigned long long ) offset + len) >>PAGE_CACHE_SHIFT ;
@@ -1349,8 +1345,6 @@ static int f2fs_ioc_start_atomic_write(struct file *filp)if (!inode_owner_or_capable (inode))return -EACCES ; -f2fs_balance_fs (F2FS_I_SB (inode)); -if (f2fs_is_atomic_file (inode))return 0 ;
@@ -1437,8 +1431,6 @@ static int f2fs_ioc_abort_volatile_write(struct file *filp)if (ret)return ret; -f2fs_balance_fs (F2FS_I_SB (inode)); -clear_inode_flag (F2FS_I (inode),FI_ATOMIC_FILE );clear_inode_flag (F2FS_I (inode),FI_VOLATILE_FILE );commit_inmem_pages (inode, true);
fs/f2fs/inline.c +4 -0
@@ -202,6 +202,10 @@ out:f2fs_unlock_op (sbi);f2fs_put_page (page,1 ); + +if (dn.node_changed) +f2fs_balance_fs (sbi); +return err; }
Signature · 1 line
2.5.4 (Apple Git-61)
Chao Yu
Reviewed-byRE: [f2fs-dev] [PATCH 4/4] f2fs: call f2fs_balance_fs only when node was changed
Quoted 11 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Thursday, December 24, 2015 3:14 AM
To: [email protected]; [email protected]; [email protected]
Subject: Re: [f2fs-dev] [PATCH 4/4] f2fs: callf2fs_balance_fsonly when node was changedChange log v2:
- add dio caseQuoted 1 line
From
c2d16a526371954671f9c8cff5f09f9d230f7993Mon Sep 17 00:00:00 2001
Quoted 8 lines
From: Jaegeuk Kim <[email protected]>
Date: Tue, 22 Dec 2015 13:23:35 -0800
Subject: [PATCH] f2fs: callf2fs_balance_fsonly when node was changedIf user tries to update or read data, we don't need to call
f2fs_balance_fswhich triggersf2fs_gc, which increases unnecessary long latency.Signed-off-by Jaegeuk Kim <[email protected]>
Quoted 11 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Wednesday, December 23, 2015 9:00 AM
To: [email protected]; [email protected]; [email protected]
Cc: Jaegeuk Kim
Subject: [f2fs-dev] [PATCH 1/4] f2fs: checkinline_dataflag at converting timeWe can check inode's
inline_dataflag when calling to convert it.Signed-off-by Jaegeuk Kim <[email protected]>