mm/damon: rename damon_pageout_score() to damon_cold_score()
Subsystems (2)
PATCH 1/1 mm/damon: rename damon_pageout_score() to damon_cold_score()
From: Kaixu Xia <[email protected]>
In the beginning there is only one damos_action 'DAMOS_PAGEOUT' that need to get the coldness score of a region for a scheme, which using damon_pageout_score() to do that. But now there are also other damos_action actions need the coldness score, so rename it to damon_cold_score() to make more sense.
--- mm/damon/ops-common.c | 2 +- mm/damon/ops-common.h | 2 +- mm/damon/paddr.c | 5 ++--- mm/damon/vaddr.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-)
mm/damon/ops-common.c +1 -1
@@ -130,7 +130,7 @@ int damon_hot_score(struct damon_ctx *c, struct damon_region *r,return hotness; } -int damon_pageout_score (struct damon_ctx *c,struct damon_region *r, +int damon_cold_score (struct damon_ctx *c,struct damon_region *r,struct damos *s) {int hotness =damon_hot_score (c, r, s);
mm/damon/ops-common.h +1 -1
@@ -12,7 +12,7 @@ struct page *damon_get_page(unsigned long pfn);void damon_ptep_mkold (pte_t *pte,struct mm_struct *mm,unsigned long addr);void damon_pmdp_mkold (pmd_t *pmd,struct mm_struct *mm,unsigned long addr); -int damon_pageout_score (struct damon_ctx *c,struct damon_region *r, +int damon_cold_score (struct damon_ctx *c,struct damon_region *r,struct damos *s);int damon_hot_score (struct damon_ctx *c,struct damon_region *r,struct damos *s);
mm/damon/paddr.c +2 -3
@@ -287,11 +287,10 @@ static int damon_pa_scheme_score(struct damon_ctx *context, {switch (scheme->action) {case DAMOS_PAGEOUT : -return damon_pageout_score (context, r, scheme); +case DAMOS_LRU_DEPRIO : +return damon_cold_score (context, r, scheme);case DAMOS_LRU_PRIO :return damon_hot_score (context, r, scheme); -case DAMOS_LRU_DEPRIO : -return damon_pageout_score (context, r, scheme);default :break ; }
mm/damon/vaddr.c +1 -1
@@ -673,7 +673,7 @@ static int damon_va_scheme_score(struct damon_ctx *context,switch (scheme->action) {case DAMOS_PAGEOUT : -return damon_pageout_score (context, r, scheme); +return damon_cold_score (context, r, scheme);default :break ; }
Signature · 1 line
2.27.0
Quoted 7 lines · On Sat, 17 Sep 2022 17:39:18 +0800 [email protected] wrote:
From: Kaixu Xia <[email protected]>
In the beginning there is only one
damos_action'DAMOS_PAGEOUT' that need to get the coldness score of a region for a scheme, which usingdamon_pageout_score()to do that. But now there are also otherdamos_actionactions need the coldness score, so rename it todamon_cold_score()to make more sense.
Good idea.
Quoted 40 lines
Signed-off-by Kaixu Xia <[email protected]>--- mm/damon/ops-common.c | 2 +- mm/damon/ops-common.h | 2 +- mm/damon/paddr.c | 5 ++--- mm/damon/vaddr.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-)mm/damon/ops-common.c +1
-1@@ -130,7 +130,7 @@ int damon_hot_score(struct damon_ctx *c, struct damon_region *r,return hotness; } -int damon_pageout_score (struct damon_ctx *c,struct damon_region *r, +int damon_cold_score (struct damon_ctx *c,struct damon_region *r,struct damos *s) {int hotness =damon_hot_score (c, r, s);mm/damon/ops-common.h +1
-1@@ -12,7 +12,7 @@ struct page *damon_get_page(unsigned long pfn);void damon_ptep_mkold (pte_t *pte,struct mm_struct *mm,unsigned long addr);void damon_pmdp_mkold (pmd_t *pmd,struct mm_struct *mm,unsigned long addr); -int damon_pageout_score (struct damon_ctx *c,struct damon_region *r, +int damon_cold_score (struct damon_ctx *c,struct damon_region *r,struct damos *s);int damon_hot_score (struct damon_ctx *c,struct damon_region *r,struct damos *s);mm/damon/paddr.c +0
-0
mm/damon/paddr.c static int damon_pa_scheme_score(struct damon_ctx *context, · line 294
Quoted 10 lines
mm/damon/paddr.c +2
-3@@ -287,11 +287,10 @@ static int damon_pa_scheme_score(struct damon_ctx *context, {switch (scheme->action) {case DAMOS_PAGEOUT : -return damon_pageout_score (context, r, scheme); +case DAMOS_LRU_DEPRIO : +return damon_cold_score (context, r, scheme);case DAMOS_LRU_PRIO :return damon_hot_score (context, r, scheme); -case DAMOS_LRU_DEPRIO : -return damon_pageout_score (context, r, scheme);
I'm not a big fan of switch-case fall-through, and want to keep the order of cases here more similar to that in damos_action definition. Let's change only the function name.
Other than that,
Thanks,
SJ
Quoted 20 lines
mm/damon/paddr.c +0
-0default :break ; }mm/damon/vaddr.c +1
-1@@ -673,7 +673,7 @@ static int damon_va_scheme_score(struct damon_ctx *context,switch (scheme->action) {case DAMOS_PAGEOUT : -return damon_pageout_score (context, r, scheme); +return damon_cold_score (context, r, scheme);default :break ; }Signature · 1 line
2.27.0
Quoted 59 lines · SeongJae Park
Quoted 7 lines · On Sat, 17 Sep 2022 17:39:18 +0800 [email protected] wrote:
From: Kaixu Xia <[email protected]>
In the beginning there is only one
damos_action'DAMOS_PAGEOUT' that need to get the coldness score of a region for a scheme, which usingdamon_pageout_score()to do that. But now there are also otherdamos_actionactions need the coldness score, so rename it todamon_cold_score()to make more sense.Good idea.
Quoted 46 lines
Signed-off-by Kaixu Xia <[email protected]>--- mm/damon/ops-common.c | 2 +- mm/damon/ops-common.h | 2 +- mm/damon/paddr.c | 5 ++--- mm/damon/vaddr.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-)mm/damon/ops-common.c +1
-1@@ -130,7 +130,7 @@ int damon_hot_score(struct damon_ctx *c, struct damon_region *r,return hotness; } -int damon_pageout_score (struct damon_ctx *c,struct damon_region *r, +int damon_cold_score (struct damon_ctx *c,struct damon_region *r,struct damos *s) {int hotness =damon_hot_score (c, r, s);mm/damon/ops-common.h +1
-1@@ -12,7 +12,7 @@ struct page *damon_get_page(unsigned long pfn);void damon_ptep_mkold (pte_t *pte,struct mm_struct *mm,unsigned long addr);void damon_pmdp_mkold (pmd_t *pmd,struct mm_struct *mm,unsigned long addr); -int damon_pageout_score (struct damon_ctx *c,struct damon_region *r, +int damon_cold_score (struct damon_ctx *c,struct damon_region *r,struct damos *s);int damon_hot_score (struct damon_ctx *c,struct damon_region *r,struct damos *s);mm/damon/paddr.c +2
-1@@ -287,11 +287,10 @@ static int damon_pa_scheme_score(struct damon_ctx *context, {switch (scheme->action) {case DAMOS_PAGEOUT : -return damon_pageout_score (context, r, scheme); +case DAMOS_LRU_DEPRIO : +return damon_cold_score (context, r, scheme);
Quoted 9 lines
mm/damon/paddr.c static int damon_pa_scheme_score(struct damon_ctx *context, · line 294
Quoted 4 lines
mm/damon/paddr.c +0
-2case DAMOS_LRU_PRIO :return damon_hot_score (context, r, scheme); -case DAMOS_LRU_DEPRIO : -return damon_pageout_score (context, r, scheme);I'm not a big fan of switch-case fall-through, and want to keep the order of cases here more similar to that in
damos_actiondefinition. Let's change only the function name.
Ok, I'll follow that in the next version.
Thanks,
Kaixu
Quoted 28 lines
Other than that,
Reviewed-by SeongJae Park <[email protected]>Thanks,
SJQuoted 20 lines
mm/damon/paddr.c +0
-0default :break ; }mm/damon/vaddr.c +1
-2@@ -673,7 +673,7 @@ static int damon_va_scheme_score(struct damon_ctx *context,switch (scheme->action) {case DAMOS_PAGEOUT : -return damon_pageout_score (context, r, scheme); +return damon_cold_score (context, r, scheme);default :break ; } --2.27.0