Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp5414507pxu; Thu, 22 Oct 2020 01:23:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwuWpGNSKzwLpLNKKCSjEgTBhX32dtRI4SUNzAhwpnGPew+E3sdG5ikJSrUpxUza9Hh6a/w X-Received: by 2002:a05:6402:143a:: with SMTP id c26mr1247405edx.150.1603355012407; Thu, 22 Oct 2020 01:23:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603355012; cv=none; d=google.com; s=arc-20160816; b=MukYA9orpilZc0Jh57zava4PKDatR+5dKeVZqkSyPkzjpnGXVmnFwpAO2AF1xKx9kM J2gncrA0upubljFTLIfmxlILROSTeEdpyXZZUcjx1GnHFcl6xt63ZaUYajSfAW7sgcYZ PqlP9e2hqRxVoclfIjQuFkuRVgtZG9PZ3YCJGXdIs2lmRmAeCNN+vOkHREhbjVkpaLNG cKktauxV3MhZSMgTGuaUOkHOCGICceY2fN6/1oqFv4o+00Ajk5RQt/IsLnH/iUyuSCA5 0ckgo6RSumlLy9WD3unrMe61JD0Ii6PAPjf4BtLn/9FsPD+ljpkhxD568nCA2Gjc9RK9 35bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=2XryR24m3OAK6z3PvGa18+srF7jv0KqJptD9j21+0eA=; b=gvPE46XthSwRPgsWN67ct7AACH9wikq/afPSMDjIQCIzR2+I1mUFMlMMWYOAt21ZlU ou5cYU9vdtE3Wu2Wdzhx4Qkt+wMuZ4TYa2TACUFhd5OM5jSmlpmJ9Bq37ISCm4lpcbJb Upf+NOXyhHildbJTDu+QrxDaF3m0951Qx26MR/bTXAN1KF8WJxZDQ0IyfVx6OOpaEZGd lQquikDVrh01agAsYf693q6dlZUOl0xRG0g3cZX1is7GXOedE0SZgtR34z9xvFZEzAxw egdde0VYXV8f0cJzq8a01jM8bFilsb8/zlO5LQS7l9Y8O1wlJq7E1KqxMpNjiPAIbEk2 L/Jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ibtnbf+z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t7si402574ejr.659.2020.10.22.01.23.09; Thu, 22 Oct 2020 01:23:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ibtnbf+z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2895588AbgJVD7H (ORCPT + 99 others); Wed, 21 Oct 2020 23:59:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2895583AbgJVD7G (ORCPT ); Wed, 21 Oct 2020 23:59:06 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F4D3C0613CE for ; Wed, 21 Oct 2020 20:59:06 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id j7so152202pgk.5 for ; Wed, 21 Oct 2020 20:59:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2XryR24m3OAK6z3PvGa18+srF7jv0KqJptD9j21+0eA=; b=ibtnbf+zU42Qm6yoZUkmeDfpbMqcjcDhrxAsWTHyxlMb1M5rcqixe71BplmRzbhvVx Gn4vX43SOy39UTRlRQrxD7jGhjce+Pa4ODp7hHXVGZH9jDquWPyQQhC5hKaMo/AeAisq 6pui/CfDhxgXtuR792KsOi2RHvVw0HPavIHsObuZIdYVZBp/9wZijOGZ8Kv6VGvRP8i3 bb30PFz4vnKXiuZz7Q594Nu86npJBpa1wZde3a1DnMKh5lmuxGaiYDxGFicJni+hUG5L IibXjYHjnr0aD2bOjOVDzsppNXjqeWQ1UNPRaWO2vPgwfQOflr6piC3vbjZDdtX7FrXB 58Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2XryR24m3OAK6z3PvGa18+srF7jv0KqJptD9j21+0eA=; b=DFvOpG7n0ofDmT7kRpey2zvsuOgftIywnGhmdoXkO9H9hCHQM+sh3IoA43/fpUsjII T4rS4NEi8S86nuiA4MZELkBIR0yKOHE0VnPlAcwQH1yUGQn3rBKj2M5RrH5e2YiYIQkq WUJ03Pw1+En41VBYBFIcsnTeIUW8AIJhYo4WzbDlC8p1hm4yHdQmpgpId9OEeHchdtfp DQ1BETeqPSzHpO8DoBOnmDxlhX2YisaId7X7XqNsLIX4PVKeoKYMJpDdQUvq83GDYjR5 jLrOYjn9rC4ZFPnY60C9Ph53n/9IoufYsIVu0pVH3FZZCb8rY0d+mxI5qjWp7OgnWJZ3 Jzag== X-Gm-Message-State: AOAM530GgkN0ngCoPBt2ECEzpDqtB6w8kwBsSeffKIDkwHgACVNKSqbT pquFtFKH/0t+JGM47KIIwfCzhDvD1Ec= X-Received: by 2002:a62:92c8:0:b029:152:1703:2da9 with SMTP id o191-20020a6292c80000b029015217032da9mr786782pfd.60.1603339145170; Wed, 21 Oct 2020 20:59:05 -0700 (PDT) Received: from daehojeong1.seo.corp.google.com ([2401:fa00:d:11:a6ae:11ff:fe18:6ce2]) by smtp.gmail.com with ESMTPSA id q81sm276879pfc.36.2020.10.21.20.59.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Oct 2020 20:59:04 -0700 (PDT) From: Daeho Jeong To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, kernel-team@android.com Cc: Daeho Jeong Subject: [PATCH v2 2/2] f2fs: add F2FS_IOC_SET_COMPRESS_OPTION ioctl Date: Thu, 22 Oct 2020 12:58:48 +0900 Message-Id: <20201022035848.976286-2-daeho43@gmail.com> X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog In-Reply-To: <20201022035848.976286-1-daeho43@gmail.com> References: <20201022035848.976286-1-daeho43@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- fs/f2fs/compress.c | 5 +++++ fs/f2fs/f2fs.h | 7 +++++++ fs/f2fs/file.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c index 7895186cc765..3b58a41223f8 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 ? false : f2fs_cops[algorithm]; +} + 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 7e64259f6f5e..b18ef22e2d9d 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -3963,6 +3963,51 @@ 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; + + if (!f2fs_sb_has_compression(sbi)) + return -EOPNOTSUPP; + + if (!f2fs_compressed_file(inode)) + return -EINVAL; + + if (!(filp->f_mode & FMODE_WRITE)) + return -EBADF; + + if (copy_from_user(&option, (struct f2fs_comp_option __user *)arg, + sizeof(option))) + return -EFAULT; + + if (option.log_cluster_size < MIN_COMPRESS_LOG_SIZE || + option.log_cluster_size > MAX_COMPRESS_LOG_SIZE || + !f2fs_is_compress_algorithm_ready(option.algorithm)) + return -EINVAL; + + file_start_write(filp); + inode_lock(inode); + + if (f2fs_is_mmap_file(inode) || + get_dirty_pages(inode) || inode->i_size) { + ret = -EINVAL; + 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); +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 +4098,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 +4271,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; -- 2.29.0.rc1.297.gfa9743e501-goog