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

Commit 237c0790 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: call SetPageUptodate if needed 



SetPageUptodate() issues memory barrier, resulting in performance degrdation.
Let's avoid that.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent fe76b796

fs/f2fs/checkpoint.c

+4 −2
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ struct page *grab_meta_page(struct f2fs_sb_info *sbi, pgoff_t index) 
		goto repeat;

	}

	f2fs_wait_on_page_writeback(page, META, true);

	if (!PageUptodate(page))

		SetPageUptodate(page);

	return page;

}
@@ -364,6 +365,7 @@ static int f2fs_set_meta_page_dirty(struct page *page) 
{

	trace_f2fs_set_page_dirty(page, META);



	if (!PageUptodate(page))

		SetPageUptodate(page);

	if (!PageDirty(page)) {

		f2fs_set_page_dirty_nobuffers(page);

fs/f2fs/data.c

+12 −6
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ static void f2fs_read_end_io(struct bio *bio) 
		struct page *page = bvec->bv_page;



		if (!bio->bi_error) {

			if (!PageUptodate(page))

				SetPageUptodate(page);

		} else {

			ClearPageUptodate(page);
@@ -443,6 +444,7 @@ struct page *get_read_data_page(struct inode *inode, pgoff_t index, 
	 */

	if (dn.data_blkaddr == NEW_ADDR) {

		zero_user_segment(page, 0, PAGE_SIZE);

		if (!PageUptodate(page))

			SetPageUptodate(page);

		unlock_page(page);

		return page;
@@ -554,6 +556,7 @@ struct page *get_new_data_page(struct inode *inode, 


	if (dn.data_blkaddr == NEW_ADDR) {

		zero_user_segment(page, 0, PAGE_SIZE);

		if (!PageUptodate(page))

			SetPageUptodate(page);

	} else {

		f2fs_put_page(page, 1);
@@ -1065,6 +1068,7 @@ static int f2fs_mpage_readpages(struct address_space *mapping, 
			}

		} else {

			zero_user_segment(page, 0, PAGE_SIZE);

			if (!PageUptodate(page))

				SetPageUptodate(page);

			unlock_page(page);

			goto next_page;
@@ -1659,6 +1663,7 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, 
		}

	}

out_update:

	if (!PageUptodate(page))

		SetPageUptodate(page);

out_clear:

	clear_cold_data(page);
@@ -1813,6 +1818,7 @@ static int f2fs_set_data_page_dirty(struct page *page) 


	trace_f2fs_set_page_dirty(page, DATA);



	if (!PageUptodate(page))

		SetPageUptodate(page);



	if (f2fs_is_atomic_file(inode)) {

fs/f2fs/file.c

+2 −1
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma, 
		zero_user_segment(page, offset, PAGE_SIZE);

	}

	set_page_dirty(page);

	if (!PageUptodate(page))

		SetPageUptodate(page);



	trace_f2fs_vm_page_mkwrite(page, DATA);

fs/f2fs/inline.c

+6 −3
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ void read_inline_data(struct page *page, struct page *ipage) 
	memcpy(dst_addr, src_addr, MAX_INLINE_DATA);

	flush_dcache_page(page);

	kunmap_atomic(dst_addr);

	if (!PageUptodate(page))

		SetPageUptodate(page);

}
@@ -97,6 +98,7 @@ int f2fs_read_inline_data(struct inode *inode, struct page *page) 
	else

		read_inline_data(page, ipage);



	if (!PageUptodate(page))

		SetPageUptodate(page);

	f2fs_put_page(ipage, 1);

	unlock_page(page);
@@ -370,6 +372,7 @@ static int f2fs_move_inline_dirents(struct inode *dir, struct page *ipage, 
					NR_INLINE_DENTRY * F2FS_SLOT_LEN);



	kunmap_atomic(dentry_blk);

	if (!PageUptodate(page))

		SetPageUptodate(page);

	set_page_dirty(page);

fs/f2fs/node.c

+6 −3
Original line number Diff line number Diff line
@@ -1045,6 +1045,7 @@ struct page *new_node_page(struct dnode_of_data *dn, 
	f2fs_wait_on_page_writeback(page, NODE, true);

	fill_node_footer(page, dn->nid, dn->inode->i_ino, ofs, true);

	set_cold_node(dn->inode, page);

	if (!PageUptodate(page))

		SetPageUptodate(page);

	if (set_page_dirty(page))

		dn->node_changed = true;
@@ -1644,6 +1645,7 @@ static int f2fs_set_node_page_dirty(struct page *page) 
{

	trace_f2fs_set_page_dirty(page, NODE);



	if (!PageUptodate(page))

		SetPageUptodate(page);

	if (!PageDirty(page)) {

		f2fs_set_page_dirty_nobuffers(page);
@@ -2015,6 +2017,7 @@ int recover_inode_page(struct f2fs_sb_info *sbi, struct page *page) 
	/* Should not use this inode from free nid list */

	remove_free_nid(NM_I(sbi), ino);



	if (!PageUptodate(ipage))

		SetPageUptodate(ipage);

	fill_node_footer(ipage, ino, ino, 0, true);