diff --git a/include/linux/damon.h b/include/linux/damon.h index 805e089ff4f2..4f7e305b261c 100644 --- a/include/linux/damon.h +++ b/include/linux/damon.h @@ -68,10 +68,10 @@ struct damon_region { unsigned int nr_accesses; unsigned char probe_hits[DAMON_MAX_PROBES]; struct list_head list; - unsigned int age; /* private: Internal value for age calculation. */ unsigned int last_nr_accesses; + unsigned char last_probe_hits[DAMON_MAX_PROBES]; }; /** diff --git a/mm/damon/core.c b/mm/damon/core.c index b2fc15a3804f..d45dc87fbbd9 100644 --- a/mm/damon/core.c +++ b/mm/damon/core.c @@ -302,8 +302,10 @@ struct damon_region *damon_new_region(unsigned long start, unsigned long end) region->ar.start = start; region->ar.end = end; region->nr_accesses = 0; - for (i = 0; i < DAMON_MAX_PROBES; i++) + for (i = 0; i < DAMON_MAX_PROBES; i++) { region->probe_hits[i] = 0; + region->last_probe_hits[i] = 0; + } INIT_LIST_HEAD(®ion->list); region->age = 0; @@ -2047,8 +2049,10 @@ static void kdamond_reset_aggregated(struct damon_ctx *c) damon_nr_regions(t), nr_probes); r->last_nr_accesses = r->nr_accesses; r->nr_accesses = 0; - for (i = 0; i < DAMON_MAX_PROBES; i++) + for (i = 0; i < DAMON_MAX_PROBES; i++) { + r->last_probe_hits[i] = r->probe_hits[i]; r->probe_hits[i] = 0; + } } ti++; } @@ -3239,6 +3243,8 @@ static void damon_split_region_at(struct damon_target *t, new->nr_accesses = r->nr_accesses; /* todo: do this for only installed probes */ memcpy(new->probe_hits, r->probe_hits, sizeof(r->probe_hits)); + memcpy(new->last_probe_hits, r->last_probe_hits, + sizeof(r->last_probe_hits)); damon_insert_region(new, r, damon_next_region(r), t); }