From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D1D3C2D0C2 for ; Thu, 2 Jan 2020 19:00:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C47D217F4 for ; Thu, 2 Jan 2020 19:00:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577991607; bh=wzd5vGv+NY8rW6icu7fH11OpcK8cT4C3Zrd0wOkIzG4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=0E6TBS9FG6rM6P9XOAAyOYCcFE8fWCGbVzz1jvQJ1mF8nW1AwJiqdsuS8jmSpg8ZT UNogHI2TZM1zEMDfxXoSxGpeKO6zISqmEsLXBADGFObcUPxIpInoKAymS1rC7DRbW9 as2KYkqiYDEM05kJKN48jUyKDyJeJXsXKMwigLso= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728167AbgABTAG (ORCPT ); Thu, 2 Jan 2020 14:00:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:60340 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727951AbgABTAF (ORCPT ); Thu, 2 Jan 2020 14:00:05 -0500 Received: from localhost (unknown [104.132.0.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2BA3B21655; Thu, 2 Jan 2020 19:00:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577991604; bh=wzd5vGv+NY8rW6icu7fH11OpcK8cT4C3Zrd0wOkIzG4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=g1VXVZsqZf4x8H1g5zREfvhpB4fyci+6APWXuWc/91hQHx8g6RbATDJeEGYZNolh0 U6ohMM39ktNKn+dN3RY6IudS2eVpMNCvS088oCfLcI4Mpqs9zmqJUfq8vD4fbeRLvo Vz/SkgBhR3YtdOCK0d8DOiDZNz+CrKD75+9bHU6g= Date: Thu, 2 Jan 2020 11:00:03 -0800 From: Jaegeuk Kim To: Chao Yu Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, chao@kernel.org Subject: Re: [RFC PATCH v5] f2fs: support data compression Message-ID: <20200102190003.GA7597@jaegeuk-macbookpro.roam.corp.google.com> References: <20191216062806.112361-1-yuchao0@huawei.com> <20191218214619.GA20072@jaegeuk-macbookpro.roam.corp.google.com> <20191231004633.GA85441@jaegeuk-macbookpro.roam.corp.google.com> <7a579223-39d4-7e51-c361-4aa592b2500d@huawei.com> <20200102181832.GA1953@jaegeuk-macbookpro.roam.corp.google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200102181832.GA1953@jaegeuk-macbookpro.roam.corp.google.com> User-Agent: Mutt/1.8.2 (2017-04-18) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/02, Jaegeuk Kim wrote: > On 12/31, Chao Yu wrote: > > On 2019/12/31 8:46, Jaegeuk Kim wrote: > > > On 12/23, Chao Yu wrote: > > >> Hi Jaegeuk, > > >> > > >> Sorry for the delay. > > >> > > >> On 2019/12/19 5:46, Jaegeuk Kim wrote: > > >>> Hi Chao, > > >>> > > >>> I still see some diffs from my latest testing version, so please check anything > > >>> that you made additionally from here. > > >>> > > >>> https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git/commit/?h=dev&id=25d18e19a91e60837d36368ee939db13fd16dc64 > > >> > > >> I've checked the diff and picked up valid parts, could you please check and > > >> comment on it? > > >> > > >> --- > > >> fs/f2fs/compress.c | 8 ++++---- > > >> fs/f2fs/data.c | 18 +++++++++++++++--- > > >> fs/f2fs/f2fs.h | 3 +++ > > >> fs/f2fs/file.c | 1 - > > >> 4 files changed, 22 insertions(+), 8 deletions(-) > > >> > > >> diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c > > >> index af23ed6deffd..1bc86a54ad71 100644 > > >> --- a/fs/f2fs/compress.c > > >> +++ b/fs/f2fs/compress.c > > >> @@ -593,7 +593,7 @@ static int prepare_compress_overwrite(struct compress_ctx *cc, > > >> fgp_flag, GFP_NOFS); > > >> if (!page) { > > >> ret = -ENOMEM; > > >> - goto unlock_pages; > > >> + goto release_pages; > > >> } > > >> > > >> if (PageUptodate(page)) > > >> @@ -608,13 +608,13 @@ static int prepare_compress_overwrite(struct compress_ctx *cc, > > >> ret = f2fs_read_multi_pages(cc, &bio, cc->cluster_size, > > >> &last_block_in_bio, false); > > >> if (ret) > > >> - goto release_pages; > > >> + goto unlock_pages; > > >> if (bio) > > >> f2fs_submit_bio(sbi, bio, DATA); > > >> > > >> ret = f2fs_init_compress_ctx(cc); > > >> if (ret) > > >> - goto release_pages; > > >> + goto unlock_pages; > > >> } > > >> > > >> for (i = 0; i < cc->cluster_size; i++) { > > >> @@ -762,7 +762,7 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc, > > >> if (err) > > >> goto out_unlock_op; > > >> > > >> - psize = (cc->rpages[last_index]->index + 1) << PAGE_SHIFT; > > >> + psize = (loff_t)(cc->rpages[last_index]->index + 1) << PAGE_SHIFT; > > >> > > >> err = f2fs_get_node_info(fio.sbi, dn.nid, &ni); > > >> if (err) > > >> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c > > >> index 19cd03450066..f1f5c701228d 100644 > > >> --- a/fs/f2fs/data.c > > >> +++ b/fs/f2fs/data.c > > >> @@ -184,13 +184,18 @@ static void f2fs_decompress_work(struct bio_post_read_ctx *ctx) > > >> } > > >> > > >> #ifdef CONFIG_F2FS_FS_COMPRESSION > > >> +void f2fs_verify_pages(struct page **rpages, unsigned int cluster_size) > > >> +{ > > >> + f2fs_decompress_end_io(rpages, cluster_size, false, true); > > >> +} > > >> + > > >> static void f2fs_verify_bio(struct bio *bio) > > >> { > > >> struct page *page = bio_first_page_all(bio); > > >> struct decompress_io_ctx *dic = > > >> (struct decompress_io_ctx *)page_private(page); > > >> > > >> - f2fs_decompress_end_io(dic->rpages, dic->cluster_size, false, true); > > >> + f2fs_verify_pages(dic->rpages, dic->cluster_size); > > >> f2fs_free_dic(dic); > > >> } > > >> #endif > > >> @@ -507,10 +512,16 @@ static bool __has_merged_page(struct bio *bio, struct inode *inode, > > >> bio_for_each_segment_all(bvec, bio, iter_all) { > > >> struct page *target = bvec->bv_page; > > >> > > >> - if (fscrypt_is_bounce_page(target)) > > >> + if (fscrypt_is_bounce_page(target)) { > > >> target = fscrypt_pagecache_page(target); > > >> - if (f2fs_is_compressed_page(target)) > > >> + if (IS_ERR(target)) > > >> + continue; > > >> + } > > >> + if (f2fs_is_compressed_page(target)) { > > >> target = f2fs_compress_control_page(target); > > >> + if (IS_ERR(target)) > > >> + continue; > > >> + } > > >> > > >> if (inode && inode == target->mapping->host) > > >> return true; > > >> @@ -2039,6 +2050,7 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret, > > >> if (ret) > > >> goto out; > > >> > > >> + /* cluster was overwritten as normal cluster */ > > >> if (dn.data_blkaddr != COMPRESS_ADDR) > > >> goto out; > > >> > > >> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > > >> index 5d55cef66410..17d2af4eeafb 100644 > > >> --- a/fs/f2fs/f2fs.h > > >> +++ b/fs/f2fs/f2fs.h > > >> @@ -2719,6 +2719,7 @@ static inline void set_compress_context(struct inode *inode) > > >> 1 << F2FS_I(inode)->i_log_cluster_size; > > >> F2FS_I(inode)->i_flags |= F2FS_COMPR_FL; > > >> set_inode_flag(inode, FI_COMPRESSED_FILE); > > >> + stat_inc_compr_inode(inode); > > >> } > > >> > > >> static inline unsigned int addrs_per_inode(struct inode *inode) > > >> @@ -3961,6 +3962,8 @@ static inline bool f2fs_force_buffered_io(struct inode *inode, > > >> return true; > > >> if (f2fs_is_multi_device(sbi)) > > >> return true; > > >> + if (f2fs_compressed_file(inode)) > > >> + return true; > > >> /* > > >> * for blkzoned device, fallback direct IO to buffered IO, so > > >> * all IOs can be serialized by log-structured write. > > >> diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > > >> index bde5612f37f5..9aeadf14413c 100644 > > >> --- a/fs/f2fs/file.c > > >> +++ b/fs/f2fs/file.c > > >> @@ -1828,7 +1828,6 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask) > > >> return -EINVAL; > > >> > > >> set_compress_context(inode); > > >> - stat_inc_compr_inode(inode); > > > > > > As this breaks the count, I'll keep as is. > > > > @@ -2719,6 +2719,7 @@ static inline void set_compress_context(struct inode *inode) > > 1 << F2FS_I(inode)->i_log_cluster_size; > > F2FS_I(inode)->i_flags |= F2FS_COMPR_FL; > > set_inode_flag(inode, FI_COMPRESSED_FILE); > > + stat_inc_compr_inode(inode); > > > > If I'm not missing anything, stat_inc_compr_inode() should be called inside > > set_compress_context() in where we convert normal inode to compress one, > > right? > > I don't care much whether that's right or not. If we want to do that, I found > another line to remove in f2fs_create(). Let me give it a try. > > Thanks, > This works to me. Could you run fsstress tests on compressed root directory? It seems still there are some bugs. --- fs/f2fs/compress.c | 14 ++++++++++---- fs/f2fs/data.c | 25 ++++++++++++++++++++++--- fs/f2fs/f2fs.h | 31 +++++++++++++++++-------------- fs/f2fs/file.c | 1 - fs/f2fs/namei.c | 1 - 5 files changed, 49 insertions(+), 23 deletions(-) diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c index af23ed6deffd..fa67ffd9d79d 100644 --- a/fs/f2fs/compress.c +++ b/fs/f2fs/compress.c @@ -593,7 +593,7 @@ static int prepare_compress_overwrite(struct compress_ctx *cc, fgp_flag, GFP_NOFS); if (!page) { ret = -ENOMEM; - goto unlock_pages; + goto release_pages; } if (PageUptodate(page)) @@ -608,13 +608,13 @@ static int prepare_compress_overwrite(struct compress_ctx *cc, ret = f2fs_read_multi_pages(cc, &bio, cc->cluster_size, &last_block_in_bio, false); if (ret) - goto release_pages; + goto unlock_pages; if (bio) f2fs_submit_bio(sbi, bio, DATA); ret = f2fs_init_compress_ctx(cc); if (ret) - goto release_pages; + goto unlock_pages; } for (i = 0; i < cc->cluster_size; i++) { @@ -762,7 +762,13 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc, if (err) goto out_unlock_op; - psize = (cc->rpages[last_index]->index + 1) << PAGE_SHIFT; + for (i = 0; i < cc->cluster_size; i++) { + if (datablock_addr(dn.inode, dn.node_page, + dn.ofs_in_node + i) == NULL_ADDR) + goto out_put_dnode; + } + + psize = (loff_t)(cc->rpages[last_index]->index + 1) << PAGE_SHIFT; err = f2fs_get_node_info(fio.sbi, dn.nid, &ni); if (err) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 356642e8c3b3..5476d33f2d76 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -184,13 +184,18 @@ static void f2fs_decompress_work(struct bio_post_read_ctx *ctx) } #ifdef CONFIG_F2FS_FS_COMPRESSION +void f2fs_verify_pages(struct page **rpages, unsigned int cluster_size) +{ + f2fs_decompress_end_io(rpages, cluster_size, false, true); +} + static void f2fs_verify_bio(struct bio *bio) { struct page *page = bio_first_page_all(bio); struct decompress_io_ctx *dic = (struct decompress_io_ctx *)page_private(page); - f2fs_decompress_end_io(dic->rpages, dic->cluster_size, false, true); + f2fs_verify_pages(dic->rpages, dic->cluster_size); f2fs_free_dic(dic); } #endif @@ -520,10 +525,16 @@ static bool __has_merged_page(struct bio *bio, struct inode *inode, bio_for_each_segment_all(bvec, bio, iter_all) { struct page *target = bvec->bv_page; - if (fscrypt_is_bounce_page(target)) + if (fscrypt_is_bounce_page(target)) { target = fscrypt_pagecache_page(target); - if (f2fs_is_compressed_page(target)) + if (IS_ERR(target)) + continue; + } + if (f2fs_is_compressed_page(target)) { target = f2fs_compress_control_page(target); + if (IS_ERR(target)) + continue; + } if (inode && inode == target->mapping->host) return true; @@ -2049,6 +2060,7 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret, if (ret) goto out; + /* cluster was overwritten as normal cluster */ if (dn.data_blkaddr != COMPRESS_ADDR) goto out; @@ -2694,12 +2706,16 @@ static int f2fs_write_data_page(struct page *page, #ifdef CONFIG_F2FS_FS_COMPRESSION struct inode *inode = page->mapping->host; + if (unlikely(f2fs_cp_error(F2FS_I_SB(inode)))) + goto out; + if (f2fs_compressed_file(inode)) { if (f2fs_is_compressed_cluster(inode, page->index)) { redirty_page_for_writepage(wbc, page); return AOP_WRITEPAGE_ACTIVATE; } } +out: #endif return f2fs_write_single_data_page(page, NULL, NULL, NULL, @@ -2809,6 +2825,9 @@ static int f2fs_write_cache_pages(struct address_space *mapping, goto result; } + if (unlikely(f2fs_cp_error(sbi))) + goto lock_page; + if (f2fs_cluster_is_empty(&cc)) { void *fsdata = NULL; struct page *pagep; diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index de494fc9d596..a95369e32876 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -2707,20 +2707,6 @@ static inline int f2fs_compressed_file(struct inode *inode) is_inode_flag_set(inode, FI_COMPRESSED_FILE); } -static inline void set_compress_context(struct inode *inode) -{ - struct f2fs_sb_info *sbi = F2FS_I_SB(inode); - - F2FS_I(inode)->i_compress_algorithm = - F2FS_OPTION(sbi).compress_algorithm; - F2FS_I(inode)->i_log_cluster_size = - F2FS_OPTION(sbi).compress_log_size; - F2FS_I(inode)->i_cluster_size = - 1 << F2FS_I(inode)->i_log_cluster_size; - F2FS_I(inode)->i_flags |= F2FS_COMPR_FL; - set_inode_flag(inode, FI_COMPRESSED_FILE); -} - static inline unsigned int addrs_per_inode(struct inode *inode) { unsigned int addrs = CUR_ADDRS_PER_INODE(inode) - @@ -3808,6 +3794,21 @@ static inline struct page *f2fs_compress_control_page(struct page *page) } #endif +static inline void set_compress_context(struct inode *inode) +{ + struct f2fs_sb_info *sbi = F2FS_I_SB(inode); + + F2FS_I(inode)->i_compress_algorithm = + F2FS_OPTION(sbi).compress_algorithm; + F2FS_I(inode)->i_log_cluster_size = + F2FS_OPTION(sbi).compress_log_size; + F2FS_I(inode)->i_cluster_size = + 1 << F2FS_I(inode)->i_log_cluster_size; + F2FS_I(inode)->i_flags |= F2FS_COMPR_FL; + set_inode_flag(inode, FI_COMPRESSED_FILE); + stat_inc_compr_inode(inode); +} + static inline u64 f2fs_disable_compressed_file(struct inode *inode) { struct f2fs_inode_info *fi = F2FS_I(inode); @@ -3963,6 +3964,8 @@ static inline bool f2fs_force_buffered_io(struct inode *inode, return true; if (f2fs_is_multi_device(sbi)) return true; + if (f2fs_compressed_file(inode)) + return true; /* * for blkzoned device, fallback direct IO to buffered IO, so * all IOs can be serialized by log-structured write. diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index f66c4cd067f5..cd84b3d9aa17 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -1831,7 +1831,6 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask) return -EINVAL; set_compress_context(inode); - stat_inc_compr_inode(inode); } } if ((iflags ^ fi->i_flags) & F2FS_NOCOMP_FL) { diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c index cf3a286106ed..2aa035422c0f 100644 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c @@ -348,7 +348,6 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode, goto out; f2fs_unlock_op(sbi); - stat_inc_compr_inode(inode); f2fs_alloc_nid_done(sbi, ino); d_instantiate_new(dentry, inode); -- 2.24.0.525.g8f36a354ae-goog