Skip to contentSkip to conversation

mm/damon: rename damon_pageout_score() to damon_cold_score()

PATCH Superseded [email protected] 2 participants 3 messages Sep 17, 2022

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

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
index 9310df72e1c5..75409601f934 100644
@@ -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
index 52329ff361cd..8d82d3722204 100644
@@ -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
index dfeebffe82f4..e495146e49e9 100644
@@ -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
index f53c2ff2bcc8..ea94e0b2c311 100644
@@ -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
maintainer Reviewed-by on v1 1/1
#1 lore raw
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 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.

Good idea.

Quoted 40 lines
---
 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
index 9310df72e1c5..75409601f934 100644
@@ -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
index 52329ff361cd..8d82d3722204 100644
@@ -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
index dfeebffe82f4..e495146e49e9 100644

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 -0
 	default:
 		break;
 	}
mm/damon/vaddr.c +1 -1
index f53c2ff2bcc8..ea94e0b2c311 100644
@@ -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
author
#2 lore raw
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 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.

Good idea.

Quoted 46 lines
---
 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
index 9310df72e1c5..75409601f934 100644
@@ -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
index 52329ff361cd..8d82d3722204 100644
@@ -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
index dfeebffe82f4..e495146e49e9 100644
@@ -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 -2
      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.

Ok, I'll follow that in the next version.

Thanks,
Kaixu

Quoted 28 lines

Other than that,

Thanks,
SJ

Quoted 20 lines
mm/damon/paddr.c +0 -0
      default:
              break;
      }
mm/damon/vaddr.c +1 -2
index f53c2ff2bcc8..ea94e0b2c311 100644
@@ -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