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=-13.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 94CC0C63777 for ; Thu, 3 Dec 2020 06:08:31 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E46752067C; Thu, 3 Dec 2020 06:08:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E46752067C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1kkhn4-00011k-4j; Thu, 03 Dec 2020 06:08:30 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkhn2-00011d-V3 for linux-f2fs-devel@lists.sourceforge.net; Thu, 03 Dec 2020 06:08:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=In-Reply-To:Content-Type:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=YFxyIrTl4B0erIS6+rbP7v/JdnE45w+eGwDU8Fe+k9g=; b=XA7xkr9sFsQfRvxZVWv7lfdPZr 9UNEIQNpfiZQcwjsvvbQRvxO05OjRSFKPjCar36DbTXlDFWDbNPRnq84o535Z/I3K2cvhMm8QFFF9 8ThRmoZYG/uHD3b3bakbfS5gZgO7TOycnspp5YcKwaBRqG1ddwCK2ESltqRNjWNp8GO4=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To :From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=YFxyIrTl4B0erIS6+rbP7v/JdnE45w+eGwDU8Fe+k9g=; b=E+i2am0o+GOo2Z4ID5JRKFvCUH 9OTV3nHMlfmUjlUOk0F2bHyfyNVroSsD84pl5tuvAjipBK3dnxb4MHDxXB3zDugpWARs4oq6ID6h+ 4jZI9WiyvH1F67FqDm8oHGYv31FF+gO1dP8FXCBsTja9dul+9btSBKMlu6qFQt0WXKk8=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1kkhmz-00CjbI-8b for linux-f2fs-devel@lists.sourceforge.net; Thu, 03 Dec 2020 06:08:28 +0000 Date: Wed, 2 Dec 2020 22:08:10 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1606975692; bh=DzXjniPJPgJTPkPM280Vl1Yp+/VxCymFuwlYzQ5qaq8=; h=From:To:Cc:Subject:References:In-Reply-To:From; b=JoxrlWbxlwzFZnJefeklAMejeKmdFCSkiO/Her4WEZZ5p3prHx42Gh6J5DjzcKTq7 7E8A6sdABOKcapkIS74JEP0XzwFHw4rYkCxfL0tY5u8IVCb07wbFN5UndJ19oTaILf 6pEsqtKqAu92V/X9/9uvDOR26zss5CnALfKdfFidmsWAZ4pYyL+PFNNHVowe88OPo7 Z46u85ZTQ9iPamRbn6FesPvUMJyrS3DxlGnlYXqRViab0o6s0z2V4n1B2EDscPCIVh BRcTI3DCsTAEMiDfgXuNbEAdGFfygzZbKhqVIqy4fSe+yJTe+A9JEedOtZBkZ1VVxG 7yY9Tc0/OxvnQ== From: Jaegeuk Kim To: Chao Yu Message-ID: References: <20201030041035.394565-1-daeho43@gmail.com> <20201030041035.394565-2-daeho43@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Headers-End: 1kkhmz-00CjbI-8b Subject: Re: [f2fs-dev] [PATCH v7 2/2] f2fs: add F2FS_IOC_SET_COMPRESS_OPTION ioctl X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-f2fs-devel@lists.sourceforge.net, kernel-team@android.com, Daeho Jeong , linux-kernel@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On 12/02, Jaegeuk Kim wrote: > On 12/03, Chao Yu wrote: > > Jaegeuk, not sure, is it too late to merge this cleanup into original patch? > > Let me merge this on top of tree. Thanks. :) I integrated this into the original patch since I had to revise this commit. :( ("f2fs: avoid race condition for shinker count") > > > > > From a5c63ec58e0cda6eb5d186b46942eea46422b7a9 Mon Sep 17 00:00:00 2001 > > From: Chao Yu > > Date: Thu, 3 Dec 2020 10:04:26 +0800 > > Subject: [PATCH] f2fs: remove f2fs_is_compress_algorithm_valid() for cleanup > > > > No logic changes. > > > > Signed-off-by: Chao Yu > > --- > > fs/f2fs/compress.c | 5 ----- > > fs/f2fs/f2fs.h | 5 ----- > > fs/f2fs/file.c | 2 +- > > 3 files changed, 1 insertion(+), 11 deletions(-) > > > > diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c > > index dfadbc78946c..869b047a4801 100644 > > --- a/fs/f2fs/compress.c > > +++ b/fs/f2fs/compress.c > > @@ -574,11 +574,6 @@ bool f2fs_is_compress_backend_ready(struct inode *inode) > > return f2fs_cops[F2FS_I(inode)->i_compress_algorithm]; > > } > > > > -bool f2fs_is_compress_algorithm_valid(unsigned char algorithm) > > -{ > > - return f2fs_cops[algorithm] != NULL; > > -} > > - > > static mempool_t *compress_page_pool; > > static int num_compress_pages = 512; > > module_param(num_compress_pages, uint, 0444); > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > > index b70c8d553439..17b45c2d2b04 100644 > > --- a/fs/f2fs/f2fs.h > > +++ b/fs/f2fs/f2fs.h > > @@ -3882,7 +3882,6 @@ bool f2fs_compress_write_end(struct inode *inode, void *fsdata, > > int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock); > > void f2fs_compress_write_end_io(struct bio *bio, struct page *page); > > bool f2fs_is_compress_backend_ready(struct inode *inode); > > -bool f2fs_is_compress_algorithm_valid(unsigned char algorithm); > > int f2fs_init_compress_mempool(void); > > void f2fs_destroy_compress_mempool(void); > > void f2fs_do_decompress_pages(struct decompress_io_ctx *dic, bool verity); > > @@ -3927,10 +3926,6 @@ static inline bool f2fs_is_compress_backend_ready(struct inode *inode) > > /* not support compression */ > > return false; > > } > > -static inline bool f2fs_is_compress_algorithm_valid(unsigned char algorithm) > > -{ > > - return false; > > -} > > static inline struct page *f2fs_compress_control_page(struct page *page) > > { > > WARN_ON_ONCE(1); > > diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > > index 300355fe25f0..0453b441228d 100644 > > --- a/fs/f2fs/file.c > > +++ b/fs/f2fs/file.c > > @@ -4016,7 +4016,7 @@ static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg) > > F2FS_I(inode)->i_cluster_size = 1 << option.log_cluster_size; > > f2fs_mark_inode_dirty_sync(inode, true); > > > > - if (!f2fs_is_compress_algorithm_valid(option.algorithm)) > > + if (!f2fs_is_compress_backend_ready(inode)) > > f2fs_warn(sbi, "compression algorithm is successfully set, " > > "but current kernel doesn't support this algorithm."); > > out: > > -- > > 2.26.2 > > > > > > > > > > > > On 2020/10/30 12:10, Daeho Jeong wrote: > > > From: Daeho Jeong > > > > > > Added a new F2FS_IOC_SET_COMPRESS_OPTION ioctl to change file > > > compression option of a file. > > > > > > struct f2fs_comp_option { > > > u8 algorithm; => compression algorithm > > > => 0:lzo, 1:lz4, 2:zstd, 3:lzorle > > > u8 log_cluster_size; => log scale cluster size > > > => 2 ~ 8 > > > }; > > > > > > struct f2fs_comp_option option; > > > > > > option.algorithm = 1; > > > option.log_cluster_size = 7; > > > > > > ioctl(fd, F2FS_IOC_SET_COMPRESS_OPTION, &option); > > > > > > Signed-off-by: Daeho Jeong > > > --- > > > > > > v6: changed the function name of checking compression algorithm validity. > > > v5: allowed to set algorithm which is not currently enabled by kernel. > > > v4: changed commit message. > > > v3: changed the error number more specific. > > > folded in fix for build breakage reported by kernel test robot > > > and Dan Carpenter . > > > v2: added ioctl description. > > > --- > > > fs/f2fs/compress.c | 5 +++++ > > > fs/f2fs/f2fs.h | 7 ++++++ > > > fs/f2fs/file.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++ > > > 3 files changed, 66 insertions(+) > > > > > > diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c > > > index 7895186cc765..b0144670d320 100644 > > > --- a/fs/f2fs/compress.c > > > +++ b/fs/f2fs/compress.c > > > @@ -514,6 +514,11 @@ bool f2fs_is_compress_backend_ready(struct inode *inode) > > > return f2fs_cops[F2FS_I(inode)->i_compress_algorithm]; > > > } > > > +bool f2fs_is_compress_algorithm_valid(unsigned char algorithm) > > > +{ > > > + return f2fs_cops[algorithm] != NULL; > > > +} > > > + > > > static mempool_t *compress_page_pool; > > > static int num_compress_pages = 512; > > > module_param(num_compress_pages, uint, 0444); > > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > > > index a33c90cf979b..70a8a2196888 100644 > > > --- a/fs/f2fs/f2fs.h > > > +++ b/fs/f2fs/f2fs.h > > > @@ -435,6 +435,8 @@ static inline bool __has_cursum_space(struct f2fs_journal *journal, > > > struct f2fs_sectrim_range) > > > #define F2FS_IOC_GET_COMPRESS_OPTION _IOR(F2FS_IOCTL_MAGIC, 21, \ > > > struct f2fs_comp_option) > > > +#define F2FS_IOC_SET_COMPRESS_OPTION _IOW(F2FS_IOCTL_MAGIC, 22, \ > > > + struct f2fs_comp_option) > > > /* > > > * should be same as XFS_IOC_GOINGDOWN. > > > @@ -3915,6 +3917,7 @@ bool f2fs_compress_write_end(struct inode *inode, void *fsdata, > > > int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock); > > > void f2fs_compress_write_end_io(struct bio *bio, struct page *page); > > > bool f2fs_is_compress_backend_ready(struct inode *inode); > > > +bool f2fs_is_compress_algorithm_valid(unsigned char algorithm); > > > int f2fs_init_compress_mempool(void); > > > void f2fs_destroy_compress_mempool(void); > > > void f2fs_decompress_pages(struct bio *bio, struct page *page, bool verity); > > > @@ -3945,6 +3948,10 @@ static inline bool f2fs_is_compress_backend_ready(struct inode *inode) > > > /* not support compression */ > > > return false; > > > } > > > +static inline bool f2fs_is_compress_algorithm_valid(unsigned char algorithm) > > > +{ > > > + return false; > > > +} > > > static inline struct page *f2fs_compress_control_page(struct page *page) > > > { > > > WARN_ON_ONCE(1); > > > diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > > > index bd52df84219d..be56702e4939 100644 > > > --- a/fs/f2fs/file.c > > > +++ b/fs/f2fs/file.c > > > @@ -3963,6 +3963,57 @@ static int f2fs_ioc_get_compress_option(struct file *filp, unsigned long arg) > > > return 0; > > > } > > > +static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg) > > > +{ > > > + struct inode *inode = file_inode(filp); > > > + struct f2fs_sb_info *sbi = F2FS_I_SB(inode); > > > + struct f2fs_comp_option option; > > > + int ret = 0; > > > + > > > + if (!f2fs_sb_has_compression(sbi)) > > > + return -EOPNOTSUPP; > > > + > > > + if (!(filp->f_mode & FMODE_WRITE)) > > > + return -EBADF; > > > + > > > + if (copy_from_user(&option, (struct f2fs_comp_option __user *)arg, > > > + sizeof(option))) > > > + return -EFAULT; > > > + > > > + if (!f2fs_compressed_file(inode) || > > > + option.log_cluster_size < MIN_COMPRESS_LOG_SIZE || > > > + option.log_cluster_size > MAX_COMPRESS_LOG_SIZE || > > > + option.algorithm >= COMPRESS_MAX) > > > + return -EINVAL; > > > + > > > + file_start_write(filp); > > > + inode_lock(inode); > > > + > > > + if (f2fs_is_mmap_file(inode) || get_dirty_pages(inode)) { > > > + ret = -EBUSY; > > > + goto out; > > > + } > > > + > > > + if (inode->i_size != 0) { > > > + ret = -EFBIG; > > > + goto out; > > > + } > > > + > > > + F2FS_I(inode)->i_compress_algorithm = option.algorithm; > > > + F2FS_I(inode)->i_log_cluster_size = option.log_cluster_size; > > > + F2FS_I(inode)->i_cluster_size = 1 << option.log_cluster_size; > > > + f2fs_mark_inode_dirty_sync(inode, true); > > > + > > > + if (!f2fs_is_compress_algorithm_valid(option.algorithm)) > > > + f2fs_warn(sbi, "compression algorithm is successfully set, " > > > + "but current kernel doesn't support this algorithm."); > > > +out: > > > + inode_unlock(inode); > > > + file_end_write(filp); > > > + > > > + return ret; > > > +} > > > + > > > long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) > > > { > > > if (unlikely(f2fs_cp_error(F2FS_I_SB(file_inode(filp))))) > > > @@ -4053,6 +4104,8 @@ long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) > > > return f2fs_sec_trim_file(filp, arg); > > > case F2FS_IOC_GET_COMPRESS_OPTION: > > > return f2fs_ioc_get_compress_option(filp, arg); > > > + case F2FS_IOC_SET_COMPRESS_OPTION: > > > + return f2fs_ioc_set_compress_option(filp, arg); > > > default: > > > return -ENOTTY; > > > } > > > @@ -4224,6 +4277,7 @@ long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) > > > case F2FS_IOC_RESERVE_COMPRESS_BLOCKS: > > > case F2FS_IOC_SEC_TRIM_FILE: > > > case F2FS_IOC_GET_COMPRESS_OPTION: > > > + case F2FS_IOC_SET_COMPRESS_OPTION: > > > break; > > > default: > > > return -ENOIOCTLCMD; > > > > > > _______________________________________________ > Linux-f2fs-devel mailing list > Linux-f2fs-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel