From f8a84cd2a387a1aaa663a214c317565c900d3f9a Mon Sep 17 00:00:00 2001 From: txexcalibur Date: Thu, 18 Jul 2024 11:05:47 +0530 Subject: [PATCH] Reapply "arm64: configs: miatoll: Enable multigenerational lru" This reverts commit df734ba7bf4fc55d9d3f91b020de18dacf34bf6b. Signed-off-by: txexcalibur --- arch/arm64/configs/vendor/miatoll-perf_defconfig | 2 ++ mm/Kconfig | 1 + mm/vmscan.c | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/vendor/miatoll-perf_defconfig b/arch/arm64/configs/vendor/miatoll-perf_defconfig index 2aaf0d2306f0..943839b973bd 100644 --- a/arch/arm64/configs/vendor/miatoll-perf_defconfig +++ b/arch/arm64/configs/vendor/miatoll-perf_defconfig @@ -77,6 +77,8 @@ CONFIG_CMA=y CONFIG_ZSMALLOC=y CONFIG_FIX_INACTIVE_RATIO=y # CONFIG_SWAP_ENABLE_READAHEAD is not set +CONFIG_LRU_GEN=y +CONFIG_LRU_GEN_ENABLED=y CONFIG_SECCOMP=y # CONFIG_HARDEN_BRANCH_PREDICTOR is not set CONFIG_ARMV8_DEPRECATED=y diff --git a/mm/Kconfig b/mm/Kconfig index 54995fec153d..3e8d186b2554 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -876,6 +876,7 @@ config NR_LRU_GENS int "Max number of generations" depends on LRU_GEN range 4 31 + default 4 if ANDROID default 7 help This will use order_base_2(N+1) spare bits from page flags. diff --git a/mm/vmscan.c b/mm/vmscan.c index 247f31ba60c3..9b2e587f8374 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -4183,7 +4183,7 @@ static unsigned long lru_gen_shrink_lruvec(struct lruvec *lruvec, struct scan_co * the background aging ******************************************************************************/ -static int lru_gen_spread = MIN_NR_GENS; +static int lru_gen_spread = IS_ENABLED(CONFIG_ANDROID) ? 0 : MIN_NR_GENS; static void try_walk_mm_list(struct lruvec *lruvec, struct scan_control *sc) {