From 1836c92f38bd7edf129a3036136fff7cb870df90 Mon Sep 17 00:00:00 2001 From: Alex Denes Date: Sun, 19 Mar 2023 19:21:40 +0000 Subject: [PATCH] Few tweaks to services - KSM stop should split merged pages - Add NUMA-aware merging - Add smartd - Depend on mount.root for rootfs changes --- main/nnd-s6-services/APKBUILD | 2 +- .../env/sys.kernel-mm-ksm-merge_across_nodes/VAL | 1 + .../rc/smartd/dependencies.d/mdevd.coldplug | 0 main/nnd-s6-services/rc/smartd/run | 9 +++++++++ main/nnd-s6-services/rc/smartd/type | 1 + .../dependencies.d/mount.sys | 0 .../rc/sys.kernel-mm-ksm-merge_across_nodes/down | 5 +++++ .../rc/sys.kernel-mm-ksm-merge_across_nodes/type | 1 + .../rc/sys.kernel-mm-ksm-merge_across_nodes/up | 6 ++++++ .../dependencies.d/sys.kernel-mm-ksm-merge_across_nodes | 0 main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/down | 2 +- .../rc/user.sshd/dependencies.d/mount.root | 0 12 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 main/nnd-s6-services/env/sys.kernel-mm-ksm-merge_across_nodes/VAL create mode 100644 main/nnd-s6-services/rc/smartd/dependencies.d/mdevd.coldplug create mode 100755 main/nnd-s6-services/rc/smartd/run create mode 100644 main/nnd-s6-services/rc/smartd/type create mode 100644 main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/dependencies.d/mount.sys create mode 100644 main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/down create mode 100644 main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/type create mode 100644 main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/up create mode 100644 main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/dependencies.d/sys.kernel-mm-ksm-merge_across_nodes create mode 100644 main/nnd-s6-services/rc/user.sshd/dependencies.d/mount.root diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD index ba97b79..96a50d8 100644 --- a/main/nnd-s6-services/APKBUILD +++ b/main/nnd-s6-services/APKBUILD @@ -3,7 +3,7 @@ . ../../APKBUILD.template pkgname=nnd-s6-services -pkgver=2.10 +pkgver=2.13 pkgrel=0 pkgdesc="Base services for s6" depends="s6-rc s6-portable-utils s6-linux-utils" diff --git a/main/nnd-s6-services/env/sys.kernel-mm-ksm-merge_across_nodes/VAL b/main/nnd-s6-services/env/sys.kernel-mm-ksm-merge_across_nodes/VAL new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/main/nnd-s6-services/env/sys.kernel-mm-ksm-merge_across_nodes/VAL @@ -0,0 +1 @@ +1 diff --git a/main/nnd-s6-services/rc/smartd/dependencies.d/mdevd.coldplug b/main/nnd-s6-services/rc/smartd/dependencies.d/mdevd.coldplug new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/smartd/run b/main/nnd-s6-services/rc/smartd/run new file mode 100755 index 0000000..a1aab71 --- /dev/null +++ b/main/nnd-s6-services/rc/smartd/run @@ -0,0 +1,9 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/path +importas -i PATH PATH + +emptyenv + +export PATH $PATH + +exec smartd -n diff --git a/main/nnd-s6-services/rc/smartd/type b/main/nnd-s6-services/rc/smartd/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/smartd/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/dependencies.d/mount.sys b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/dependencies.d/mount.sys new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/down b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/down new file mode 100644 index 0000000..29df41a --- /dev/null +++ b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/down @@ -0,0 +1,5 @@ +#!/bin/execlineb -P +export SYSPATH kernel/mm/ksm/merge_across_nodes +export VAL 0 + +/usr/libexec/nnd/s6/sysfs diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/type b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/up b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/up new file mode 100644 index 0000000..ce340a1 --- /dev/null +++ b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/up @@ -0,0 +1,6 @@ +#!/bin/execlineb -P +export SYSPATH kernel/mm/ksm/merge_across_nodes + +s6-envdir -i /etc/s6/env/sys.kernel-mm-ksm-merge_across_nodes + +/usr/libexec/nnd/s6/sysfs diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/dependencies.d/sys.kernel-mm-ksm-merge_across_nodes b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/dependencies.d/sys.kernel-mm-ksm-merge_across_nodes new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/down b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/down index 9d97448..0979ee7 100644 --- a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/down +++ b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/down @@ -1,5 +1,5 @@ #!/bin/execlineb -P export SYSPATH kernel/mm/ksm/run -export VAL 0 +export VAL 2 /usr/libexec/nnd/s6/sysfs diff --git a/main/nnd-s6-services/rc/user.sshd/dependencies.d/mount.root b/main/nnd-s6-services/rc/user.sshd/dependencies.d/mount.root new file mode 100644 index 0000000..e69de29