Received-SPF: pass (google.com: domain of linux-kernel+bounces-21870-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Yangtao Li <frank.li@vivo.com>
To: Jaegeuk Kim <jaegeuk@kernel.org>,
	Chao Yu <chao@kernel.org>
Cc: Yangtao Li <frank.li@vivo.com>,
	linux-f2fs-devel@lists.sourceforge.net,
	linux-kernel@vger.kernel.org
Subject: [PATCH] f2fs: compress: reserve blocks on released compress inode while writing
Date: Wed, 10 Jan 2024 02:10:08 -0700
Message-Id: <20240110091009.138206-1-frank.li@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?ExB0O7UiGYOexeUc1UP3VVxJDC9FfAIgrtEfdcmfdwBtTT5suAH6vwwOB110?=
 =?us-ascii?Q?Tvt97l9syXiLtgWkJ5r+kefFGnm/dXvzq37XNJB0XUNpc0LRfAtx5to+Cjgq?=
 =?us-ascii?Q?xyOa8s55BPeqQVQrHMzoIUxX5V9uN3+Z/uzspeJjtPhfOzb0T6GlTasWZLlG?=
 =?us-ascii?Q?QAo0C9uofd69KMpHkV/4sIPvwpYNYdN09YK2OC3wwhbWwsQ6wjasIaOo8mXA?=
 =?us-ascii?Q?l2W9iiAwsV0wK2lVql+9utY55h//WRLKbBzE0a794a/639p9EjSFm8Zp2w49?=
 =?us-ascii?Q?l80/u/aI4hGEjJZjU3m/pjr7JK2GJ+oU6Y0Pn+3oW0Vz94OMpzNCcEnVc9QC?=
 =?us-ascii?Q?MaSuctBkQj2fSKTCzdbMm0p4ou4pOIT5ffWa5qagRZ6K9kzELh9jLJtXUO5a?=
 =?us-ascii?Q?3qCe+okbmiNuf0rIOLXd3OcIzDUhzxhHNCgs1EMLlBIIA+lMkgmf8nEZRpw+?=
 =?us-ascii?Q?l68m2SYYECKnBIZLUIVXDbfqz8zBtbicYh6h18Aqu+S0sLOJNhK+fa5NF0wB?=
 =?us-ascii?Q?CcQi+jcakx1fSuyb7Q2pUtFOSAoJMG4yByBOGgRnwQgfO1QhpTQFea3QWo5j?=
 =?us-ascii?Q?p1rQ3+YL8ZHJ3VIaz6foPl148uuaXyJu+HzZKjed7qemVK+1y1NI0isdPf6w?=
 =?us-ascii?Q?XfKbQ+6lHVu2Pe18fr4R13osM1DH1P7kS7xFRY/MykidqTusBo0fYjehX4Qq?=
 =?us-ascii?Q?LHh09IRJUl2nHmdqKxazHdtU4REwDM83ial/G+4cVW+XlJtaAYScs8D6KPf2?=
 =?us-ascii?Q?dBpfvQAW63czXctmRF8tdVqnL6JG4ggA6mf1FNo2kGtierfsxeCG2K0jn9oG?=
 =?us-ascii?Q?8Qu5r3Ll1YXWqOoTkH6IoiuvluGCxn2vEcC2Pcv+duT56fcgQ/y3OL7bYjcV?=
 =?us-ascii?Q?SwLUAz4jkGW02jRiXC4RH6sZn1XC4UIcDP+VKRfXw6ANz+RGOSW4Ji0hLJ1O?=
 =?us-ascii?Q?2lhqM1SFUxhPJ2EXUKKZ7EPVGY3fbzNNAItvXBSfLthXLDsjFCHRWZLIHyOR?=
 =?us-ascii?Q?PMcIHCdwUhdodTYQmr9D/hi046MqsvTcaJKR8jq8chjHxcAjj62pywglxA5L?=
 =?us-ascii?Q?mZu/TwU7heGRjVgfllFLBDZkx1MyUvcCClQ5mvw/8pl3tf6TANMdQduk/iiv?=
 =?us-ascii?Q?/Yd9XK4bQRGxFGnUfOa9doiTQEKp7laI4twP+SMBBwJMaeKC1CdnosF6R5hE?=
 =?us-ascii?Q?hHjy+q9vf34RFZqhK4MVm6npUa6DsmGyRy4USjE3JOyctybVcyTyW2pryR2D?=
 =?us-ascii?Q?6oF2nkBTjYBM0+lB6MhwLdZrry+p8O4xykTKr3QrqeSLZPg9ARyM9ZOQhK9X?=
 =?us-ascii?Q?Due+5+gAdweJyHYpJ4o9eo8yrsjHzCabTTzniC1drIsvmW4RDsD0XhK0hHyl?=
 =?us-ascii?Q?gtlVhP8ObytdUy0WjEwrWsRe+rZ3ue9DA8NN5IwCPbU9mkUFNgxrNXcK6gSy?=
 =?us-ascii?Q?T5fu1+dJA7/jK06e8Wuvyb4uEUnmk5oK7DoMta5LLoT7XTor8nhAqOYYL0E4?=
 =?us-ascii?Q?An7p+R0viWOYhbDJ4J0vEsCYCXhr6+NmDoAz4ELN4NAFDTxvIABbfscfsA7J?=
 =?us-ascii?Q?XfkSSW9px3scdGsXHtL0kFETgZuzZSoWMi7ACXlr?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ff5213ad-b0de-4aa6-2798-08dc11ba7d11
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2024 08:59:44.2226
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 7Uk4b9zyKh/l+PbkWONBMJgkLd6WwzchsO50g21Y79LrhMz+BZC2/NpqTq7sdxCAg7frls/zYSp/6SeJVuag7w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: JH0PR06MB7082

Reserve blocks on released compress inode while writing, so
compressed files with released space are allowed to be rewritten.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/file.c | 86 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 51 insertions(+), 35 deletions(-)

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 15dabeac4690..749b5af17141 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -3612,39 +3612,15 @@ static int reserve_compress_blocks(struct dnode_of_data *dn, pgoff_t count)
 	return reserved_blocks;
 }
 
