[V2] mm/damon: simplify scheme create in damon_lru_sort_apply_parameters

Commit Message

haoxin Sept. 11, 2022, 12:59 a.m. UTC

In damon_lru_sort_apply_parameters(), we can use damon_set_schemes() to
replace the way of creating the first 'scheme' in original code, this
makes the code look cleaner.

Signed-off-by: Xin Hao <[e-mail]>
---
Changes from v1
(https://lore.kernel.org/linux-mm/[e-mail]/T/)
- Fix complile warning about unused 'next_schemes' variable
---
 mm/damon/lru_sort.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

--
2.31.0

Comments

SeongJae Park Sept. 11, 2022, 11:57 a.m. UTC | #1

Hi Xin,

On Sun, 11 Sep 2022 08:59:17 +0800 Xin Hao <[e-mail]> wrote:

> In damon_lru_sort_apply_parameters(), we can use damon_set_schemes() to
> replace the way of creating the first 'scheme' in original code, this
> makes the code look cleaner.
> 
> Signed-off-by: Xin Hao <[e-mail]>

Reviewed-by: SeongJae Park <[e-mail]>


Thanks,
SJ

[...]

Patch

diff --git a/mm/damon/lru_sort.c b/mm/damon/lru_sort.c
index b8ec52739e0f..1eb824ab8a98 100644
--- a/mm/damon/lru_sort.c
+++ b/mm/damon/lru_sort.c
@@ -340,7 +340,7 @@  static struct damos *damon_lru_sort_new_cold_scheme(unsigned int cold_thres)

 static int damon_lru_sort_apply_parameters(void)
 {
-	struct damos *scheme, *next_scheme;
+	struct damos *scheme;
 	struct damon_addr_range addr_range;
 	unsigned int hot_thres, cold_thres;
 	int err = 0;
@@ -350,17 +350,15 @@  static int damon_lru_sort_apply_parameters(void)
 	if (err)
 		return err;

-	/* free previously set schemes */
-	damon_for_each_scheme_safe(scheme, next_scheme, ctx)
-		damon_destroy_scheme(scheme);
-
 	/* aggr_interval / sample_interval is the maximum nr_accesses */
 	hot_thres = aggr_interval / sample_interval * hot_thres_access_freq /
 		1000;
 	scheme = damon_lru_sort_new_hot_scheme(hot_thres);
 	if (!scheme)
 		return -ENOMEM;
-	damon_add_scheme(ctx, scheme);
+	err = damon_set_schemes(ctx, &scheme, 1);
+	if (err)
+		return err;

 	cold_thres = cold_min_age / aggr_interval;
 	scheme = damon_lru_sort_new_cold_scheme(cold_thres);