f2fs: call write_checkpoint under disabled gc
Subsystems (2)
Jaegeuk Kim
maintainerPATCH 1/4 f2fs: call write_checkpoint under disabled gc
During the write_checkpoint, we should avoid f2fs_gc trigger to avoid any filesystem consistency.
--- fs/f2fs/segment.c | 2 ++ 1 file changed, 2 insertions(+)
fs/f2fs/segment.c +2 -0
@@ -1046,7 +1046,9 @@ int f2fs_trim_fs(struct f2fs_sb_info *sbi, struct fstrim_range *range) cpc.trim_minlen = range->minlen >> sbi->log_blocksize;/* do checkpoint to issue discard commands safely */ +mutex_lock (&sbi->gc_mutex);write_checkpoint (sbi, &cpc); +mutex_unlock (&sbi->gc_mutex); out: range->len = cpc.trimmed << sbi->log_blocksize;return 0 ;
Signature · 1 line
2.1.1
Jaegeuk Kim
maintainerPATCH 2/4 f2fs: flush_dcache_page for inline data
When reading inline data, we should call flush_dcache_page.
--- fs/f2fs/inline.c | 1 + 1 file changed, 1 insertion(+)
fs/f2fs/inline.c +1 -0
@@ -57,6 +57,7 @@ int f2fs_read_inline_data(struct inode *inode, struct page *page) src_addr =inline_data_addr (ipage); dst_addr =kmap_atomic (page);memcpy (dst_addr, src_addr,MAX_INLINE_DATA ); +flush_dcache_page (page);kunmap_atomic (dst_addr);f2fs_put_page (ipage,1 ); out:
Signature · 4 lines
2.1.1 ------------------------------------------------------------------------------
Jaegeuk Kim
maintainerPATCH 3/4 f2fs: do not discard data protected by the previous checkpoint
In reply to Jaegeuk KimWe should not discard any data protected by the previous checkpoint all the time.
--- fs/f2fs/segment.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/segment.c +1 -1
@@ -517,7 +517,7 @@ static void add_discard_addrs(struct f2fs_sb_info *sbi, struct cp_control *cpc)/* SIT_VBLOCK_MAP_SIZE should be multiple of sizeof(unsigned long) */ for (i =0 ; i < entries; i++) - dmap[i] = (cur_map[i] ^ ckpt_map[i]) & ckpt_map[i]; + dmap[i] = ~(cur_map[i] | ckpt_map[i]);while (force ||SM_I (sbi)->nr_discards <=SM_I (sbi)->max_discards) { start =__find_rev_next_bit (dmap, max_blocks, end +1 );
Signature · 1 line
2.1.1
Jaegeuk Kim
maintainerPATCH 4/4 f2fs: revisit inline_data to avoid data races and potential bugs
In reply to Jaegeuk KimThis patch simplifies the inline_data usage with the following rule.
1. inline_data is set during the file creation.
2. If new data is requested to be written ranges out of inline_data, f2fs converts that inode permanently.
3. There is no cases which converts non-inline_data inode to inline_data.
4. The inline_data flag should be changed under inode page lock.
--- fs/f2fs/data.c | 89 +++++++++++----------- fs/f2fs/f2fs.h | 24 +++++- fs/f2fs/file.c | 105 ++++++++++++-------------- fs/f2fs/inline.c | 194 +++++++++++++++++++++++------------------------- fs/f2fs/inode.c | 1 + fs/f2fs/namei.c | 3 + include/linux/f2fs_fs.h | 1 + 7 files changed, 210 insertions(+), 207 deletions(-)
fs/f2fs/data.c +45 -44
@@ -737,14 +737,14 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,static int f2fs_read_data_page (struct file *file,struct page *page) {struct inode *inode = page->mapping->host; -int ret; +int ret = -EAGAIN ;trace_f2fs_readpage (page,DATA );/* If the file has inline data, try to read it directly */ if (f2fs_has_inline_data (inode)) ret =f2fs_read_inline_data (inode, page); -else +if (ret == -EAGAIN ) ret =mpage_readpage (page, get_data_block);return ret;
@@ -856,10 +856,11 @@ write:else if (has_not_enough_free_secs (sbi,0 )) goto redirty_out; + err = -EAGAIN ;f2fs_lock_op (sbi); -if (f2fs_has_inline_data (inode) ||f2fs_may_inline (inode)) - err =f2fs_write_inline_data (inode, page, offset); -else +if (f2fs_has_inline_data (inode)) + err =f2fs_write_inline_data (inode, page); +if (err == -EAGAIN ) err =do_write_data_page (page, &fio);f2fs_unlock_op (sbi); done:
@@ -957,24 +958,14 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping,f2fs_balance_fs (sbi); repeat: - err =f2fs_convert_inline_data (inode, pos + len,NULL ); -if (err) - goto fail; - page =grab_cache_page_write_begin (mapping, index, flags);if (!page) { err = -ENOMEM ; goto fail; } -/* to avoid latency during memory pressure */ -unlock_page (page); - *pagep = page; -if (f2fs_has_inline_data (inode) && (pos + len) <=MAX_INLINE_DATA ) - goto inline_data; -f2fs_lock_op (sbi);/* check inline_data */
@@ -982,32 +973,42 @@ repeat:if (IS_ERR (ipage)) goto unlock_fail; +set_new_dnode (&dn, inode, ipage, ipage,0 ); +if (f2fs_has_inline_data (inode)) { -f2fs_put_page (ipage,1 ); -f2fs_unlock_op (sbi); -f2fs_put_page (page,0 ); - goto repeat; +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; + }else if (page->index ==0 ) { + err =f2fs_convert_inline_page (&dn, page); +if (err) + goto unlock_fail; + }else { +struct page *p =grab_cache_page (inode->i_mapping,0 ); +if (!p) { + err = -ENOMEM ; + goto unlock_fail; + } + err =f2fs_convert_inline_page (&dn, p); +f2fs_put_page (p,1 ); +if (err) + goto unlock_fail; + } } - -set_new_dnode (&dn, inode, ipage,NULL ,0 ); err =f2fs_reserve_block (&dn, index);if (err) goto unlock_fail; +put_next:f2fs_put_dnode (&dn);f2fs_unlock_op (sbi); -inline_data: -lock_page (page); -if (unlikely (page->mapping != mapping)) { -f2fs_put_page (page,1 ); - goto repeat; - } - -f2fs_wait_on_page_writeback (page,DATA ); -if ((len ==PAGE_CACHE_SIZE ) ||PageUptodate (page))return 0 ; +f2fs_wait_on_page_writeback (page,DATA ); +if ((pos &PAGE_CACHE_MASK ) >=i_size_read (inode)) {unsigned start = pos & (PAGE_CACHE_SIZE -1 );unsigned end = start + len;
@@ -1017,13 +1018,7 @@ inline_data: goto out; } -if (f2fs_has_inline_data (inode)) { - err =f2fs_read_inline_data (inode, page); -if (err) { -page_cache_release (page); - goto fail; - } - }else if (dn.data_blkaddr ==NEW_ADDR ) { +if (dn.data_blkaddr ==NEW_ADDR ) {zero_user_segment (page,0 ,PAGE_CACHE_SIZE ); }else { err = f2fs_submit_page_bio(sbi, page, dn.data_blkaddr,
@@ -1049,7 +1044,7 @@ out: unlock_fail:f2fs_unlock_op (sbi); -f2fs_put_page (page,0 ); +f2fs_put_page (page,1 ); fail:f2fs_write_failed (mapping, pos + len);return err;
@@ -1102,9 +1097,12 @@ static ssize_t f2fs_direct_IO(int rw, struct kiocb *iocb,size_t count =iov_iter_count (iter);int err; -/* Let buffer I/O handle the inline data case. */ -if (f2fs_has_inline_data (inode)) -return 0 ; +/* 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; + }if (check_direct_IO (inode, rw, iter, offset))return 0 ;
@@ -1170,9 +1168,12 @@ static sector_t f2fs_bmap(struct address_space *mapping, sector_t block) {struct inode *inode = mapping->host; -if (f2fs_has_inline_data (inode)) -return 0 ; - +/* we don't need to use inline_data strictly */ +if (f2fs_has_inline_data (inode)) { +int err =f2fs_convert_inline_inode (inode); +if (err) +return err; + }return generic_block_bmap (mapping, block, get_data_block); }
fs/f2fs/f2fs.h +21 -3
@@ -1101,6 +1101,7 @@ enum {FI_NEED_IPU ,/* used for ipu per file */ FI_ATOMIC_FILE ,/* indicate atomic file */ FI_VOLATILE_FILE ,/* indicate volatile file */ + FI_DATA_EXIST, /* indicate data exists */ };static inline void set_inode_flag (struct f2fs_inode_info *fi,int flag)
@@ -1135,6 +1136,8 @@ static inline void get_inline_info(struct f2fs_inode_info *fi,set_inode_flag (fi,FI_INLINE_DATA );if (ri->i_inline &F2FS_INLINE_DENTRY )set_inode_flag (fi,FI_INLINE_DENTRY ); +if (ri->i_inline &F2FS_DATA_EXIST ) +set_inode_flag (fi,FI_DATA_EXIST ); } static inline void set_raw_inline(struct f2fs_inode_info *fi,
@@ -1148,6 +1151,8 @@ static inline void set_raw_inline(struct f2fs_inode_info *fi, ri->i_inline |=F2FS_INLINE_DATA ;if (is_inode_flag_set (fi,FI_INLINE_DENTRY )) ri->i_inline |=F2FS_INLINE_DENTRY ; +if (is_inode_flag_set (fi,FI_DATA_EXIST )) + ri->i_inline |=F2FS_DATA_EXIST ; }static inline int f2fs_has_inline_xattr (struct inode *inode)
@@ -1182,6 +1187,17 @@ static inline int f2fs_has_inline_data(struct inode *inode)return is_inode_flag_set (F2FS_I (inode),FI_INLINE_DATA ); } +static inline void f2fs_clear_inline_inode (struct inode *inode) +{ +clear_inode_flag (F2FS_I (inode),FI_INLINE_DATA ); +clear_inode_flag (F2FS_I (inode),FI_DATA_EXIST ); +} + +static inline int f2fs_exist_data (struct inode *inode) +{ +return is_inode_flag_set (F2FS_I (inode),FI_DATA_EXIST ); +} +static inline bool f2fs_is_atomic_file (struct inode *inode) {return is_inode_flag_set (F2FS_I (inode),FI_ATOMIC_FILE );
@@ -1590,10 +1606,12 @@ extern const struct inode_operations f2fs_special_inode_operations;* inline.c */ bool f2fs_may_inline (struct inode *); +void read_inline_data (struct page *,struct page *);int f2fs_read_inline_data (struct inode *,struct page *); -int f2fs_convert_inline_data (struct inode *,pgoff_t ,struct page *); -int f2fs_write_inline_data (struct inode *,struct page *,unsigned int ); -void truncate_inline_data (struct inode *,u64 ); +int f2fs_convert_inline_page (struct dnode_of_data *,struct page *); +int f2fs_convert_inline_inode (struct inode *); +int f2fs_write_inline_data (struct inode *,struct page *); +void truncate_inline_data (struct page *,u64 );bool recover_inline_data (struct inode *,struct page *);struct f2fs_dir_entry *find_in_inline_dir (struct inode *,struct qstr *,struct page **);
fs/f2fs/file.c +48 -57
200 lines not on this page · raw message
fs/f2fs/inline.c +91 -103
301 lines not on this page · raw message
fs/f2fs/inode.c +1 -0
@@ -329,6 +329,7 @@ void handle_failed_inode(struct inode *inode)remove_inode_page (inode); +clear_inode_flag (F2FS_I (inode),FI_INLINE_DATA );clear_inode_flag (F2FS_I (inode),FI_INLINE_DENTRY );alloc_nid_failed (sbi, inode->i_ino);f2fs_unlock_op (sbi);
fs/f2fs/namei.c +3 -0
@@ -55,6 +55,8 @@ static struct inode *f2fs_new_inode(struct inode *dir, umode_t mode) goto out; } +if (f2fs_may_inline (inode)) +set_inode_flag (F2FS_I (inode),FI_INLINE_DATA );if (test_opt (sbi,INLINE_DENTRY ) &&S_ISDIR (inode->i_mode))set_inode_flag (F2FS_I (inode),FI_INLINE_DENTRY );
@@ -133,6 +135,7 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode,alloc_nid_done (sbi, ino); +stat_inc_inline_inode (inode);d_instantiate (dentry, inode);unlock_new_inode (inode);return 0 ;
include/linux/f2fs_fs.h +1 -0
@@ -172,6 +172,7 @@ struct f2fs_extent {#define F2FS_INLINE_XATTR 0x01/* file inline xattr flag */ #define F2FS_INLINE_DATA 0x02/* file inline data flag */ #define F2FS_INLINE_DENTRY 0x04/* file inline dentry flag */ +#define F2FS_DATA_EXIST 0x08/* file inline data exist flag */ #define MAX_INLINE_DATA (sizeof(__le32) * (DEF_ADDRS_PER_INODE - \ F2FS_INLINE_XATTR_ADDRS - 1))
Signature · 4 lines
2.1.1 ------------------------------------------------------------------------------