Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98e85b90 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: enhance multiple device flush 



When multiple device feature is enabled, during ->fsync we will issue
flush in all devices to make sure node/data of the file being persisted
into storage. But some flushes of device could be unneeded as file's
data may be not writebacked into those devices. So this patch adds and
manage bitmap per inode in global cache to indicate which device is
dirty and it needs to issue flush during ->fsync, hence, we could improve
performance of fsync in scenario of multiple device.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 97acaf71

fs/f2fs/checkpoint.c

+31 −5
Original line number Diff line number Diff line
@@ -402,7 +402,8 @@ const struct address_space_operations f2fs_meta_aops = { 
#endif

};



static void __add_ino_entry(struct f2fs_sb_info *sbi, nid_t ino, int type)

static void __add_ino_entry(struct f2fs_sb_info *sbi, nid_t ino,

						unsigned int devidx, int type)

{

	struct inode_management *im = &sbi->im[type];

	struct ino_entry *e, *tmp;
@@ -427,6 +428,10 @@ retry: 
		if (type != ORPHAN_INO)

			im->ino_num++;

	}



	if (type == FLUSH_INO)

		f2fs_set_bit(devidx, (char *)&e->dirty_device);



	spin_unlock(&im->ino_lock);

	radix_tree_preload_end();
@@ -455,7 +460,7 @@ static void __remove_ino_entry(struct f2fs_sb_info *sbi, nid_t ino, int type) 
void add_ino_entry(struct f2fs_sb_info *sbi, nid_t ino, int type)

{

	/* add new dirty ino entry into list */

	__add_ino_entry(sbi, ino, type);

	__add_ino_entry(sbi, ino, 0, type);

}



void remove_ino_entry(struct f2fs_sb_info *sbi, nid_t ino, int type)
@@ -481,7 +486,7 @@ void release_ino_entry(struct f2fs_sb_info *sbi, bool all) 
	struct ino_entry *e, *tmp;

	int i;



	for (i = all ? ORPHAN_INO: APPEND_INO; i <= UPDATE_INO; i++) {

	for (i = all ? ORPHAN_INO : APPEND_INO; i < MAX_INO_ENTRY; i++) {

		struct inode_management *im = &sbi->im[i];



		spin_lock(&im->ino_lock);
@@ -495,6 +500,27 @@ void release_ino_entry(struct f2fs_sb_info *sbi, bool all) 
	}

}



void set_dirty_device(struct f2fs_sb_info *sbi, nid_t ino,

					unsigned int devidx, int type)

{

	__add_ino_entry(sbi, ino, devidx, type);

}



bool is_dirty_device(struct f2fs_sb_info *sbi, nid_t ino,

					unsigned int devidx, int type)

{

	struct inode_management *im = &sbi->im[type];

	struct ino_entry *e;

	bool is_dirty = false;



	spin_lock(&im->ino_lock);

	e = radix_tree_lookup(&im->ino_root, ino);

	if (e && f2fs_test_bit(devidx, (char *)&e->dirty_device))

		is_dirty = true;

	spin_unlock(&im->ino_lock);

	return is_dirty;

}



int acquire_orphan_inode(struct f2fs_sb_info *sbi)

