Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp981369pxx; Thu, 29 Oct 2020 21:12:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwBUNsARKfBFG4iykNXpXIoYBhOgFNIrIknR7gKRTg9bBRUlXCUOixYWLIEztqIOz6a0nI6 X-Received: by 2002:a17:907:366:: with SMTP id rs6mr601123ejb.352.1604031166856; Thu, 29 Oct 2020 21:12:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1604031166; cv=none; d=google.com; s=arc-20160816; b=QvuX9Pxas+D4V19sbqf0SJSZD/KDxIrMcbgXckLx/2TjgL1Rpbcuxaa5EJE494ygtQ /SAD/vAfq5DAbzVpbyOJcAhB9Wkme4c1yV45L1ppm9pHblBxa9XNMvfiM1MEiHrQUpWI 28eJXc0kLD0dNpYAUkvjSlykjnehA7K4mGeWALFCzB/62XQoDL5/gRXjOeWWPabk2oc/ ln3NR4STgHm+OcEfQmvA3uDK5B0kVTJq6SqEPQG6jtIxZkTrLl4PxnsBSQoHAr56PVe7 swVjcf8weoMotvWV7zCvrVVO8IBuGl9N8SXhKf9OEfgc9cccIa6BouZMaxSmqDfeoD/b rDwA== 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=TS5bAPWJChRnrnmCdYH1q2m+OpWH8Ki5SVhUI5O7NG8=; b=K/Sz9BHO84+IgOVVwiajqHoEbB1rHJyGEC67lZA1WIQbNrXv4Gl/Juz5zcl97+TAV+ mD4JqJlVBMpYC2zg1rfjojl2imPy+j7bB0sbu2RyNGMnpGB22UC9HzGSmAgUUe3279WR kXOWLIKvRP5BnXY73C+y1fBUkJWTFih1QN0m4H2kTToe1gaus29bnbYV5YkQrovzfyyU tDGUbTR5Nt3WmVDZorH2pw9bcHfRuWu/i0BhRymm9V1nJFLDk7FcPggNWpl7gaCZVP+V iT3wy5PU1IYs+eJqxpLu/txYOuPr4SAApjtIEKI1Oypy4lHjcmVRG9BfxOLaIWePRDS5 Dpkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=YSKcfciR; 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 dp11si2568562ejc.42.2020.10.29.21.12.24; Thu, 29 Oct 2020 21:12:46 -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=YSKcfciR; 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 S1726250AbgJ3EKq (ORCPT + 99 others); Fri, 30 Oct 2020 00:10:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725780AbgJ3EKp (ORCPT ); Fri, 30 Oct 2020 00:10:45 -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 61F52C0613D5 for ; Thu, 29 Oct 2020 21:10:45 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id r186so4137813pgr.0 for ; Thu, 29 Oct 2020 21:10:45 -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=TS5bAPWJChRnrnmCdYH1q2m+OpWH8Ki5SVhUI5O7NG8=; b=YSKcfciRNgxGwXndTT0H4XyeZ5o4hbOuGOye07As7oLYoMCwisIOHUYwkFLQoMuasi 3luBGGH0CkWn8Lp6tCxJ71ev0+URAJsQldYs6VEJJ1YzWhNx9vaQkMnVflw8P9TsdOa9 /EO1dYphqvsq9p2k0BKgYZHbzgrhPPvHME5oJH8ZuYitQ4FnAm8rxOyCJ+v15dIqD3Pv BJ16XDMCgsZjJl9rXY0OVfageRioWm2i7Z9D3kda6u0cn2aoA4nOywBnyrTK7c+G/QYw lRJ/UODkwZF+ldfj+GQIUm7Rulwt2NVuli/Ip4nTqym5zSSkDfZXAyC30r/ldk7S0raH 0puA== 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=TS5bAPWJChRnrnmCdYH1q2m+OpWH8Ki5SVhUI5O7NG8=; b=ZLXUneSH5g3l4Vwr3K0IkSu5vTf1bRep6H4kiYCyfKNbARdnOXe+pt4r+FkbMPtvVb YFCnlOlbKlleODHDMuBcCwGBcakpeeKanjTRh/br83hPcr6o+83aGVXIprwlwMdKdU+W Ne7zCoZ+gzX5XIw7noJTUV92e5MgR/yKNwQsXQpy8jyudHJBIrECj33bvQMJsHx5i1jW 9V3+Ey7oLnxbqOJIuD5NrHTNd685Tke3QnvUSfwDdTYhtVcjAja6jUDAfLQC/UWMB2Qo PDl1KlTqNi2Men57cdSs6cnS9ZiZYJjiBdtv3IAjGiIanQYppbvEl/ra404hGhVKgwke eymA== X-Gm-Message-State: AOAM533K60uodyoLhhNZEHSOwdGCZ6aNRbJQubaDEHy7bDynbSI3pXZC WWAsPSDXIURUG+P2/OPNQOAZjTgleG4= X-Received: by 2002:a62:62c2:0:b029:164:563a:b2c with SMTP id w185-20020a6262c20000b0290164563a0b2cmr7235970pfb.16.1604031044569; Thu, 29 Oct 2020 21:10:44 -0700 (PDT) Received: from daehojeong1.seo.corp.google.com ([2401:fa00:d:11:a6ae:11ff:fe18:6ce2]) by smtp.gmail.com with ESMTPSA id k9sm4374326pfi.188.2020.10.29.21.10.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 21:10:43 -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 v7 2/2] f2fs: add F2FS_IOC_SET_COMPRESS_OPTION ioctl Date: Fri, 30 Oct 2020 13:10:35 +0900 Message-Id: <20201030041035.394565-2-daeho43@gmail.com> X-Mailer: git-send-email 2.29.1.341.ge80a0c044ae-goog In-Reply-To: <20201030041035.394565-1-daeho43@gmail.com> References: <20201030041035.394565-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 --- 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; -- 2.29.1.341.ge80a0c044ae-goog