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=-11.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 3B11FC2D0A3 for ; Thu, 29 Oct 2020 07:58:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E33C920EDD for ; Thu, 29 Oct 2020 07:58:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732920AbgJ2H6M (ORCPT ); Thu, 29 Oct 2020 03:58:12 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:6987 "EHLO szxga06-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726913AbgJ2H6G (ORCPT ); Thu, 29 Oct 2020 03:58:06 -0400 Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4CMHqc17HSzhcfq; Thu, 29 Oct 2020 15:58:04 +0800 (CST) Received: from [10.136.114.67] (10.136.114.67) by smtp.huawei.com (10.3.19.201) with Microsoft SMTP Server (TLS) id 14.3.487.0; Thu, 29 Oct 2020 15:57:58 +0800 Subject: Re: [f2fs-dev] [PATCH v5 2/2] f2fs: add F2FS_IOC_SET_COMPRESS_OPTION ioctl To: Daeho Jeong CC: , , , Daeho Jeong References: <20201029041538.4165209-1-daeho43@gmail.com> <20201029041538.4165209-2-daeho43@gmail.com> <92f4da8e-27a1-7577-84f9-39038eaa88cb@huawei.com> From: Chao Yu Message-ID: Date: Thu, 29 Oct 2020 15:57:58 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Originating-IP: [10.136.114.67] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020/10/29 15:39, Daeho Jeong wrote: > f2fs_cops is a static variable. Do you wanna change this to global > variable (extern)? Oh, no, how about updating f2fs_is_compress_algorithm_ready() as below? and use this function in f2fs_ioc_set_compress_option(). bool f2fs_is_compress_algorithm_valid(unsigned char algorithm) { return f2fs_cops[algorithm]; } > > 2020년 10월 29일 (목) 오후 4:29, Chao Yu 님이 작성: >> >> On 2020/10/29 12:15, 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 >>> --- >>> >>> 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..816d7adc914c 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_ready(unsigned char algorithm) >>> +{ >>> + return algorithm < COMPRESS_MAX && 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..cc38afde6c04 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_ready(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_ready(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 8922ab191a9d..a0f31d8ebcfd 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; >>> + } >> >> Hmm... >> >> Shouldn't it be: >> >> if (algorithm >= COMPRESS_MAX) { >> ret = -ENOPKG; >> goto out; >> } >> >> if (!f2fs_cops[algorithm]) >> f2fs_warn(...); >> >>> + >>> + 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_ready(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; >>> > . >