f2fs: refactor flush_sit_entries codes for reducing SIT writes
PATCH 2/2 f2fs: refactor flush_sit_entries codes for reducing SIT writes
In commit aec71382c681 ("f2fs: refactor flush_nat_entries codes for reducing NAT writes"), we descripte the issue as below:
"Although building NAT journal in cursum reduce the read/write work for NAT block, but previous design leave us lower performance when write checkpoint frequently for these cases:
1. if journal in cursum has already full, it's a bit of waste that we flush all nat entries to page for persistence, but not to cache any entries.
2. if journal in cursum is not full, we fill nat entries to journal util journal is full, then flush the left dirty entries to disk without merge journaled entries, so these journaled entries may be flushed to disk at next checkpoint but lost chance to flushed last time."
Actually, we have the same problem in using SIT journal area.
In this patch, firstly we will update sit journal with dirty entries as many as possible. Secondly if there is no space in sit journal, we will remove all entries in journal and walk through the whole dirty entry bitmap of sit, accounting dirty sit entries located in same SIT block to sit entry set. All entry sets are linked to list sit_entry_set in sm_info, sorted ascending order by count of entries in set. Later we flush entries in set which have fewest entries into journal as many as we can, and then flush dense set with merged entries to disk.
In this way we can use sit journal area more effectively, also we will reduce SIT update, result in gaining in performance and saving lifetime of flash device.
In my testing environment, it shows this patch can help to reduce SIT block update obviously.
virtual machine + hard disk:
fsstress -p 20 -n 400 -l 5
sit page num cp count sit pages/cp
based 2006.50 1349.75 1.486
patched 1566.25 1463.25 1.070
Our latency of merging op is small when handling a great number of dirty SIT entries in flush_sit_entries:
latency(ns) dirty sit count
36038 2151
49168 2123
37174 2232
--- fs/f2fs/f2fs.h | 11 +++ fs/f2fs/node.c | 13 +--- fs/f2fs/segment.c | 227 +++++++++++++++++++++++++++++++++++++++--------------- fs/f2fs/segment.h | 6 ++ 4 files changed, 186 insertions(+), 71 deletions(-)
fs/f2fs/f2fs.h +11 -0
@@ -161,6 +161,15 @@ static inline int update_sits_in_cursum(struct f2fs_summary_block *rs, int i)return before; } +static inline bool __has_cursum_space (struct f2fs_summary_block *sum,int size, +int type) +{ +if (type ==NAT_JOURNAL ) +return nats_in_cursum (sum) + size <=NAT_JOURNAL_ENTRIES ; + +return sits_in_cursum (sum) + size <=SIT_JOURNAL_ENTRIES ; +} +/* * ioctl commands */
@@ -375,6 +384,8 @@ struct f2fs_sm_info {int nr_discards;/* # of discards in the list */ int max_discards;/* max. discards to be issued */ +struct list_head sit_entry_set;/* sit entry set list */ +unsigned int ipu_policy;/* in-place-update policy */ unsigned int min_ipu_util;/* in-place-update threshold */
fs/f2fs/node.c +3 -10
@@ -1798,14 +1798,6 @@ static void merge_nats_in_set(struct f2fs_sb_info *sbi)write_unlock (&nm_i->nat_tree_lock); } -static bool __has_cursum_space (struct f2fs_summary_block *sum,int size) -{ -if (nats_in_cursum (sum) + size <=NAT_JOURNAL_ENTRIES ) -return true; -else -return false; -} -static void remove_nats_in_journal (struct f2fs_sb_info *sbi) {struct f2fs_nm_info *nm_i =NM_I (sbi);
@@ -1860,7 +1852,7 @@ void flush_nat_entries(struct f2fs_sb_info *sbi)* entries, remove all entries from journal and merge them * into nat entry set. */ -if (!__has_cursum_space (sum, nm_i->dirty_nat_cnt)) { +if (!__has_cursum_space (sum, nm_i->dirty_nat_cnt,NAT_JOURNAL )) {remove_nats_in_journal (sbi);/*
@@ -1883,7 +1875,8 @@ void flush_nat_entries(struct f2fs_sb_info *sbi)struct page *page;nid_t start_nid = nes->start_nid; -if (to_journal && !__has_cursum_space (sum, nes->entry_cnt)) +if (to_journal && + !__has_cursum_space (sum, nes->entry_cnt,NAT_JOURNAL )) to_journal = false;if (to_journal) {
fs/f2fs/segment.c +166 -61
295 lines not on this page · raw message
fs/f2fs/segment.h +6 -0
@@ -237,6 +237,12 @@ struct curseg_info {unsigned int next_segno;/* preallocated segment */ }; +struct sit_entry_set { +struct list_head set_list;/* link with all sit sets */ +unsigned int start_segno;/* start segno of sits in set */ +unsigned int entry_cnt;/* the # of sit entries in set */ +}; +/* * inline functions */
Signature · 1 line
2.0.1.474.g72c7794