{

	struct inode_management *im = &sbi->im[ORPHAN_INO];
@@ -531,7 +557,7 @@ void release_orphan_inode(struct f2fs_sb_info *sbi) 
void add_orphan_inode(struct inode *inode)

{

	/* add new orphan ino entry into list */

	__add_ino_entry(F2FS_I_SB(inode), inode->i_ino, ORPHAN_INO);

	__add_ino_entry(F2FS_I_SB(inode), inode->i_ino, 0, ORPHAN_INO);

	update_inode_page(inode);

}
@@ -555,7 +581,7 @@ static int recover_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino) 
		return err;

	}



	__add_ino_entry(sbi, ino, ORPHAN_INO);

	__add_ino_entry(sbi, ino, 0, ORPHAN_INO);



	inode = f2fs_iget_retry(sbi->sb, ino);

	if (IS_ERR(inode)) {

fs/f2fs/data.c

+1 −0
Original line number Diff line number Diff line
@@ -1493,6 +1493,7 @@ static int __write_data_page(struct page *page, bool *submitted, 
	int err = 0;

	struct f2fs_io_info fio = {

		.sbi = sbi,

		.ino = inode->i_ino,

		.type = DATA,

		.op = REQ_OP_WRITE,

		.op_flags = wbc_to_write_flags(wbc),

fs/f2fs/f2fs.h

+11 −3
Original line number Diff line number Diff line
@@ -276,12 +276,14 @@ enum { 
	ORPHAN_INO,		/* for orphan ino list */

	APPEND_INO,		/* for append ino list */

	UPDATE_INO,		/* for update ino list */

	FLUSH_INO,		/* for multiple device flushing */

	MAX_INO_ENTRY,		/* max. list */

};



struct ino_entry {

	struct list_head list;		/* list head */

	nid_t ino;			/* inode number */

	unsigned int dirty_device;	/* dirty device bitmap */

};



/* for the list of inodes to be GCed */
@@ -868,6 +870,7 @@ enum { 
struct flush_cmd {

	struct completion wait;

	struct llist_node llnode;

	nid_t ino;

	int ret;

};
@@ -995,6 +998,7 @@ enum iostat_type { 


struct f2fs_io_info {

	struct f2fs_sb_info *sbi;	/* f2fs_sb_info pointer */

	nid_t ino;		/* inode number */

	enum page_type type;	/* contains DATA/NODE/META/META_FLUSH */

	enum temp_type temp;	/* contains HOT/WARM/COLD */

	int op;			/* contains REQ_OP_ */
@@ -2635,7 +2639,7 @@ void drop_inmem_page(struct inode *inode, struct page *page); 
int commit_inmem_pages(struct inode *inode);

void f2fs_balance_fs(struct f2fs_sb_info *sbi, bool need);

void f2fs_balance_fs_bg(struct f2fs_sb_info *sbi);

int f2fs_issue_flush(struct f2fs_sb_info *sbi);

int f2fs_issue_flush(struct f2fs_sb_info *sbi, nid_t ino);

int create_flush_cmd_control(struct f2fs_sb_info *sbi);

void destroy_flush_cmd_control(struct f2fs_sb_info *sbi, bool free);

void invalidate_blocks(struct f2fs_sb_info *sbi, block_t addr);
@@ -2697,6 +2701,10 @@ void add_ino_entry(struct f2fs_sb_info *sbi, nid_t ino, int type); 
void remove_ino_entry(struct f2fs_sb_info *sbi, nid_t ino, int type);

void release_ino_entry(struct f2fs_sb_info *sbi, bool all);

bool exist_written_data(struct f2fs_sb_info *sbi, nid_t ino, int mode);

void set_dirty_device(struct f2fs_sb_info *sbi, nid_t ino,

					unsigned int devidx, int type);

bool is_dirty_device(struct f2fs_sb_info *sbi, nid_t ino,

					unsigned int devidx, int type);

int f2fs_sync_inode_meta(struct f2fs_sb_info *sbi);

int acquire_orphan_inode(struct f2fs_sb_info *sbi);

void release_orphan_inode(struct f2fs_sb_info *sbi);

fs/f2fs/file.c

+2 −1
Original line number Diff line number Diff line
@@ -298,10 +298,11 @@ sync_nodes: 
	clear_inode_flag(inode, FI_APPEND_WRITE);

flush_out:

	if (!atomic)

		ret = f2fs_issue_flush(sbi);

		ret = f2fs_issue_flush(sbi, inode->i_ino);

	if (!ret) {

		remove_ino_entry(sbi, ino, UPDATE_INO);

		clear_inode_flag(inode, FI_UPDATE_WRITE);

		remove_ino_entry(sbi, ino, FLUSH_INO);

	}

	f2fs_update_time(sbi, REQ_TIME);

out:

fs/f2fs/gc.c

+2 −0
Original line number Diff line number Diff line
@@ -598,6 +598,7 @@ static void move_data_block(struct inode *inode, block_t bidx, 
{

	struct f2fs_io_info fio = {

		.sbi = F2FS_I_SB(inode),

		.ino = inode->i_ino,

		.type = DATA,

		.temp = COLD,

		.op = REQ_OP_READ,
@@ -728,6 +729,7 @@ static void move_data_page(struct inode *inode, block_t bidx, int gc_type, 
	} else {

		struct f2fs_io_info fio = {

			.sbi = F2FS_I_SB(inode),

			.ino = inode->i_ino,

			.type = DATA,

			.temp = COLD,

			.op = REQ_OP_WRITE,