Merge tag 'net-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[platform/kernel/linux-starfive.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 0331f14..57e1d8c 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -23,7 +23,7 @@ menuconfig SWAP
          in your computer.  If unsure say Y.
 
 config ZSWAP
-       bool "Compressed cache for swap pages (EXPERIMENTAL)"
+       bool "Compressed cache for swap pages"
        depends on SWAP
        select FRONTSWAP
        select CRYPTO
@@ -36,12 +36,6 @@ config ZSWAP
          in the case where decompressing from RAM is faster than swap device
          reads, can also improve workload performance.
 
-         This is marked experimental because it is a new feature (as of
-         v3.11) that interacts heavily with memory reclaim.  While these
-         interactions don't cause any known issues on simple memory setups,
-         they have not be fully explored on the large set of potential
-         configurations and workloads that exist.
-
 config ZSWAP_DEFAULT_ON
        bool "Enable the compressed cache for swap pages by default"
        depends on ZSWAP
@@ -579,6 +573,12 @@ config COMPACTION
          it and then we would be really interested to hear about that at
          linux-mm@kvack.org.
 
+config COMPACT_UNEVICTABLE_DEFAULT
+       int
+       depends on COMPACTION
+       default 0 if PREEMPT_RT
+       default 1
+
 #
 # support for free page reporting
 config PAGE_REPORTING
@@ -1124,6 +1124,32 @@ config PTE_MARKER_UFFD_WP
          purposes.  It is required to enable userfaultfd write protection on
          file-backed memory types like shmem and hugetlbfs.
 
+# multi-gen LRU {
+config LRU_GEN
+       bool "Multi-Gen LRU"
+       depends on MMU
+       # make sure folio->flags has enough spare bits
+       depends on 64BIT || !SPARSEMEM || SPARSEMEM_VMEMMAP
+       help
+         A high performance LRU implementation to overcommit memory. See
+         Documentation/admin-guide/mm/multigen_lru.rst for details.
+
+config LRU_GEN_ENABLED
+       bool "Enable by default"
+       depends on LRU_GEN
+       help
+         This option enables the multi-gen LRU by default.
+
+config LRU_GEN_STATS
+       bool "Full stats for debugging"
+       depends on LRU_GEN
+       help
+         Do not enable this option unless you plan to look at historical stats
+         from evicted generations for debugging purpose.
+
+         This option has a per-memcg and per-node memory overhead.
+# }
+
 source "mm/damon/Kconfig"
 
 endmenu