f2fs: add bio cache for IPU (8648de2c) · Commits · 戴 / test

fs/f2fs/data.c

+79 −9

Original line number	Diff line number	Diff line
		@@ -347,20 +347,20 @@ static void __submit_merged_bio(struct f2fs_bio_info *io)
		io->bio = NULL;
		}

		static bool __has_merged_page(struct f2fs_bio_info io, struct inode inode,
		static bool __has_merged_page(struct bio bio, struct inode inode,
		struct page *page, nid_t ino)
		{
		struct bio_vec *bvec;
		struct page *target;
		struct bvec_iter_all iter_all;

		if (!io->bio)
		if (!bio)
		return false;

		if (!inode && !page && !ino)
		return true;

		bio_for_each_segment_all(bvec, io->bio, iter_all) {
		bio_for_each_segment_all(bvec, bio, iter_all) {

		if (bvec->bv_page->mapping)
		target = bvec->bv_page;
		@@ -411,7 +411,7 @@ static void __submit_merged_write_cond(struct f2fs_sb_info *sbi,
		struct f2fs_bio_info *io = sbi->write_io[btype] + temp;

		down_read(&io->io_rwsem);
		ret = __has_merged_page(io, inode, page, ino);
		ret = __has_merged_page(io->bio, inode, page, ino);
		up_read(&io->io_rwsem);
		}
		if (ret)
		@@ -481,6 +481,61 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio)
		return 0;
		}

		int f2fs_merge_page_bio(struct f2fs_io_info *fio)
		{
		struct bio bio = fio->bio;
		struct page *page = fio->encrypted_page ?
		fio->encrypted_page : fio->page;

		if (!f2fs_is_valid_blkaddr(fio->sbi, fio->new_blkaddr,
		__is_meta_io(fio) ? META_GENERIC : DATA_GENERIC))
		return -EFAULT;

		trace_f2fs_submit_page_bio(page, fio);
		f2fs_trace_ios(fio, 0);

		if (bio && (*fio->last_block + 1 != fio->new_blkaddr \|\|
		!__same_bdev(fio->sbi, fio->new_blkaddr, bio))) {
		__submit_bio(fio->sbi, bio, fio->type);
		bio = NULL;
		}
		alloc_new:
		if (!bio) {
		bio = __bio_alloc(fio->sbi, fio->new_blkaddr, fio->io_wbc,
		BIO_MAX_PAGES, false, fio->type, fio->temp);
		bio_set_op_attrs(bio, fio->op, fio->op_flags);
		}

		if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) {
		__submit_bio(fio->sbi, bio, fio->type);
		bio = NULL;
		goto alloc_new;
		}

		if (fio->io_wbc)
		wbc_account_io(fio->io_wbc, page, PAGE_SIZE);

		inc_page_count(fio->sbi, WB_DATA_TYPE(page));

		*fio->last_block = fio->new_blkaddr;
		*fio->bio = bio;

		return 0;
		}

		static void f2fs_submit_ipu_bio(struct f2fs_sb_info sbi, struct bio *bio,
		struct page *page)
		{
		if (!bio)
		return;

		if (!__has_merged_page(*bio, NULL, page, 0))
		return;

		__submit_bio(sbi, *bio, DATA);
		*bio = NULL;
		}

		void f2fs_submit_page_write(struct f2fs_io_info *fio)
		{
		struct f2fs_sb_info *sbi = fio->sbi;
		@@ -1947,6 +2002,8 @@ out:
		}

		static int __write_data_page(struct page page, bool submitted,
		struct bio **bio,
		sector_t *last_block,
		struct writeback_control *wbc,
		enum iostat_type io_type)
		{
		@@ -1972,6 +2029,8 @@ static int __write_data_page(struct page page, bool submitted,
		.need_lock = LOCK_RETRY,
		.io_type = io_type,
		.io_wbc = wbc,
		.bio = bio,
		.last_block = last_block,
		};

		trace_f2fs_writepage(page, DATA);
		@@ -2070,10 +2129,13 @@ out:

		unlock_page(page);
		if (!S_ISDIR(inode->i_mode) && !IS_NOQUOTA(inode) &&
		!F2FS_I(inode)->cp_task)
		!F2FS_I(inode)->cp_task) {
		f2fs_submit_ipu_bio(sbi, bio, page);
		f2fs_balance_fs(sbi, need_balance_fs);
		}

		if (unlikely(f2fs_cp_error(sbi))) {
		f2fs_submit_ipu_bio(sbi, bio, page);
		f2fs_submit_merged_write(sbi, DATA);
		submitted = NULL;
		}
		@@ -2100,7 +2162,7 @@ redirty_out:
		static int f2fs_write_data_page(struct page *page,
		struct writeback_control *wbc)
		{
		return __write_data_page(page, NULL, wbc, FS_DATA_IO);
		return __write_data_page(page, NULL, NULL, NULL, wbc, FS_DATA_IO);
		}

		/*
		@@ -2116,6 +2178,8 @@ static int f2fs_write_cache_pages(struct address_space *mapping,
		int done = 0;
		struct pagevec pvec;
		struct f2fs_sb_info *sbi = F2FS_M_SB(mapping);
		struct bio *bio = NULL;
		sector_t last_block;
		int nr_pages;
		pgoff_t uninitialized_var(writeback_index);
		pgoff_t index;
		@@ -2192,17 +2256,20 @@ continue_unlock:
		}

		if (PageWriteback(page)) {
		if (wbc->sync_mode != WB_SYNC_NONE)
		if (wbc->sync_mode != WB_SYNC_NONE) {
		f2fs_wait_on_page_writeback(page,
		DATA, true, true);
		else
		f2fs_submit_ipu_bio(sbi, &bio, page);
		} else {
		goto continue_unlock;
		}
		}

		if (!clear_page_dirty_for_io(page))
		goto continue_unlock;

		ret = __write_data_page(page, &submitted, wbc, io_type);
		ret = __write_data_page(page, &submitted, &bio,
		&last_block, wbc, io_type);
		if (unlikely(ret)) {
		/*
		* keep nr_to_write, since vfs uses this to
		@@ -2251,6 +2318,9 @@ continue_unlock:
		if (nwritten)
		f2fs_submit_merged_write_cond(F2FS_M_SB(mapping), mapping->host,
		NULL, 0, DATA);
		/* submit cached bio of IPU write */
		if (bio)
		__submit_bio(sbi, bio, DATA);

		return ret;
		}

