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

Commit 10e6f06a authored by Sahitya Tummala's avatar Sahitya Tummala Committed by Jaegeuk Kim
Browse files

f2fs: fix data corruption issue with hardware encryption 



Direct IO can be used in case of hardware encryption. The following
scenario results into data corruption issue in this path -

Thread A -                          Thread B-
-> write file#1 in direct IO
                                    -> GC gets kicked in
                                    -> GC submitted bio on meta mapping
				       for file#1, but pending completion
-> write file#1 again with new data
   in direct IO
                                    -> GC bio gets completed now
                                    -> GC writes old data to the new
                                       location and thus file#1 is
				       corrupted.

Fix this by submitting and waiting for pending io on meta mapping
for direct IO case in f2fs_map_blocks().

Signed-off-by: default avatarSahitya Tummala <stummala@codeaurora.org>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 423f370f

fs/f2fs/data.c

+11 −0
Original line number Diff line number Diff line
@@ -1053,6 +1053,11 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, 
		map->m_flags = F2FS_MAP_MAPPED;

		if (map->m_next_extent)

			*map->m_next_extent = pgofs + map->m_len;



		/* for hardware encryption, but to avoid potential issue in future */

		if (flag == F2FS_GET_BLOCK_DIO)

			f2fs_wait_on_block_writeback_range(inode,

						map->m_pblk, map->m_len);

		goto out;

	}
@@ -1211,6 +1216,12 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, 
	goto next_dnode;



sync_out:



	/* for hardware encryption, but to avoid potential issue in future */

	if (flag == F2FS_GET_BLOCK_DIO && map->m_flags & F2FS_MAP_MAPPED)

		f2fs_wait_on_block_writeback_range(inode,

						map->m_pblk, map->m_len);



	if (flag == F2FS_GET_BLOCK_PRECACHE) {

		if (map->m_flags & F2FS_MAP_MAPPED) {

			unsigned int ofs = start_pgofs - map->m_lblk;

fs/f2fs/f2fs.h

+2 −0
Original line number Diff line number Diff line
@@ -2988,6 +2988,8 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page, 
void f2fs_wait_on_page_writeback(struct page *page,

			enum page_type type, bool ordered);

void f2fs_wait_on_block_writeback(struct inode *inode, block_t blkaddr);

void f2fs_wait_on_block_writeback_range(struct inode *inode, block_t blkaddr,

								block_t len);

void f2fs_write_data_summaries(struct f2fs_sb_info *sbi, block_t start_blk);

void f2fs_write_node_summaries(struct f2fs_sb_info *sbi, block_t start_blk);

int f2fs_lookup_journal_in_cursum(struct f2fs_journal *journal, int type,

fs/f2fs/segment.c

+9 −0
Original line number Diff line number Diff line
@@ -3303,6 +3303,15 @@ void f2fs_wait_on_block_writeback(struct inode *inode, block_t blkaddr) 
	}

}



void f2fs_wait_on_block_writeback_range(struct inode *inode, block_t blkaddr,

								block_t len)

{

	block_t i;



	for (i = 0; i < len; i++)

		f2fs_wait_on_block_writeback(inode, blkaddr + i);

}



static int read_compacted_summaries(struct f2fs_sb_info *sbi)

{

	struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi);