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.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 25F22C56201 for ; Mon, 23 Nov 2020 03:18:25 +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 A975220721; Mon, 23 Nov 2020 03:18:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sourceforge.net header.i=@sourceforge.net header.b="fEXRZqWk"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="TUKqvcBz"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hkxrUEZ1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A975220721 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1kh2My-0001LU-9z; Mon, 23 Nov 2020 03:18:24 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kh2Mw-0001LI-MN for linux-f2fs-devel@lists.sourceforge.net; Mon, 23 Nov 2020 03:18:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: 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=U9pXaoYOYzvSlbjuyA3XUmqJqWngslHl5D8Ri48QQwk=; b=fEXRZqWkMcigDEtPpDeq29zdeA NuHwMoZKJ+eJE1PxeTRwlEZSckmyCoYAiigKuG29PLGVyhO5hqo9BATN0W5EFNZwhSeFx/7j8G8mh /xYmFSgLKV84OQHgug4DR9iKPtNxI2s+hnj+P6lTu7Jp7KFvkKZtpjk5veUuxUlfegFg=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: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=U9pXaoYOYzvSlbjuyA3XUmqJqWngslHl5D8Ri48QQwk=; b=TUKqvcBzaGwU4Qb5nPsa/hFaU3 kF6oEbr0+x7UVUh19miIUm7i8wCeO5NxxHQCYFAe2G/C4v60slemVCkH3zbfr8E7lCAmdzLZfs9Hw cXFe9iKk/Yz/GsLWQrIdu2sLMBL9Qc2iFy16B7eRB9XNKxYDXNNOv23zyVtnWjy+Bv6A=; Received: from mail-pg1-f193.google.com ([209.85.215.193]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1kh2Ms-009mez-DA for linux-f2fs-devel@lists.sourceforge.net; Mon, 23 Nov 2020 03:18:22 +0000 Received: by mail-pg1-f193.google.com with SMTP id m9so12949374pgb.4 for ; Sun, 22 Nov 2020 19:18:18 -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=BmQfy8DIPaBPilAkIMqOLNR2Xa4HdlqWQq4oLxg7dSokRCgrrXZqCuFV/iOQqH8m2E 3mKlYT5WLMIT2dGYoELX/BXxviY9S3tTgYwSfgwpSIvQ1I2n2dH/dlWTErlYzsWM6+Fm ygCTFAWKoVi+DtzbEpeDEVJ+X7MbkX8gVXQQy1cImbrn2E1g3q8IcU6Z3cIBujdRpEcM hA1GLSCAXWXFU5d0VU75kL+A7EO2E46pRy9PtptahGkhrz9pOb2PD3OD9IBq0rrRoFhU irxfIXcRMa6uPSLdbTEcMTaj50Cl3nglnO9lTVQLmoS8xDgGqSOXks1fAJediz3jKWTY aVIg== X-Gm-Message-State: AOAM531Vq7k+LJ6qJpDee979t2ck1CywuQx3ZQowx3hXKZwedF9BRnli AFwnbZsPTYTndDn0dcsb8MM= X-Google-Smtp-Source: ABdhPJzg6TNYsJppZtttDAla/a1UQBtqLC3+uHiLnO04lQj71/bIz+VB2H5KbluLZah1onE9M/eXXw== 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 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 X-Headers-End: 1kh2Ms-009mez-DA Subject: [f2fs-dev] [PATCH 2/2] f2fs: add F2FS_IOC_DECOMPRESS_FILE and F2FS_IOC_COMPRESS_FILE 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: Daeho Jeong Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net 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 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel