Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp552906pxu; Sun, 22 Nov 2020 19:19:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJyoLN8XLJ31zxtXtYvy8NYMq9KzIMDDPgxSOjIHO/c66cEs3Rudi5hMMbaqNKbhVRP2Wsdf X-Received: by 2002:aa7:ce8c:: with SMTP id y12mr46653714edv.185.1606101597588; Sun, 22 Nov 2020 19:19:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606101597; cv=none; d=google.com; s=arc-20160816; b=BtbsHBklVpkxM0ME5u/VBlqqJijp96iy5ZXjfGz0rCpy3QdsQpof93SlUZIWXfoQTE SnFAJSBivMu90u/vC8TJ9rYPVGagN2W5AsmNRErpvkswyYaEAW7XRPZ0rlJhsRHQsDJ6 wPBftDJJQZcEdO8WTRODsCfzCKL9T3jQtLKkqlzD6BPaDWh9zsD7YgXvVkhNEJcN+itc CxJTCoFF9iulYI1hBW6XXsptKCscsoGHyoD2U/T12fBi48eaqKGtejtcQR/ESS2bpDS0 RAUmzLWYl17zsOvLMl+hwCX5iw7ehmjDfjnQaUt25aj1suTCFc85XljzS8i2z9koSUgo 4+gQ== 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=U9pXaoYOYzvSlbjuyA3XUmqJqWngslHl5D8Ri48QQwk=; b=zrOiG3+vXs/j5x0dZy6TdjYATmbYEnGoZW0eUlUb21kn3scTdfbxExseN+R3cfZh8N Ov2VXPT9LiM0u0UVWdcTNxhjh2X2AhEffhZX0PXfnV23YZSW638OHzuZKOd63iVyr8hw NEERPc7kzzRPiCLOwagWGDMufB1mYJBQaZoEvQX/bpLAuu+FKW4OIq3uMrow8z/EinOn 8MFQqclclFvyLXYK7XTSIlG4ylXsol8d1aYkmvCejq3TyFqOhEokSbCAjWB9DQLL4OA9 6b6DY9O2W/yWmy86YRJmHqhR2DXVhakDXyH8xFwoHz+ttPMh0ZLd248WJ0wF6JG4oF44 AoRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=hkxrUEZ1; 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 ly22si6097112ejb.511.2020.11.22.19.19.35; Sun, 22 Nov 2020 19:19:57 -0800 (PST) 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=hkxrUEZ1; 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 S1728008AbgKWDSH (ORCPT + 99 others); Sun, 22 Nov 2020 22:18:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727966AbgKWDSG (ORCPT ); Sun, 22 Nov 2020 22:18:06 -0500 Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CB80C0613CF for ; Sun, 22 Nov 2020 19:18:06 -0800 (PST) Received: by mail-pf1-x442.google.com with SMTP id b63so13568887pfg.12 for ; Sun, 22 Nov 2020 19:18:06 -0800 (PST) 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=U9pXaoYOYzvSlbjuyA3XUmqJqWngslHl5D8Ri48QQwk=; b=hkxrUEZ1i4eD5Z6Z9NUwnB0pW+/b05J3+fhar8Vh1c92USl6x0QotN4mxcGs0y9o/7 Ubwb7VRC58aJhRqYWVIb57YC2WdvWNb5UsRK/i/2MculRP0xwM+pu+Nb6sunEogjdp96 1Z3TueUW2UoRET1qoSDiY5cLF+KuB7YHez2bu9pH0krGJRC4nWC5U0g4Y4d0l/2utAuM s/0+5AbVhBvAa7EwbLu/+PFTXrIZ0P5qFqIUTQ/fL9rTLc0m7fqv/ZWWKk96x7Qgx4rp GumYkZOP1P8zFccDwaKn/Y3vzO0/0uUz9CKQiFFhuTu4jR/nPCNhmpmWT9sgNmV7E1s5 DiEQ== 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=U9pXaoYOYzvSlbjuyA3XUmqJqWngslHl5D8Ri48QQwk=; b=Mpw47JUjxzgDdcJyG4Xy/7VuPG/MKBItjBkIiQA6x7HLjUtsSvH4cQNfRNkVoN0TrO UnPQIMQsfAr+/LMg/W2TzkdNvsmH7a49cYFBkBwAEwTyyGLLKFp6gjpnsfNJ3eNaQ9UI awvxWj/1tSwiyGiK4ToO2J1YnX4ORAnTs04qt4LrmvRfmGed/3uz7/I/HKIe6PRu24mN ENMPrX6H7a4kYdGCvrU9EnoE5r0RwBXDrfYXUUqj4xxRG8mmUqX/k1KJtBNwqJXJ1yMa MbmiS+d/cGSlqv5eTlmk4uzRqzbxTBXpOzkbNtdn1ph6ViAi2b98dwQWi05AWErnO1X4 QyIg== X-Gm-Message-State: AOAM533mdKxMvriX+7ts31sSuOziS3fGbHNXXKGNpQ/YpMJML1aXp7Au Gj+E7JYG2EvprpxQaybh42OsaXwNlrA= X-Received: by 2002:a62:ce05:0:b029:198:166b:338f with SMTP id y5-20020a62ce050000b0290198166b338fmr1061890pfg.69.1606101485752; Sun, 22 Nov 2020 19:18:05 -0800 (PST) Received: from daehojeong1.seo.corp.google.com ([2401:fa00:d:11:a6ae:11ff:fe18:6ce2]) by smtp.gmail.com with ESMTPSA id i3sm7214044pjs.34.2020.11.22.19.18.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Nov 2020 19:18:05 -0800 (PST) From: Daeho Jeong To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, kernel-team@android.com Cc: Daeho Jeong Subject: [PATCH 2/2] f2fs: add F2FS_IOC_DECOMPRESS_FILE and F2FS_IOC_COMPRESS_FILE Date: Mon, 23 Nov 2020 12:17:51 +0900 Message-Id: <20201123031751.36811-2-daeho43@gmail.com> X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog In-Reply-To: <20201123031751.36811-1-daeho43@gmail.com> References: <20201123031751.36811-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 two ioctl to decompress/compress explicitly the compression enabled file in "compress_mode=user-based" mount option. Using these two ioctls, the users can make a control of compression and decompression of their files. Signed-off-by: Daeho Jeong --- fs/f2fs/file.c | 181 +++++++++++++++++++++++++++++++++++++- include/uapi/linux/f2fs.h | 2 + 2 files changed, 182 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index be8db06aca27..e8f142470e87 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -4026,6 +4026,180 @@ static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg) return ret; } +static int redirty_blocks(struct inode *inode, pgoff_t page_idx, int len) +{ + DEFINE_READAHEAD(ractl, NULL, inode->i_mapping, page_idx); + struct f2fs_sb_info *sbi = F2FS_I_SB(inode); + struct address_space *mapping = inode->i_mapping; + struct page *page; + pgoff_t redirty_idx = page_idx; + int i, page_len = 0, ret = 0; + + page_cache_ra_unbounded(&ractl, len, 0); + + for (i = 0; i < len; i++, page_idx++) { + page = read_cache_page(mapping, page_idx, NULL, NULL); + if (IS_ERR(page)) { + ret = PTR_ERR(page); + f2fs_warn(sbi, "%s: inode (%lu) : page_index (%lu) " + "couldn't be read (errno:%d).\n", + __func__, inode->i_ino, page_idx, ret); + break; + } + page_len++; + } + + for (i = 0; i < page_len; i++, redirty_idx++) { + page = find_lock_page(mapping, redirty_idx); + if (!page) { + ret = -ENOENT; + f2fs_warn(sbi, "%s: inode (%lu) : page_index (%lu) " + "couldn't be found (errno:%d).\n", + __func__, inode->i_ino, redirty_idx, ret); + } + set_page_dirty(page); + f2fs_put_page(page, 1); + f2fs_put_page(page, 0); + } + + return ret; +} + +static int f2fs_ioc_decompress_file(struct file *filp, unsigned long arg) +{ + struct inode *inode = file_inode(filp); + struct f2fs_sb_info *sbi = F2FS_I_SB(inode); + struct f2fs_inode_info *fi = F2FS_I(inode); + pgoff_t page_idx = 0, last_idx; + int cluster_size = F2FS_I(inode)->i_cluster_size; + int count, ret; + + if (!f2fs_sb_has_compression(sbi)) + return -EOPNOTSUPP; + + if (!(filp->f_mode & FMODE_WRITE)) + return -EBADF; + + if (!f2fs_compressed_file(inode)) + return -EINVAL; + + f2fs_balance_fs(F2FS_I_SB(inode), true); + + file_start_write(filp); + inode_lock(inode); + + if (f2fs_is_mmap_file(inode)) { + ret = -EBUSY; + goto out; + } + + ret = filemap_write_and_wait_range(inode->i_mapping, 0, LLONG_MAX); + if (ret) + goto out; + + if (!atomic_read(&fi->i_compr_blocks)) + goto out; + + last_idx = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE); + + count = last_idx - page_idx; + while (count) { + int len = min(cluster_size, count); + + ret = redirty_blocks(inode, page_idx, len); + + if (ret < 0) + break; + + page_idx += len; + count -= len; + } + + if (!ret) + ret = filemap_write_and_wait_range(inode->i_mapping, 0, + LLONG_MAX); + + if (!ret) { + stat_sub_compr_blocks(inode, atomic_read(&fi->i_compr_blocks)); + atomic_set(&fi->i_compr_blocks, 0); + f2fs_mark_inode_dirty_sync(inode, true); + } else { + f2fs_warn(sbi, "%s: The file might be partially decompressed " + "(errno=%d). Please delete the file.\n", + __func__, ret); + } +out: + inode_unlock(inode); + file_end_write(filp); + + return ret; +} + +static int f2fs_ioc_compress_file(struct file *filp, unsigned long arg) +{ + struct inode *inode = file_inode(filp); + struct f2fs_sb_info *sbi = F2FS_I_SB(inode); + pgoff_t page_idx = 0, last_idx; + int cluster_size = F2FS_I(inode)->i_cluster_size; + int count, ret; + + if (!f2fs_sb_has_compression(sbi)) + return -EOPNOTSUPP; + + if (!(filp->f_mode & FMODE_WRITE)) + return -EBADF; + + if (!f2fs_compressed_file(inode)) + return -EINVAL; + + f2fs_balance_fs(F2FS_I_SB(inode), true); + + file_start_write(filp); + inode_lock(inode); + + if (f2fs_is_mmap_file(inode)) { + ret = -EBUSY; + goto out; + } + + ret = filemap_write_and_wait_range(inode->i_mapping, 0, LLONG_MAX); + if (ret) + goto out; + + set_inode_flag(inode, FI_ENABLE_COMPRESS); + + last_idx = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE); + + count = last_idx - page_idx; + while (count) { + int len = min(cluster_size, count); + + ret = redirty_blocks(inode, page_idx, len); + + if (ret < 0) + break; + + page_idx += len; + count -= len; + } + + if (!ret) + ret = filemap_write_and_wait_range(inode->i_mapping, 0, + LLONG_MAX); + + clear_inode_flag(inode, FI_ENABLE_COMPRESS); + + if (ret) + f2fs_warn(sbi, "%s: The file might be partially compressed " + "(errno=%d). Please delete the file.\n", + __func__, ret); +out: + inode_unlock(inode); + file_end_write(filp); + + return ret; +} + static long __f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { switch (cmd) { @@ -4113,6 +4287,10 @@ static long __f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) return f2fs_ioc_get_compress_option(filp, arg); case F2FS_IOC_SET_COMPRESS_OPTION: return f2fs_ioc_set_compress_option(filp, arg); + case F2FS_IOC_DECOMPRESS_FILE: + return f2fs_ioc_decompress_file(filp, arg); + case F2FS_IOC_COMPRESS_FILE: + return f2fs_ioc_compress_file(filp, arg); default: return -ENOTTY; } @@ -4352,7 +4530,8 @@ long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) case F2FS_IOC_SEC_TRIM_FILE: case F2FS_IOC_GET_COMPRESS_OPTION: case F2FS_IOC_SET_COMPRESS_OPTION: - break; + case F2FS_IOC_DECOMPRESS_FILE: + case F2FS_IOC_COMPRESS_FILE: default: return -ENOIOCTLCMD; } diff --git a/include/uapi/linux/f2fs.h b/include/uapi/linux/f2fs.h index f00199a2e38b..352a822d4370 100644 --- a/include/uapi/linux/f2fs.h +++ b/include/uapi/linux/f2fs.h @@ -40,6 +40,8 @@ struct f2fs_comp_option) #define F2FS_IOC_SET_COMPRESS_OPTION _IOW(F2FS_IOCTL_MAGIC, 22, \ struct f2fs_comp_option) +#define F2FS_IOC_DECOMPRESS_FILE _IO(F2FS_IOCTL_MAGIC, 23) +#define F2FS_IOC_COMPRESS_FILE _IO(F2FS_IOCTL_MAGIC, 24) /* * should be same as XFS_IOC_GOINGDOWN. -- 2.29.2.454.gaff20da3a2-goog