* [PATCH] f2fs: introduce cf_name_slab cache
@ 2021-06-07 23:27 ` Chao Yu
0 siblings, 0 replies; 6+ messages in thread
From: Chao Yu @ 2021-06-07 23:27 UTC (permalink / raw)
To: jaegeuk; +Cc: linux-f2fs-devel, linux-kernel, Chao Yu
From: Chao Yu <yuchao0@huawei.com>
Add a slab cache: "f2fs_casefold_name_entry" for memory allocation
of casefold name.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
---
fs/f2fs/dir.c | 16 ++++++++++------
fs/f2fs/recovery.c | 6 +++++-
fs/f2fs/super.c | 24 ++++++++++++++++++++++++
3 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 96dcc4aca639..ee400562157d 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -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
}
diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index 4cfe36fa41be..3c198ab4f1db 100644
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -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 {
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 9089303f7f8c..194ccff9d59e 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -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();
--
2.22.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [f2fs-dev] [PATCH] f2fs: introduce cf_name_slab cache
@ 2021-06-07 23:27 ` Chao Yu
0 siblings, 0 replies; 6+ messages in thread
From: Chao Yu @ 2021-06-07 23:27 UTC (permalink / raw)
To: jaegeuk; +Cc: linux-kernel, linux-f2fs-devel
From: Chao Yu <yuchao0@huawei.com>
Add a slab cache: "f2fs_casefold_name_entry" for memory allocation
of casefold name.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
---
fs/f2fs/dir.c | 16 ++++++++++------
fs/f2fs/recovery.c | 6 +++++-
fs/f2fs/super.c | 24 ++++++++++++++++++++++++
3 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 96dcc4aca639..ee400562157d 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -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
}
diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index 4cfe36fa41be..3c198ab4f1db 100644
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -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 {
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 9089303f7f8c..194ccff9d59e 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -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();
--
2.22.1
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [f2fs-dev] [PATCH] f2fs: introduce cf_name_slab cache
2021-06-07 23:27 ` [f2fs-dev] " Chao Yu
@ 2021-06-07 23:47 ` Eric Biggers
-1 siblings, 0 replies; 6+ messages in thread
From: Eric Biggers @ 2021-06-07 23:47 UTC (permalink / raw)
To: Chao Yu; +Cc: jaegeuk, linux-kernel, linux-f2fs-devel
On Tue, Jun 08, 2021 at 07:27:15AM +0800, Chao Yu wrote:
> From: Chao Yu <yuchao0@huawei.com>
>
> Add a slab cache: "f2fs_casefold_name_entry" for memory allocation
> of casefold name.
>
> Signed-off-by: Chao Yu <yuchao0@huawei.com>
> ---
> 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.
>
> diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
> index 96dcc4aca639..ee400562157d 100644
> --- a/fs/f2fs/dir.c
> +++ b/fs/f2fs/dir.c
> @@ -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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [f2fs-dev] [PATCH] f2fs: introduce cf_name_slab cache
@ 2021-06-07 23:47 ` Eric Biggers
0 siblings, 0 replies; 6+ messages in thread
From: Eric Biggers @ 2021-06-07 23:47 UTC (permalink / raw)
To: Chao Yu; +Cc: jaegeuk, linux-kernel, linux-f2fs-devel
On Tue, Jun 08, 2021 at 07:27:15AM +0800, Chao Yu wrote:
> From: Chao Yu <yuchao0@huawei.com>
>
> Add a slab cache: "f2fs_casefold_name_entry" for memory allocation
> of casefold name.
>
> Signed-off-by: Chao Yu <yuchao0@huawei.com>
> ---
> 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.
>
> diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
> index 96dcc4aca639..ee400562157d 100644
> --- a/fs/f2fs/dir.c
> +++ b/fs/f2fs/dir.c
> @@ -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
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [f2fs-dev] [PATCH] f2fs: introduce cf_name_slab cache
2021-06-07 23:47 ` Eric Biggers
@ 2021-06-08 0:01 ` Chao Yu
-1 siblings, 0 replies; 6+ messages in thread
From: Chao Yu @ 2021-06-08 0:01 UTC (permalink / raw)
To: Eric Biggers; +Cc: jaegeuk, linux-kernel, linux-f2fs-devel
On 2021/6/8 7:47, Eric Biggers wrote:
> On Tue, Jun 08, 2021 at 07:27:15AM +0800, Chao Yu wrote:
>> From: Chao Yu <yuchao0@huawei.com>
>>
>> Add a slab cache: "f2fs_casefold_name_entry" for memory allocation
>> of casefold name.
>>
>> Signed-off-by: Chao Yu <yuchao0@huawei.com>
>> ---
>> 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.
Better, done.
>
>>
>> diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
>> index 96dcc4aca639..ee400562157d 100644
>> --- a/fs/f2fs/dir.c
>> +++ b/fs/f2fs/dir.c
>> @@ -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.
Correct, fixed in v2.
Thanks for the suggestion.
Thanks,
>
> - Eric
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [f2fs-dev] [PATCH] f2fs: introduce cf_name_slab cache
@ 2021-06-08 0:01 ` Chao Yu
0 siblings, 0 replies; 6+ messages in thread
From: Chao Yu @ 2021-06-08 0:01 UTC (permalink / raw)
To: Eric Biggers; +Cc: jaegeuk, linux-kernel, linux-f2fs-devel
On 2021/6/8 7:47, Eric Biggers wrote:
> On Tue, Jun 08, 2021 at 07:27:15AM +0800, Chao Yu wrote:
>> From: Chao Yu <yuchao0@huawei.com>
>>
>> Add a slab cache: "f2fs_casefold_name_entry" for memory allocation
>> of casefold name.
>>
>> Signed-off-by: Chao Yu <yuchao0@huawei.com>
>> ---
>> 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.
Better, done.
>
>>
>> diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
>> index 96dcc4aca639..ee400562157d 100644
>> --- a/fs/f2fs/dir.c
>> +++ b/fs/f2fs/dir.c
>> @@ -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.
Correct, fixed in v2.
Thanks for the suggestion.
Thanks,
>
> - Eric
>
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-06-08 0:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-07 23:27 [PATCH] f2fs: introduce cf_name_slab cache Chao Yu
2021-06-07 23:27 ` [f2fs-dev] " Chao Yu
2021-06-07 23:47 ` Eric Biggers
2021-06-07 23:47 ` Eric Biggers
2021-06-08 0:01 ` Chao Yu
2021-06-08 0:01 ` Chao Yu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.