f2fs: clean up to remove parameter
Subsystems (2)
Jaegeuk Kim
maintainerPATCH 1/4 f2fs: clean up to remove parameter
This patch uses dn->data_blkaddr as a parameter for the destination block address.
--- fs/f2fs/data.c | 27 ++++++++++++++------------- fs/f2fs/f2fs.h | 2 +- fs/f2fs/file.c | 3 ++- fs/f2fs/inline.c | 2 +- fs/f2fs/recovery.c | 3 ++- fs/f2fs/segment.c | 1 + 6 files changed, 21 insertions(+), 17 deletions(-)
fs/f2fs/data.c +14 -13
@@ -197,7 +197,7 @@ alloc_new:* ->node_page * update block addresses in the node page */ -static void __set_data_blkaddr (struct dnode_of_data *dn,block_t new_addr) +static void __set_data_blkaddr (struct dnode_of_data *dn) {struct f2fs_node *rn;__le32 *addr_array;
@@ -210,7 +210,7 @@ static void __set_data_blkaddr(struct dnode_of_data *dn, block_t new_addr)/* Get physical address of data block */ addr_array =blkaddr_in_node (rn); - addr_array[ofs_in_node] =cpu_to_le32 (new_addr); + addr_array[ofs_in_node] =cpu_to_le32 (dn->data_blkaddr);set_page_dirty (node_page); }
@@ -225,8 +225,8 @@ int reserve_new_block(struct dnode_of_data *dn)trace_f2fs_reserve_new_block (dn->inode, dn->nid, dn->ofs_in_node); -__set_data_blkaddr (dn,NEW_ADDR ); dn->data_blkaddr =NEW_ADDR ; +__set_data_blkaddr (dn);mark_inode_dirty (dn->inode);sync_inode_page (dn);return 0 ;
@@ -291,19 +291,19 @@ static int check_extent_cache(struct inode *inode, pgoff_t pgofs,return 0 ; } -void update_extent_cache (block_t blk_addr,struct dnode_of_data *dn) +void update_extent_cache (struct dnode_of_data *dn) {struct f2fs_inode_info *fi =F2FS_I (dn->inode);pgoff_t fofs, start_fofs, end_fofs;block_t start_blkaddr, end_blkaddr;int need_update = true; -f2fs_bug_on (F2FS_I_SB (dn->inode), blk_addr ==NEW_ADDR ); +f2fs_bug_on (F2FS_I_SB (dn->inode), dn->data_blkaddr ==NEW_ADDR ); fofs =start_bidx_of_node (ofs_of_node (dn->node_page), fi) + dn->ofs_in_node;/* Update the page address in the parent node */ -__set_data_blkaddr (dn, blk_addr); +__set_data_blkaddr (dn);if (is_inode_flag_set (fi,FI_NO_EXTENT ))return ;
@@ -321,16 +321,16 @@ void update_extent_cache(block_t blk_addr, struct dnode_of_data *dn)/* Initial extent */ if (fi->ext.len ==0 ) { -if (blk_addr !=NULL_ADDR ) { +if (dn->data_blkaddr !=NULL_ADDR ) { fi->ext.fofs = fofs; - fi->ext.blk_addr = blk_addr; + fi->ext.blk_addr = dn->data_blkaddr; fi->ext.len =1 ; } goto end_update; }/* Front merge */ -if (fofs == start_fofs -1 && blk_addr == start_blkaddr -1 ) { +if (fofs == start_fofs -1 && dn->data_blkaddr == start_blkaddr -1 ) { fi->ext.fofs--; fi->ext.blk_addr--; fi->ext.len++;
@@ -338,7 +338,7 @@ void update_extent_cache(block_t blk_addr, struct dnode_of_data *dn) }/* Back merge */ -if (fofs == end_fofs +1 && blk_addr == end_blkaddr +1 ) { +if (fofs == end_fofs +1 && dn->data_blkaddr == end_blkaddr +1 ) { fi->ext.len++; goto end_update; }
@@ -572,8 +572,8 @@ static int __allocate_data_block(struct dnode_of_data *dn)if (unlikely (!inc_valid_block_count (sbi, dn->inode,1 )))return -ENOSPC ; -__set_data_blkaddr (dn,NEW_ADDR ); dn->data_blkaddr =NEW_ADDR ; +__set_data_blkaddr (dn);get_node_info (sbi, dn->nid, &ni);set_summary (&sum, dn->nid, dn->ofs_in_node, ni.version);
@@ -584,7 +584,8 @@ static int __allocate_data_block(struct dnode_of_data *dn)/* direct IO doesn't use extent cache to maximize the performance */ set_inode_flag (F2FS_I (dn->inode),FI_NO_EXTENT ); -update_extent_cache (new_blkaddr, dn); + dn->data_blkaddr = new_blkaddr; +update_extent_cache (dn);clear_inode_flag (F2FS_I (dn->inode),FI_NO_EXTENT );/* update i_size */
@@ -784,7 +785,7 @@ int do_write_data_page(struct page *page, struct f2fs_io_info *fio)set_inode_flag (F2FS_I (inode),FI_UPDATE_WRITE ); }else {write_data_page (page, &dn, fio); -update_extent_cache (fio->blk_addr, &dn); +update_extent_cache (&dn);set_inode_flag (F2FS_I (inode),FI_APPEND_WRITE ); } out_writepage:
fs/f2fs/f2fs.h +1 -1
@@ -1478,7 +1478,7 @@ void f2fs_submit_page_mbio(struct f2fs_sb_info *, struct page *, struct f2fs_io_info *);int reserve_new_block (struct dnode_of_data *);int f2fs_reserve_block (struct dnode_of_data *,pgoff_t ); -void update_extent_cache (block_t ,struct dnode_of_data *); +void update_extent_cache (struct dnode_of_data *);struct page *find_data_page (struct inode *,pgoff_t ,bool );struct page *get_lock_data_page (struct inode *,pgoff_t );struct page *get_new_data_page (struct inode *,struct page *,pgoff_t ,bool );
fs/f2fs/file.c +2 -1
@@ -429,7 +429,8 @@ int truncate_data_blocks_range(struct dnode_of_data *dn, int count)if (blkaddr ==NULL_ADDR )continue ; -update_extent_cache (NULL_ADDR , dn); + dn->data_blkaddr =NULL_ADDR ; +update_extent_cache (dn);invalidate_blocks (sbi, blkaddr); nr_free++; }
fs/f2fs/inline.c +1 -1
@@ -116,7 +116,7 @@ no_update:set_page_writeback (page); fio.blk_addr = dn->data_blkaddr;write_data_page (page, dn, &fio); -update_extent_cache (fio.blk_addr, dn); +update_extent_cache (dn);f2fs_wait_on_page_writeback (page,DATA );if (dirty)inode_dec_dirty_pages (dn->inode);
fs/f2fs/recovery.c +2 -1
@@ -396,7 +396,8 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,/* write dummy data page */ recover_data_page (sbi,NULL , &sum, src, dest); -update_extent_cache (dest, &dn); + dn.data_blkaddr = dest; +update_extent_cache (&dn); recovered++; } dn.ofs_in_node++;
fs/f2fs/segment.c +1 -0
@@ -1226,6 +1226,7 @@ void write_data_page(struct page *page, struct dnode_of_data *dn,get_node_info (sbi, dn->nid, &ni);set_summary (&sum, dn->nid, dn->ofs_in_node, ni.version);do_write_page (sbi, page, &sum, fio); + dn->data_blkaddr = fio->blk_addr; }void rewrite_data_page (struct page *page,struct f2fs_io_info *fio)
Signature · 9 lines
2.1.1 ------------------------------------------------------------------------------ Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net
Jaegeuk Kim
maintainerPATCH 2/4 f2fs: avoid potential unnecessary codes
This patch relocates some operations to avoid unnecessary execution.
--- fs/f2fs/data.c | 5 +++-- fs/f2fs/node.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-)
fs/f2fs/data.c +3 -2
@@ -299,8 +299,6 @@ void update_extent_cache(struct dnode_of_data *dn)int need_update = true;f2fs_bug_on (F2FS_I_SB (dn->inode), dn->data_blkaddr ==NEW_ADDR ); - fofs =start_bidx_of_node (ofs_of_node (dn->node_page), fi) + - dn->ofs_in_node;/* Update the page address in the parent node */ __set_data_blkaddr (dn);
@@ -308,6 +306,9 @@ void update_extent_cache(struct dnode_of_data *dn)if (is_inode_flag_set (fi,FI_NO_EXTENT ))return ; + fofs =start_bidx_of_node (ofs_of_node (dn->node_page), fi) + + dn->ofs_in_node; +write_lock (&fi->ext.ext_lock); start_fofs = fi->ext.fofs;
fs/f2fs/node.c +2 -1
@@ -348,7 +348,6 @@ void get_node_info(struct f2fs_sb_info *sbi, nid_t nid, struct node_info *ni)struct nat_entry *e;int i; -memset (&ne,0 ,sizeof (struct f2fs_nat_entry )); ni->nid = nid;/* Check nat cache */
@@ -363,6 +362,8 @@ void get_node_info(struct f2fs_sb_info *sbi, nid_t nid, struct node_info *ni)if (e)return ; +memset (&ne,0 ,sizeof (struct f2fs_nat_entry )); +/* Check current segment summary */ mutex_lock (&curseg->curseg_mutex); i =lookup_journal_in_cursum (sum,NAT_JOURNAL , nid,0 );
Signature · 9 lines
2.1.1 ------------------------------------------------------------------------------ Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net
Jaegeuk Kim
maintainerPATCH 3/4 f2fs: remove uncovered code path
In reply to Jaegeuk KimThis patch removes unnecessary function calls.
--- fs/f2fs/data.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-)
fs/f2fs/data.c +3 -13
@@ -563,31 +563,22 @@ static int __allocate_data_block(struct dnode_of_data *dn)struct f2fs_sb_info *sbi =F2FS_I_SB (dn->inode);struct f2fs_inode_info *fi =F2FS_I (dn->inode);struct f2fs_summary sum; -block_t new_blkaddr;struct node_info ni;pgoff_t fofs; -int type;if (unlikely (is_inode_flag_set (F2FS_I (dn->inode),FI_NO_ALLOC )))return -EPERM ;if (unlikely (!inc_valid_block_count (sbi, dn->inode,1 )))return -ENOSPC ; - dn->data_blkaddr =NEW_ADDR ; -__set_data_blkaddr (dn); -get_node_info (sbi, dn->nid, &ni);set_summary (&sum, dn->nid, dn->ofs_in_node, ni.version); - type =CURSEG_WARM_DATA ; - -allocate_data_block (sbi,NULL ,NULL_ADDR , &new_blkaddr, &sum, type); +allocate_data_block (sbi,NULL ,NULL_ADDR , &dn->data_blkaddr, &sum, +CURSEG_WARM_DATA );/* direct IO doesn't use extent cache to maximize the performance */ -set_inode_flag (F2FS_I (dn->inode),FI_NO_EXTENT ); - dn->data_blkaddr = new_blkaddr; -update_extent_cache (dn); -clear_inode_flag (F2FS_I (dn->inode),FI_NO_EXTENT ); +__set_data_blkaddr (dn);/* update i_size */ fofs = start_bidx_of_node(ofs_of_node(dn->node_page), fi) +
@@ -595,7 +586,6 @@ static int __allocate_data_block(struct dnode_of_data *dn)if (i_size_read (dn->inode) < ((fofs +1 ) <<PAGE_CACHE_SHIFT ))i_size_write (dn->inode, ((fofs +1 ) <<PAGE_CACHE_SHIFT )); - dn->data_blkaddr = new_blkaddr;return 0 ; }
Signature · 9 lines
2.1.1 ------------------------------------------------------------------------------ Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net
Jaegeuk Kim
maintainerPATCH 4/4 f2fs: align direct_io'ed data to section
In reply to Jaegeuk KimThis patch aligns the start block address of a file for direct io to the f2fs's section size.
Some flash devices manage an over 4KB-sized page as a write unit, and if the direct_io'ed data are written but not aligned to that unit, the performance can be degraded due to the partial page copies.
Thus, since f2fs has a section that is well aligned to FTL units, we can align the block address to the section size so that f2fs avoids this misalignment.
--- fs/f2fs/data.c | 7 +++++-- fs/f2fs/f2fs.h | 3 ++- fs/f2fs/segment.c | 27 +++++++++++++++++++-------- 3 files changed, 26 insertions(+), 11 deletions(-)
fs/f2fs/data.c +5 -2
@@ -564,6 +564,7 @@ static int __allocate_data_block(struct dnode_of_data *dn)struct f2fs_inode_info *fi =F2FS_I (dn->inode);struct f2fs_summary sum;struct node_info ni; +int seg =CURSEG_WARM_DATA ;pgoff_t fofs;if (unlikely (is_inode_flag_set (F2FS_I (dn->inode),FI_NO_ALLOC )))
@@ -574,8 +575,10 @@ static int __allocate_data_block(struct dnode_of_data *dn)get_node_info (sbi, dn->nid, &ni);set_summary (&sum, dn->nid, dn->ofs_in_node, ni.version); -allocate_data_block (sbi,NULL ,NULL_ADDR , &dn->data_blkaddr, &sum, -CURSEG_WARM_DATA ); +if (dn->ofs_in_node ==0 && dn->inode_page == dn->node_page) + seg =CURSEG_DIRECT_IO ; + +allocate_data_block (sbi,NULL ,NULL_ADDR , &dn->data_blkaddr, &sum, seg);/* direct IO doesn't use extent cache to maximize the performance */ __set_data_blkaddr (dn);
fs/f2fs/f2fs.h +2 -1
@@ -406,7 +406,8 @@ enum {CURSEG_HOT_NODE ,/* direct node blocks of directory files */ CURSEG_WARM_NODE ,/* direct node blocks of normal files */ CURSEG_COLD_NODE ,/* indirect node blocks */ -NO_CHECK_TYPE +NO_CHECK_TYPE , + CURSEG_DIRECT_IO, /* to use for the direct IO path */ }; struct flush_cmd {
fs/f2fs/segment.c +19 -8
@@ -1024,18 +1024,22 @@ static void allocate_segment_by_default(struct f2fs_sb_info *sbi,stat_inc_seg_type (sbi, curseg); } +static void __allocate_new_segments (struct f2fs_sb_info *sbi,int type) +{ +struct curseg_info *curseg =CURSEG_I (sbi, type); +unsigned int old_segno; + + old_segno = curseg->segno; +SIT_I (sbi)->s_ops->allocate_segment (sbi, type, true); +locate_dirty_segment (sbi, old_segno); +} +void allocate_new_segments (struct f2fs_sb_info *sbi) { -struct curseg_info *curseg; -unsigned int old_curseg;int i; -for (i =CURSEG_HOT_DATA ; i <=CURSEG_COLD_DATA ; i++) { - curseg =CURSEG_I (sbi, i); - old_curseg = curseg->segno; -SIT_I (sbi)->s_ops->allocate_segment (sbi, i, true); -locate_dirty_segment (sbi, old_curseg); - } +for (i =CURSEG_HOT_DATA ; i <=CURSEG_COLD_DATA ; i++) +__allocate_new_segments (sbi, i); }static const struct segment_allocation default_salloc_ops = {
@@ -1148,11 +1152,18 @@ void allocate_data_block(struct f2fs_sb_info *sbi, struct page *page, {struct sit_info *sit_i =SIT_I (sbi);struct curseg_info *curseg; +bool direct_io = (type ==CURSEG_DIRECT_IO ); + + type = direct_io ?CURSEG_WARM_DATA : type; curseg =CURSEG_I (sbi, type);mutex_lock (&curseg->curseg_mutex); +/* direct_io'ed data is aligned to the segment for better performance */ +if (direct_io && curseg->next_blkoff) +__allocate_new_segments (sbi, type); + *new_blkaddr =NEXT_FREE_BLKADDR (sbi, curseg);/*
Signature · 9 lines
2.1.1 ------------------------------------------------------------------------------ Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net