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

Commit 0177d2dd authored by Sayali Lokhande's avatar Sayali Lokhande Committed by Gerrit - the friendly Code Review server
Browse files

Revert "f2fs: add bio cache for IPU" 



This reverts commit 207991d5.

Change-Id: I17e5fd1efb3dc3ac5f2551e082e75cb8bd616fc2
Signed-off-by: default avatarSayali Lokhande <sayalil@codeaurora.org>
parent 648817d7

fs/f2fs/data.c

+9 −79
Original line number Original line Diff line number Diff line
@@ -381,20 +381,20 @@ static void __submit_merged_bio(struct f2fs_bio_info *io) 
	io->bio = NULL;

	io->bio = NULL;

}

}





static bool __has_merged_page(struct bio *bio, struct inode *inode,

static bool __has_merged_page(struct f2fs_bio_info *io, struct inode *inode,

						struct page *page, nid_t ino)

						struct page *page, nid_t ino)

{

{

	struct bio_vec *bvec;

	struct bio_vec *bvec;

	struct page *target;

	struct page *target;

	int i;

	int i;





	if (!bio)

	if (!io->bio)

		return false;

		return false;





	if (!inode && !page && !ino)

	if (!inode && !page && !ino)

		return true;

		return true;





	bio_for_each_segment_all(bvec, bio, i) {

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





		if (bvec->bv_page->mapping)

		if (bvec->bv_page->mapping)

			target = bvec->bv_page;

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

			struct f2fs_bio_info *io = sbi->write_io[btype] + temp;





			down_read(&io->io_rwsem);

			down_read(&io->io_rwsem);

			ret = __has_merged_page(io->bio, inode, page, ino);

			ret = __has_merged_page(io, inode, page, ino);

			up_read(&io->io_rwsem);

			up_read(&io->io_rwsem);

		}

		}

		if (ret)

		if (ret)
@@ -525,61 +525,6 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio) 
	return 0;

	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 -EFSCORRUPTED;



	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)

void f2fs_submit_page_write(struct f2fs_io_info *fio)

{

{

	struct f2fs_sb_info *sbi = fio->sbi;

	struct f2fs_sb_info *sbi = fio->sbi;
@@ -2089,8 +2034,6 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) 
}

}





static int __write_data_page(struct page *page, bool *submitted,

static int __write_data_page(struct page *page, bool *submitted,

				struct bio **bio,

				sector_t *last_block,

				struct writeback_control *wbc,

				struct writeback_control *wbc,

				enum iostat_type io_type)

				enum iostat_type io_type)

{

{
@@ -2116,8 +2059,6 @@ static int __write_data_page(struct page *page, bool *submitted, 
		.need_lock = LOCK_RETRY,

		.need_lock = LOCK_RETRY,

		.io_type = io_type,

		.io_type = io_type,

		.io_wbc = wbc,

		.io_wbc = wbc,

		.bio = bio,

		.last_block = last_block,

	};

	};





	trace_f2fs_writepage(page, DATA);

	trace_f2fs_writepage(page, DATA);
@@ -2216,13 +2157,10 @@ static int __write_data_page(struct page *page, bool *submitted, 




	unlock_page(page);

	unlock_page(page);

	if (!S_ISDIR(inode->i_mode) && !IS_NOQUOTA(inode) &&

	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);

		f2fs_balance_fs(sbi, need_balance_fs);

	}





