hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/fs/f2fs/shrinker.c
....@@ -18,9 +18,7 @@
1818
1919 static unsigned long __count_nat_entries(struct f2fs_sb_info *sbi)
2020 {
21
- long count = NM_I(sbi)->nat_cnt - NM_I(sbi)->dirty_nat_cnt;
22
-
23
- return count > 0 ? count : 0;
21
+ return NM_I(sbi)->nat_cnt[RECLAIMABLE_NAT];
2422 }
2523
2624 static unsigned long __count_free_nids(struct f2fs_sb_info *sbi)
....@@ -30,10 +28,13 @@
3028 return count > 0 ? count : 0;
3129 }
3230
33
-static unsigned long __count_extent_cache(struct f2fs_sb_info *sbi)
31
+static unsigned long __count_extent_cache(struct f2fs_sb_info *sbi,
32
+ enum extent_type type)
3433 {
35
- return atomic_read(&sbi->total_zombie_tree) +
36
- atomic_read(&sbi->total_ext_node);
34
+ struct extent_tree_info *eti = &sbi->extent_tree[type];
35
+
36
+ return atomic_read(&eti->total_zombie_tree) +
37
+ atomic_read(&eti->total_ext_node);
3738 }
3839
3940 unsigned long f2fs_shrink_count(struct shrinker *shrink,
....@@ -55,8 +56,11 @@
5556 }
5657 spin_unlock(&f2fs_list_lock);
5758
58
- /* count extent cache entries */
59
- count += __count_extent_cache(sbi);
59
+ /* count read extent cache entries */
60
+ count += __count_extent_cache(sbi, EX_READ);
61
+
62
+ /* count block age extent cache entries */
63
+ count += __count_extent_cache(sbi, EX_BLOCK_AGE);
6064
6165 /* count clean nat cache entries */
6266 count += __count_nat_entries(sbi);
....@@ -102,7 +106,10 @@
102106 sbi->shrinker_run_no = run_no;
103107
104108 /* shrink extent cache entries */
105
- freed += f2fs_shrink_extent_tree(sbi, nr >> 1);
109
+ freed += f2fs_shrink_age_extent_tree(sbi, nr >> 2);
110
+
111
+ /* shrink read extent cache entries */
112
+ freed += f2fs_shrink_read_extent_tree(sbi, nr >> 2);
106113
107114 /* shrink clean nat cache entries */
108115 if (freed < nr)
....@@ -132,7 +139,9 @@
132139
133140 void f2fs_leave_shrinker(struct f2fs_sb_info *sbi)
134141 {
135
- f2fs_shrink_extent_tree(sbi, __count_extent_cache(sbi));
142
+ f2fs_shrink_read_extent_tree(sbi, __count_extent_cache(sbi, EX_READ));
143
+ f2fs_shrink_age_extent_tree(sbi,
144
+ __count_extent_cache(sbi, EX_BLOCK_AGE));
136145
137146 spin_lock(&f2fs_list_lock);
138147 list_del_init(&sbi->s_list);