Re: [PATCH v2 09/47] f2fs: dynamically allocate the f2fs-shrinker

2023-07-26 Thread Muchun Song



> On Jul 24, 2023, at 17:43, Qi Zheng  wrote:
> 
> Use new APIs to dynamically allocate the f2fs-shrinker.
> 
> Signed-off-by: Qi Zheng 

Reviewed-by: Muchun Song 

Thanks.



[PATCH v2 09/47] f2fs: dynamically allocate the f2fs-shrinker

2023-07-24 Thread Qi Zheng
Use new APIs to dynamically allocate the f2fs-shrinker.

Signed-off-by: Qi Zheng 
---
 fs/f2fs/super.c | 32 
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index ca31163da00a..8b08473db358 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -83,11 +83,27 @@ void f2fs_build_fault_attr(struct f2fs_sb_info *sbi, 
unsigned int rate,
 #endif
 
 /* f2fs-wide shrinker description */
-static struct shrinker f2fs_shrinker_info = {
-   .scan_objects = f2fs_shrink_scan,
-   .count_objects = f2fs_shrink_count,
-   .seeks = DEFAULT_SEEKS,
-};
+static struct shrinker *f2fs_shrinker_info;
+
+static int f2fs_init_shrinker(void)
+{
+   f2fs_shrinker_info = shrinker_alloc(0, "f2fs-shrinker");
+   if (!f2fs_shrinker_info)
+   return -ENOMEM;
+
+   f2fs_shrinker_info->count_objects = f2fs_shrink_count;
+   f2fs_shrinker_info->scan_objects = f2fs_shrink_scan;
+   f2fs_shrinker_info->seeks = DEFAULT_SEEKS;
+
+   shrinker_register(f2fs_shrinker_info);
+
+   return 0;
+}
+
+static void f2fs_exit_shrinker(void)
+{
+   shrinker_unregister(f2fs_shrinker_info);
+}
 
 enum {
Opt_gc_background,
@@ -4941,7 +4957,7 @@ static int __init init_f2fs_fs(void)
err = f2fs_init_sysfs();
if (err)
goto free_garbage_collection_cache;
-   err = register_shrinker(_shrinker_info, "f2fs-shrinker");
+   err = f2fs_init_shrinker();
if (err)
goto free_sysfs;
err = register_filesystem(_fs_type);
@@ -4986,7 +5002,7 @@ static int __init init_f2fs_fs(void)
f2fs_destroy_root_stats();
unregister_filesystem(_fs_type);
 free_shrinker:
-   unregister_shrinker(_shrinker_info);
+   f2fs_exit_shrinker();
 free_sysfs:
f2fs_exit_sysfs();
 free_garbage_collection_cache:
@@ -5018,7 +5034,7 @@ static void __exit exit_f2fs_fs(void)
f2fs_destroy_post_read_processing();
f2fs_destroy_root_stats();
unregister_filesystem(_fs_type);
-   unregister_shrinker(_shrinker_info);
+   f2fs_exit_shrinker();
f2fs_exit_sysfs();
f2fs_destroy_garbage_collection_cache();
f2fs_destroy_extent_cache();
-- 
2.30.2