	if (unlikely(f2fs_cp_error(sbi))) {

	if (unlikely(f2fs_cp_error(sbi))) {

		f2fs_submit_ipu_bio(sbi, bio, page);

		f2fs_submit_merged_write(sbi, DATA);

		f2fs_submit_merged_write(sbi, DATA);

		submitted = NULL;

		submitted = NULL;

	}

	}
@@ -2249,7 +2187,7 @@ static int __write_data_page(struct page *page, bool *submitted, 
static int f2fs_write_data_page(struct page *page,

static int f2fs_write_data_page(struct page *page,

					struct writeback_control *wbc)

					struct writeback_control *wbc)

{

{

	return __write_data_page(page, NULL, NULL, NULL, wbc, FS_DATA_IO);

	return __write_data_page(page, NULL, wbc, FS_DATA_IO);

}

}





/*

/*
@@ -2265,8 +2203,6 @@ static int f2fs_write_cache_pages(struct address_space *mapping, 
	int done = 0;

	int done = 0;

	struct pagevec pvec;

	struct pagevec pvec;

	struct f2fs_sb_info *sbi = F2FS_M_SB(mapping);

	struct f2fs_sb_info *sbi = F2FS_M_SB(mapping);

	struct bio *bio = NULL;

	sector_t last_block;

	int nr_pages;

	int nr_pages;

	pgoff_t uninitialized_var(writeback_index);

	pgoff_t uninitialized_var(writeback_index);

	pgoff_t index;

	pgoff_t index;
@@ -2343,20 +2279,17 @@ static int f2fs_write_cache_pages(struct address_space *mapping, 
			}

			}





			if (PageWriteback(page)) {

			if (PageWriteback(page)) {

				if (wbc->sync_mode != WB_SYNC_NONE) {

				if (wbc->sync_mode != WB_SYNC_NONE)

					f2fs_wait_on_page_writeback(page,

					f2fs_wait_on_page_writeback(page,

							DATA, true, true);

							DATA, true, true);

					f2fs_submit_ipu_bio(sbi, &bio, page);

				else

				} else {

					goto continue_unlock;

					goto continue_unlock;

			}

			}

			}





			if (!clear_page_dirty_for_io(page))

			if (!clear_page_dirty_for_io(page))

				goto continue_unlock;

				goto continue_unlock;





			ret = __write_data_page(page, &submitted, &bio,

			ret = __write_data_page(page, &submitted, wbc, io_type);

					&last_block, wbc, io_type);

			if (unlikely(ret)) {

			if (unlikely(ret)) {

				/*

				/*

				 * keep nr_to_write, since vfs uses this to

				 * keep nr_to_write, since vfs uses this to
@@ -2405,9 +2338,6 @@ static int f2fs_write_cache_pages(struct address_space *mapping, 
	if (nwritten)

	if (nwritten)

		f2fs_submit_merged_write_cond(F2FS_M_SB(mapping), mapping->host,

		f2fs_submit_merged_write_cond(F2FS_M_SB(mapping), mapping->host,

								NULL, 0, DATA);

								NULL, 0, DATA);

	/* submit cached bio of IPU write */

	if (bio)

		__submit_bio(sbi, bio, DATA);





	return ret;

	return ret;

}

}

fs/f2fs/f2fs.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -1055,8 +1055,6 @@ struct f2fs_io_info { 
	bool retry;		/* need to reallocate block address */

	bool retry;		/* need to reallocate block address */

	enum iostat_type io_type;	/* io type */

	enum iostat_type io_type;	/* io type */

	struct writeback_control *io_wbc; /* writeback control */

	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 */

	unsigned char version;		/* version of the node */

};

};
@@ -3195,7 +3193,6 @@ void f2fs_submit_merged_write_cond(struct f2fs_sb_info *sbi, 
				nid_t ino, enum page_type type);

				nid_t ino, enum page_type type);

void f2fs_flush_merged_writes(struct f2fs_sb_info *sbi);

void f2fs_flush_merged_writes(struct f2fs_sb_info *sbi);

int f2fs_submit_page_bio(struct f2fs_io_info *fio);

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);

void f2fs_submit_page_write(struct f2fs_io_info *fio);

struct block_device *f2fs_target_device(struct f2fs_sb_info *sbi,

struct block_device *f2fs_target_device(struct f2fs_sb_info *sbi,

			block_t blk_addr, struct bio *bio);

			block_t blk_addr, struct bio *bio);

fs/f2fs/segment.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -3237,9 +3237,6 @@ int f2fs_inplace_write_data(struct f2fs_io_info *fio) 




	stat_inc_inplace_blocks(fio->sbi);

	stat_inc_inplace_blocks(fio->sbi);





	if (fio->bio)

		err = f2fs_merge_page_bio(fio);

	else

	err = f2fs_submit_page_bio(fio);

	err = f2fs_submit_page_bio(fio);

	if (!err) {

	if (!err) {

		update_device_state(fio);

		update_device_state(fio);