From 97620ebba3b45619e97106403059269ad9d0337f Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Mon, 16 Sep 2024 23:14:11 -0400 Subject: [PATCH] Set mpol=interleave on dracut tmpfs. - Closes #1347 - Closes #1348 Signed-off-by: Jonathon Anderson --- CHANGELOG.md | 4 ++++ dracut/modules.d/90wwinit/load-wwinit.sh | 2 +- overlays/wwinit/rootfs/init | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34d62ae66..6b14d43aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,6 +43,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## v4.5.8, unreleased +### Changed + +- Interleave tmpfs across all available NUMA nodes. #1347, #1348 + ### Fixed - Return an error during `wwctl container import` if archive filename includes a colon. #1371 diff --git a/dracut/modules.d/90wwinit/load-wwinit.sh b/dracut/modules.d/90wwinit/load-wwinit.sh index 9a7933150..b115857cd 100755 --- a/dracut/modules.d/90wwinit/load-wwinit.sh +++ b/dracut/modules.d/90wwinit/load-wwinit.sh @@ -1,7 +1,7 @@ #!/bin/bash info "Mounting tmpfs at $NEWROOT" -mount -t tmpfs ${wwinit_tmpfs_size_option} tmpfs "$NEWROOT" +mount -t tmpfs -o mpol=interleave ${wwinit_tmpfs_size_option} tmpfs "$NEWROOT" for archive in "${wwinit_container}" "${wwinit_kmods}" "${wwinit_system}" "${wwinit_runtime}" do diff --git a/overlays/wwinit/rootfs/init b/overlays/wwinit/rootfs/init index af754f944..fadc0a914 100755 --- a/overlays/wwinit/rootfs/init +++ b/overlays/wwinit/rootfs/init @@ -39,7 +39,7 @@ elif test "$WWROOT" = "tmpfs"; then else echo "Setting up tmpfs root file system" mkdir /newroot - mount wwroot /newroot -t tmpfs + mount wwroot /newroot -t tmpfs -o mpol=interleave echo "Moving RAMFS to TMPFS" tar -cf - --exclude ./proc --exclude ./sys --exclude ./dev --exclude ./newroot . | tar -xf - -C /newroot mkdir /newroot/proc /newroot/dev /newroot/sys /newroot/run 2>/dev/null