From 01787de503983e6aeb8b8e56599fbfa8609fd96e Mon Sep 17 00:00:00 2001 From: Alexey Avramov Date: Sat, 15 Feb 2020 12:39:08 +0900 Subject: [PATCH] update config --- nohang/nohang-desktop.conf | 74 +++++++++++++++++++++++--------------- nohang/nohang.conf | 40 +++++++++++---------- 2 files changed, 67 insertions(+), 47 deletions(-) diff --git a/nohang/nohang-desktop.conf b/nohang/nohang-desktop.conf index 82539cc..992b00c 100644 --- a/nohang/nohang-desktop.conf +++ b/nohang/nohang-desktop.conf @@ -265,7 +265,7 @@ forbid_negative_badness = True Prefer terminating Firefox tabs instead of terminating the entire browser. (In Chromium and Electron-based apps child processes get oom_score_adj=300 by default.) -@BADNESS_ADJ_RE_NAME 300 /// ^Web Content$ +@BADNESS_ADJ_RE_NAME 200 /// ^Web Content$ 7.3.2. Matching CGroup_v1-line with RE patterns @@ -289,45 +289,57 @@ forbid_negative_badness = True @BADNESS_ADJ_RE_REALPATH 20 /// ^/usr/bin/foo$ Protect X. -@BADNESS_ADJ_RE_REALPATH -300 /// ^(/usr/libexec/Xorg|/usr/lib/xorg/Xorg|/usr/lib/Xorg|/usr/bin/X|/usr/bin/Xwayland|/usr/bin/weston|/usr/bin/sway)$ +@BADNESS_ADJ_RE_REALPATH -200 /// ^(/usr/libexec/Xorg|/usr/lib/xorg/Xorg|/usr/lib/Xorg|/usr/bin/X|/usr/bin/Xwayland|/usr/bin/weston|/usr/bin/sway)$ - Protect Gnome. -@BADNESS_ADJ_RE_REALPATH -300 /// ^(/usr/bin/gnome-shell|/usr/bin/metacity|/usr/bin/mutter)$ + Protect GNOME. +@BADNESS_ADJ_RE_REALPATH -200 /// ^(/usr/bin/gnome-shell|/usr/bin/metacity|/usr/bin/mutter|/usr/lib/gnome-session/gnome-session-binary|/usr/libexec/gnome-session-binary|/usr/libexec/gnome-session-ctl)$ - Protect Plasma. -@BADNESS_ADJ_RE_REALPATH -300 /// ^(/usr/bin/plasma-desktop|/usr/bin/plasmashell|/usr/bin/kwin|/usr/bin/kwin_x11|/usr/bin/kwin_wayland)$ + Protect KDE Plasma. +@BADNESS_ADJ_RE_REALPATH -200 /// ^(/usr/bin/plasma-desktop|/usr/bin/plasmashell|/usr/bin/plasma_session|/usr/bin/kwin|/usr/bin/kwin_x11|/usr/bin/kwin_wayland)$ +@BADNESS_ADJ_RE_REALPATH -200 /// ^(/usr/bin/startplasma-wayland|/usr/lib/x86_64-linux-gnu/libexec/startplasma-waylandsession|/usr/bin/ksmserver)$ Protect Cinnamon. -@BADNESS_ADJ_RE_REALPATH -300 /// ^(/usr/bin/cinnamon|/usr/bin/muffin|/usr/bin/cinnamon-session)$ +@BADNESS_ADJ_RE_REALPATH -200 /// ^(/usr/bin/cinnamon|/usr/bin/muffin|/usr/bin/cinnamon-session|/usr/bin/cinnamon-launcher)$ Protect Xfce. -@BADNESS_ADJ_RE_REALPATH -300 /// ^(/usr/bin/xfwm4|/usr/bin/xfce4-session|/usr/bin/xfce4-panel|/usr/bin/xfdesktop)$ +@BADNESS_ADJ_RE_REALPATH -200 /// ^(/usr/bin/xfwm4|/usr/bin/xfce4-session|/usr/bin/xfce4-panel|/usr/bin/xfdesktop)$ Protect Mate. -@BADNESS_ADJ_RE_REALPATH -300 /// ^(/usr/bin/marco|/usr/bin/mate-session|/usr/bin/caja|/usr/bin/mate-panel)$ +@BADNESS_ADJ_RE_REALPATH -200 /// ^(/usr/bin/marco|/usr/bin/mate-session|/usr/bin/caja|/usr/bin/mate-panel)$ Protect LXQt. -@BADNESS_ADJ_RE_REALPATH -300 /// ^(/usr/bin/lxqt-panel|/usr/bin/pcmanfm-qt|/usr/bin/lxqt-session)$ +@BADNESS_ADJ_RE_REALPATH -200 /// ^(/usr/bin/lxqt-panel|/usr/bin/pcmanfm-qt|/usr/bin/lxqt-session)$ + + Protect Budgie Desktop. +@BADNESS_ADJ_RE_REALPATH -200 /// ^(/usr/bin/budgie-wm|/usr/bin/budgie-panel)$ Protect other. -@BADNESS_ADJ_RE_REALPATH -300 /// ^(/usr/bin/compiz|/usr/bin/openbox|/usr/bin/fluxbox|/usr/bin/awesome|/usr/bin/icewm|/usr/bin/enlightenment)$ +@BADNESS_ADJ_RE_REALPATH -200 /// ^(/usr/bin/compiz|/usr/bin/openbox|/usr/bin/fluxbox|/usr/bin/awesome|/usr/bin/icewm|/usr/bin/enlightenment|/usr/bin/gala|/usr/bin/wingpanel)$ - Prefer stress. -@BADNESS_ADJ_RE_REALPATH 900 /// ^(/usr/bin/stress|/usr/bin/stress-ng)$ + Protect display managers. +@BADNESS_ADJ_RE_REALPATH -200 /// ^(/usr/sbin/gdm|/usr/sbin/gdm3|/usr/sbin/sddm|/usr/bin/sddm|/usr/lib/x86_64-linux-gnu/sddm/sddm-helper|/usr/bin/slim|/usr/sbin/lightdm|/usr/libexec/gdm-session-worker|/usr/libexec/gdm-wayland-session|/usr/lib/gdm3/gdm-wayland-session|/usr/lib/gdm3/gdm-session-worker)$ +@BADNESS_ADJ_RE_REALPATH -200 /// ^/usr/lib/gdm3/ + + Protect systemd-logind. +@BADNESS_ADJ_RE_REALPATH -200 /// ^(/lib/systemd/systemd-logind|/usr/lib/systemd/systemd-logind)$ Protect `systemd --user`. -@BADNESS_ADJ_RE_REALPATH -300 /// ^(/lib/systemd/systemd|/usr/lib/systemd/systemd)$ +@BADNESS_ADJ_RE_REALPATH -200 /// ^(/lib/systemd/systemd|/usr/lib/systemd/systemd)$ - Protect `dbus-daemon --session`. -@BADNESS_ADJ_RE_REALPATH -300 /// ^/usr/bin/dbus-daemon$ + Protect dbus. +@BADNESS_ADJ_RE_REALPATH -200 /// ^(/usr/bin/dbus-daemon|/usr/bin/dbus-run-session)$ - 7.3.5.1. Matching cwd with RE patterns + Prefer stress. + @BADNESS_ADJ_RE_REALPATH 900 /// ^(/usr/bin/stress|/usr/bin/stress-ng)$ + + + 7.3.6. Matching cwd with RE patterns @BADNESS_ADJ_RE_CWD 200 /// ^/home/ - 7.3.6. Matching cmdlines with RE patterns - - A good option that allows fine adjustment. + 7.3.7. Matching cmdlines with RE patterns + WARNING: using this option can greatly slow down the search for a victim + in conditions of heavily swapping. Prefer Chromium tabs and Electron-based apps @BADNESS_ADJ_RE_CMDLINE 200 /// --type=renderer @@ -337,7 +349,9 @@ forbid_negative_badness = True @BADNESS_ADJ_RE_CMDLINE -200 /// ^/usr/lib/virtualbox - 7.3.7. Matching environ with RE patterns + 7.3.8. Matching environ with RE patterns + WARNING: using this option can greatly slow down the search for a victim + in conditions of heavily swapping. @BADNESS_ADJ_RE_ENVIRON 100 /// USER=user @@ -355,7 +369,7 @@ forbid_negative_badness = True Syntax: KEY REGEXP SEPARATOR COMMAND - @SOFT_ACTION_RE_NAME ^foo$ /// kill -SEGV $PID + @SOFT_ACTION_RE_NAME ^foo$ /// kill -KILL $PID @SOFT_ACTION_RE_NAME ^bash$ /// kill -9 $PID @SOFT_ACTION_RE_CGROUP_V1 ^/system\.slice/ /// systemctl restart $SERVICE @@ -443,15 +457,17 @@ min_mem_report_interval = 60 print_proc_table = False Description: + WARNING: using "cmdline" or "environ" keys can greatly slow down + the search for a victim in conditions of heavily swapping. Type: string Valid values: - None - cgroup_v1 - cgroup_v2 - realpath - cwd - cmdline - environ + None + cgroup_v1 + cgroup_v2 + realpath + cwd + cmdline + environ extra_table_info = None diff --git a/nohang/nohang.conf b/nohang/nohang.conf index 8cd4361..986b6f0 100644 --- a/nohang/nohang.conf +++ b/nohang/nohang.conf @@ -248,7 +248,6 @@ ignore_positive_oom_score_adj = False forbid_negative_badness = True - 7.3.1. Matching process names with RE patterns change their badness Syntax: @@ -279,27 +278,30 @@ forbid_negative_badness = True @BADNESS_ADJ_RE_UID -100 /// ^0$ - 7.3.5. Matching realpath with RE patterns + 7.3.5. Matching /proc/[pid]/exe realpath with RE patterns - @BADNESS_ADJ_RE_REALPATH 20 /// ^/usr/bin/foo + Example: + @BADNESS_ADJ_RE_REALPATH 900 /// ^(/usr/bin/stress|/usr/bin/stress-ng)$ - 7.3.5.1. Matching cwd with RE patterns + 7.3.6. Matching cwd with RE patterns @BADNESS_ADJ_RE_CWD 200 /// ^/home/ - 7.3.6. Matching cmdlines with RE patterns + 7.3.7. Matching cmdlines with RE patterns + WARNING: using this option can greatly slow down the search for a victim + in conditions of heavily swapping. - A good option that allows fine adjustment. - - Prefer chromium tabs and electron-based apps + Prefer Chromium tabs and Electron-based apps @BADNESS_ADJ_RE_CMDLINE 200 /// --type=renderer - Prefer firefox tabs (Web Content and WebExtensions) + Prefer Firefox tabs (Web Content and WebExtensions) @BADNESS_ADJ_RE_CMDLINE 100 /// -appomni @BADNESS_ADJ_RE_CMDLINE -200 /// ^/usr/lib/virtualbox - 7.3.7. Matching environ with RE patterns + 7.3.8. Matching environ with RE patterns + WARNING: using this option can greatly slow down the search for a victim + in conditions of heavily swapping. @BADNESS_ADJ_RE_ENVIRON 100 /// USER=user @@ -317,7 +319,7 @@ forbid_negative_badness = True Syntax: KEY REGEXP SEPARATOR COMMAND - @SOFT_ACTION_RE_NAME ^foo$ /// kill -SEGV $PID + @SOFT_ACTION_RE_NAME ^foo$ /// kill -KILL $PID @SOFT_ACTION_RE_NAME ^bash$ /// kill -9 $PID @SOFT_ACTION_RE_CGROUP_V1 ^/system\.slice/ /// systemctl restart $SERVICE @@ -405,15 +407,17 @@ min_mem_report_interval = 60 print_proc_table = False Description: + WARNING: using "cmdline" or "environ" keys can greatly slow down + the search for a victim in conditions of heavily swapping. Type: string Valid values: - None - cgroup_v1 - cgroup_v2 - realpath - cwd - cmdline - environ + None + cgroup_v1 + cgroup_v2 + realpath + cwd + cmdline + environ extra_table_info = None