mm-damon-lru_sort-adjust-local-variable-to-dynamic-allocation.patch removed from -mm tree
The quilt patch titled
Subject: mm/damon/lru_sort: adjust local variable to dynamic allocation
has been removed from the -mm tree. Its filename was
mm-damon-lru_sort-adjust-local-variable-to-dynamic-allocation.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Peng Hao <[email protected]>
Subject: mm/damon/lru_sort: adjust local variable to dynamic allocation
Date: Tue, 23 Jul 2024 11:55:13 +0800
When KASAN is enabled and built with clang:
mm/damon/lru_sort.c:199:12: error: stack frame size (2328) exceeds
limit (2048) in 'damon_lru_sort_apply_parameters' [-Werror,-Wframe-larger-than]
static int damon_lru_sort_apply_parameters(void)
^
1 error generated.
This is because damon_lru_sort_quota contains a large array, and assigning this variable to a local variable causes a large amount of stack space to be occupied.
So adjust local variable to dynamic allocation.
---
mm/damon/lru_sort.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
mm/damon/lru_sort.c renamed from mm/damon/lru_sort.c~mm-damon-lru_sort-adjust-local-variable-to-dynamic-allocation +11 -4
@@ -148,12 +148,17 @@ static struct damon_target *target;static struct damos *damon_lru_sort_new_scheme (struct damos_access_pattern *pattern,enum damos_action action) { -struct damos_quota quota = damon_lru_sort_quota; +struct damos *damos; +struct damos_quota *quota =kmemdup (&damon_lru_sort_quota, +sizeof (damon_lru_sort_quota),GFP_KERNEL ); + +if (!quota) +return NULL ;/* Use half of total quota for hot/cold pages sorting */ - quota.ms = quota.ms /2 ; + quota->ms = quota->ms /2 ; - return damon_new_scheme( + damos = damon_new_scheme( /* find the pattern, and */ pattern,/* (de)prioritize on LRU-lists */
@@ -161,10 +166,12 @@ static struct damos *damon_lru_sort_new_/* for each aggregation interval */ 0 ,/* under the quota. */ - "a, + 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 */
_
Patches currently in -mm which might be from [email protected] are