From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4671310F2 for ; Thu, 28 Dec 2023 02:44:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="C1u06OLx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 66E6AC433C7; Thu, 28 Dec 2023 02:44:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703731456; bh=5Sry3MZK5nXPzSBh0f8DSWrW1gKYAHch4PSI9KBt3g8=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=C1u06OLxhWQVdwt+XdvP32ieP6YmSAzwoIzs1zdhTe3nAEy7El8CVx5xHUW2Skxz1 4aXLMk0i0g5y3j4V4YNJHZBygBlPeFGMskkbDOZviro39Ja/cs8QdxuSprpWUeZQtt e8mGK51Bnog4dicRGLBNee5KqYZOiD0bGzlF05Ig1jyLJcP3ovDY6goqMa3XjKqRND 6eBjzvfG+R4V4QhDDeD7JU+Gs1q9fZsezKKxfVLNIjGurRfN+jOQLpJ0vrWrgoGnC5 MrXN5gvQdiINFPaMLxj843vnUYNrk/MWIRtVsEbr9745rA/oVfiukakwdiENQx7x6i QTZBnteaQyCuA== Message-ID: Date: Thu, 28 Dec 2023 10:44:09 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/6] f2fs: compress: fix to guarantee persisting compressed blocks by CP Content-Language: en-US To: Jaegeuk Kim Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org References: <20231220135934.3471407-1-chao@kernel.org> <35f160e2-a9e4-4f76-af32-de00dce05fa1@kernel.org> From: Chao Yu In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2023/12/28 6:55, Jaegeuk Kim wrote: > On 12/27, Chao Yu wrote: >> On 2023/12/27 5:02, Jaegeuk Kim wrote: >>> On 12/20, Chao Yu wrote: >>>> 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: 4c8ff7095bef ("f2fs: support data compression") >>>> Signed-off-by: Chao Yu >>>> --- >>>> fs/f2fs/compress.c | 3 ++- >>>> fs/f2fs/data.c | 12 +++++++++--- >>>> fs/f2fs/f2fs.h | 3 ++- >>>> 3 files changed, 13 insertions(+), 5 deletions(-) >>>> >>>> diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c >>>> index 5b076329e9bf..1122db8cc0b0 100644 >>>> --- a/fs/f2fs/compress.c >>>> +++ b/fs/f2fs/compress.c >>>> @@ -1442,6 +1442,7 @@ void f2fs_compress_write_end_io(struct bio *bio, struct page *page) >>>> struct f2fs_sb_info *sbi = bio->bi_private; >>>> struct compress_io_ctx *cic = >>>> (struct compress_io_ctx *)page_private(page); >>>> + enum count_type type = WB_DATA_TYPE(page); >>>> int i; >>>> if (unlikely(bio->bi_status)) >>>> @@ -1449,7 +1450,7 @@ void f2fs_compress_write_end_io(struct bio *bio, struct 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)) >>>> return; >>>> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c >>>> index d28c97282e68..6c72a6e86ba8 100644 >>>> --- a/fs/f2fs/data.c >>>> +++ b/fs/f2fs/data.c >>>> @@ -48,7 +48,7 @@ void f2fs_destroy_bioset(void) >>>> 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 inode *inode; >>>> @@ -66,7 +66,7 @@ static bool __is_cp_guaranteed(struct page *page) >>>> return true; >>>> if (f2fs_is_compressed_page(page)) >>>> - return false; >>>> + return true; >>>> if ((S_ISREG(inode->i_mode) && IS_NOQUOTA(inode)) || >>>> page_private_gcing(page)) >>>> return true; >>>> @@ -1007,6 +1007,7 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio) >>>> enum page_type btype = PAGE_TYPE_OF_BIO(fio->type); >>>> struct f2fs_bio_info *io = sbi->write_io[btype] + fio->temp; >>>> struct page *bio_page; >>>> + enum count_type type; >>>> f2fs_bug_on(sbi, is_read_io(fio->op)); >>>> @@ -1046,7 +1047,12 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio) >>>> /* set submitted = true as a return value */ >>>> fio->submitted = 1; >>>> - inc_page_count(sbi, WB_DATA_TYPE(bio_page)); >>>> + type = WB_DATA_TYPE(bio_page); >>>> + /* override count type if page is compressed one */ >>>> + if (fio->compressed_page) >>>> + type = WB_DATA_TYPE(fio->compressed_page); >>> >>> Doesn't bio_page already point fio->compressed_page? >> >> Please check below codes, bio_page will point to fio->encrypted_page if >> both software encryption feature and compression feature are on, for this >> case, we still need to account F2FS_WB_CP_DATA. > > So, it seems you want to make F2FS_WB_CP_DATA regardless of conditions. Then, > how about making this explictly instead of implicit condition check of the page? > > #define WB_DATA_TYPE(p, f) (f || __is_cp_guaranteed(p) ? F2FS_WB_CP_DATA : F2FS_WB_DATA) > > inc_page_count(sbi, WB_DATA_TYPE(bio_page, bio_page == fio->compressed_page)); Do you mean inc_page_count(sbi, WB_DATA_TYPE(bio_page, fio->compressed_page));? If we use inc_page_count(sbi, WB_DATA_TYPE(bio_page, bio_page == fio->compressed_page)); if bio_page points to fio->encrypted_page, but fio->compressed_page is valid, then WB_DATA_TYPE() will return F2FS_WB_DATA, it doesn't as expect. Or am I missing something? Thanks, > > dec_page_count(sbi, WB_DATA_TYPE(page, f2fs_is_compressed_page(page))); > >> >> if (fio->encrypted_page) >> bio_page = fio->encrypted_page; >> else if (fio->compressed_page) >> bio_page = fio->compressed_page; >> else >> bio_page = fio->page; >> >> Thanks, >> >>> >>>> + >>>> + inc_page_count(sbi, type); >>>> if (io->bio && >>>> (!io_is_mergeable(sbi, io->bio, io, fio, io->last_block_in_bio, >>>> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h >>>> index 76e9a8682e38..bcb3940ab5ba 100644 >>>> --- a/fs/f2fs/f2fs.h >>>> +++ b/fs/f2fs/f2fs.h >>>> @@ -1092,7 +1092,7 @@ struct f2fs_sm_info { >>>> * f2fs monitors the number of several block types such as on-writeback, >>>> * 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) (f2fs_is_cp_guaranteed(p) ? F2FS_WB_CP_DATA : F2FS_WB_DATA) >>>> enum count_type { >>>> F2FS_DIRTY_DENTS, >>>> F2FS_DIRTY_DATA, >>>> @@ -3824,6 +3824,7 @@ void f2fs_init_ckpt_req_control(struct f2fs_sb_info *sbi); >>>> */ >>>> int __init f2fs_init_bioset(void); >>>> void f2fs_destroy_bioset(void); >>>> +bool f2fs_is_cp_guaranteed(struct page *page); >>>> int f2fs_init_bio_entry_cache(void); >>>> void f2fs_destroy_bio_entry_cache(void); >>>> void f2fs_submit_read_bio(struct f2fs_sb_info *sbi, struct bio *bio, >>>> -- >>>> 2.40.1