iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

f2fs: compress: fix to guarantee persisting compressed blocks by CP

Browse Source 
[ Upstream commit 8a430dd49e ]

If data block in compressed cluster is not persisted with metadata
during checkpoint, after SPOR, the data may be corrupted, let's
guarantee to write compressed page by checkpoint.

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:27 +08:00
committed by Sasha Levin
parent 85570b91e4
commit 82704e598d
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/f2fs/compress.c
View File

@ -1413,6 +1413,8 @@ void f2fs_compress_write_end_io(struct bio *bio, struct page *page)
struct f2fs_sb_info *sbi = bio->bi_private; struct f2fs_sb_info *sbi = bio->bi_private;
struct compress_io_ctx *cic = struct compress_io_ctx *cic =
(struct compress_io_ctx *)page_private(page); (struct compress_io_ctx *)page_private(page);
enum count_type type = WB_DATA_TYPE(page,
f2fs_is_compressed_page(page));
int i; int i;
if (unlikely(bio->bi_status)) if (unlikely(bio->bi_status))
@ -1420,7 +1422,7 @@ void f2fs_compress_write_end_io(struct bio *bio, struct page *page)
f2fs_compress_free_page(page); f2fs_compress_free_page(page);
dec_page_count(sbi, F2FS_WB_DATA); dec_page_count(sbi, type);
if (atomic_dec_return(&cic->pending_pages)) if (atomic_dec_return(&cic->pending_pages))
return; return;

17
fs/f2fs/data.c
View File

