summaryrefslogtreecommitdiff
path: root/mm/damon
diff options
context:
space:
mode:
authorSeongJae Park <sj@kernel.org>2024-08-25 21:23:23 -0700
committerAndrew Morton <akpm@linux-foundation.org>2024-09-09 16:39:00 -0700
commit2986846437e21dcfdd7531d50a0020e98087b586 (patch)
treea6cae9e86dd25390668332adaede343a75c40ded /mm/damon
parente3bcb1672583f2e1cf456e4303ce562a3cc775c0 (diff)
Revert "mm/damon/lru_sort: adjust local variable to dynamic allocation"
This reverts commit 0742cadf5e4c ("mm/damon/lru_sort: adjust local variable to dynamic allocation"). The commit was introduced to avoid unnecessary usage of stack memory for per-scheme region priorities histogram buffer. The fix is nice, but the point of the fix looks not very clear if the commit message is not read together. That's mainly because the buffer is a private field, which means it is hidden from the DAMON API users. That's not the fault of the fix but the underlying data structure. Now the per-scheme histogram buffer is gone, so the problem that the commit was fixing is also removed. The use of kmemdup() has no more point but just making the code bit difficult to understand. Revert the fix. Link: https://lkml.kernel.org/r/20240826042323.87025-5-sj@kernel.org Signed-off-by: SeongJae Park <sj@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'mm/damon')
-rw-r--r--mm/damon/lru_sort.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/mm/damon/lru_sort.c b/mm/damon/lru_sort.c
index 0b35bd5fb659..4af8fd4a390b 100644
--- a/mm/damon/lru_sort.c
+++ b/mm/damon/lru_sort.c
@@ -148,17 +148,12 @@ static struct damon_target *target;
static struct damos *damon_lru_sort_new_scheme(
struct damos_access_pattern *pattern, enum damos_action action)
{
- struct damos *damos;
- struct damos_quota *quota = kmemdup(&damon_lru_sort_quota,
- sizeof(damon_lru_sort_quota), GFP_KERNEL);
-
- if (!quota)
- return NULL;
+ struct damos_quota quota = damon_lru_sort_quota;
/* Use half of total quota for hot/cold pages sorting */
- quota->ms = quota->ms / 2;
+ quota.ms = quota.ms / 2;
- damos = damon_new_scheme(
+ return damon_new_scheme(
/* find the pattern, and */
pattern,
/* (de)prioritize on LRU-lists */
@@ -166,12 +161,10 @@ static struct damos *damon_lru_sort_new_scheme(
/* for each aggregation interval */
0,
/* under the quota. */
- quota,
+ &quota,
/* (De)activate this according to the watermarks. */
&damon_lru_sort_wmarks,
NUMA_NO_NODE);
- kfree(quota);
- return damos;
}
/* Create a DAMON-based operation scheme for hot memory regions */