2024-03-15 11:33:41

by 牛志国 (Zhiguo Niu)

Subject: [PATCH V2] f2fs: add REQ_TIME time update for some user behaviors

some user behaviors requested filesystem operations, which
will cause filesystem not idle.
Meanwhile adjust some f2fs_update_time(REQ_TIME) positions.

Signed-off-by: Zhiguo Niu <[email protected]>
---
v2: update patch according to Chao's suggestions
---
---
fs/f2fs/file.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 1761ad1..8c9d6ea 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -2354,13 +2354,14 @@ static bool uuid_is_nonzero(__u8 u[16])
static int f2fs_ioc_set_encryption_policy(struct file *filp, unsigned long arg)
{
struct inode *inode = file_inode(filp);
+ int ret;

if (!f2fs_sb_has_encrypt(F2FS_I_SB(inode)))
return -EOPNOTSUPP;

+ ret = fscrypt_ioctl_set_policy(filp, (const void __user *)arg);
f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);
-
- return fscrypt_ioctl_set_policy(filp, (const void __user *)arg);
+ return ret;
}

static int f2fs_ioc_get_encryption_policy(struct file *filp, unsigned long arg)
@@ -2786,7 +2787,8 @@ static int f2fs_ioc_defragment(struct file *filp, unsigned long arg)
err = f2fs_defragment_range(sbi, filp, &range);
mnt_drop_write_file(filp);

- f2fs_update_time(sbi, REQ_TIME);
+ if (range.len)
+ f2fs_update_time(sbi, REQ_TIME);
if (err < 0)
return err;

@@ -3599,6 +3601,7 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg)

filemap_invalidate_unlock(inode->i_mapping);
f2fs_up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
+ f2fs_update_time(sbi, REQ_TIME);
out:
inode_unlock(inode);

@@ -3768,6 +3771,7 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)
clear_inode_flag(inode, FI_COMPRESS_RELEASED);
inode_set_ctime_current(inode);
f2fs_mark_inode_dirty_sync(inode, true);
+ f2fs_update_time(sbi, REQ_TIME);
}
unlock_inode:
inode_unlock(inode);
@@ -3966,6 +3970,7 @@ static int f2fs_sec_trim_file(struct file *filp, unsigned long arg)
if (len)
ret = f2fs_secure_erase(prev_bdev, inode, prev_index,
prev_block, len, range.flags);
+ f2fs_update_time(sbi, REQ_TIME);
out:
filemap_invalidate_unlock(mapping);
f2fs_up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
@@ -4175,6 +4180,7 @@ static int f2fs_ioc_decompress_file(struct file *filp)
if (ret)
f2fs_warn(sbi, "%s: The file might be partially decompressed (errno=%d). Please delete the file.",
__func__, ret);
+ f2fs_update_time(sbi, REQ_TIME);
out:
inode_unlock(inode);
file_end_write(filp);
@@ -4254,6 +4260,7 @@ static int f2fs_ioc_compress_file(struct file *filp)
if (ret)
f2fs_warn(sbi, "%s: The file might be partially compressed (errno=%d). Please delete the file.",
__func__, ret);
+ f2fs_update_time(sbi, REQ_TIME);
out:
inode_unlock(inode);
file_end_write(filp);
--
1.9.1

2024-03-18 10:02:15

by Chao Yu

Subject: Re: [PATCH V2] f2fs: add REQ_TIME time update for some user behaviors

On 2024/3/15 19:32, Zhiguo Niu wrote:
> some user behaviors requested filesystem operations, which
> will cause filesystem not idle.
> Meanwhile adjust some f2fs_update_time(REQ_TIME) positions.
>
> Signed-off-by: Zhiguo Niu <[email protected]>
> ---
> v2: update patch according to Chao's suggestions
> ---
> ---
> fs/f2fs/file.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
> index 1761ad1..8c9d6ea 100644
> --- a/fs/f2fs/file.c
> +++ b/fs/f2fs/file.c
> @@ -2354,13 +2354,14 @@ static bool uuid_is_nonzero(__u8 u[16])
> static int f2fs_ioc_set_encryption_policy(struct file *filp, unsigned long arg)
> {
> struct inode *inode = file_inode(filp);
> + int ret;
>
> if (!f2fs_sb_has_encrypt(F2FS_I_SB(inode)))
> return -EOPNOTSUPP;
>
> + ret = fscrypt_ioctl_set_policy(filp, (const void __user *)arg);
> f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);
> -
> - return fscrypt_ioctl_set_policy(filp, (const void __user *)arg);
> + return ret;
> }
>
> static int f2fs_ioc_get_encryption_policy(struct file *filp, unsigned long arg)
> @@ -2786,7 +2787,8 @@ static int f2fs_ioc_defragment(struct file *filp, unsigned long arg)
> err = f2fs_defragment_range(sbi, filp, &range);
> mnt_drop_write_file(filp);
>
> - f2fs_update_time(sbi, REQ_TIME);
> + if (range.len)
> + f2fs_update_time(sbi, REQ_TIME);
> if (err < 0)
> return err;
>
> @@ -3599,6 +3601,7 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg)
>
> filemap_invalidate_unlock(inode->i_mapping);
> f2fs_up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
> + f2fs_update_time(sbi, REQ_TIME);
> out:

if (released_blocks)
f2fs_update_time();

> inode_unlock(inode);
>
> @@ -3768,6 +3771,7 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)
> clear_inode_flag(inode, FI_COMPRESS_RELEASED);
> inode_set_ctime_current(inode);
> f2fs_mark_inode_dirty_sync(inode, true);
> + f2fs_update_time(sbi, REQ_TIME);
> }
> unlock_inode:

if (reserved_blocks)
f2fs_update_time();

Thanks,

> inode_unlock(inode);
> @@ -3966,6 +3970,7 @@ static int f2fs_sec_trim_file(struct file *filp, unsigned long arg)
> if (len)
> ret = f2fs_secure_erase(prev_bdev, inode, prev_index,
> prev_block, len, range.flags);
> + f2fs_update_time(sbi, REQ_TIME);
> out:
> filemap_invalidate_unlock(mapping);
> f2fs_up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
> @@ -4175,6 +4180,7 @@ static int f2fs_ioc_decompress_file(struct file *filp)
> if (ret)
> f2fs_warn(sbi, "%s: The file might be partially decompressed (errno=%d). Please delete the file.",
> __func__, ret);
> + f2fs_update_time(sbi, REQ_TIME);
> out:
> inode_unlock(inode);
> file_end_write(filp);
> @@ -4254,6 +4260,7 @@ static int f2fs_ioc_compress_file(struct file *filp)
> if (ret)
> f2fs_warn(sbi, "%s: The file might be partially compressed (errno=%d). Please delete the file.",
> __func__, ret);
> + f2fs_update_time(sbi, REQ_TIME);
> out:
> inode_unlock(inode);
> file_end_write(filp);