f2fs: introduce cf_name_slab cache
Chao Yu
maintainerPATCH 1/1 f2fs: introduce cf_name_slab cache
From: Chao Yu <[email protected]>
Add a slab cache: "f2fs_casefold_name_entry" for memory allocation of casefold name.
--- fs/f2fs/dir.c | 16 ++++++++++------ fs/f2fs/recovery.c | 6 +++++- fs/f2fs/super.c | 24 ++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 7 deletions(-)
fs/f2fs/dir.c +10 -6
@@ -16,6 +16,10 @@#include "xattr.h" #include <trace/events/f2fs.h> +#ifdef CONFIG_UNICODE +extern struct kmem_cache *cf_name_slab; +#endif +static unsigned long dir_blocks (struct inode *inode) {return ((unsigned long long ) (i_size_read (inode) +PAGE_SIZE -1 ))
@@ -77,11 +81,9 @@ int f2fs_init_casefolded_name(const struct inode *dir, {#ifdef CONFIG_UNICODE struct super_block *sb = dir->i_sb; -struct f2fs_sb_info *sbi =F2FS_SB (sb);if (IS_CASEFOLDED (dir)) { - fname->cf_name.name =f2fs_kmalloc (sbi,F2FS_NAME_LEN , -GFP_NOFS ); + fname->cf_name.name =kmem_cache_alloc (cf_name_slab,GFP_NOFS );if (!fname->cf_name.name)return -ENOMEM ; fname->cf_name.len = utf8_casefold(sb->s_encoding,
@@ -89,7 +91,7 @@ int f2fs_init_casefolded_name(const struct inode *dir, fname->cf_name.name, F2FS_NAME_LEN);if ((int )fname->cf_name.len <=0 ) { -kfree (fname->cf_name.name); +kmem_cache_free (cf_name_slab, fname->cf_name.name); fname->cf_name.name =NULL ;if (sb_has_strict_encoding (sb))return -EINVAL ;
@@ -172,8 +174,10 @@ void f2fs_free_filename(struct f2fs_filename *fname) fname->crypto_buf.name =NULL ;#endif #ifdef CONFIG_UNICODE -kfree (fname->cf_name.name); - fname->cf_name.name =NULL ; +if (fname->cf_name.name) { +kmem_cache_free (cf_name_slab, fname->cf_name.name); + fname->cf_name.name =NULL ; + }#endif }
fs/f2fs/recovery.c +5 -1
@@ -45,6 +45,10 @@static struct kmem_cache *fsync_entry_slab; +#ifdef CONFIG_UNICODE +extern struct kmem_cache *cf_name_slab; +#endif +bool f2fs_space_for_roll_forward (struct f2fs_sb_info *sbi) {s64 nalloc =percpu_counter_sum_positive (&sbi->alloc_valid_block_count);
@@ -145,7 +149,7 @@ static int init_recovered_filename(const struct inode *dir,f2fs_hash_filename (dir, fname);#ifdef CONFIG_UNICODE /* Case-sensitive match is fine for recovery */ -kfree (fname->cf_name.name); +kmem_cache_free (cf_name_slab, fname->cf_name.name); fname->cf_name.name =NULL ;#endif }else {
fs/f2fs/super.c +24 -0
@@ -277,6 +277,24 @@ static int f2fs_sb_read_encoding(const struct f2fs_super_block *sb, return 0; } + +struct kmem_cache *cf_name_slab; +static int __init f2fs_create_casefold_cache (void ) +{ + cf_name_slab =f2fs_kmem_cache_create ("f2fs_casefold_name_entry" , +F2FS_NAME_LEN ); +if (!cf_name_slab) +return -ENOMEM ; +return 0 ; +} + +static void f2fs_destroy_casefold_cache (void ) +{ +kmem_cache_destroy (cf_name_slab); +} +#else +static int __init f2fs_create_casefold_cache (void ) {return 0 ; } +static void f2fs_destroy_casefold_cache (void ) { }#endif static inline void limit_reserve_root (struct f2fs_sb_info *sbi)
@@ -4316,7 +4334,12 @@ static int __init init_f2fs_fs(void) err =f2fs_init_compress_cache ();if (err) goto free_compress_mempool; + err =f2fs_create_casefold_cache (); +if (err) + goto free_compress_cache;return 0 ; +free_compress_cache: +f2fs_destroy_compress_cache (); free_compress_mempool:f2fs_destroy_compress_mempool (); free_bioset:
@@ -4352,6 +4375,7 @@ static int __init init_f2fs_fs(void) static void __exit exit_f2fs_fs(void) { +f2fs_destroy_casefold_cache ();f2fs_destroy_compress_cache ();f2fs_destroy_compress_mempool ();f2fs_destroy_bioset ();
Signature · 1 line
2.22.1
Quoted 11 lines · Chao Yu
From: Chao Yu <[email protected]>
Add a slab cache: "
f2fs_casefold_name_entry" for memory allocation of casefold name.Signed-off-by Chao Yu <[email protected]>--- fs/f2fs/dir.c | 16 ++++++++++------ fs/f2fs/recovery.c | 6 +++++- fs/f2fs/super.c | 24 ++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 7 deletions(-)
Looks good, but "f2fs_casefolded_name" would be a better name for this cache.
"f2fs_casefold_name_entry" makes it sounds like it contains some bookkeeping information and not the actual casefolded filenames.
fs/f2fs/dir.c line 21
Quoted 12 lines
fs/f2fs/dir.c +3
-0@@ -16,6 +16,10 @@#include "xattr.h" #include <trace/events/f2fs.h> +#ifdef CONFIG_UNICODE +extern struct kmem_cache *cf_name_slab; +#endif
Also this variable needs to be prefixed with "f2fs_". Otherwise this will cause a build error if/when ext4 adds the same thing.
- Eric
Chao Yu
maintainerQuoted 13 lines · Eric Biggers
Quoted 11 lines · Chao Yu
From: Chao Yu <[email protected]>
Add a slab cache: "
f2fs_casefold_name_entry" for memory allocation of casefold name.Signed-off-by Chao Yu <[email protected]>--- fs/f2fs/dir.c | 16 ++++++++++------ fs/f2fs/recovery.c | 6 +++++- fs/f2fs/super.c | 24 ++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 7 deletions(-)
Quoted 4 lines
Looks good, but "
f2fs_casefolded_name" would be a better name for this cache."
f2fs_casefold_name_entry" makes it sounds like it contains some bookkeeping information and not the actual casefolded filenames.
Better, done.
Quoted 10 lines
Quoted 10 lines
fs/f2fs/dir.c +0
-0@@ -16,6 +16,10 @@#include "xattr.h" #include <trace/events/f2fs.h>
Quoted 6 lines
fs/f2fs/dir.c line 21
Quoted 3 lines
fs/f2fs/dir.c +3
-0+#ifdef CONFIG_UNICODE +extern struct kmem_cache *cf_name_slab; +#endif Also this variable needs to be prefixed with "
f2fs_". Otherwise this will cause a build error if/when ext4 adds the same thing.
Correct, fixed in v2.
Thanks for the suggestion.
Thanks,
Quoted 3 lines
- Eric