Revert "lakitu_defconfig: enable MGLRU by default"
This reverts commit e43a36516bd554e696e19f2c4596f53b2a6afe4f.
MGLRU was enabled because of performance improvements, but it has an
interaction with Kubernetes that results in pod evictions. Pod evictions
are denial of service and fixing those is higher priority than the
performance improvements.
BUG=b/370543699
TEST=presubmit
RELEASE_NOTE=Disabled MGLRU by default due to integration issues with
Kubernetes.
cos-patch: bug
Change-Id: I34c7a057192bdf7ac3d80f27377096feb7567454
Signed-off-by: Robert Kolchmeyer <rkolchmeyer@google.com>
Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/82940
Reviewed-by: Oleksandr Tymoshenko <ovt@google.com>
Main-Branch-Verified: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/arch/arm64/configs/lakitu_defconfig b/arch/arm64/configs/lakitu_defconfig
index a80b854..1bf5d13 100644
--- a/arch/arm64/configs/lakitu_defconfig
+++ b/arch/arm64/configs/lakitu_defconfig
@@ -1033,7 +1033,7 @@
CONFIG_USERFAULTFD=y
CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y
CONFIG_LRU_GEN=y
-CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_ENABLED is not set
# CONFIG_LRU_GEN_STATS is not set
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
diff --git a/arch/x86/configs/lakitu_defconfig b/arch/x86/configs/lakitu_defconfig
index 1156320..9762704 100644
--- a/arch/x86/configs/lakitu_defconfig
+++ b/arch/x86/configs/lakitu_defconfig
@@ -1097,7 +1097,7 @@
CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y
CONFIG_PTE_MARKER_UFFD_WP=y
CONFIG_LRU_GEN=y
-CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_ENABLED is not set
# CONFIG_LRU_GEN_STATS is not set
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
