f2fs: do retry operations with cond_resched
Subsystems (2)
Jaegeuk Kim
maintainerPATCH 1/5 f2fs: do retry operations with cond_resched
This patch revists retrial paths in f2fs.
The basic idea is to use cond_resched instead of retrying from the very early stage.
--- fs/f2fs/f2fs.h | 7 +++++++ fs/f2fs/gc.c | 5 ++--- fs/f2fs/node.c | 41 +++++++++-------------------------------- fs/f2fs/segment.c | 5 ++--- 4 files changed, 20 insertions(+), 38 deletions(-)
fs/f2fs/f2fs.h +7 -0
@@ -1021,6 +1021,13 @@ retry:return entry; } +static inline void f2fs_radix_tree_insert (struct radix_tree_root *root, +unsigned long index,void *item) +{ +while (radix_tree_insert (root, index, item)) +cond_resched (); +} +#define RAW_IS_INODE (p) ((p)->footer.nid == (p)->footer.ino)static inline bool IS_INODE (struct page *page)
fs/f2fs/gc.c +2 -3
@@ -356,12 +356,11 @@ static void add_gc_inode(struct gc_inode_list *gc_list, struct inode *inode)iput (inode);return ; } -retry: new_ie =f2fs_kmem_cache_alloc (winode_slab,GFP_NOFS ); new_ie->inode = inode; - +retry:if (radix_tree_insert (&gc_list->iroot, inode->i_ino, new_ie)) { -kmem_cache_free (winode_slab, new_ie); +cond_resched (); goto retry; }list_add_tail (&new_ie->list, &gc_list->ilist);
fs/f2fs/node.c +9 -32
89 lines not on this page · raw message
fs/f2fs/segment.c +2 -3
@@ -179,13 +179,13 @@ void register_inmem_page(struct inode *inode, struct page *page)struct f2fs_inode_info *fi =F2FS_I (inode);struct inmem_pages *new;int err; -retry: + new =f2fs_kmem_cache_alloc (inmem_entry_slab,GFP_NOFS );/* add atomic page indices to the list */ new->page = page;INIT_LIST_HEAD (&new->list); - +retry:/* increase reference count with clean state */ mutex_lock (&fi->inmem_lock); err =radix_tree_insert (&fi->inmem_root, page->index, new);
@@ -195,7 +195,6 @@ retry:return ; }else if (err) {mutex_unlock (&fi->inmem_lock); -kmem_cache_free (inmem_entry_slab, new); goto retry; }get_page (page);
Signature · 9 lines
2.1.1 ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
Jaegeuk Kim
maintainerPATCH 2/5 f2fs: count inline_xx in do_read_inode
In do_read_inode, if we failed __recover_inline_status, the inode has inline flag without increasing its count.
Later, f2fs_evict_inode will decrease the count, which causes -1.
--- fs/f2fs/inode.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/f2fs/inode.c +4 -2
@@ -148,6 +148,10 @@ static int do_read_inode(struct inode *inode)__get_inode_rdev (inode, ri);f2fs_put_page (node_page,1 ); + +stat_inc_inline_inode (inode); +stat_inc_inline_dir (inode); +return err; }
@@ -199,8 +203,6 @@ make_now: goto bad_inode; }unlock_new_inode (inode); -stat_inc_inline_inode (inode); -stat_inc_inline_dir (inode);trace_f2fs_iget (inode);return inode;
Signature · 9 lines
2.1.1 ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
Jaegeuk Kim
maintainerPATCH 3/5 f2fs: set page private for inmemory pages for truncation
In reply to Jaegeuk KimThe inmemory pages should be handled by invalidate_page since it needs to be released int the truncation path.
--- fs/f2fs/segment.c | 2 ++ 1 file changed, 2 insertions(+)
fs/f2fs/segment.c +2 -0
@@ -180,6 +180,8 @@ void register_inmem_page(struct inode *inode, struct page *page)struct inmem_pages *new;int err; +SetPagePrivate (page); + new =f2fs_kmem_cache_alloc (inmem_entry_slab,GFP_NOFS );/* add atomic page indices to the list */
Signature · 9 lines
2.1.1 ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
Jaegeuk Kim
maintainerPATCH 4/5 f2fs: release inmemory pages when the file was closed
In reply to Jaegeuk KimIf file is closed, let's drop inmemory pages.
--- fs/f2fs/file.c | 9 +++++++++ 1 file changed, 9 insertions(+)
fs/f2fs/file.c +9 -0
@@ -901,6 +901,14 @@ static int f2fs_ioc_start_atomic_write(struct file *filp)return f2fs_convert_inline_inode (inode); } +static int f2fs_release_file (struct inode *inode,struct file *filp) +{ +/* some remained atomic pages should discarded */ +if (f2fs_is_atomic_file (inode) ||f2fs_is_volatile_file (inode)) +commit_inmem_pages (inode, true); +return 0 ; +} +static int f2fs_ioc_commit_atomic_write (struct file *filp) {struct inode *inode =file_inode (filp);
@@ -1010,6 +1018,7 @@ const struct file_operations f2fs_file_operations = { .read_iter = generic_file_read_iter, .write_iter = generic_file_write_iter, .open = generic_file_open, + .release = f2fs_release_file, .mmap = f2fs_file_mmap, .fsync = f2fs_sync_file, .fallocate = f2fs_fallocate,
Signature · 9 lines
2.1.1 ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
Jaegeuk Kim
maintainerPATCH 5/5 f2fs: count the number of inmemory pages
In reply to Jaegeuk KimThis patch adds counting # of inmemory pages in the page cache.
--- fs/f2fs/debug.c | 3 +++ fs/f2fs/f2fs.h | 3 ++- fs/f2fs/segment.c | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-)
fs/f2fs/debug.c +3 -0
@@ -39,6 +39,7 @@ static void update_general_status(struct f2fs_sb_info *sbi) si->ndirty_dent =get_pages (sbi,F2FS_DIRTY_DENTS ); si->ndirty_dirs = sbi->n_dirty_dirs; si->ndirty_meta =get_pages (sbi,F2FS_DIRTY_META ); + si->inmem_pages =get_pages (sbi,F2FS_INMEM_PAGES ); si->total_count = (int )sbi->user_block_count / sbi->blocks_per_seg; si->rsvd_segs =reserved_segments (sbi); si->overp_segs =overprovision_segments (sbi);
@@ -249,6 +250,8 @@ static int stat_show(struct seq_file *s, void *v)seq_printf (s,"\nExtent Hit Ratio: %d / %d\n" , si->hit_ext, si->total_ext);seq_puts (s,"\nBalancing F2FS Async:\n" ); +seq_printf (s," - inmem: %4d\n" , + si->inmem_pages);seq_printf (s," - nodes: %4d in %4d\n" , si->ndirty_node, si->node_pages); seq_printf(s, " - dents: %4d in dirs:%4d\n",
fs/f2fs/f2fs.h +2 -1
@@ -462,6 +462,7 @@ enum count_type {F2FS_DIRTY_DENTS ,F2FS_DIRTY_NODES ,F2FS_DIRTY_META , +F2FS_INMEM_PAGES , NR_COUNT_TYPE, };
@@ -1498,7 +1499,7 @@ struct f2fs_stat_info {int ndirty_node, ndirty_dent, ndirty_dirs, ndirty_meta;int nats, sits, fnids;int total_count, utilization; -int bg_gc, inline_inode, inline_dir; +int bg_gc, inline_inode, inline_dir, inmem_pages;unsigned int valid_count, valid_node_count, valid_inode_count;unsigned int bimodal, avg_vblocks;int util_free, util_valid, util_invalid;
fs/f2fs/segment.c +3 -0
@@ -201,6 +201,7 @@ retry: }get_page (page);list_add_tail (&new->list, &fi->inmem_pages); +inc_page_count (F2FS_I_SB (inode),F2FS_INMEM_PAGES );mutex_unlock (&fi->inmem_lock); }
@@ -216,6 +217,7 @@ void invalidate_inmem_page(struct inode *inode, struct page *page)f2fs_put_page (cur->page,0 );list_del (&cur->list);kmem_cache_free (inmem_entry_slab, cur); +dec_page_count (F2FS_I_SB (inode),F2FS_INMEM_PAGES ); }mutex_unlock (&fi->inmem_lock); }
@@ -257,6 +259,7 @@ void commit_inmem_pages(struct inode *inode, bool abort)f2fs_put_page (cur->page,1 );list_del (&cur->list);kmem_cache_free (inmem_entry_slab, cur); +dec_page_count (F2FS_I_SB (inode),F2FS_INMEM_PAGES ); }if (submit_bio)f2fs_submit_merged_bio (sbi,DATA ,WRITE );
Signature · 9 lines
2.1.1 ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
Quoted 8 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Sunday, December 07, 2014 3:56 AM
To: [email protected]; [email protected]; [email protected]
Cc: Jaegeuk Kim
Subject: [f2fs-dev] [PATCH 1/5] f2fs: do retry operations withcond_resched
Quoted 6 lines
This patch revists retrial paths in f2fs.
The basic idea is to usecond_reschedinstead of retrying from the very early stage.Suggested-by Gu Zheng <[email protected]>Signed-off-by Jaegeuk Kim <[email protected]>
Quoted 34 lines
--- fs/f2fs/f2fs.h | 7 +++++++ fs/f2fs/gc.c | 5 ++--- fs/f2fs/node.c | 41 +++++++++-------------------------------- fs/f2fs/segment.c | 5 ++--- 4 files changed, 20 insertions(+), 38 deletions(-)fs/f2fs/f2fs.h +7
-0@@ -1021,6 +1021,13 @@ retry:return entry; } +static inline void f2fs_radix_tree_insert (struct radix_tree_root *root, +unsigned long index,void *item) +{ +while (radix_tree_insert (root, index, item)) +cond_resched (); +} +#define RAW_IS_INODE (p) ((p)->footer.nid == (p)->footer.ino)static inline bool IS_INODE (struct page *page)fs/f2fs/gc.c +0
-0@@ -356,12 +356,11 @@ static void add_gc_inode(struct gc_inode_list *gc_list, struct inode *inode)iput (inode);return ; }
fs/f2fs/gc.c static void add_gc_inode(struct gc_inode_list *gc_list, struct inode · line 366
Quoted 10 lines
fs/f2fs/gc.c +2
-3-retry: new_ie =f2fs_kmem_cache_alloc (winode_slab,GFP_NOFS ); new_ie->inode = inode; - +retry:if (radix_tree_insert (&gc_list->iroot, inode->i_ino, new_ie)) { -kmem_cache_free (winode_slab, new_ie); +cond_resched (); goto retry; }
use f2fs_radix_tree_insert instead?
Thanks,
Yu