-static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)
+static int f2fs_reserve_file(struct inode *inode, unsigned int *blocks)
 {
-	struct inode *inode = file_inode(filp);
 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
 	pgoff_t page_idx = 0, last_idx;
 	unsigned int reserved_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 (atomic_read(&F2FS_I(inode)->i_compr_blocks))
-		goto out;
-
 	f2fs_balance_fs(F2FS_I_SB(inode), true);
 
-	inode_lock(inode);
-
-	if (!is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {
-		ret = -EINVAL;
-		goto unlock_inode;
-	}
-
 	f2fs_down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
 	filemap_invalidate_lock(inode->i_mapping);
 
@@ -3688,14 +3664,8 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)
 		clear_inode_flag(inode, FI_COMPRESS_RELEASED);
 		inode->i_ctime = current_time(inode);
 		f2fs_mark_inode_dirty_sync(inode, true);
-	}
-unlock_inode:
-	inode_unlock(inode);
-out:
-	mnt_drop_write_file(filp);
-
-	if (ret >= 0) {
-		ret = put_user(reserved_blocks, (u64 __user *)arg);
+		if (blocks)
+			*blocks = reserved_blocks;
 	} else if (reserved_blocks &&
 			atomic_read(&F2FS_I(inode)->i_compr_blocks)) {
 		set_sbi_flag(sbi, SBI_NEED_FSCK);
@@ -3710,6 +3680,49 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)
 	return ret;
 }
 
+static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)
+{
+	struct inode *inode = file_inode(filp);
+	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
+	unsigned int reserved_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 (atomic_read(&F2FS_I(inode)->i_compr_blocks))
+		goto out;
+
+	inode_lock(inode);
+
+	if (!is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {
+		ret = -EINVAL;
+		goto unlock_inode;
+	}
+
+	ret = f2fs_reserve_file(inode, &reserved_blocks);
+
+unlock_inode:
+	inode_unlock(inode);
+out:
+	mnt_drop_write_file(filp);
+
+	if (ret >= 0)
+		ret = put_user(reserved_blocks, (u64 __user *)arg);
+
+	return ret;
+}
+
 static int f2fs_secure_erase(struct block_device *bdev, struct inode *inode,
 		pgoff_t off, block_t block, block_t len, u32 flags)
 {
@@ -4412,8 +4425,11 @@ static ssize_t f2fs_write_checks(struct kiocb *iocb, struct iov_iter *from)
 	if (IS_IMMUTABLE(inode))
 		return -EPERM;
 
-	if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED))
-		return -EPERM;
+	if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {
+		err = f2fs_reserve_file(inode, NULL);
+		if (err < 0)
+			return err;
+	}
 
 	count = generic_write_checks(iocb, from);
 	if (count <= 0)
-- 
2.39.0