Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <f508dea8-5dc3-e29e-0d8b-4d64735817ac@kernel.org>
Date:   Tue, 15 Nov 2022 09:49:21 +0800
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.3.1
Subject: Re: [f2fs-dev] [PATCH v2 1/2] f2fs: fix to enable compress for newly
 created file if extension matches
Content-Language: en-US
To:     Jaegeuk Kim <jaegeuk@kernel.org>, Sheng Yong <shengyong@oppo.com>
Cc:     linux-kernel@vger.kernel.org,
        linux-f2fs-devel@lists.sourceforge.net
References: <20221111100830.953733-1-shengyong@oppo.com>
 <Y3LDuezGylrrocsb@google.com> <Y3LbZbGwoghK1cBJ@google.com>
From:   Chao Yu <chao@kernel.org>
In-Reply-To: <Y3LbZbGwoghK1cBJ@google.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 2022/11/15 8:20, Jaegeuk Kim wrote:
> On 11/14, Jaegeuk Kim wrote:
>> If compress_extension is set, and a newly created file matches the
>> extension, the file could be marked as compression file. However,
>> if inline_data is also enabled, there is no chance to check its
>> extension since f2fs_should_compress() always returns false.
>>
>> This patch moves set_compress_inode(), which do extension check, in
>> f2fs_should_compress() to check extensions before setting inline
>> data flag.
>>
>> Fixes: 7165841d578e ("f2fs: fix to check inline_data during compressed inode conversion")
>> Signed-off-by: Sheng Yong <shengyong@oppo.com>
>> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
>> ---
>>   fs/f2fs/namei.c | 326 ++++++++++++++++++++++++------------------------
>>   1 file changed, 160 insertions(+), 166 deletions(-)
>>
>> diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
>> index e104409c3a0e..43b721d8e491 100644
>> --- a/fs/f2fs/namei.c
>> +++ b/fs/f2fs/namei.c
>> @@ -22,8 +22,160 @@
>>   #include "acl.h"
>>   #include <trace/events/f2fs.h>
>>   
>> +static inline int is_extension_exist(const unsigned char *s, const char *sub,
>> +						bool tmp_ext)
>> +{
>> +	size_t slen = strlen(s);
>> +	size_t sublen = strlen(sub);
>> +	int i;
>> +
>> +	if (sublen == 1 && *sub == '*')
>> +		return 1;
>> +
>> +	/*
>> +	 * filename format of multimedia file should be defined as:
>> +	 * "filename + '.' + extension + (optional: '.' + temp extension)".
>> +	 */
>> +	if (slen < sublen + 2)
>> +		return 0;
>> +
>> +	if (!tmp_ext) {
>> +		/* file has no temp extension */
>> +		if (s[slen - sublen - 1] != '.')
>> +			return 0;
>> +		return !strncasecmp(s + slen - sublen, sub, sublen);
>> +	}
>> +
>> +	for (i = 1; i < slen - sublen; i++) {
>> +		if (s[i] != '.')
>> +			continue;
>> +		if (!strncasecmp(s + i + 1, sub, sublen))
>> +			return 1;
>> +	}
>> +
>> +	return 0;
>> +}
>> +
>> +int f2fs_update_extension_list(struct f2fs_sb_info *sbi, const char *name,
>> +							bool hot, bool set)
>> +{
>> +	__u8 (*extlist)[F2FS_EXTENSION_LEN] = sbi->raw_super->extension_list;
>> +	int cold_count = le32_to_cpu(sbi->raw_super->extension_count);
>> +	int hot_count = sbi->raw_super->hot_ext_count;
>> +	int total_count = cold_count + hot_count;
>> +	int start, count;
>> +	int i;
>> +
>> +	if (set) {
>> +		if (total_count == F2FS_MAX_EXTENSION)
>> +			return -EINVAL;
>> +	} else {
>> +		if (!hot && !cold_count)
>> +			return -EINVAL;
>> +		if (hot && !hot_count)
>> +			return -EINVAL;
>> +	}
>> +
>> +	if (hot) {
>> +		start = cold_count;
>> +		count = total_count;
>> +	} else {
>> +		start = 0;
>> +		count = cold_count;
>> +	}
>> +
>> +	for (i = start; i < count; i++) {
>> +		if (strcmp(name, extlist[i]))
>> +			continue;
>> +
>> +		if (set)
>> +			return -EINVAL;
>> +
>> +		memcpy(extlist[i], extlist[i + 1],
>> +				F2FS_EXTENSION_LEN * (total_count - i - 1));
>> +		memset(extlist[total_count - 1], 0, F2FS_EXTENSION_LEN);
>> +		if (hot)
>> +			sbi->raw_super->hot_ext_count = hot_count - 1;
>> +		else
>> +			sbi->raw_super->extension_count =
>> +						cpu_to_le32(cold_count - 1);
>> +		return 0;
>> +	}
>> +
>> +	if (!set)
>> +		return -EINVAL;
>> +
>> +	if (hot) {
>> +		memcpy(extlist[count], name, strlen(name));
>> +		sbi->raw_super->hot_ext_count = hot_count + 1;
>> +	} else {
>> +		char buf[F2FS_MAX_EXTENSION][F2FS_EXTENSION_LEN];
>> +
>> +		memcpy(buf, &extlist[cold_count],
>> +				F2FS_EXTENSION_LEN * hot_count);
>> +		memset(extlist[cold_count], 0, F2FS_EXTENSION_LEN);
>> +		memcpy(extlist[cold_count], name, strlen(name));
>> +		memcpy(&extlist[cold_count + 1], buf,
>> +				F2FS_EXTENSION_LEN * hot_count);
>> +		sbi->raw_super->extension_count = cpu_to_le32(cold_count + 1);
>> +	}
>> +	return 0;
>> +}
>> +
>> +static void set_compress_new_inode(struct f2fs_sb_info *sbi, struct inode *dir,
>> +				struct inode *inode, const unsigned char *name)
>> +{
>> +	__u8 (*extlist)[F2FS_EXTENSION_LEN] = sbi->raw_super->extension_list;
>> +	unsigned char (*noext)[F2FS_EXTENSION_LEN] =
>> +						F2FS_OPTION(sbi).noextensions;
>> +	unsigned char (*ext)[F2FS_EXTENSION_LEN] = F2FS_OPTION(sbi).extensions;
>> +	unsigned char ext_cnt = F2FS_OPTION(sbi).compress_ext_cnt;
>> +	unsigned char noext_cnt = F2FS_OPTION(sbi).nocompress_ext_cnt;
>> +	int i, cold_count, hot_count;
>> +
>> +	if (!f2fs_sb_has_compression(sbi) || !name)
>> +		return;
>> +	if (!S_ISREG(inode->i_mode) && !S_ISDIR(inode->i_mode))
>> +		return;
>> +
>> +	/* Inherit the compression flag in directory */
>> +	if ((F2FS_I(dir)->i_flags & F2FS_COMPR_FL)) {
>> +		set_compress_context(inode);
>> +		return;
>> +	}
>> +
>> +	/* Start to check extension list */
>> +	if (!ext_cnt)
>> +		return;
>> +
>> +	/* Don't compress hot files. */
>> +	f2fs_down_read(&sbi->sb_lock);
>> +	cold_count = le32_to_cpu(sbi->raw_super->extension_count);
>> +	hot_count = sbi->raw_super->hot_ext_count;
>> +	for (i = cold_count; i < cold_count + hot_count; i++)
>> +		if (is_extension_exist(name, extlist[i], false))
>> +			break;
>> +	f2fs_up_read(&sbi->sb_lock);
>> +	if (i < (cold_count + hot_count))
>> +		return;
>> +
>> +	/* Don't compress unallowed extension. */
>> +	for (i = 0; i < noext_cnt; i++)
>> +		if (is_extension_exist(name, noext[i], false))
>> +			return;
>> +
>> +	/* Compress wanting extension. */
>> +	for (i = 0; i < ext_cnt; i++) {
>> +		if (is_extension_exist(name, ext[i], false)) {
>> +			set_compress_context(inode);
>> +			return;
>> +		}
>> +	}
>> +}
>> +
>>   static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
>> -						struct inode *dir, umode_t mode)
>> +						struct inode *dir, umode_t mode,
>> +						const char *name)
>>   {
>>   	struct f2fs_sb_info *sbi = F2FS_I_SB(dir);
>>   	nid_t ino;
>> @@ -114,12 +266,8 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
>>   	if (F2FS_I(inode)->i_flags & F2FS_PROJINHERIT_FL)
>>   		set_inode_flag(inode, FI_PROJ_INHERIT);
>>   
>> -	if (f2fs_sb_has_compression(sbi)) {
>> -		/* Inherit the compression flag in directory */
>> -		if ((F2FS_I(dir)->i_flags & F2FS_COMPR_FL) &&
>> -					f2fs_may_compress(inode))
>> -			set_compress_context(inode);
>> -	}
>> +	/* Check compression first. */
>> +	set_compress_new_inode(sbi, dir, inode, name);
>>   
>>   	/* Should enable inline_data after compression set */
>>   	if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode))
>> @@ -153,40 +301,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,
>>   	return ERR_PTR(err);
>>   }
>>   
>> -static inline int is_extension_exist(const unsigned char *s, const char *sub,
>> -						bool tmp_ext)
>> -{
>> -	size_t slen = strlen(s);
>> -	size_t sublen = strlen(sub);
>> -	int i;
>> -
>> -	if (sublen == 1 && *sub == '*')
>> -		return 1;
>> -
>> -	/*
>> -	 * filename format of multimedia file should be defined as:
>> -	 * "filename + '.' + extension + (optional: '.' + temp extension)".
>> -	 */
>> -	if (slen < sublen + 2)
>> -		return 0;
>> -
>> -	if (!tmp_ext) {
>> -		/* file has no temp extension */
>> -		if (s[slen - sublen - 1] != '.')
>> -			return 0;
>> -		return !strncasecmp(s + slen - sublen, sub, sublen);
>> -	}
>> -
>> -	for (i = 1; i < slen - sublen; i++) {
>> -		if (s[i] != '.')
>> -			continue;
>> -		if (!strncasecmp(s + i + 1, sub, sublen))
>> -			return 1;
>> -	}
>> -
>> -	return 0;
>> -}
>> -
>>   /*
>>    * Set file's temperature for hot/cold data separation
>>    */
>> @@ -217,124 +331,6 @@ static inline void set_file_temperature(struct f2fs_sb_info *sbi, struct inode *
>>   		file_set_hot(inode);
>>   }
>>   
>> -int f2fs_update_extension_list(struct f2fs_sb_info *sbi, const char *name,
>> -							bool hot, bool set)
>> -{
>> -	__u8 (*extlist)[F2FS_EXTENSION_LEN] = sbi->raw_super->extension_list;
>> -	int cold_count = le32_to_cpu(sbi->raw_super->extension_count);
>> -	int hot_count = sbi->raw_super->hot_ext_count;
>> -	int total_count = cold_count + hot_count;
>> -	int start, count;
>> -	int i;
>> -
>> -	if (set) {
>> -		if (total_count == F2FS_MAX_EXTENSION)
>> -			return -EINVAL;
>> -	} else {
>> -		if (!hot && !cold_count)
>> -			return -EINVAL;
>> -		if (hot && !hot_count)
>> -			return -EINVAL;
>> -	}
>> -
>> -	if (hot) {
>> -		start = cold_count;
>> -		count = total_count;
>> -	} else {
>> -		start = 0;
>> -		count = cold_count;
>> -	}
>> -
>> -	for (i = start; i < count; i++) {
>> -		if (strcmp(name, extlist[i]))
>> -			continue;
>> -
>> -		if (set)
>> -			return -EINVAL;
>> -
>> -		memcpy(extlist[i], extlist[i + 1],
>> -				F2FS_EXTENSION_LEN * (total_count - i - 1));
>> -		memset(extlist[total_count - 1], 0, F2FS_EXTENSION_LEN);
>> -		if (hot)
>> -			sbi->raw_super->hot_ext_count = hot_count - 1;
>> -		else
>> -			sbi->raw_super->extension_count =
>> -						cpu_to_le32(cold_count - 1);
>> -		return 0;
>> -	}
>> -
>> -	if (!set)
>> -		return -EINVAL;
>> -
>> -	if (hot) {
>> -		memcpy(extlist[count], name, strlen(name));
>> -		sbi->raw_super->hot_ext_count = hot_count + 1;
>> -	} else {
>> -		char buf[F2FS_MAX_EXTENSION][F2FS_EXTENSION_LEN];
>> -
>> -		memcpy(buf, &extlist[cold_count],
>> -				F2FS_EXTENSION_LEN * hot_count);
>> -		memset(extlist[cold_count], 0, F2FS_EXTENSION_LEN);
>> -		memcpy(extlist[cold_count], name, strlen(name));
>> -		memcpy(&extlist[cold_count + 1], buf,
>> -				F2FS_EXTENSION_LEN * hot_count);
>> -		sbi->raw_super->extension_count = cpu_to_le32(cold_count + 1);
>> -	}
>> -	return 0;
>> -}
>> -
>> -static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,
>> -						const unsigned char *name)
>> -{
>> -	__u8 (*extlist)[F2FS_EXTENSION_LEN] = sbi->raw_super->extension_list;
>> -	unsigned char (*noext)[F2FS_EXTENSION_LEN] = F2FS_OPTION(sbi).noextensions;
>> -	unsigned char (*ext)[F2FS_EXTENSION_LEN] = F2FS_OPTION(sbi).extensions;
>> -	unsigned char ext_cnt = F2FS_OPTION(sbi).compress_ext_cnt;
>> -	unsigned char noext_cnt = F2FS_OPTION(sbi).nocompress_ext_cnt;
>> -	int i, cold_count, hot_count;
>> -
>> -	if (!f2fs_sb_has_compression(sbi) ||
>> -			F2FS_I(inode)->i_flags & F2FS_NOCOMP_FL ||
>> -			!f2fs_may_compress(inode) ||
>> -			(!ext_cnt && !noext_cnt))
>> -		return;
>> -
>> -	f2fs_down_read(&sbi->sb_lock);
>> -
>> -	cold_count = le32_to_cpu(sbi->raw_super->extension_count);
>> -	hot_count = sbi->raw_super->hot_ext_count;
>> -
>> -	for (i = cold_count; i < cold_count + hot_count; i++) {
>> -		if (is_extension_exist(name, extlist[i], false)) {
>> -			f2fs_up_read(&sbi->sb_lock);
>> -			return;
>> -		}
>> -	}
>> -
>> -	f2fs_up_read(&sbi->sb_lock);
>> -
>> -	for (i = 0; i < noext_cnt; i++) {
>> -		if (is_extension_exist(name, noext[i], false)) {
>> -			f2fs_disable_compressed_file(inode);
>> -			return;
>> -		}
>> -	}
>> -
>> -	if (is_inode_flag_set(inode, FI_COMPRESSED_FILE))
>> -		return;
>> -
>> -	for (i = 0; i < ext_cnt; i++) {
>> -		if (!is_extension_exist(name, ext[i], false))
>> -			continue;
>> -
>> -		/* Do not use inline_data with compression */
>> -		stat_dec_inline_inode(inode);
>> -		clear_inode_flag(inode, FI_INLINE_DATA);
>> -		set_compress_context(inode);
>> -		return;
>> -	}
>> -}
>> -
>>   static int f2fs_create(struct user_namespace *mnt_userns, struct inode *dir,
>>   		       struct dentry *dentry, umode_t mode, bool excl)
>>   {
>> @@ -352,15 +348,13 @@ static int f2fs_create(struct user_namespace *mnt_userns, struct inode *dir,
>>   	if (err)
>>   		return err;
>>   
>> -	inode = f2fs_new_inode(mnt_userns, dir, mode);
>> +	inode = f2fs_new_inode(mnt_userns, dir, mode, dentry->d_name.name);
>>   	if (IS_ERR(inode))
>>   		return PTR_ERR(inode);
>>   
>>   	if (!test_opt(sbi, DISABLE_EXT_IDENTIFY))
>>   		set_file_temperature(sbi, inode, dentry->d_name.name);
>>   
>> -	set_compress_inode(sbi, inode, dentry->d_name.name);
>> -
>>   	inode->i_op = &f2fs_file_inode_operations;
>>   	inode->i_fop = &f2fs_file_operations;
>>   	inode->i_mapping->a_ops = &f2fs_dblock_aops;
>> @@ -689,7 +683,7 @@ static int f2fs_symlink(struct user_namespace *mnt_userns, struct inode *dir,
>>   	if (err)
>>   		return err;
>>   
>> -	inode = f2fs_new_inode(mnt_userns, dir, S_IFLNK | S_IRWXUGO);
>> +	inode = f2fs_new_inode(mnt_userns, dir, S_IFLNK | S_IRWXUGO, NULL);
>>   	if (IS_ERR(inode))
>>   		return PTR_ERR(inode);
>>   
>> @@ -760,7 +754,7 @@ static int f2fs_mkdir(struct user_namespace *mnt_userns, struct inode *dir,
>>   	if (err)
>>   		return err;
>>   
>> -	inode = f2fs_new_inode(mnt_userns, dir, S_IFDIR | mode);
>> +	inode = f2fs_new_inode(mnt_userns, dir, S_IFDIR | mode, NULL);
> 
> -       inode = f2fs_new_inode(mnt_userns, dir, S_IFDIR | mode, NULL);
> +       inode = f2fs_new_inode(mnt_userns, dir, S_IFDIR | mode,
> +                                               dentry->d_name.name);
> 
> Should pass dentry.

It looks F2FS_COMPR_FL should be inherited for both directory and regular inode,
and the flag should be set/unset due to matched {,no}ext only for regular inode.

Thanks,

> 
>>   	if (IS_ERR(inode))
>>   		return PTR_ERR(inode);
>>   
>> @@ -817,7 +811,7 @@ static int f2fs_mknod(struct user_namespace *mnt_userns, struct inode *dir,
>>   	if (err)
>>   		return err;
>>   
>> -	inode = f2fs_new_inode(mnt_userns, dir, mode);
>> +	inode = f2fs_new_inode(mnt_userns, dir, mode, NULL);
>>   	if (IS_ERR(inode))
>>   		return PTR_ERR(inode);
>>   
>> @@ -856,7 +850,7 @@ static int __f2fs_tmpfile(struct user_namespace *mnt_userns, struct inode *dir,
>>   	if (err)
>>   		return err;
>>   
>> -	inode = f2fs_new_inode(mnt_userns, dir, mode);
>> +	inode = f2fs_new_inode(mnt_userns, dir, mode, NULL);
>>   	if (IS_ERR(inode))
>>   		return PTR_ERR(inode);
>>   
>> -- 
>> 2.38.1.493.g58b659f92b-goog
>>
>>
>>
>> _______________________________________________
>> Linux-f2fs-devel mailing list
>> Linux-f2fs-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
> 
> 
> _______________________________________________
> Linux-f2fs-devel mailing list
> Linux-f2fs-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel