f2fs: introduce prepare_write_begin to clean up
Subsystems (2)
Jaegeuk Kim
maintainerPATCH 1/4 f2fs: introduce prepare_write_begin to clean up
This patch adds prepare_write_begin to clean f2fs_write_begin. The major role of this function is to convert any inline_data and allocate or find block address.
--- fs/f2fs/data.c | 92 ++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 54 insertions(+), 38 deletions(-)
fs/f2fs/data.c +54 -38
@@ -1410,6 +1410,51 @@ static void f2fs_write_failed(struct address_space *mapping, loff_t to) } } +static int prepare_write_begin (struct f2fs_sb_info *sbi, +struct page *page,loff_t pos,unsigned len, +block_t *blk_addr,bool *node_changed) +{ +struct inode *inode = page->mapping->host; +pgoff_t index = page->index; +struct dnode_of_data dn; +struct page *ipage; +int err =0 ; + +f2fs_lock_op (sbi); + +/* check inline_data */ + ipage =get_node_page (sbi, inode->i_ino); +if (IS_ERR (ipage)) { + err =PTR_ERR (ipage); + goto unlock_out; + } + +set_new_dnode (&dn, inode, ipage, ipage,0 ); + +if (f2fs_has_inline_data (inode)) { +if (pos + len <=MAX_INLINE_DATA ) { +read_inline_data (page, ipage); +set_inode_flag (F2FS_I (inode),FI_DATA_EXIST ); +sync_inode_page (&dn); + goto done; + }else { + err =f2fs_convert_inline_page (&dn, page); +if (err) + goto err_out; + } + } + err =f2fs_get_block (&dn, index); +done: +/* convert_inline_page can make node_changed */ + *blk_addr = dn.data_blkaddr; + *node_changed = dn.node_changed; +err_out: +f2fs_put_dnode (&dn); +unlock_out: +f2fs_unlock_op (sbi); +return err; +} +static int f2fs_write_begin (struct file *file,struct address_space *mapping,loff_t pos,unsigned len,unsigned flags,struct page **pagep,void **fsdata)
@@ -1417,9 +1462,9 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping,struct inode *inode = mapping->host;struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct page *page =NULL ; -struct page *ipage;pgoff_t index = ((unsigned long long ) pos) >>PAGE_CACHE_SHIFT ; -struct dnode_of_data dn; +bool need_balance = false; +block_t blkaddr =NULL_ADDR ;int err =0 ;trace_f2fs_write_begin (inode, pos, len, flags);
@@ -1443,37 +1488,12 @@ repeat: *pagep = page; -f2fs_lock_op (sbi); - -/* check inline_data */ - ipage =get_node_page (sbi, inode->i_ino); -if (IS_ERR (ipage)) { - err =PTR_ERR (ipage); - goto unlock_fail; - } - -set_new_dnode (&dn, inode, ipage, ipage,0 ); - -if (f2fs_has_inline_data (inode)) { -if (pos + len <=MAX_INLINE_DATA ) { -read_inline_data (page, ipage); -set_inode_flag (F2FS_I (inode),FI_DATA_EXIST ); -sync_inode_page (&dn); - goto put_next; - } - err =f2fs_convert_inline_page (&dn, page); -if (err) - goto put_fail; - } - - err =f2fs_get_block (&dn, index); + err =prepare_write_begin (sbi, page, pos + len, + &blkaddr, &need_balance);if (err) - goto put_fail; -put_next: -f2fs_put_dnode (&dn); -f2fs_unlock_op (sbi); + goto fail; -if (dn.node_changed &&has_not_enough_free_secs (sbi,0 )) { +if (need_balance &&has_not_enough_free_secs (sbi,0 )) {unlock_page (page);f2fs_balance_fs (sbi);lock_page (page);
@@ -1488,7 +1508,7 @@ put_next:/* wait for GCed encrypted page writeback */ if (f2fs_encrypted_inode (inode) &&S_ISREG (inode->i_mode)) -f2fs_wait_on_encrypted_page_writeback (sbi, dn.data_blkaddr); +f2fs_wait_on_encrypted_page_writeback (sbi, blkaddr);if (len ==PAGE_CACHE_SIZE ) goto out_update;
@@ -1504,14 +1524,14 @@ put_next: goto out_update; } -if (dn.data_blkaddr ==NEW_ADDR ) { +if (blkaddr ==NEW_ADDR ) {zero_user_segment (page,0 ,PAGE_CACHE_SIZE ); }else {struct f2fs_io_info fio = { .sbi = sbi, .type =DATA , .rw =READ_SYNC , - .blk_addr = dn.data_blkaddr, + .blk_addr = blkaddr, .page = page, .encrypted_page =NULL , };
@@ -1542,10 +1562,6 @@ out_clear:clear_cold_data (page);return 0 ; -put_fail: -f2fs_put_dnode (&dn); -unlock_fail: -f2fs_unlock_op (sbi); fail:f2fs_put_page (page,1 );f2fs_write_failed (mapping, pos + len);
Signature · 1 line
2.5.4 (Apple Git-61)
Jaegeuk Kim
maintainerPATCH 2/4 f2fs: return early when trying to read null nid
If get_node_page() gets zero nid, we can return early without getting a wrong page. For example, get_dnode_of_data() can try to do that.
--- fs/f2fs/node.c | 3 +++ 1 file changed, 3 insertions(+)
fs/f2fs/node.c +3 -0
@@ -1059,6 +1059,9 @@ struct page *get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid) {struct page *page;int err; + +if (!nid) +return ERR_PTR (-ENOENT ); repeat: page =grab_cache_page (NODE_MAPPING (sbi), nid);if (!page)
Signature · 1 line
2.5.4 (Apple Git-61)
RE: [f2fs-dev] [PATCH 2/4] f2fs: return early when trying to read null nid
Hi Jaegeuk,
Quoted 10 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Thursday, December 24, 2015 10:15 AM
To: [email protected]; [email protected]; [email protected]
Cc: Jaegeuk Kim
Subject: [f2fs-dev] [PATCH 2/4] f2fs: return early when trying to read null nidIf
get_node_page()gets zero nid, we can return early without getting a wrong page. For example,get_dnode_of_data()can try to do that.
Good catch!
Quoted 11 lines
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/node.c | 3 +++ 1 file changed, 3 insertions(+)fs/f2fs/node.c +0
-0
fs/f2fs/node.c struct page *get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid) · line 1064
Quoted 6 lines
fs/f2fs/node.c +3
-0@@ -1059,6 +1059,9 @@ struct page *get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid) {struct page *page;int err; + +if (!nid) +return ERR_PTR (-ENOENT );
How about expand to check upper and lower boundary:
if (check_nid_range) return ERR_PTR(-ENOENT);
Thanks,
Quoted 12 lines
fs/f2fs/node.c +0
-1repeat: page =grab_cache_page (NODE_MAPPING (sbi), nid);if (!page) --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] f2fs: return early when trying to read null nid
Quoted 35 lines · Chao Yu
Hi Jaegeuk,
Quoted 10 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Thursday, December 24, 2015 10:15 AM
To: [email protected]; [email protected]; [email protected]
Cc: Jaegeuk Kim
Subject: [f2fs-dev] [PATCH 2/4] f2fs: return early when trying to read null nidIf
get_node_page()gets zero nid, we can return early without getting a wrong page. For example,get_dnode_of_data()can try to do that.Good catch!
Quoted 11 lines
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/node.c | 3 +++ 1 file changed, 3 insertions(+)fs/f2fs/node.c +0
-0fs/f2fs/node.c struct page *get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid) · line 1064
Quoted 6 lines
fs/f2fs/node.c +3
-0@@ -1059,6 +1059,9 @@ struct page *get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid) {struct page *page;int err; + +if (!nid) +return ERR_PTR (-ENOENT );How about expand to check upper and lower boundary:
Quoted 2 lines
if (check_nid_range) return ERR_PTR(-ENOENT);
It'd better to add f2fs_bug_on(check_nid_range()) after this. Cause check_nid_range() checks its nid as *unlikely*, but this case seems *likely*.
Thanks,
Quoted 15 lines
Thanks,
Quoted 12 lines
fs/f2fs/node.c +0
-1repeat: page =grab_cache_page (NODE_MAPPING (sbi), nid);if (!page) --2.5.4 (Apple Git-61)
------------------------------------------------------------------------------
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
RE: [f2fs-dev] [PATCH 2/4] f2fs: return early when trying to read null nid
Quoted 44 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Friday, December 25, 2015 4:16 AM
To: Chao Yu
Cc: [email protected]; [email protected]; [email protected]
Subject: Re: [f2fs-dev] [PATCH 2/4] f2fs: return early when trying to read null nidQuoted 35 lines · Chao Yu
Hi Jaegeuk,
Quoted 10 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Thursday, December 24, 2015 10:15 AM
To: [email protected]; [email protected]; [email protected]
Cc: Jaegeuk Kim
Subject: [f2fs-dev] [PATCH 2/4] f2fs: return early when trying to read null nidIf
get_node_page()gets zero nid, we can return early without getting a wrong page. For example,get_dnode_of_data()can try to do that.Good catch!
Quoted 11 lines
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/node.c | 3 +++ 1 file changed, 3 insertions(+)fs/f2fs/node.c +0
-0fs/f2fs/node.c struct page *get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid) · line 1064
Quoted 6 lines
fs/f2fs/node.c +3
-0@@ -1059,6 +1059,9 @@ struct page *get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid) {struct page *page;int err; + +if (!nid) +return ERR_PTR (-ENOENT );How about expand to check upper and lower boundary:
Quoted 6 lines
Quoted 2 lines
if (check_nid_range) return ERR_PTR(-ENOENT);It'd better to add f2fs_bug_on(check_nid_range()) after this. Cause
check_nid_range()checks its nid as *unlikely*, but this case seems *likely*.
Agreed.
Thanks,
Quoted 18 lines
Thanks,
Quoted 15 lines
Thanks,
Quoted 12 lines
fs/f2fs/node.c +0
-1repeat: page =grab_cache_page (NODE_MAPPING (sbi), nid);if (!page) --2.5.4 (Apple Git-61)
------------------------------------------------------------------------------
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Jaegeuk Kim
maintainerPATCH 3/4 f2fs: avoid f2fs_lock_op in f2fs_write_begin
In reply to Jaegeuk KimIf f2fs_write_begin is to update data, we can bypass calling f2fs_lock_op() in order to avoid the checkpoint latency in the write syscall.
--- fs/f2fs/data.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-)
fs/f2fs/data.c +34 -9
@@ -1418,10 +1418,16 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,pgoff_t index = page->index;struct dnode_of_data dn;struct page *ipage; +bool locked = false; +struct extent_info ei;int err =0 ; -f2fs_lock_op (sbi); - +if (f2fs_has_inline_data (inode) || + (pos &PAGE_CACHE_MASK ) >=i_size_read (inode)) { +f2fs_lock_op (sbi); + locked = true; + } +restart:/* check inline_data */ ipage =get_node_page (sbi, inode->i_ino);if (IS_ERR (ipage)) {
@@ -1436,22 +1442,41 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,read_inline_data (page, ipage);set_inode_flag (F2FS_I (inode),FI_DATA_EXIST );sync_inode_page (&dn); - goto done; }else { err =f2fs_convert_inline_page (&dn, page);if (err) - goto err_out; + goto out; + err =f2fs_get_block (&dn, index); + } + }else if (locked) { + err =f2fs_get_block (&dn, index); + }else { +if (f2fs_lookup_extent_cache (inode, index, &ei)) { + dn.data_blkaddr = ei.blk + index - ei.fofs; + }else { +bool restart = false; + +/* hole case */ + err =get_dnode_of_data (&dn, index,LOOKUP_NODE ); +if (err || (!err && dn.data_blkaddr ==NULL_ADDR )) + restart = true; +if (restart) { +f2fs_put_dnode (&dn); +f2fs_lock_op (sbi); + locked = true; + goto restart; + } } } - err =f2fs_get_block (&dn, index); -done: +/* convert_inline_page can make node_changed */ *blk_addr = dn.data_blkaddr; *node_changed = dn.node_changed; -err_out: +out:f2fs_put_dnode (&dn); unlock_out: -f2fs_unlock_op (sbi); +if (locked) +f2fs_unlock_op (sbi);return err; }
@@ -1488,7 +1513,7 @@ repeat: *pagep = page; - err =prepare_write_begin (sbi, page, pos + len, + err =prepare_write_begin (sbi, page, pos, len, &blkaddr, &need_balance);if (err) goto fail;
Signature · 1 line
2.5.4 (Apple Git-61)
RE: [f2fs-dev] [PATCH 3/4] f2fs: avoid f2fs_lock_op in f2fs_write_begin
Hi Jaegeuk,
Quoted 40 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Thursday, December 24, 2015 10:15 AM
To: [email protected]; [email protected]; [email protected]
Cc: Jaegeuk Kim
Subject: [f2fs-dev] [PATCH 3/4] f2fs: avoidf2fs_lock_opinf2fs_write_beginIf
f2fs_write_beginis to update data, we can bypass callingf2fs_lock_op()in order to avoid the checkpoint latency in the write syscall.Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/data.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-)fs/f2fs/data.c +8
-2@@ -1418,10 +1418,16 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,pgoff_t index = page->index;struct dnode_of_data dn;struct page *ipage; +bool locked = false; +struct extent_info ei;int err =0 ; -f2fs_lock_op (sbi); - +if (f2fs_has_inline_data (inode) || + (pos &PAGE_CACHE_MASK ) >=i_size_read (inode)) { +f2fs_lock_op (sbi); + locked = true; + } +restart:/* check inline_data */ ipage =get_node_page (sbi, inode->i_ino);if (IS_ERR (ipage)) {
fs/f2fs/data.c static int prepare_write_begin(struct f2fs_sb_info *sbi, · line 1449
Quoted 10 lines
fs/f2fs/data.c +2
-2@@ -1436,22 +1442,41 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,read_inline_data (page, ipage);set_inode_flag (F2FS_I (inode),FI_DATA_EXIST );sync_inode_page (&dn); - goto done; }else { err =f2fs_convert_inline_page (&dn, page);if (err) - goto err_out; + goto out; + err =f2fs_get_block (&dn, index);
Seems after f2fs_convert_inline_page, data_blkaddr and node_changed should have been set, so f2fs_get_block could be removed here.
fs/f2fs/data.c static int prepare_write_begin(struct f2fs_sb_info *sbi, · line 1460
Quoted 11 lines
fs/f2fs/data.c +11
-0+ } + }else if (locked) { + err =f2fs_get_block (&dn, index); + }else { +if (f2fs_lookup_extent_cache (inode, index, &ei)) { + dn.data_blkaddr = ei.blk + index - ei.fofs; + }else { +bool restart = false; + +/* hole case */ + err =get_dnode_of_data (&dn, index,LOOKUP_NODE );
Better to handle error case like -ENOMEM or -EIO.
Thanks,
Quoted 44 lines
fs/f2fs/data.c +13
-6+if (err || (!err && dn.data_blkaddr ==NULL_ADDR )) + restart = true; +if (restart) { +f2fs_put_dnode (&dn); +f2fs_lock_op (sbi); + locked = true; + goto restart; + } } } - err =f2fs_get_block (&dn, index); -done: +/* convert_inline_page can make node_changed */ *blk_addr = dn.data_blkaddr; *node_changed = dn.node_changed; -err_out: +out:f2fs_put_dnode (&dn); unlock_out: -f2fs_unlock_op (sbi); +if (locked) +f2fs_unlock_op (sbi);return err; }@@ -1488,7 +1513,7 @@ repeat: *pagep = page; - err =prepare_write_begin (sbi, page, pos + len, + err =prepare_write_begin (sbi, page, pos, len, &blkaddr, &need_balance);if (err) goto fail; --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: avoid f2fs_lock_op in f2fs_write_begin
Hi Chao,
Quoted 47 lines · Chao Yu
Hi Jaegeuk,
Quoted 45 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Thursday, December 24, 2015 10:15 AM
To: [email protected]; [email protected]; [email protected]
Cc: Jaegeuk Kim
Subject: [f2fs-dev] [PATCH 3/4] f2fs: avoidf2fs_lock_opinf2fs_write_beginIf
f2fs_write_beginis to update data, we can bypass callingf2fs_lock_op()in order to avoid the checkpoint latency in the write syscall.Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/data.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-)fs/f2fs/data.c +8
-3@@ -1418,10 +1418,16 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,pgoff_t index = page->index;struct dnode_of_data dn;struct page *ipage; +bool locked = false; +struct extent_info ei;int err =0 ; -f2fs_lock_op (sbi); - +if (f2fs_has_inline_data (inode) || + (pos &PAGE_CACHE_MASK ) >=i_size_read (inode)) { +f2fs_lock_op (sbi); + locked = true; + } +restart:/* check inline_data */ ipage =get_node_page (sbi, inode->i_ino);if (IS_ERR (ipage)) {@@ -1436,22 +1442,41 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,read_inline_data (page, ipage);set_inode_flag (F2FS_I (inode),FI_DATA_EXIST );sync_inode_page (&dn); - goto done; }else {
Quoted 8 lines
fs/f2fs/data.c static int prepare_write_begin(struct f2fs_sb_info *sbi, · line 1449
Quoted 5 lines
fs/f2fs/data.c +2
-1err =f2fs_convert_inline_page (&dn, page);if (err) - goto err_out; + goto out; + err =f2fs_get_block (&dn, index);Seems after
f2fs_convert_inline_page,data_blkaddrandnode_changedshould have been set, sof2fs_get_blockcould be removed here.
I don't think so. The inline_data treats with 0'th index only. In order to handle non-zero index, we should do f2fs_get_block. Oh, if you meant zero index case only, we can do that like this.
if (index) err = f2fs_get_block();
Quoted 14 lines
fs/f2fs/data.c static int prepare_write_begin(struct f2fs_sb_info *sbi, · line 1460
Quoted 12 lines
fs/f2fs/data.c +11
-0+ } + }else if (locked) { + err =f2fs_get_block (&dn, index); + }else { +if (f2fs_lookup_extent_cache (inode, index, &ei)) { + dn.data_blkaddr = ei.blk + index - ei.fofs; + }else { +bool restart = false; + +/* hole case */ + err =get_dnode_of_data (&dn, index,LOOKUP_NODE );Better to handle error case like
-ENOMEMor-EIO.
I think we can just give another chance at this moment and let f2fs_get_block() handle that in the next round.
Thanks,
Quoted 47 lines
Thanks,
Quoted 44 lines
fs/f2fs/data.c +13
-6+if (err || (!err && dn.data_blkaddr ==NULL_ADDR )) + restart = true; +if (restart) { +f2fs_put_dnode (&dn); +f2fs_lock_op (sbi); + locked = true; + goto restart; + } } } - err =f2fs_get_block (&dn, index); -done: +/* convert_inline_page can make node_changed */ *blk_addr = dn.data_blkaddr; *node_changed = dn.node_changed; -err_out: +out:f2fs_put_dnode (&dn); unlock_out: -f2fs_unlock_op (sbi); +if (locked) +f2fs_unlock_op (sbi);return err; }@@ -1488,7 +1513,7 @@ repeat: *pagep = page; - err =prepare_write_begin (sbi, page, pos + len, + err =prepare_write_begin (sbi, page, pos, len, &blkaddr, &need_balance);if (err) goto fail; --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: avoid f2fs_lock_op in f2fs_write_begin
Hi Chao,
Quoted 59 lines · Jaegeuk Kim
Hi Chao,
Quoted 47 lines · Chao Yu
Hi Jaegeuk,
Quoted 45 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Thursday, December 24, 2015 10:15 AM
To: [email protected]; [email protected]; [email protected]
Cc: Jaegeuk Kim
Subject: [f2fs-dev] [PATCH 3/4] f2fs: avoidf2fs_lock_opinf2fs_write_beginIf
f2fs_write_beginis to update data, we can bypass callingf2fs_lock_op()in order to avoid the checkpoint latency in the write syscall.Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/data.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-)fs/f2fs/data.c +8
-3@@ -1418,10 +1418,16 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,pgoff_t index = page->index;struct dnode_of_data dn;struct page *ipage; +bool locked = false; +struct extent_info ei;int err =0 ; -f2fs_lock_op (sbi); - +if (f2fs_has_inline_data (inode) || + (pos &PAGE_CACHE_MASK ) >=i_size_read (inode)) { +f2fs_lock_op (sbi); + locked = true; + } +restart:/* check inline_data */ ipage =get_node_page (sbi, inode->i_ino);if (IS_ERR (ipage)) {@@ -1436,22 +1442,41 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,read_inline_data (page, ipage);set_inode_flag (F2FS_I (inode),FI_DATA_EXIST );sync_inode_page (&dn); - goto done; }else {Quoted 8 lines
fs/f2fs/data.c static int prepare_write_begin(struct f2fs_sb_info *sbi, · line 1449
Quoted 5 lines
fs/f2fs/data.c +2
-1err =f2fs_convert_inline_page (&dn, page);if (err) - goto err_out; + goto out; + err =f2fs_get_block (&dn, index);Seems after
f2fs_convert_inline_page,data_blkaddrandnode_changedshould have been set, sof2fs_get_blockcould be removed here.
Quoted 6 lines
I don't think so. The
inline_datatreats with 0'th index only. In order to handle non-zero index, we should dof2fs_get_block. Oh, if you meant zero index case only, we can do that like this.if (index) err = f2fs_get_block();
Actually, we need
if (index || !dn.data_blkaddr) err = f2fs_get_block();
Since f2fs_convert_inline_page can return right away, if there is no data in inline_data space.
Thanks,
Quoted 74 lines
Quoted 15 lines
fs/f2fs/data.c static int prepare_write_begin(struct f2fs_sb_info *sbi, · line 1460
Quoted 13 lines
fs/f2fs/data.c +11
-0+ } + }else if (locked) { + err =f2fs_get_block (&dn, index); + }else { +if (f2fs_lookup_extent_cache (inode, index, &ei)) { + dn.data_blkaddr = ei.blk + index - ei.fofs; + }else { +bool restart = false; + +/* hole case */ + err =get_dnode_of_data (&dn, index,LOOKUP_NODE );Better to handle error case like
-ENOMEMor-EIO.I think we can just give another chance at this moment and let
f2fs_get_block()handle that in the next round.Thanks,
Quoted 42 lines
Thanks,
Quoted 39 lines
fs/f2fs/data.c +13
-6+if (err || (!err && dn.data_blkaddr ==NULL_ADDR )) + restart = true; +if (restart) { +f2fs_put_dnode (&dn); +f2fs_lock_op (sbi); + locked = true; + goto restart; + } } } - err =f2fs_get_block (&dn, index); -done: +/* convert_inline_page can make node_changed */ *blk_addr = dn.data_blkaddr; *node_changed = dn.node_changed; -err_out: +out:f2fs_put_dnode (&dn); unlock_out: -f2fs_unlock_op (sbi); +if (locked) +f2fs_unlock_op (sbi);return err; }@@ -1488,7 +1513,7 @@ repeat: *pagep = page; - err =prepare_write_begin (sbi, page, pos + len, + err =prepare_write_begin (sbi, page, pos, len, &blkaddr, &need_balance);if (err) goto fail; --2.5.4 (Apple Git-61)
Quoted 5 lines
Quoted 5 lines
------------------------------------------------------------------------------
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel------------------------------------------------------------------------------
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
RE: [f2fs-dev] [PATCH 3/4] f2fs: avoid f2fs_lock_op in f2fs_write_begin
Hi Jaegeuk,
Quoted 8 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Friday, December 25, 2015 5:52 AM
To: Chao Yu
Cc: [email protected]; [email protected]; [email protected]
Subject: Re: [f2fs-dev] [PATCH 3/4] f2fs: avoidf2fs_lock_opinf2fs_write_begin
Quoted 64 lines
Hi Chao,
Quoted 61 lines · Jaegeuk Kim
Hi Chao,
Quoted 47 lines · Chao Yu
Hi Jaegeuk,
Quoted 45 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Thursday, December 24, 2015 10:15 AM
To: [email protected]; [email protected]; [email protected]
Cc: Jaegeuk Kim
Subject: [f2fs-dev] [PATCH 3/4] f2fs: avoidf2fs_lock_opinf2fs_write_beginIf
f2fs_write_beginis to update data, we can bypass callingf2fs_lock_op()in order to avoid the checkpoint latency in the write syscall.Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/data.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-)fs/f2fs/data.c +8
-3@@ -1418,10 +1418,16 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,pgoff_t index = page->index;struct dnode_of_data dn;struct page *ipage; +bool locked = false; +struct extent_info ei;int err =0 ; -f2fs_lock_op (sbi); - +if (f2fs_has_inline_data (inode) || + (pos &PAGE_CACHE_MASK ) >=i_size_read (inode)) { +f2fs_lock_op (sbi); + locked = true; + } +restart:/* check inline_data */ ipage =get_node_page (sbi, inode->i_ino);if (IS_ERR (ipage)) {@@ -1436,22 +1442,41 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,read_inline_data (page, ipage);set_inode_flag (F2FS_I (inode),FI_DATA_EXIST );sync_inode_page (&dn); - goto done; }else {Quoted 8 lines
fs/f2fs/data.c static int prepare_write_begin(struct f2fs_sb_info *sbi, · line 1449
Quoted 5 lines
fs/f2fs/data.c +2
-1err =f2fs_convert_inline_page (&dn, page);if (err) - goto err_out; + goto out; + err =f2fs_get_block (&dn, index);Seems after
f2fs_convert_inline_page,data_blkaddrandnode_changedshould have been set, sof2fs_get_blockcould be removed here.I don't think so. The
inline_datatreats with 0'th index only. In order to handle non-zero index, we should dof2fs_get_block.
non-zero index page should have been handled before grab_cache_page_write_begin. We won't encounter such case here.
Quoted 11 lines
Quoted 4 lines
Oh, if you meant zero index case only, we can do that like this.
if (index) err = f2fs_get_block();Actually, we need
if (index || !dn.data_blkaddr) err = f2fs_get_block();Since
f2fs_convert_inline_pagecan return right away, if there is no data ininline_dataspace.
Yes, that's the case we should handle. :)
Thanks,
Quoted 77 lines
Thanks,
Quoted 74 lines
Quoted 15 lines
fs/f2fs/data.c static int prepare_write_begin(struct f2fs_sb_info *sbi, · line 1460
Quoted 13 lines
fs/f2fs/data.c +11
-0+ } + }else if (locked) { + err =f2fs_get_block (&dn, index); + }else { +if (f2fs_lookup_extent_cache (inode, index, &ei)) { + dn.data_blkaddr = ei.blk + index - ei.fofs; + }else { +bool restart = false; + +/* hole case */ + err =get_dnode_of_data (&dn, index,LOOKUP_NODE );Better to handle error case like
-ENOMEMor-EIO.I think we can just give another chance at this moment and let
f2fs_get_block()handle that in the next round.Thanks,
Quoted 42 lines
Thanks,
Quoted 39 lines
fs/f2fs/data.c +13
-6+if (err || (!err && dn.data_blkaddr ==NULL_ADDR )) + restart = true; +if (restart) { +f2fs_put_dnode (&dn); +f2fs_lock_op (sbi); + locked = true; + goto restart; + } } } - err =f2fs_get_block (&dn, index); -done: +/* convert_inline_page can make node_changed */ *blk_addr = dn.data_blkaddr; *node_changed = dn.node_changed; -err_out: +out:f2fs_put_dnode (&dn); unlock_out: -f2fs_unlock_op (sbi); +if (locked) +f2fs_unlock_op (sbi);return err; }@@ -1488,7 +1513,7 @@ repeat: *pagep = page; - err =prepare_write_begin (sbi, page, pos + len, + err =prepare_write_begin (sbi, page, pos, len, &blkaddr, &need_balance);if (err) goto fail; --2.5.4 (Apple Git-61)
Quoted 5 lines
Quoted 5 lines
------------------------------------------------------------------------------
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel------------------------------------------------------------------------------
_______________________________________________
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: avoid f2fs_lock_op in f2fs_write_begin
Hi Chao,
Quoted 72 lines · Chao Yu
Hi Jaegeuk,
Quoted 70 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Friday, December 25, 2015 5:52 AM
To: Chao Yu
Cc: [email protected]; [email protected]; [email protected]
Subject: Re: [f2fs-dev] [PATCH 3/4] f2fs: avoidf2fs_lock_opinf2fs_write_beginHi Chao,
Quoted 59 lines · Jaegeuk Kim
Hi Chao,
Quoted 55 lines · Chao Yu
Hi Jaegeuk,
Quoted 40 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Thursday, December 24, 2015 10:15 AM
To: [email protected]; [email protected]; [email protected]
Cc: Jaegeuk Kim
Subject: [f2fs-dev] [PATCH 3/4] f2fs: avoidf2fs_lock_opinf2fs_write_beginIf
f2fs_write_beginis to update data, we can bypass callingf2fs_lock_op()in order to avoid the checkpoint latency in the write syscall.Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/data.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-)fs/f2fs/data.c +8
-2@@ -1418,10 +1418,16 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,pgoff_t index = page->index;struct dnode_of_data dn;struct page *ipage; +bool locked = false; +struct extent_info ei;int err =0 ; -f2fs_lock_op (sbi); - +if (f2fs_has_inline_data (inode) || + (pos &PAGE_CACHE_MASK ) >=i_size_read (inode)) { +f2fs_lock_op (sbi); + locked = true; + } +restart:/* check inline_data */ ipage =get_node_page (sbi, inode->i_ino);if (IS_ERR (ipage)) {fs/f2fs/data.c static int prepare_write_begin(struct f2fs_sb_info *sbi, · line 1449
Quoted 10 lines
fs/f2fs/data.c +2
-2@@ -1436,22 +1442,41 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,read_inline_data (page, ipage);set_inode_flag (F2FS_I (inode),FI_DATA_EXIST );sync_inode_page (&dn); - goto done; }else { err =f2fs_convert_inline_page (&dn, page);if (err) - goto err_out; + goto out; + err =f2fs_get_block (&dn, index);Seems after
f2fs_convert_inline_page,data_blkaddrandnode_changedshould have been set, sof2fs_get_blockcould be removed here.
Quoted 5 lines
Quoted 2 lines
Quoted 2 lines
I don't think so. The
inline_datatreats with 0'th index only. In order to handle non-zero index, we should dof2fs_get_block.non-zero index page should have been handled before
grab_cache_page_write_begin. We won't encounter such case here.
Alright.
So, let me go with:
if (dn.data_blkaddr == NULL_ADDR) err = f2fs_get_block();
Thanks,
Quoted 94 lines
Quoted 6 lines
Quoted 5 lines
Oh, if you meant zero index case only, we can do that like this.
if (index) err = f2fs_get_block();Quoted 6 lines
Actually, we need
if (index || !dn.data_blkaddr) err = f2fs_get_block();Since
f2fs_convert_inline_pagecan return right away, if there is no data ininline_dataspace.Yes, that's the case we should handle. :)
Thanks,
Quoted 77 lines
Thanks,
Quoted 74 lines
Quoted 15 lines
fs/f2fs/data.c static int prepare_write_begin(struct f2fs_sb_info *sbi, · line 1460
Quoted 13 lines
fs/f2fs/data.c +11
-0+ } + }else if (locked) { + err =f2fs_get_block (&dn, index); + }else { +if (f2fs_lookup_extent_cache (inode, index, &ei)) { + dn.data_blkaddr = ei.blk + index - ei.fofs; + }else { +bool restart = false; + +/* hole case */ + err =get_dnode_of_data (&dn, index,LOOKUP_NODE );Better to handle error case like
-ENOMEMor-EIO.I think we can just give another chance at this moment and let
f2fs_get_block()handle that in the next round.Thanks,
Quoted 42 lines
Thanks,
Quoted 39 lines
fs/f2fs/data.c +13
-6+if (err || (!err && dn.data_blkaddr ==NULL_ADDR )) + restart = true; +if (restart) { +f2fs_put_dnode (&dn); +f2fs_lock_op (sbi); + locked = true; + goto restart; + } } } - err =f2fs_get_block (&dn, index); -done: +/* convert_inline_page can make node_changed */ *blk_addr = dn.data_blkaddr; *node_changed = dn.node_changed; -err_out: +out:f2fs_put_dnode (&dn); unlock_out: -f2fs_unlock_op (sbi); +if (locked) +f2fs_unlock_op (sbi);return err; }@@ -1488,7 +1513,7 @@ repeat: *pagep = page; - err =prepare_write_begin (sbi, page, pos + len, + err =prepare_write_begin (sbi, page, pos, len, &blkaddr, &need_balance);if (err) goto fail; --2.5.4 (Apple Git-61)
Quoted 5 lines
Quoted 5 lines
------------------------------------------------------------------------------
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel------------------------------------------------------------------------------
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Jaegeuk Kim
maintainerPATCH 4/4 f2fs: declare static function
In reply to Jaegeuk KimThe __f2fs_commit_super is static.
--- fs/f2fs/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/super.c +1 -1
@@ -1195,7 +1195,7 @@ next:return 0 ; } -int __f2fs_commit_super (struct f2fs_sb_info *sbi,int block) +static int __f2fs_commit_super (struct f2fs_sb_info *sbi,int block) {struct f2fs_super_block *super =F2FS_RAW_SUPER (sbi);struct buffer_head *bh;
Signature · 1 line
2.5.4 (Apple Git-61)