fs/f2fs/f2fs.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -1052,6 +1052,8 @@ struct f2fs_io_info {
		bool retry; /* need to reallocate block address */
		enum iostat_type io_type; /* io type */
		struct writeback_control io_wbc; / writeback control */
		struct bio *bio; / bio for ipu */
		sector_t last_block; / last block number in bio */
		unsigned char version; /* version of the node */
		};

		@@ -3169,6 +3171,7 @@ void f2fs_submit_merged_write_cond(struct f2fs_sb_info *sbi,
		nid_t ino, enum page_type type);
		void f2fs_flush_merged_writes(struct f2fs_sb_info *sbi);
		int f2fs_submit_page_bio(struct f2fs_io_info *fio);
		int f2fs_merge_page_bio(struct f2fs_io_info *fio);
		void f2fs_submit_page_write(struct f2fs_io_info *fio);
		struct block_device f2fs_target_device(struct f2fs_sb_info sbi,
		block_t blk_addr, struct bio *bio);

fs/f2fs/segment.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -3202,6 +3202,9 @@ int f2fs_inplace_write_data(struct f2fs_io_info *fio)

		stat_inc_inplace_blocks(fio->sbi);

		if (fio->bio)
		err = f2fs_merge_page_bio(fio);
		else
		err = f2fs_submit_page_bio(fio);
		if (!err) {
		update_device_state(fio);

Admin message