Commit 4356e48e authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs crypto: fix incorrect positioning for GCing encrypted data page 



For now, flow of GCing an encrypted data page:
1) try to grab meta page in meta inode's mapping with index of old block
address of that data page
2) load data of ciphertext into meta page
3) allocate new block address
4) write the meta page into new block address
5) update block address pointer in direct node page.

Other reader/writer will use f2fs_wait_on_encrypted_page_writeback to
check and wait on GCed encrypted data cached in meta page writebacked
in order to avoid inconsistence among data page cache, meta page cache
and data on-disk when updating.

However, we will use new block address updated in step 5) as an index to
lookup meta page in inner bio buffer. That would be wrong, and we will
never find the GCing meta page, since we use the old block address as
index of that page in step 1).

This patch fixes the issue by adjust the order of step 1) and step 3),
and in step 1) grab page with index generated in step 3).

Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 80dd9c0e

fs/f2fs/f2fs.h

+2 −0
Original line number Diff line number Diff line
@@ -1855,6 +1855,8 @@ void write_meta_page(struct f2fs_sb_info *, struct page *); 
void write_node_page(unsigned int, struct f2fs_io_info *);

void write_data_page(struct dnode_of_data *, struct f2fs_io_info *);

void rewrite_data_page(struct f2fs_io_info *);

void __f2fs_replace_block(struct f2fs_sb_info *, struct f2fs_summary *,

					block_t, block_t, bool, bool);

void f2fs_replace_block(struct f2fs_sb_info *, struct dnode_of_data *,

				block_t, block_t, unsigned char, bool, bool);

void allocate_data_block(struct f2fs_sb_info *, struct page *,

fs/f2fs/gc.c

+22 −10
Original line number Diff line number Diff line
@@ -553,6 +553,7 @@ static void move_encrypted_block(struct inode *inode, block_t bidx) 
	struct f2fs_summary sum;

	struct node_info ni;

	struct page *page;

	block_t newaddr;

	int err;



	/* do not read out */
@@ -583,12 +584,15 @@ static void move_encrypted_block(struct inode *inode, block_t bidx) 
	fio.page = page;

	fio.new_blkaddr = fio.old_blkaddr = dn.data_blkaddr;



	fio.encrypted_page = pagecache_get_page(META_MAPPING(fio.sbi),

					fio.new_blkaddr,

					FGP_LOCK|FGP_CREAT,

					GFP_NOFS);

	if (!fio.encrypted_page)

		goto put_out;

	allocate_data_block(fio.sbi, NULL, fio.old_blkaddr, &newaddr,

							&sum, CURSEG_COLD_DATA);



	fio.encrypted_page = pagecache_get_page(META_MAPPING(fio.sbi), newaddr,

					FGP_LOCK | FGP_CREAT, GFP_NOFS);

	if (!fio.encrypted_page) {

		err = -ENOMEM;

		goto recover_block;

	}



	err = f2fs_submit_page_bio(&fio);

	if (err)
@@ -597,10 +601,14 @@ static void move_encrypted_block(struct inode *inode, block_t bidx) 
	/* write page */

	lock_page(fio.encrypted_page);



	if (unlikely(!PageUptodate(fio.encrypted_page)))

	if (unlikely(!PageUptodate(fio.encrypted_page))) {

		err = -EIO;

		goto put_page_out;

	if (unlikely(fio.encrypted_page->mapping != META_MAPPING(fio.sbi)))

	}

	if (unlikely(fio.encrypted_page->mapping != META_MAPPING(fio.sbi))) {

		err = -EIO;

		goto put_page_out;

	}



	set_page_dirty(fio.encrypted_page);

	f2fs_wait_on_page_writeback(fio.encrypted_page, DATA, true);
@@ -611,9 +619,9 @@ static void move_encrypted_block(struct inode *inode, block_t bidx) 


	/* allocate block address */

	f2fs_wait_on_page_writeback(dn.node_page, NODE, true);

	allocate_data_block(fio.sbi, NULL, fio.old_blkaddr, &fio.new_blkaddr,

							&sum, CURSEG_COLD_DATA);



	fio.rw = WRITE_SYNC;

	fio.new_blkaddr = newaddr;

	f2fs_submit_page_mbio(&fio);



	dn.data_blkaddr = fio.new_blkaddr;
@@ -624,6 +632,10 @@ static void move_encrypted_block(struct inode *inode, block_t bidx) 
		set_inode_flag(F2FS_I(inode), FI_FIRST_BLOCK_WRITTEN);

put_page_out:

	f2fs_put_page(fio.encrypted_page, 1);

recover_block:

	if (err)

		__f2fs_replace_block(fio.sbi, &sum, newaddr, fio.old_blkaddr,

								true, true);

put_out:

	f2fs_put_dnode(&dn);

out:

fs/f2fs/segment.c

+1 −2
Original line number Diff line number Diff line
@@ -1439,8 +1439,7 @@ void rewrite_data_page(struct f2fs_io_info *fio) 
	f2fs_submit_page_mbio(fio);

}



static void __f2fs_replace_block(struct f2fs_sb_info *sbi,

				struct f2fs_summary *sum,

void __f2fs_replace_block(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,

				block_t old_blkaddr, block_t new_blkaddr,

				bool recover_curseg, bool recover_newaddr)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE