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=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,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 A8962C3F2CD for ; Thu, 5 Mar 2020 06:34:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7CE26208C3 for ; Thu, 5 Mar 2020 06:34:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725993AbgCEGe1 (ORCPT ); Thu, 5 Mar 2020 01:34:27 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:54180 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725818AbgCEGe1 (ORCPT ); Thu, 5 Mar 2020 01:34:27 -0500 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id D9CC424A2E0F6ADA41A4; Thu, 5 Mar 2020 14:34:23 +0800 (CST) Received: from [10.134.22.195] (10.134.22.195) by smtp.huawei.com (10.3.19.205) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 5 Mar 2020 14:34:18 +0800 Subject: Re: [PATCH v2] f2fs: introduce F2FS_IOC_RELEASE_COMPRESS_BLOCKS To: Jaegeuk Kim CC: , , References: <20200227112621.126505-1-yuchao0@huawei.com> <20200227183052.GA55284@google.com> <8cb4552e-e6a2-e57b-1baa-40171e53e120@huawei.com> <20200304182635.GA87370@google.com> <20200305002950.GA193721@google.com> From: Chao Yu Message-ID: <23e51691-7201-11d8-0b11-82614a1dfcfc@huawei.com> Date: Thu, 5 Mar 2020 14:34:17 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200305002950.GA193721@google.com> Content-Type: text/plain; charset="windows-1252" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.134.22.195] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020/3/5 8:29, Jaegeuk Kim wrote: > On 03/04, Jaegeuk Kim wrote: >> On 02/28, Chao Yu wrote: >>> On 2020/2/28 2:30, Jaegeuk Kim wrote: >>>> On 02/27, Chao Yu wrote: >>>>> There are still reserved blocks on compressed inode, this patch >>>>> introduce a new ioctl to help release reserved blocks back to >>>>> filesystem, so that userspace can reuse those freed space. > > BTW, this patch makes i_blocks breakages. Could you please check? It's consistent, however we should not account COMPRESS_ADDR as reserved block once we released compress block on that inode: if (blkaddr == COMPRESS_ADDR) { fsck->chk.valid_blk_cnt++; *blk_cnt = *blk_cnt + 1; continue; } Thanks, > >>>> >>>> Hmm, once we release the blocks, what happens if we remove the immutable >>>> bit back? >>> >>> Oh, if we allow to overwrite on compress file, i_blocks and real physical blocks >>> usage may be inconsistent? >>> >>> So if we need to support above scenario, should we add another ioctl interface >>> to rollback all compress inode status: >>> - add reserved blocks in dnode blocks >>> - increase i_compr_blocks, i_blocks, total_valid_block_count >>> - remove immutable >> >> I think that'd be doable. >> >>> >>> Thanks, >>> >>>> >>>>> >>>>> Signed-off-by: Chao Yu >>>>> --- >>>>> v2: >>>>> - set inode as immutable in ioctl. >>>>> fs/f2fs/f2fs.h | 6 +++ >>>>> fs/f2fs/file.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++++- >>>>> 2 files changed, 141 insertions(+), 1 deletion(-) >>>>> >>>>> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h >>>>> index 23b93a116c73..4a02edc2454b 100644 >>>>> --- a/fs/f2fs/f2fs.h >>>>> +++ b/fs/f2fs/f2fs.h >>>>> @@ -427,6 +427,8 @@ static inline bool __has_cursum_space(struct f2fs_journal *journal, >>>>> #define F2FS_IOC_PRECACHE_EXTENTS _IO(F2FS_IOCTL_MAGIC, 15) >>>>> #define F2FS_IOC_RESIZE_FS _IOW(F2FS_IOCTL_MAGIC, 16, __u64) >>>>> #define F2FS_IOC_GET_COMPRESS_BLOCKS _IOR(F2FS_IOCTL_MAGIC, 17, __u64) >>>>> +#define F2FS_IOC_RELEASE_COMPRESS_BLOCKS \ >>>>> + _IOR(F2FS_IOCTL_MAGIC, 18, __u64) >>>>> >>>>> #define F2FS_IOC_GET_VOLUME_NAME FS_IOC_GETFSLABEL >>>>> #define F2FS_IOC_SET_VOLUME_NAME FS_IOC_SETFSLABEL >>>>> @@ -3956,6 +3958,10 @@ static inline void f2fs_i_compr_blocks_update(struct inode *inode, >>>>> { >>>>> int diff = F2FS_I(inode)->i_cluster_size - blocks; >>>>> >>>>> + /* don't update i_compr_blocks if saved blocks were released */ >>>>> + if (!add && !F2FS_I(inode)->i_compr_blocks) >>>>> + return; >>>>> + >>>>> if (add) { >>>>> F2FS_I(inode)->i_compr_blocks += diff; >>>>> stat_add_compr_blocks(inode, diff); >>>>> diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c >>>>> index 37c1147eb244..b8f01ee9d698 100644 >>>>> --- a/fs/f2fs/file.c >>>>> +++ b/fs/f2fs/file.c >>>>> @@ -550,6 +550,7 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count) >>>>> bool compressed_cluster = false; >>>>> int cluster_index = 0, valid_blocks = 0; >>>>> int cluster_size = F2FS_I(dn->inode)->i_cluster_size; >>>>> + bool released = !F2FS_I(dn->inode)->i_compr_blocks; >>>>> >>>>> if (IS_INODE(dn->node_page) && f2fs_has_extra_attr(dn->inode)) >>>>> base = get_extra_isize(dn->inode); >>>>> @@ -588,7 +589,9 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count) >>>>> clear_inode_flag(dn->inode, FI_FIRST_BLOCK_WRITTEN); >>>>> >>>>> f2fs_invalidate_blocks(sbi, blkaddr); >>>>> - nr_free++; >>>>> + >>>>> + if (released && blkaddr != COMPRESS_ADDR) >>>>> + nr_free++; >>>>> } >>>>> >>>>> if (compressed_cluster) >>>>> @@ -3403,6 +3406,134 @@ static int f2fs_get_compress_blocks(struct file *filp, unsigned long arg) >>>>> return put_user(blocks, (u64 __user *)arg); >>>>> } >>>>> >>>>> +static int release_compress_blocks(struct dnode_of_data *dn, pgoff_t count) >>>>> +{ >>>>> + struct f2fs_sb_info *sbi = F2FS_I_SB(dn->inode); >>>>> + unsigned int released_blocks = 0; >>>>> + int cluster_size = F2FS_I(dn->inode)->i_cluster_size; >>>>> + >>>>> + while (count) { >>>>> + int compr_blocks = 0; >>>>> + block_t blkaddr = f2fs_data_blkaddr(dn); >>>>> + int i; >>>>> + >>>>> + if (blkaddr != COMPRESS_ADDR) { >>>>> + dn->ofs_in_node += cluster_size; >>>>> + goto next; >>>>> + } >>>>> + >>>>> + for (i = 0; i < cluster_size; i++, dn->ofs_in_node++) { >>>>> + blkaddr = f2fs_data_blkaddr(dn); >>>>> + >>>>> + if (__is_valid_data_blkaddr(blkaddr)) { >>>>> + compr_blocks++; >>>>> + if (unlikely(!f2fs_is_valid_blkaddr(sbi, blkaddr, >>>>> + DATA_GENERIC_ENHANCE))) >>>>> + return -EFSCORRUPTED; >>>>> + } >>>>> + >>>>> + if (blkaddr != NEW_ADDR) >>>>> + continue; >>>>> + >>>>> + dn->data_blkaddr = NULL_ADDR; >>>>> + f2fs_set_data_blkaddr(dn); >>>>> + } >>>>> + >>>>> + f2fs_i_compr_blocks_update(dn->inode, compr_blocks, false); >>>>> + dec_valid_block_count(sbi, dn->inode, >>>>> + cluster_size - compr_blocks); >>>>> + >>>>> + released_blocks += cluster_size - compr_blocks; >>>>> +next: >>>>> + count -= cluster_size; >>>>> + } >>>>> + >>>>> + return released_blocks; >>>>> +} >>>>> + >>>>> +static int f2fs_release_compress_blocks(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; >>>>> + unsigned int released_blocks = 0; >>>>> + int ret; >>>>> + >>>>> + if (!f2fs_sb_has_compression(F2FS_I_SB(inode))) >>>>> + return -EOPNOTSUPP; >>>>> + >>>>> + if (!f2fs_compressed_file(inode)) >>>>> + return -EINVAL; >>>>> + >>>>> + if (f2fs_readonly(sbi->sb)) >>>>> + return -EROFS; >>>>> + >>>>> + ret = mnt_want_write_file(filp); >>>>> + if (ret) >>>>> + return ret; >>>>> + >>>>> + if (!F2FS_I(inode)->i_compr_blocks) >>>>> + goto out; >>>>> + >>>>> + f2fs_balance_fs(F2FS_I_SB(inode), true); >>>>> + >>>>> + inode_lock(inode); >>>>> + >>>>> + if (!IS_IMMUTABLE(inode)) { >>>>> + F2FS_I(inode)->i_flags |= F2FS_IMMUTABLE_FL; >>>>> + f2fs_set_inode_flags(inode); >>>>> + inode->i_ctime = current_time(inode); >>>>> + f2fs_mark_inode_dirty_sync(inode, true); >>>>> + } >>>>> + >>>>> + down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); >>>>> + down_write(&F2FS_I(inode)->i_mmap_sem); >>>>> + >>>>> + last_idx = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE); >>>>> + >>>>> + while (page_idx < last_idx) { >>>>> + struct dnode_of_data dn; >>>>> + pgoff_t end_offset, count; >>>>> + >>>>> + set_new_dnode(&dn, inode, NULL, NULL, 0); >>>>> + ret = f2fs_get_dnode_of_data(&dn, page_idx, LOOKUP_NODE); >>>>> + if (ret) { >>>>> + if (ret == -ENOENT) { >>>>> + page_idx = f2fs_get_next_page_offset(&dn, >>>>> + page_idx); >>>>> + ret = 0; >>>>> + continue; >>>>> + } >>>>> + break; >>>>> + } >>>>> + >>>>> + end_offset = ADDRS_PER_PAGE(dn.node_page, inode); >>>>> + count = min(end_offset - dn.ofs_in_node, last_idx - page_idx); >>>>> + >>>>> + ret = release_compress_blocks(&dn, count); >>>>> + >>>>> + f2fs_put_dnode(&dn); >>>>> + >>>>> + if (ret < 0) >>>>> + break; >>>>> + >>>>> + page_idx += count; >>>>> + released_blocks += ret; >>>>> + } >>>>> + >>>>> + up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); >>>>> + up_write(&F2FS_I(inode)->i_mmap_sem); >>>>> + >>>>> + inode_unlock(inode); >>>>> +out: >>>>> + mnt_drop_write_file(filp); >>>>> + >>>>> + if (!ret) >>>>> + ret = put_user(released_blocks, (u64 __user *)arg); >>>>> + >>>>> + 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))))) >>>>> @@ -3483,6 +3614,8 @@ long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) >>>>> return f2fs_set_volume_name(filp, arg); >>>>> case F2FS_IOC_GET_COMPRESS_BLOCKS: >>>>> return f2fs_get_compress_blocks(filp, arg); >>>>> + case F2FS_IOC_RELEASE_COMPRESS_BLOCKS: >>>>> + return f2fs_release_compress_blocks(filp, arg); >>>>> default: >>>>> return -ENOTTY; >>>>> } >>>>> @@ -3643,6 +3776,7 @@ long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) >>>>> case F2FS_IOC_GET_VOLUME_NAME: >>>>> case F2FS_IOC_SET_VOLUME_NAME: >>>>> case F2FS_IOC_GET_COMPRESS_BLOCKS: >>>>> + case F2FS_IOC_RELEASE_COMPRESS_BLOCKS: >>>>> break; >>>>> default: >>>>> return -ENOIOCTLCMD; >>>>> -- >>>>> 2.18.0.rc1 >>>> . >>>> > . > 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=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 A9446C3F2CD for ; Thu, 5 Mar 2020 06:34:38 +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 77B96207FD for ; Thu, 5 Mar 2020 06:34:38 +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="QtEMbPSG"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="Fi/+JeYl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 77B96207FD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.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 1j9k5d-0004vf-Gq; Thu, 05 Mar 2020 06:34:37 +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 1j9k5c-0004vZ-PQ for linux-f2fs-devel@lists.sourceforge.net; Thu, 05 Mar 2020 06:34:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:In-Reply-To: MIME-Version:Date:Message-ID:From:References:CC:To:Subject:Sender:Reply-To: 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=RuTfLzRHeEzKNHQGefUVX7omQQnaozWg6ODRhgKZPQQ=; b=QtEMbPSGosvHHehw2qhM0EkEgg eJNDQpqnVdLSSSTlGrmvBEDktA5jtCisfAzT5a/NtYaK731uWkPRhOXMqwh1OS8ro/7DjWaUIb9Ps iKTW4A8jqagMeN9AA7D1xW393T6E5s/39l+DQQ1NVTuXoAJJPtc7pKeAF3poFDDHiz/U=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:MIME-Version:Date: Message-ID:From:References:CC:To:Subject:Sender:Reply-To: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=RuTfLzRHeEzKNHQGefUVX7omQQnaozWg6ODRhgKZPQQ=; b=Fi/+JeYllCJP9YA3NCWipKbGzu HFB5BNQLg2gkpb6NfOc1QDsMymF2X+6OdUVGBStCRR4LdZLKvCUw/Z0nH4CaRxsPAvNsHppXf9lYf 9cPj7ri8B4xQxbqL2Q2hqIW/Ln8AGOOxJLcMxhgnajXEybh1TzG//pqe63KnxJMXU+1k=; Received: from szxga07-in.huawei.com ([45.249.212.35] helo=huawei.com) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1j9k5Z-00HAFf-0p for linux-f2fs-devel@lists.sourceforge.net; Thu, 05 Mar 2020 06:34:36 +0000 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id D9CC424A2E0F6ADA41A4; Thu, 5 Mar 2020 14:34:23 +0800 (CST) Received: from [10.134.22.195] (10.134.22.195) by smtp.huawei.com (10.3.19.205) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 5 Mar 2020 14:34:18 +0800 To: Jaegeuk Kim References: <20200227112621.126505-1-yuchao0@huawei.com> <20200227183052.GA55284@google.com> <8cb4552e-e6a2-e57b-1baa-40171e53e120@huawei.com> <20200304182635.GA87370@google.com> <20200305002950.GA193721@google.com> From: Chao Yu Message-ID: <23e51691-7201-11d8-0b11-82614a1dfcfc@huawei.com> Date: Thu, 5 Mar 2020 14:34:17 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200305002950.GA193721@google.com> Content-Language: en-US X-Originating-IP: [10.134.22.195] X-CFilter-Loop: Reflected X-Headers-End: 1j9k5Z-00HAFf-0p Subject: Re: [f2fs-dev] [PATCH v2] f2fs: introduce F2FS_IOC_RELEASE_COMPRESS_BLOCKS 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: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On 2020/3/5 8:29, Jaegeuk Kim wrote: > On 03/04, Jaegeuk Kim wrote: >> On 02/28, Chao Yu wrote: >>> On 2020/2/28 2:30, Jaegeuk Kim wrote: >>>> On 02/27, Chao Yu wrote: >>>>> There are still reserved blocks on compressed inode, this patch >>>>> introduce a new ioctl to help release reserved blocks back to >>>>> filesystem, so that userspace can reuse those freed space. > > BTW, this patch makes i_blocks breakages. Could you please check? It's consistent, however we should not account COMPRESS_ADDR as reserved block once we released compress block on that inode: if (blkaddr == COMPRESS_ADDR) { fsck->chk.valid_blk_cnt++; *blk_cnt = *blk_cnt + 1; continue; } Thanks, > >>>> >>>> Hmm, once we release the blocks, what happens if we remove the immutable >>>> bit back? >>> >>> Oh, if we allow to overwrite on compress file, i_blocks and real physical blocks >>> usage may be inconsistent? >>> >>> So if we need to support above scenario, should we add another ioctl interface >>> to rollback all compress inode status: >>> - add reserved blocks in dnode blocks >>> - increase i_compr_blocks, i_blocks, total_valid_block_count >>> - remove immutable >> >> I think that'd be doable. >> >>> >>> Thanks, >>> >>>> >>>>> >>>>> Signed-off-by: Chao Yu >>>>> --- >>>>> v2: >>>>> - set inode as immutable in ioctl. >>>>> fs/f2fs/f2fs.h | 6 +++ >>>>> fs/f2fs/file.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++++- >>>>> 2 files changed, 141 insertions(+), 1 deletion(-) >>>>> >>>>> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h >>>>> index 23b93a116c73..4a02edc2454b 100644 >>>>> --- a/fs/f2fs/f2fs.h >>>>> +++ b/fs/f2fs/f2fs.h >>>>> @@ -427,6 +427,8 @@ static inline bool __has_cursum_space(struct f2fs_journal *journal, >>>>> #define F2FS_IOC_PRECACHE_EXTENTS _IO(F2FS_IOCTL_MAGIC, 15) >>>>> #define F2FS_IOC_RESIZE_FS _IOW(F2FS_IOCTL_MAGIC, 16, __u64) >>>>> #define F2FS_IOC_GET_COMPRESS_BLOCKS _IOR(F2FS_IOCTL_MAGIC, 17, __u64) >>>>> +#define F2FS_IOC_RELEASE_COMPRESS_BLOCKS \ >>>>> + _IOR(F2FS_IOCTL_MAGIC, 18, __u64) >>>>> >>>>> #define F2FS_IOC_GET_VOLUME_NAME FS_IOC_GETFSLABEL >>>>> #define F2FS_IOC_SET_VOLUME_NAME FS_IOC_SETFSLABEL >>>>> @@ -3956,6 +3958,10 @@ static inline void f2fs_i_compr_blocks_update(struct inode *inode, >>>>> { >>>>> int diff = F2FS_I(inode)->i_cluster_size - blocks; >>>>> >>>>> + /* don't update i_compr_blocks if saved blocks were released */ >>>>> + if (!add && !F2FS_I(inode)->i_compr_blocks) >>>>> + return; >>>>> + >>>>> if (add) { >>>>> F2FS_I(inode)->i_compr_blocks += diff; >>>>> stat_add_compr_blocks(inode, diff); >>>>> diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c >>>>> index 37c1147eb244..b8f01ee9d698 100644 >>>>> --- a/fs/f2fs/file.c >>>>> +++ b/fs/f2fs/file.c >>>>> @@ -550,6 +550,7 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count) >>>>> bool compressed_cluster = false; >>>>> int cluster_index = 0, valid_blocks = 0; >>>>> int cluster_size = F2FS_I(dn->inode)->i_cluster_size; >>>>> + bool released = !F2FS_I(dn->inode)->i_compr_blocks; >>>>> >>>>> if (IS_INODE(dn->node_page) && f2fs_has_extra_attr(dn->inode)) >>>>> base = get_extra_isize(dn->inode); >>>>> @@ -588,7 +589,9 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count) >>>>> clear_inode_flag(dn->inode, FI_FIRST_BLOCK_WRITTEN); >>>>> >>>>> f2fs_invalidate_blocks(sbi, blkaddr); >>>>> - nr_free++; >>>>> + >>>>> + if (released && blkaddr != COMPRESS_ADDR) >>>>> + nr_free++; >>>>> } >>>>> >>>>> if (compressed_cluster) >>>>> @@ -3403,6 +3406,134 @@ static int f2fs_get_compress_blocks(struct file *filp, unsigned long arg) >>>>> return put_user(blocks, (u64 __user *)arg); >>>>> } >>>>> >>>>> +static int release_compress_blocks(struct dnode_of_data *dn, pgoff_t count) >>>>> +{ >>>>> + struct f2fs_sb_info *sbi = F2FS_I_SB(dn->inode); >>>>> + unsigned int released_blocks = 0; >>>>> + int cluster_size = F2FS_I(dn->inode)->i_cluster_size; >>>>> + >>>>> + while (count) { >>>>> + int compr_blocks = 0; >>>>> + block_t blkaddr = f2fs_data_blkaddr(dn); >>>>> + int i; >>>>> + >>>>> + if (blkaddr != COMPRESS_ADDR) { >>>>> + dn->ofs_in_node += cluster_size; >>>>> + goto next; >>>>> + } >>>>> + >>>>> + for (i = 0; i < cluster_size; i++, dn->ofs_in_node++) { >>>>> + blkaddr = f2fs_data_blkaddr(dn); >>>>> + >>>>> + if (__is_valid_data_blkaddr(blkaddr)) { >>>>> + compr_blocks++; >>>>> + if (unlikely(!f2fs_is_valid_blkaddr(sbi, blkaddr, >>>>> + DATA_GENERIC_ENHANCE))) >>>>> + return -EFSCORRUPTED; >>>>> + } >>>>> + >>>>> + if (blkaddr != NEW_ADDR) >>>>> + continue; >>>>> + >>>>> + dn->data_blkaddr = NULL_ADDR; >>>>> + f2fs_set_data_blkaddr(dn); >>>>> + } >>>>> + >>>>> + f2fs_i_compr_blocks_update(dn->inode, compr_blocks, false); >>>>> + dec_valid_block_count(sbi, dn->inode, >>>>> + cluster_size - compr_blocks); >>>>> + >>>>> + released_blocks += cluster_size - compr_blocks; >>>>> +next: >>>>> + count -= cluster_size; >>>>> + } >>>>> + >>>>> + return released_blocks; >>>>> +} >>>>> + >>>>> +static int f2fs_release_compress_blocks(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; >>>>> + unsigned int released_blocks = 0; >>>>> + int ret; >>>>> + >>>>> + if (!f2fs_sb_has_compression(F2FS_I_SB(inode))) >>>>> + return -EOPNOTSUPP; >>>>> + >>>>> + if (!f2fs_compressed_file(inode)) >>>>> + return -EINVAL; >>>>> + >>>>> + if (f2fs_readonly(sbi->sb)) >>>>> + return -EROFS; >>>>> + >>>>> + ret = mnt_want_write_file(filp); >>>>> + if (ret) >>>>> + return ret; >>>>> + >>>>> + if (!F2FS_I(inode)->i_compr_blocks) >>>>> + goto out; >>>>> + >>>>> + f2fs_balance_fs(F2FS_I_SB(inode), true); >>>>> + >>>>> + inode_lock(inode); >>>>> + >>>>> + if (!IS_IMMUTABLE(inode)) { >>>>> + F2FS_I(inode)->i_flags |= F2FS_IMMUTABLE_FL; >>>>> + f2fs_set_inode_flags(inode); >>>>> + inode->i_ctime = current_time(inode); >>>>> + f2fs_mark_inode_dirty_sync(inode, true); >>>>> + } >>>>> + >>>>> + down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); >>>>> + down_write(&F2FS_I(inode)->i_mmap_sem); >>>>> + >>>>> + last_idx = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE); >>>>> + >>>>> + while (page_idx < last_idx) { >>>>> + struct dnode_of_data dn; >>>>> + pgoff_t end_offset, count; >>>>> + >>>>> + set_new_dnode(&dn, inode, NULL, NULL, 0); >>>>> + ret = f2fs_get_dnode_of_data(&dn, page_idx, LOOKUP_NODE); >>>>> + if (ret) { >>>>> + if (ret == -ENOENT) { >>>>> + page_idx = f2fs_get_next_page_offset(&dn, >>>>> + page_idx); >>>>> + ret = 0; >>>>> + continue; >>>>> + } >>>>> + break; >>>>> + } >>>>> + >>>>> + end_offset = ADDRS_PER_PAGE(dn.node_page, inode); >>>>> + count = min(end_offset - dn.ofs_in_node, last_idx - page_idx); >>>>> + >>>>> + ret = release_compress_blocks(&dn, count); >>>>> + >>>>> + f2fs_put_dnode(&dn); >>>>> + >>>>> + if (ret < 0) >>>>> + break; >>>>> + >>>>> + page_idx += count; >>>>> + released_blocks += ret; >>>>> + } >>>>> + >>>>> + up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); >>>>> + up_write(&F2FS_I(inode)->i_mmap_sem); >>>>> + >>>>> + inode_unlock(inode); >>>>> +out: >>>>> + mnt_drop_write_file(filp); >>>>> + >>>>> + if (!ret) >>>>> + ret = put_user(released_blocks, (u64 __user *)arg); >>>>> + >>>>> + 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))))) >>>>> @@ -3483,6 +3614,8 @@ long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) >>>>> return f2fs_set_volume_name(filp, arg); >>>>> case F2FS_IOC_GET_COMPRESS_BLOCKS: >>>>> return f2fs_get_compress_blocks(filp, arg); >>>>> + case F2FS_IOC_RELEASE_COMPRESS_BLOCKS: >>>>> + return f2fs_release_compress_blocks(filp, arg); >>>>> default: >>>>> return -ENOTTY; >>>>> } >>>>> @@ -3643,6 +3776,7 @@ long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) >>>>> case F2FS_IOC_GET_VOLUME_NAME: >>>>> case F2FS_IOC_SET_VOLUME_NAME: >>>>> case F2FS_IOC_GET_COMPRESS_BLOCKS: >>>>> + case F2FS_IOC_RELEASE_COMPRESS_BLOCKS: >>>>> break; >>>>> default: >>>>> return -ENOIOCTLCMD; >>>>> -- >>>>> 2.18.0.rc1 >>>> . >>>> > . > _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel