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

Commit 9d154a40 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: avoid race in between GC and block exchange 



During block exchange in {insert,collapse,move}_range, page-block mapping
is unstable due to mapping moving or recovery, so there should be no
concurrent cache read operation rely on such mapping, nor cache write
operation to mess up block exchange.

So this patch let background GC be aware of that.

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

fs/f2fs/file.c

+21 −5
Original line number Diff line number Diff line
@@ -1171,11 +1171,14 @@ static int f2fs_collapse_range(struct inode *inode, loff_t offset, loff_t len) 
	if (ret)

		goto out;



	/* avoid gc operation during block exchange */

	down_write(&F2FS_I(inode)->dio_rwsem[WRITE]);



	truncate_pagecache(inode, offset);



	ret = f2fs_do_collapse(inode, pg_start, pg_end);

	if (ret)

		goto out;

		goto out_unlock;



	/* write out all moved pages, if possible */

	filemap_write_and_wait_range(inode->i_mapping, offset, LLONG_MAX);
@@ -1187,7 +1190,8 @@ static int f2fs_collapse_range(struct inode *inode, loff_t offset, loff_t len) 
	ret = truncate_blocks(inode, new_size, true);

	if (!ret)

		f2fs_i_size_write(inode, new_size);



out_unlock:

	up_write(&F2FS_I(inode)->dio_rwsem[WRITE]);

out:

	up_write(&F2FS_I(inode)->i_mmap_sem);

	return ret;
@@ -1370,6 +1374,9 @@ static int f2fs_insert_range(struct inode *inode, loff_t offset, loff_t len) 
	if (ret)

		goto out;



	/* avoid gc operation during block exchange */

	down_write(&F2FS_I(inode)->dio_rwsem[WRITE]);



	truncate_pagecache(inode, offset);



	pg_start = offset >> PAGE_SHIFT;
@@ -1397,6 +1404,8 @@ static int f2fs_insert_range(struct inode *inode, loff_t offset, loff_t len) 


	if (!ret)

		f2fs_i_size_write(inode, new_size);



	up_write(&F2FS_I(inode)->dio_rwsem[WRITE]);

out:

	up_write(&F2FS_I(inode)->i_mmap_sem);

	return ret;
@@ -2261,9 +2270,13 @@ static int f2fs_move_file_range(struct file *file_in, loff_t pos_in, 
	}



	inode_lock(src);

	down_write(&F2FS_I(src)->dio_rwsem[WRITE]);

	if (src != dst) {

		if (!inode_trylock(dst)) {

		ret = -EBUSY;

		if (!inode_trylock(dst))

			goto out;

		if (!down_write_trylock(&F2FS_I(dst)->dio_rwsem[WRITE])) {

			inode_unlock(dst);

			goto out;

		}

	}
@@ -2323,9 +2336,12 @@ static int f2fs_move_file_range(struct file *file_in, loff_t pos_in, 
	}

	f2fs_unlock_op(sbi);

out_unlock:

	if (src != dst)

	if (src != dst) {

		up_write(&F2FS_I(dst)->dio_rwsem[WRITE]);

		inode_unlock(dst);

	}

out:

	up_write(&F2FS_I(src)->dio_rwsem[WRITE]);

	inode_unlock(src);

	return ret;

}

fs/f2fs/gc.c

+7 −0
Original line number Diff line number Diff line
@@ -832,10 +832,17 @@ next_step: 
				continue;

			}



			if (!down_write_trylock(

				&F2FS_I(inode)->dio_rwsem[WRITE])) {

				iput(inode);

				continue;

			}



			start_bidx = start_bidx_of_node(nofs, inode);

			data_page = get_read_data_page(inode,

					start_bidx + ofs_in_node, REQ_RAHEAD,

					true);

			up_write(&F2FS_I(inode)->dio_rwsem[WRITE]);

			if (IS_ERR(data_page)) {

				iput(inode);

				continue;