mirror of
https://abf.rosa.ru/djam/kernel-5.15.git
synced 2025-02-24 02:52:55 +00:00
Test another le9 patch, I did not see affect of the previous one
This commit is contained in:
Mikhail Novosyolov
parent
bcdf18427e
commit
b62e019833
2 changed files with 198 additions and 2 deletions
|
|
@ -24,7 +24,7 @@
|
||||||
%define sublevel 2
|
%define sublevel 2
|
||||||
|
|
||||||
# Release number. Increase this before a rebuild.
|
# Release number. Increase this before a rebuild.
|
||||||
%define rpmrel 2
|
%define rpmrel 3
|
||||||
%define fullrpmrel %{rpmrel}
|
%define fullrpmrel %{rpmrel}
|
||||||
|
|
||||||
%define rpmtag %{disttag}
|
%define rpmtag %{disttag}
|
||||||
|
|
@ -310,7 +310,9 @@ Patch305: 0001-crypto-support-loading-GOST-signed-kernel-modules.patch
|
||||||
# Allow to off modules signature check dynamically
|
# Allow to off modules signature check dynamically
|
||||||
Patch306: 0001-ROSA-ima-allow-to-off-modules-signature-check-dynami.patch
|
Patch306: 0001-ROSA-ima-allow-to-off-modules-signature-check-dynami.patch
|
||||||
# (WIP, experimantal) https://www.linux.org.ru/news/kernel/16052362
|
# (WIP, experimantal) https://www.linux.org.ru/news/kernel/16052362
|
||||||
Patch307: rosa-le9.diff
|
#Patch307: rosa-le9.diff
|
||||||
|
# https://www.linux.org.ru/news/kernel/16052362?cid=16073153
|
||||||
|
Patch307: le9pf.diff
|
||||||
|
|
||||||
# Disable AutoReq
|
# Disable AutoReq
|
||||||
AutoReq: 0
|
AutoReq: 0
|
||||||
|
|
|
||||||
194
le9pf.diff
Normal file
194
le9pf.diff
Normal file
|
|
@ -0,0 +1,194 @@
|
||||||
|
diff --git a/Documentation/admin-guide/sysctl/vm.rst b/Documentation/admin-guide/sysctl/vm.rst
|
||||||
|
index f455fa00c00f..a6146e0fc88a 100644
|
||||||
|
--- a/Documentation/admin-guide/sysctl/vm.rst
|
||||||
|
+++ b/Documentation/admin-guide/sysctl/vm.rst
|
||||||
|
@@ -69,6 +69,8 @@ Currently, these files are in /proc/sys/vm:
|
||||||
|
- stat_refresh
|
||||||
|
- numa_stat
|
||||||
|
- swappiness
|
||||||
|
+- unevictable_activefile_kbytes_low
|
||||||
|
+- unevictable_activefile_kbytes_min
|
||||||
|
- unprivileged_userfaultfd
|
||||||
|
- user_reserve_kbytes
|
||||||
|
- vfs_cache_pressure
|
||||||
|
@@ -881,6 +883,31 @@ privileged users (with SYS_CAP_PTRACE capability).
|
||||||
|
The default value is 1.
|
||||||
|
|
||||||
|
|
||||||
|
+unevictable_activefile_kbytes_low
|
||||||
|
+=================================
|
||||||
|
+
|
||||||
|
+Keep some active file pages still mapped under memory pressure to avoid
|
||||||
|
+potential disk thrashing that may occur due to evicting running executables
|
||||||
|
+code. This implements soft eviction throttling, and some file pages can still
|
||||||
|
+be discarded.
|
||||||
|
+
|
||||||
|
+Setting it to 0 effectively disables this feature.
|
||||||
|
+
|
||||||
|
+The default value is 512 MiB.
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+unevictable_activefile_kbytes_min
|
||||||
|
+=================================
|
||||||
|
+
|
||||||
|
+Keep all active file pages still mapped under memory pressure to avoid
|
||||||
|
+potential disk thrashing that may occur due to evicting running executables
|
||||||
|
+code. This is the hard limit.
|
||||||
|
+
|
||||||
|
+Setting it to 0 effectively disables this feature.
|
||||||
|
+
|
||||||
|
+The default value is 256 MiB.
|
||||||
|
+
|
||||||
|
+
|
||||||
|
user_reserve_kbytes
|
||||||
|
===================
|
||||||
|
|
||||||
|
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
|
||||||
|
index afad085960b8..8bb82cf5d74e 100644
|
||||||
|
--- a/kernel/sysctl.c
|
||||||
|
+++ b/kernel/sysctl.c
|
||||||
|
@@ -111,6 +111,22 @@
|
||||||
|
static int sixty = 60;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if defined(CONFIG_UNEVICTABLE_ACTIVEFILE)
|
||||||
|
+#if CONFIG_UNEVICTABLE_ACTIVEFILE_KBYTES_LOW < 0
|
||||||
|
+#error "CONFIG_UNEVICTABLE_ACTIVEFILE_KBYTES_LOW should be >= 0"
|
||||||
|
+#endif
|
||||||
|
+#if CONFIG_UNEVICTABLE_ACTIVEFILE_KBYTES_MIN < 0
|
||||||
|
+#error "CONFIG_UNEVICTABLE_ACTIVEFILE_KBYTES_MIN should be >= 0"
|
||||||
|
+#endif
|
||||||
|
+#if CONFIG_UNEVICTABLE_ACTIVEFILE_KBYTES_LOW < CONFIG_UNEVICTABLE_ACTIVEFILE_KBYTES_MIN
|
||||||
|
+#error "CONFIG_UNEVICTABLE_ACTIVEFILE_KBYTES_LOW should be >= CONFIG_UNEVICTABLE_ACTIVEFILE_KBYTES_MIN"
|
||||||
|
+#endif
|
||||||
|
+unsigned long sysctl_unevictable_activefile_kbytes_low __read_mostly =
|
||||||
|
+ CONFIG_UNEVICTABLE_ACTIVEFILE_KBYTES_LOW;
|
||||||
|
+unsigned long sysctl_unevictable_activefile_kbytes_min __read_mostly =
|
||||||
|
+ CONFIG_UNEVICTABLE_ACTIVEFILE_KBYTES_MIN;
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
static int __maybe_unused neg_one = -1;
|
||||||
|
static int __maybe_unused two = 2;
|
||||||
|
static int __maybe_unused four = 4;
|
||||||
|
@@ -3081,6 +3097,25 @@ static struct ctl_table vm_table[] = {
|
||||||
|
.extra1 = SYSCTL_ZERO,
|
||||||
|
.extra2 = SYSCTL_ONE,
|
||||||
|
},
|
||||||
|
+#endif
|
||||||
|
+#if defined(CONFIG_UNEVICTABLE_ACTIVEFILE)
|
||||||
|
+ {
|
||||||
|
+ .procname = "unevictable_activefile_kbytes_low",
|
||||||
|
+ .data = &sysctl_unevictable_activefile_kbytes_low,
|
||||||
|
+ .maxlen = sizeof(sysctl_unevictable_activefile_kbytes_low),
|
||||||
|
+ .mode = 0644,
|
||||||
|
+ .proc_handler = proc_doulongvec_minmax,
|
||||||
|
+ .extra1 = &sysctl_unevictable_activefile_kbytes_min,
|
||||||
|
+ },
|
||||||
|
+ {
|
||||||
|
+ .procname = "unevictable_activefile_kbytes_min",
|
||||||
|
+ .data = &sysctl_unevictable_activefile_kbytes_min,
|
||||||
|
+ .maxlen = sizeof(sysctl_unevictable_activefile_kbytes_min),
|
||||||
|
+ .mode = 0644,
|
||||||
|
+ .proc_handler = proc_doulongvec_minmax,
|
||||||
|
+ .extra1 = &zero_ul,
|
||||||
|
+ .extra2 = &sysctl_unevictable_activefile_kbytes_low,
|
||||||
|
+ },
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
.procname = "user_reserve_kbytes",
|
||||||
|
diff --git a/mm/Kconfig b/mm/Kconfig
|
||||||
|
index 390165ffbb0f..1e1fb8ad434a 100644
|
||||||
|
--- a/mm/Kconfig
|
||||||
|
+++ b/mm/Kconfig
|
||||||
|
@@ -63,6 +63,41 @@ config SPARSEMEM_MANUAL
|
||||||
|
|
||||||
|
endchoice
|
||||||
|
|
||||||
|
+config UNEVICTABLE_ACTIVEFILE
|
||||||
|
+ bool "Keep some active file pages under memory pressure"
|
||||||
|
+ depends on SYSCTL
|
||||||
|
+ def_bool y
|
||||||
|
+ help
|
||||||
|
+ Keep some active file pages still mapped under memory pressure to avoid
|
||||||
|
+ potential disk thrashing that may occur due to evicting running executables
|
||||||
|
+ code.
|
||||||
|
+
|
||||||
|
+ The UNEVICTABLE_ACTIVEFILE_KBYTES_LOW value defines a threshold to activate
|
||||||
|
+ file pages eviction throttling. The vm.unevictable_activefile_kbytes_low
|
||||||
|
+ sysctl knob is used to change the amount in the runtime (setting it to 0
|
||||||
|
+ effectively disables this feature).
|
||||||
|
+
|
||||||
|
+ Recommended value: 524288 for typical desktop workload.
|
||||||
|
+
|
||||||
|
+ The UNEVICTABLE_ACTIVEFILE_KBYTES_MIN value sets the amount of pages to keep
|
||||||
|
+ as a hard limit. The vm.unevictable_activefile_kbytes_min sysctl knob is used
|
||||||
|
+ to change the amount in the runtime (setting it to 0 effectively disables
|
||||||
|
+ this feature).
|
||||||
|
+
|
||||||
|
+ Recommended value: 262144 for typical desktop workload.
|
||||||
|
+
|
||||||
|
+ See also: Documentation/admin-guide/sysctl/vm.rst
|
||||||
|
+
|
||||||
|
+config UNEVICTABLE_ACTIVEFILE_KBYTES_LOW
|
||||||
|
+ int "Default value for vm.unevictable_activefile_kbytes_low"
|
||||||
|
+ depends on UNEVICTABLE_ACTIVEFILE
|
||||||
|
+ default "524288"
|
||||||
|
+
|
||||||
|
+config UNEVICTABLE_ACTIVEFILE_KBYTES_MIN
|
||||||
|
+ int "Default value for vm.unevictable_activefile_kbytes_min"
|
||||||
|
+ depends on UNEVICTABLE_ACTIVEFILE
|
||||||
|
+ default "262144"
|
||||||
|
+
|
||||||
|
config DISCONTIGMEM
|
||||||
|
def_bool y
|
||||||
|
depends on (!SELECT_MEMORY_MODEL && ARCH_DISCONTIGMEM_ENABLE) || DISCONTIGMEM_MANUAL
|
||||||
|
diff --git a/mm/vmscan.c b/mm/vmscan.c
|
||||||
|
index 7b4e31eac2cf..c017f44960f6 100644
|
||||||
|
--- a/mm/vmscan.c
|
||||||
|
+++ b/mm/vmscan.c
|
||||||
|
@@ -166,6 +166,11 @@ struct scan_control {
|
||||||
|
#define prefetchw_prev_lru_page(_page, _base, _field) do { } while (0)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if defined(CONFIG_UNEVICTABLE_ACTIVEFILE)
|
||||||
|
+extern unsigned long sysctl_unevictable_activefile_kbytes_low;
|
||||||
|
+extern unsigned long sysctl_unevictable_activefile_kbytes_min;
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* From 0 .. 200. Higher means more swappy.
|
||||||
|
*/
|
||||||
|
@@ -2225,6 +2230,10 @@ enum scan_balance {
|
||||||
|
SCAN_FILE,
|
||||||
|
};
|
||||||
|
|
||||||
|
+#if defined(CONFIG_UNEVICTABLE_ACTIVEFILE)
|
||||||
|
+#define K(x) ((x) << (PAGE_SHIFT - 10))
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* Determine how aggressively the anon and file LRU lists should be
|
||||||
|
* scanned. The relative value of each set of LRU lists is determined
|
||||||
|
@@ -2418,6 +2427,22 @@ static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc,
|
||||||
|
BUG();
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if defined(CONFIG_UNEVICTABLE_ACTIVEFILE)
|
||||||
|
+ if (lru == LRU_ACTIVE_FILE) {
|
||||||
|
+ unsigned long kib_active_file_now = K(global_node_page_state(NR_ACTIVE_FILE));
|
||||||
|
+ if (kib_active_file_now < sysctl_unevictable_activefile_kbytes_low &&
|
||||||
|
+ kib_active_file_now > sysctl_unevictable_activefile_kbytes_min) {
|
||||||
|
+ nr[lru] = scan *
|
||||||
|
+ (kib_active_file_now -
|
||||||
|
+ sysctl_unevictable_activefile_kbytes_min) /
|
||||||
|
+ (sysctl_unevictable_activefile_kbytes_low -
|
||||||
|
+ sysctl_unevictable_activefile_kbytes_min);
|
||||||
|
+ } else if (kib_active_file_now <= sysctl_unevictable_activefile_kbytes_min) {
|
||||||
|
+ nr[lru] = 0;
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
nr[lru] = scan;
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Add table
Reference in a new issue