@ -48,7 +48,7 @@ void f2fs_destroy_bioset(void)
bioset_exit(&f2fs_bioset); bioset_exit(&f2fs_bioset);
} }
static bool __is_cp_guaranteed(struct page *page) bool f2fs_is_cp_guaranteed(struct page *page)
{ {
struct address_space *mapping = page->mapping; struct address_space *mapping = page->mapping;
struct inode *inode; struct inode *inode;
@ -65,8 +65,6 @@ static bool __is_cp_guaranteed(struct page *page)
S_ISDIR(inode->i_mode)) S_ISDIR(inode->i_mode))
return true; return true;
if (f2fs_is_compressed_page(page))
return false;
if ((S_ISREG(inode->i_mode) && IS_NOQUOTA(inode)) || if ((S_ISREG(inode->i_mode) && IS_NOQUOTA(inode)) ||
page_private_gcing(page)) page_private_gcing(page))
return true; return true;
@ -338,7 +336,7 @@ static void f2fs_write_end_io(struct bio *bio)
bio_for_each_segment_all(bvec, bio, iter_all) { bio_for_each_segment_all(bvec, bio, iter_all) {
struct page *page = bvec->bv_page; struct page *page = bvec->bv_page;
enum count_type type = WB_DATA_TYPE(page); enum count_type type = WB_DATA_TYPE(page, false);
if (page_private_dummy(page)) { if (page_private_dummy(page)) {
clear_page_private_dummy(page); clear_page_private_dummy(page);
@ -762,7 +760,7 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio)
wbc_account_cgroup_owner(fio->io_wbc, fio->page, PAGE_SIZE); wbc_account_cgroup_owner(fio->io_wbc, fio->page, PAGE_SIZE);
inc_page_count(fio->sbi, is_read_io(fio->op) ? inc_page_count(fio->sbi, is_read_io(fio->op) ?
__read_io_type(page) : WB_DATA_TYPE(fio->page)); __read_io_type(page) : WB_DATA_TYPE(fio->page, false));
if (is_read_io(bio_op(bio))) if (is_read_io(bio_op(bio)))
f2fs_submit_read_bio(fio->sbi, bio, fio->type); f2fs_submit_read_bio(fio->sbi, bio, fio->type);
@ -973,7 +971,7 @@ alloc_new:
if (fio->io_wbc) if (fio->io_wbc)
wbc_account_cgroup_owner(fio->io_wbc, fio->page, PAGE_SIZE); wbc_account_cgroup_owner(fio->io_wbc, fio->page, PAGE_SIZE);
inc_page_count(fio->sbi, WB_DATA_TYPE(page)); inc_page_count(fio->sbi, WB_DATA_TYPE(page, false));
*fio->last_block = fio->new_blkaddr; *fio->last_block = fio->new_blkaddr;
*fio->bio = bio; *fio->bio = bio;
@ -1007,6 +1005,7 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio)
enum page_type btype = PAGE_TYPE_OF_BIO(fio->type); enum page_type btype = PAGE_TYPE_OF_BIO(fio->type);
struct f2fs_bio_info *io = sbi->write_io[btype] + fio->temp; struct f2fs_bio_info *io = sbi->write_io[btype] + fio->temp;
struct page *bio_page; struct page *bio_page;
enum count_type type;
f2fs_bug_on(sbi, is_read_io(fio->op)); f2fs_bug_on(sbi, is_read_io(fio->op));
@ -1046,7 +1045,8 @@ next:
/* set submitted = true as a return value */ /* set submitted = true as a return value */
fio->submitted = 1; fio->submitted = 1;
inc_page_count(sbi, WB_DATA_TYPE(bio_page)); type = WB_DATA_TYPE(bio_page, fio->compressed_page);
inc_page_count(sbi, type);
if (io->bio && if (io->bio &&
(!io_is_mergeable(sbi, io->bio, io, fio, io->last_block_in_bio, (!io_is_mergeable(sbi, io->bio, io, fio, io->last_block_in_bio,
@ -1059,7 +1059,8 @@ alloc_new:
if (F2FS_IO_ALIGNED(sbi) && if (F2FS_IO_ALIGNED(sbi) &&
(fio->type == DATA || fio->type == NODE) && (fio->type == DATA || fio->type == NODE) &&
fio->new_blkaddr & F2FS_IO_SIZE_MASK(sbi)) { fio->new_blkaddr & F2FS_IO_SIZE_MASK(sbi)) {
dec_page_count(sbi, WB_DATA_TYPE(bio_page)); dec_page_count(sbi, WB_DATA_TYPE(bio_page,
fio->compressed_page));
fio->retry = 1; fio->retry = 1;
goto skip; goto skip;
} }

4
fs/f2fs/f2fs.h
View File

@ -1075,7 +1075,8 @@ struct f2fs_sm_info {
* f2fs monitors the number of several block types such as on-writeback, * f2fs monitors the number of several block types such as on-writeback,
* dirty dentry blocks, dirty node blocks, and dirty meta blocks. * dirty dentry blocks, dirty node blocks, and dirty meta blocks.
*/ */
#define WB_DATA_TYPE(p) (__is_cp_guaranteed(p) ? F2FS_WB_CP_DATA : F2FS_WB_DATA) #define WB_DATA_TYPE(p, f) \
(f || f2fs_is_cp_guaranteed(p) ? F2FS_WB_CP_DATA : F2FS_WB_DATA)
enum count_type { enum count_type {
F2FS_DIRTY_DENTS, F2FS_DIRTY_DENTS,
F2FS_DIRTY_DATA, F2FS_DIRTY_DATA,
@ -3794,6 +3795,7 @@ void f2fs_init_ckpt_req_control(struct f2fs_sb_info *sbi);
*/ */
int __init f2fs_init_bioset(void); int __init f2fs_init_bioset(void);
void f2fs_destroy_bioset(void); void f2fs_destroy_bioset(void);
bool f2fs_is_cp_guaranteed(struct page *page);
int f2fs_init_bio_entry_cache(void); int f2fs_init_bio_entry_cache(void);
void f2fs_destroy_bio_entry_cache(void); void f2fs_destroy_bio_entry_cache(void);
void f2fs_submit_read_bio(struct f2fs_sb_info *sbi, struct bio *bio, void f2fs_submit_read_bio(struct f2fs_sb_info *sbi, struct bio *bio,