shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

f2fs: compress: fix to cover normal cluster write with cp_rwsem

Browse Source 
[ Upstream commit fd244524c2cf07b5f4c3fe8abd6a99225c76544b ]

When we overwrite compressed cluster w/ normal cluster, we should
not unlock cp_rwsem during f2fs_write_raw_pages(), otherwise data
will be corrupted if partial blocks were persisted before CP & SPOR,
due to cluster metadata wasn't updated atomically.

Fixes: 4c8ff7095b ("f2fs: support data compression")
Reviewed-by: Daeho Jeong <daehojeong@google.com>
Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Chao Yu
2024-01-13 03:41:28 +08:00
committed by Sasha Levin
parent ed22aef701
commit 7d420eaaa1
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
fs/f2fs/compress.c
View File

@@ -1445,12 +1445,14 @@ void f2fs_compress_write_end_io(struct bio *bio, struct page *page)
} }
static int f2fs_write_raw_pages(struct compress_ctx *cc, static int f2fs_write_raw_pages(struct compress_ctx *cc,
int *submitted, int *submitted_p,
struct writeback_control *wbc, struct writeback_control *wbc,
enum iostat_type io_type) enum iostat_type io_type)
{ {
struct address_space *mapping = cc->inode->i_mapping; struct address_space *mapping = cc->inode->i_mapping;
int _submitted, compr_blocks, ret, i; struct f2fs_sb_info *sbi = F2FS_M_SB(mapping);
int submitted, compr_blocks, i;
int ret = 0;
compr_blocks = f2fs_compressed_blocks(cc); compr_blocks = f2fs_compressed_blocks(cc);
@@ -1465,6 +1467,10 @@ static int f2fs_write_raw_pages(struct compress_ctx *cc,
if (compr_blocks < 0) if (compr_blocks < 0)
return compr_blocks; return compr_blocks;
/* overwrite compressed cluster w/ normal cluster */
if (compr_blocks > 0)
f2fs_lock_op(sbi);
for (i = 0; i < cc->cluster_size; i++) { for (i = 0; i < cc->cluster_size; i++) {
if (!cc->rpages[i]) if (!cc->rpages[i])
continue; continue;
@@ -1489,7 +1495,7 @@ continue_unlock:
if (!clear_page_dirty_for_io(cc->rpages[i])) if (!clear_page_dirty_for_io(cc->rpages[i]))
goto continue_unlock; goto continue_unlock;
ret = f2fs_write_single_data_page(cc->rpages[i], &_submitted, ret = f2fs_write_single_data_page(cc->rpages[i], &submitted,
NULL, NULL, wbc, io_type, NULL, NULL, wbc, io_type,
compr_blocks, false); compr_blocks, false);
if (ret) { if (ret) {
@@ -1497,26 +1503,29 @@ continue_unlock:
unlock_page(cc->rpages[i]); unlock_page(cc->rpages[i]);
ret = 0; ret = 0;
} else if (ret == -EAGAIN) { } else if (ret == -EAGAIN) {
ret = 0;
/* /*
* for quota file, just redirty left pages to * for quota file, just redirty left pages to
* avoid deadlock caused by cluster update race * avoid deadlock caused by cluster update race
* from foreground operation. * from foreground operation.
*/ */
if (IS_NOQUOTA(cc->inode)) if (IS_NOQUOTA(cc->inode))
return 0; goto out;
ret = 0;
f2fs_io_schedule_timeout(DEFAULT_IO_TIMEOUT); f2fs_io_schedule_timeout(DEFAULT_IO_TIMEOUT);
goto retry_write; goto retry_write;
} }
return ret; goto out;
} }
*submitted += _submitted; *submitted_p += submitted;
} }
f2fs_balance_fs(F2FS_M_SB(mapping), true); out:
if (compr_blocks > 0)
f2fs_unlock_op(sbi);
return 0; f2fs_balance_fs(sbi, true);
return ret;
} }
int f2fs_write_multi_pages(struct compress_ctx *cc, int f2fs_write_multi_pages(struct compress_ctx *cc,

3
fs/f2fs/data.c
View File

@@ -2801,7 +2801,7 @@ int f2fs_write_single_data_page(struct page *page, int *submitted,
.encrypted_page = NULL, .encrypted_page = NULL,
.submitted = 0, .submitted = 0,
.compr_blocks = compr_blocks, .compr_blocks = compr_blocks,
.need_lock = LOCK_RETRY, .need_lock = compr_blocks ? LOCK_DONE : LOCK_RETRY,
.post_read = f2fs_post_read_required(inode) ? 1 : 0, .post_read = f2fs_post_read_required(inode) ? 1 : 0,
.io_type = io_type, .io_type = io_type,
.io_wbc = wbc, .io_wbc = wbc,
@@ -2886,6 +2886,7 @@ write:
if (err == -EAGAIN) { if (err == -EAGAIN) {
err = f2fs_do_write_data_page(&fio); err = f2fs_do_write_data_page(&fio);
if (err == -EAGAIN) { if (err == -EAGAIN) {
f2fs_bug_on(sbi, compr_blocks);
fio.need_lock = LOCK_REQ; fio.need_lock = LOCK_REQ;
err = f2fs_do_write_data_page(&fio); err = f2fs_do_write_data_page(&fio);
} }