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

Commit 6bacf52f authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: add unlikely() macro for compiler more aggressively 



This patch adds unlikely() macro into the most of codes.
The basic rule is to add that when:
- checking unusual errors,
- checking page mappings,
- and the other unlikely conditions.

Change log from v1:
 - Don't add unlikely for the NULL test and error test: advised by Andi Kleen.

Cc: Chao Yu <chao2.yu@samsung.com>
Cc: Andi Kleen <andi@firstfloor.org>
Reviewed-by: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
parent cfb271d4

fs/f2fs/checkpoint.c

+5 −5
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ repeat: 
		goto repeat;



	lock_page(page);

	if (page->mapping != mapping) {

	if (unlikely(page->mapping != mapping)) {

		f2fs_put_page(page, 1);

		goto repeat;

	}
@@ -473,7 +473,7 @@ static int __add_dirty_inode(struct inode *inode, struct dir_inode_entry *new) 
	list_for_each(this, head) {

		struct dir_inode_entry *entry;

		entry = list_entry(this, struct dir_inode_entry, list);

		if (entry->inode == inode)

		if (unlikely(entry->inode == inode))

			return -EEXIST;

	}

	list_add_tail(&new->list, head);
@@ -783,7 +783,7 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount) 
	/* Here, we only have one bio having CP pack */

	sync_meta_pages(sbi, META_FLUSH, LONG_MAX);



	if (!is_set_ckpt_flags(ckpt, CP_ERROR_FLAG)) {

	if (unlikely(!is_set_ckpt_flags(ckpt, CP_ERROR_FLAG))) {

		clear_prefree_segments(sbi);

		F2FS_RESET_SB_DIRT(sbi);

	}
@@ -840,11 +840,11 @@ int __init create_checkpoint_caches(void) 
{

	orphan_entry_slab = f2fs_kmem_cache_create("f2fs_orphan_entry",

			sizeof(struct orphan_inode_entry), NULL);

	if (unlikely(!orphan_entry_slab))

	if (!orphan_entry_slab)

		return -ENOMEM;

	inode_entry_slab = f2fs_kmem_cache_create("f2fs_dirty_dir_entry",

			sizeof(struct dir_inode_entry), NULL);

	if (unlikely(!inode_entry_slab)) {

	if (!inode_entry_slab) {

		kmem_cache_destroy(orphan_entry_slab);

		return -ENOMEM;

	}

fs/f2fs/data.c

+14 −15
Original line number Diff line number Diff line
@@ -49,11 +49,11 @@ static void f2fs_read_end_io(struct bio *bio, int err) 
		if (--bvec >= bio->bi_io_vec)

			prefetchw(&bvec->bv_page->flags);



		if (uptodate) {

			SetPageUptodate(page);

		} else {

		if (unlikely(!uptodate)) {

			ClearPageUptodate(page);

			SetPageError(page);

		} else {

			SetPageUptodate(page);

		}

		unlock_page(page);

	} while (bvec >= bio->bi_io_vec);
@@ -73,7 +73,7 @@ static void f2fs_write_end_io(struct bio *bio, int err) 
		if (--bvec >= bio->bi_io_vec)

			prefetchw(&bvec->bv_page->flags);



		if (!uptodate) {

		if (unlikely(!uptodate)) {

			SetPageError(page);

			set_bit(AS_EIO, &page->mapping->flags);

			set_ckpt_flags(sbi->ckpt, CP_ERROR_FLAG);
@@ -249,7 +249,7 @@ int reserve_new_block(struct dnode_of_data *dn) 
{

	struct f2fs_sb_info *sbi = F2FS_SB(dn->inode->i_sb);



	if (is_inode_flag_set(F2FS_I(dn->inode), FI_NO_ALLOC))

	if (unlikely(is_inode_flag_set(F2FS_I(dn->inode), FI_NO_ALLOC)))

		return -EPERM;

	if (unlikely(!inc_valid_block_count(sbi, dn->inode, 1)))

		return -ENOSPC;
@@ -424,7 +424,7 @@ struct page *find_data_page(struct inode *inode, pgoff_t index, bool sync) 
		return ERR_PTR(-ENOENT);



	/* By fallocate(), there is no cached page, but with NEW_ADDR */

	if (dn.data_blkaddr == NEW_ADDR)

	if (unlikely(dn.data_blkaddr == NEW_ADDR))

		return ERR_PTR(-EINVAL);



	page = grab_cache_page_write_begin(mapping, index, AOP_FLAG_NOFS);
@@ -443,7 +443,7 @@ struct page *find_data_page(struct inode *inode, pgoff_t index, bool sync) 


	if (sync) {

		wait_on_page_locked(page);

		if (!PageUptodate(page)) {

		if (unlikely(!PageUptodate(page))) {

			f2fs_put_page(page, 0);

			return ERR_PTR(-EIO);

		}
@@ -477,7 +477,7 @@ repeat: 
	}

	f2fs_put_dnode(&dn);



	if (dn.data_blkaddr == NULL_ADDR) {

	if (unlikely(dn.data_blkaddr == NULL_ADDR)) {

		f2fs_put_page(page, 1);

		return ERR_PTR(-ENOENT);

	}
@@ -502,11 +502,11 @@ repeat: 
		return ERR_PTR(err);



	lock_page(page);

	if (!PageUptodate(page)) {

	if (unlikely(!PageUptodate(page))) {

		f2fs_put_page(page, 1);

		return ERR_PTR(-EIO);

	}

	if (page->mapping != mapping) {

	if (unlikely(page->mapping != mapping)) {

		f2fs_put_page(page, 1);

		goto repeat;

	}
@@ -534,7 +534,6 @@ struct page *get_new_data_page(struct inode *inode, 
	err = f2fs_reserve_block(&dn, index);

	if (err)

		return ERR_PTR(err);



repeat:

	page = grab_cache_page(mapping, index);

	if (!page)
@@ -552,11 +551,11 @@ repeat: 
		if (err)

			return ERR_PTR(err);

		lock_page(page);

		if (!PageUptodate(page)) {

		if (unlikely(!PageUptodate(page))) {

			f2fs_put_page(page, 1);

			return ERR_PTR(-EIO);

		}

		if (page->mapping != mapping) {

		if (unlikely(page->mapping != mapping)) {

			f2fs_put_page(page, 1);

			goto repeat;

		}
@@ -841,11 +840,11 @@ repeat: 
		if (err)

			return err;

		lock_page(page);

		if (!PageUptodate(page)) {

		if (unlikely(!PageUptodate(page))) {

			f2fs_put_page(page, 1);

			return -EIO;

		}

		if (page->mapping != mapping) {

		if (unlikely(page->mapping != mapping)) {

			f2fs_put_page(page, 1);

			goto repeat;

		}

fs/f2fs/file.c

+4 −5
Original line number Diff line number Diff line
@@ -50,9 +50,9 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma, 


	file_update_time(vma->vm_file);

	lock_page(page);

	if (page->mapping != inode->i_mapping ||

	if (unlikely(page->mapping != inode->i_mapping ||

			page_offset(page) > i_size_read(inode) ||

			!PageUptodate(page)) {

			!PageUptodate(page))) {

		unlock_page(page);

		err = -EFAULT;

		goto out;
@@ -120,7 +120,7 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) 
		.for_reclaim = 0,

	};



	if (f2fs_readonly(inode->i_sb))

	if (unlikely(f2fs_readonly(inode->i_sb)))

		return 0;



	trace_f2fs_sync_file_enter(inode);
@@ -241,7 +241,7 @@ static void truncate_partial_data_page(struct inode *inode, u64 from) 
		return;



	lock_page(page);

	if (page->mapping != inode->i_mapping) {

	if (unlikely(page->mapping != inode->i_mapping)) {

		f2fs_put_page(page, 1);

		return;

	}
@@ -516,7 +516,6 @@ static int expand_inode_data(struct inode *inode, loff_t offset, 
		if (ret)

			break;





		if (pg_start == pg_end)

			new_size = offset + len;

		else if (index == pg_start && off_start)

fs/f2fs/gc.c

+1 −2
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ int start_gc_thread(struct f2fs_sb_info *sbi) 
		kfree(gc_th);

		sbi->gc_thread = NULL;

	}



out:

	return err;

}
@@ -695,7 +694,7 @@ int f2fs_gc(struct f2fs_sb_info *sbi) 


	INIT_LIST_HEAD(&ilist);

gc_more:

	if (!(sbi->sb->s_flags & MS_ACTIVE))

	if (unlikely(!(sbi->sb->s_flags & MS_ACTIVE)))

		goto stop;



	if (gc_type == BG_GC && has_not_enough_free_secs(sbi, nfree)) {

fs/f2fs/node.c

+14 −14
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ skip_partial: 
		if (offset[1] == 0 &&

				rn->i.i_nid[offset[0] - NODE_DIR1_BLOCK]) {

			lock_page(page);

			if (page->mapping != node_mapping) {

			if (unlikely(page->mapping != node_mapping)) {

				f2fs_put_page(page, 1);

				goto restart;

			}
@@ -841,14 +841,14 @@ struct page *new_node_page(struct dnode_of_data *dn, 
	struct page *page;

	int err;



	if (is_inode_flag_set(F2FS_I(dn->inode), FI_NO_ALLOC))

	if (unlikely(is_inode_flag_set(F2FS_I(dn->inode), FI_NO_ALLOC)))

		return ERR_PTR(-EPERM);



	page = grab_cache_page(mapping, dn->nid);

	if (!page)

		return ERR_PTR(-ENOMEM);



	if (!inc_valid_node_count(sbi, dn->inode)) {

	if (unlikely(!inc_valid_node_count(sbi, dn->inode))) {

		err = -ENOSPC;

		goto fail;

	}
@@ -898,7 +898,7 @@ static int read_node_page(struct page *page, int rw) 


	get_node_info(sbi, page->index, &ni);



	if (ni.blk_addr == NULL_ADDR) {

	if (unlikely(ni.blk_addr == NULL_ADDR)) {

		f2fs_put_page(page, 1);

		return -ENOENT;

	}
@@ -953,11 +953,11 @@ repeat: 
		goto got_it;



	lock_page(page);

	if (!PageUptodate(page)) {

	if (unlikely(!PageUptodate(page))) {

		f2fs_put_page(page, 1);

		return ERR_PTR(-EIO);

	}

	if (page->mapping != mapping) {

	if (unlikely(page->mapping != mapping)) {

		f2fs_put_page(page, 1);

		goto repeat;

	}
@@ -1010,12 +1010,12 @@ repeat: 
	blk_finish_plug(&plug);



	lock_page(page);

	if (page->mapping != mapping) {

	if (unlikely(page->mapping != mapping)) {

		f2fs_put_page(page, 1);

		goto repeat;

	}

page_hit:

	if (!PageUptodate(page)) {

	if (unlikely(!PageUptodate(page))) {

		f2fs_put_page(page, 1);

		return ERR_PTR(-EIO);

	}
@@ -1173,9 +1173,9 @@ int wait_on_node_pages_writeback(struct f2fs_sb_info *sbi, nid_t ino) 
		cond_resched();

	}



	if (test_and_clear_bit(AS_ENOSPC, &mapping->flags))

	if (unlikely(test_and_clear_bit(AS_ENOSPC, &mapping->flags)))

		ret2 = -ENOSPC;

	if (test_and_clear_bit(AS_EIO, &mapping->flags))

	if (unlikely(test_and_clear_bit(AS_EIO, &mapping->flags)))

		ret2 = -EIO;

	if (!ret)

		ret = ret2;
@@ -1202,7 +1202,7 @@ static int f2fs_write_node_page(struct page *page, 
	get_node_info(sbi, nid, &ni);



	/* This page is already truncated */

	if (ni.blk_addr == NULL_ADDR) {

	if (unlikely(ni.blk_addr == NULL_ADDR)) {

		dec_page_count(sbi, F2FS_DIRTY_NODES);

		unlock_page(page);

		return 0;
@@ -1627,14 +1627,14 @@ int restore_node_summary(struct f2fs_sb_info *sbi, 
		list_for_each_entry_safe(page, tmp, &page_list, lru) {



			lock_page(page);

			if(PageUptodate(page)) {

			if (unlikely(!PageUptodate(page))) {

				err = -EIO;

			} else {

				rn = F2FS_NODE(page);

				sum_entry->nid = rn->footer.nid;

				sum_entry->version = 0;

				sum_entry->ofs_in_node = 0;

				sum_entry++;

			} else {

				err = -EIO;

			}



			list_del(&page->lru);