Merge pull request #12884 from mrc0mmand/numapolicy-test
test: introduce TEST-36-NUMAPOLICY
This commit is contained in:
Frantisek Sumsal
@@ -18,8 +18,8 @@ const ExitStatusMapping exit_status_mappings[256] = {
|
||||
* 8…63 │ (Currently unmapped)
|
||||
* 64…78 │ BSD defined exit codes
|
||||
* 79…199 │ (Currently unmapped)
|
||||
* 200…241 │ systemd's private error codes (might be extended to 254 in future development)
|
||||
* 242…254 │ (Currently unmapped, but see above)
|
||||
* 200…242 │ systemd's private error codes (might be extended to 254 in future development)
|
||||
* 243…254 │ (Currently unmapped, but see above)
|
||||
*
|
||||
* 255 │ EXIT_EXCEPTION (We use this to propagate exit-by-signal events. It's frequently used by others apps (like bash)
|
||||
* │ to indicate exit reason that cannot really be expressed in a single exit status value — such as a propagated
|
||||
@@ -99,7 +99,7 @@ const ExitStatusMapping exit_status_mappings[256] = {
|
||||
const char* exit_status_to_string(int code, ExitStatusClass class) {
|
||||
if (code < 0 || (size_t) code >= ELEMENTSOF(exit_status_mappings))
|
||||
return NULL;
|
||||
return FLAGS_SET(exit_status_mappings[code].class, class) ? exit_status_mappings[code].name : NULL;
|
||||
return class & exit_status_mappings[code].class ? exit_status_mappings[code].name : NULL;
|
||||
}
|
||||
|
||||
const char* exit_status_class(int code) {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
/* SPDX-License-Identifier: LGPL-2.1+ */
|
||||
|
||||
#include "exit-status.h"
|
||||
#include "string-util.h"
|
||||
#include "tests.h"
|
||||
|
||||
static void test_exit_status_to_string(void) {
|
||||
@@ -31,11 +32,21 @@ static void test_exit_status_from_string(void) {
|
||||
assert_se(exit_status_from_string("FAILURE") == 1);
|
||||
}
|
||||
|
||||
static void test_exit_status_NUMA_POLICY(void) {
|
||||
log_info("/* %s */", __func__);
|
||||
|
||||
assert_se(streq(exit_status_to_string(EXIT_NUMA_POLICY, EXIT_STATUS_FULL), "NUMA_POLICY"));
|
||||
assert_se(streq(exit_status_to_string(EXIT_NUMA_POLICY, EXIT_STATUS_SYSTEMD), "NUMA_POLICY"));
|
||||
assert_se(!exit_status_to_string(EXIT_NUMA_POLICY, EXIT_STATUS_BSD));
|
||||
assert_se(!exit_status_to_string(EXIT_NUMA_POLICY, EXIT_STATUS_LSB));
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
test_setup_logging(LOG_DEBUG);
|
||||
|
||||
test_exit_status_to_string();
|
||||
test_exit_status_from_string();
|
||||
test_exit_status_NUMA_POLICY();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Symlink
+1
@@ -0,0 +1 @@
|
||||
../TEST-01-BASIC/Makefile
|
||||
Executable
+51
@@ -0,0 +1,51 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
TEST_DESCRIPTION="test MUMAPolicy= and NUMAMask= options"
|
||||
TEST_NO_NSPAWN=1
|
||||
QEMU_OPTIONS="-numa node,nodeid=0"
|
||||
|
||||
. $TEST_BASE_DIR/test-functions
|
||||
|
||||
test_setup() {
|
||||
create_empty_image
|
||||
mkdir -p $TESTDIR/root
|
||||
mount ${LOOPDEV}p1 $TESTDIR/root
|
||||
|
||||
(
|
||||
LOG_LEVEL=5
|
||||
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
|
||||
|
||||
setup_basic_environment
|
||||
dracut_install mktemp
|
||||
|
||||
# mask some services that we do not want to run in these tests
|
||||
ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
||||
ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
||||
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
||||
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
||||
ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
||||
ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service
|
||||
|
||||
# setup the testsuite service
|
||||
cat >$initdir/etc/systemd/system/testsuite.service <<EOF
|
||||
[Unit]
|
||||
Description=Testsuite service
|
||||
|
||||
[Service]
|
||||
ExecStart=/bin/bash -x /testsuite.sh
|
||||
Type=oneshot
|
||||
StandardOutput=tty
|
||||
StandardError=tty
|
||||
NotifyAccess=all
|
||||
EOF
|
||||
cp testsuite.sh $initdir/
|
||||
|
||||
setup_testsuite
|
||||
) || return 1
|
||||
setup_nspawn_root
|
||||
|
||||
ddebug "umount $TESTDIR/root"
|
||||
umount $TESTDIR/root
|
||||
}
|
||||
|
||||
do_test "$@"
|
||||
Executable
+323
@@ -0,0 +1,323 @@
|
||||
#!/bin/bash
|
||||
set -ex
|
||||
set -o pipefail
|
||||
|
||||
at_exit() {
|
||||
if [ $? -ne 0 ]; then
|
||||
# We're exiting with a non-zero EC, let's dump test artifacts
|
||||
# for easier debugging
|
||||
[ -f "$straceLog" ] && cat "$straceLog"
|
||||
[ -f "$journalLog" ] && cat "$journalLog"
|
||||
fi
|
||||
}
|
||||
|
||||
trap at_exit EXIT
|
||||
|
||||
systemd-analyze log-level debug
|
||||
systemd-analyze log-target journal
|
||||
|
||||
# Log files
|
||||
straceLog='strace.log'
|
||||
journalLog='journal.log'
|
||||
|
||||
# Systemd config files
|
||||
testUnit='numa-test.service'
|
||||
testUnitFile="/etc/systemd/system/$testUnit"
|
||||
testUnitNUMAConf="$testUnitFile.d/numa.conf"
|
||||
|
||||
# Sleep constants (we should probably figure out something better but nothing comes to mind)
|
||||
journalSleep=5
|
||||
sleepAfterStart=1
|
||||
|
||||
# Journal cursor for easier navigation
|
||||
journalCursorFile="jounalCursorFile"
|
||||
|
||||
startStrace() {
|
||||
coproc strace -qq -p 1 -o $straceLog -e set_mempolicy -s 1024 $1
|
||||
# Wait for strace to properly "initialize"
|
||||
sleep $sleepAfterStart
|
||||
}
|
||||
|
||||
stopStrace() {
|
||||
kill -s TERM $COPROC_PID
|
||||
# Make sure the strace process is indeed dead
|
||||
while kill -0 $COPROC_PID 2>/dev/null; do sleep 0.1; done
|
||||
}
|
||||
|
||||
startJournalctl() {
|
||||
# Save journal's cursor for later navigation
|
||||
journalctl --no-pager --cursor-file="$journalCursorFile" -n0 -ocat
|
||||
}
|
||||
|
||||
stopJournalctl() {
|
||||
local unit="${1:-init.scope}"
|
||||
# Using journalctl --sync should be better than using SIGRTMIN+1, as
|
||||
# the --sync wait until the synchronization is complete
|
||||
echo "Force journald to write all queued messages"
|
||||
journalctl --sync
|
||||
journalctl -u $unit --cursor-file="$journalCursorFile" > "$journalLog"
|
||||
}
|
||||
|
||||
checkNUMA() {
|
||||
# NUMA enabled system should have at least NUMA node0
|
||||
test -e /sys/devices/system/node/node0
|
||||
}
|
||||
|
||||
writePID1NUMAPolicy() {
|
||||
echo [Manager] > $confDir/numa.conf
|
||||
echo NUMAPolicy=$1 >> $confDir/numa.conf
|
||||
echo NUMAMask=$2>> $confDir/numa.conf
|
||||
}
|
||||
|
||||
writeTestUnit() {
|
||||
echo [Service] > $testUnitFile
|
||||
echo ExecStart=/bin/sleep 3600 >> $testUnitFile
|
||||
mkdir -p $testUnitFile.d/
|
||||
}
|
||||
|
||||
writeTestUnitNUMAPolicy() {
|
||||
echo [Service] > $testUnitNUMAConf
|
||||
echo NUMAPolicy=$1 >> $testUnitNUMAConf
|
||||
echo NUMAMask=$2>> $testUnitNUMAConf
|
||||
systemctl daemon-reload
|
||||
}
|
||||
|
||||
pid1ReloadWithStrace() {
|
||||
startStrace
|
||||
systemctl daemon-reload
|
||||
sleep $sleepAfterStart
|
||||
stopStrace
|
||||
}
|
||||
|
||||
pid1ReloadWithJournal() {
|
||||
startJournalctl
|
||||
systemctl daemon-reload
|
||||
stopJournalctl
|
||||
}
|
||||
|
||||
pid1StartUnitWithStrace() {
|
||||
startStrace '-f'
|
||||
systemctl start $1
|
||||
sleep $sleepAfterStart
|
||||
stopStrace
|
||||
}
|
||||
|
||||
pid1StartUnitWithJournal() {
|
||||
startJournalctl
|
||||
systemctl start $1
|
||||
sleep $sleepAfterStart
|
||||
stopJournalctl
|
||||
}
|
||||
|
||||
pid1StopUnit() {
|
||||
systemctl stop $1
|
||||
}
|
||||
|
||||
systemctlCheckNUMAProperties() {
|
||||
local LOGFILE="$(mktemp)"
|
||||
systemctl show -p NUMAPolicy $1 > "$LOGFILE"
|
||||
grep "NUMAPolicy=$2" "$LOGFILE"
|
||||
|
||||
> "$LOGFILE"
|
||||
|
||||
if [ -n $3 ]; then
|
||||
systemctl show -p NUMAMask $1 > "$LOGFILE"
|
||||
grep "NUMAMask=$3" "$LOGFILE"
|
||||
fi
|
||||
}
|
||||
|
||||
writeTestUnit
|
||||
|
||||
# Create systemd config drop-in directory
|
||||
confDir="/etc/systemd/system.conf.d/"
|
||||
mkdir -p "$confDir"
|
||||
|
||||
if ! checkNUMA; then
|
||||
echo >&2 "NUMA is not supported on this machine, switching to a simple sanity check"
|
||||
|
||||
echo "PID1 NUMAPolicy=default && NUMAMask=0 check without NUMA support"
|
||||
writePID1NUMAPolicy "default" "0"
|
||||
startJournalctl
|
||||
systemctl daemon-reload
|
||||
stopJournalctl
|
||||
grep "NUMA support not available, ignoring" "$journalLog"
|
||||
|
||||
echo "systemd-run NUMAPolicy=default && NUMAMask=0 check without NUMA support"
|
||||
runUnit='numa-systemd-run-test.service'
|
||||
startJournalctl
|
||||
systemd-run -p NUMAPolicy=default -p NUMAMask=0 --unit $runUnit sleep 1000
|
||||
sleep $sleepAfterStart
|
||||
pid1StopUnit $runUnit
|
||||
stopJournalctl $runUnit
|
||||
grep "NUMA support not available, ignoring" "$journalLog"
|
||||
|
||||
else
|
||||
echo "PID1 NUMAPolicy support - Default policy w/o mask"
|
||||
writePID1NUMAPolicy "default"
|
||||
pid1ReloadWithStrace
|
||||
# Kernel requires that nodemask argument is set to NULL when setting default policy
|
||||
grep "set_mempolicy(MPOL_DEFAULT, NULL" $straceLog
|
||||
|
||||
echo "PID1 NUMAPolicy support - Default policy w/ mask"
|
||||
writePID1NUMAPolicy "default" "0"
|
||||
pid1ReloadWithStrace
|
||||
grep "set_mempolicy(MPOL_DEFAULT, NULL" $straceLog
|
||||
|
||||
echo "PID1 NUMAPolicy support - Bind policy w/o mask"
|
||||
writePID1NUMAPolicy "bind"
|
||||
pid1ReloadWithJournal
|
||||
grep "Failed to set NUMA memory policy: Invalid argument" $journalLog
|
||||
|
||||
echo "PID1 NUMAPolicy support - Bind policy w/ mask"
|
||||
writePID1NUMAPolicy "bind" "0"
|
||||
pid1ReloadWithStrace
|
||||
grep -P "set_mempolicy\(MPOL_BIND, \[0x0*1\]" $straceLog
|
||||
|
||||
echo "PID1 NUMAPolicy support - Interleave policy w/o mask"
|
||||
writePID1NUMAPolicy "interleave"
|
||||
pid1ReloadWithJournal
|
||||
grep "Failed to set NUMA memory policy: Invalid argument" $journalLog
|
||||
|
||||
echo "PID1 NUMAPolicy support - Interleave policy w/ mask"
|
||||
writePID1NUMAPolicy "interleave" "0"
|
||||
pid1ReloadWithStrace
|
||||
grep -P "set_mempolicy\(MPOL_INTERLEAVE, \[0x0*1\]" $straceLog
|
||||
|
||||
echo "PID1 NUMAPolicy support - Preferred policy w/o mask"
|
||||
writePID1NUMAPolicy "preferred"
|
||||
pid1ReloadWithJournal
|
||||
# Preferred policy with empty node mask is actually allowed and should reset allocation policy to default
|
||||
! grep "Failed to set NUMA memory policy: Invalid argument" $journalLog
|
||||
|
||||
echo "PID1 NUMAPolicy support - Preferred policy w/ mask"
|
||||
writePID1NUMAPolicy "preferred" "0"
|
||||
pid1ReloadWithStrace
|
||||
grep -P "set_mempolicy\(MPOL_PREFERRED, \[0x0*1\]" $straceLog
|
||||
|
||||
echo "PID1 NUMAPolicy support - Local policy w/o mask"
|
||||
writePID1NUMAPolicy "local"
|
||||
pid1ReloadWithStrace
|
||||
# Kernel requires that nodemask argument is set to NULL when setting default policy
|
||||
# The unpatched versions of strace don't recognize the MPOL_LOCAL constant and
|
||||
# return a numerical constant instead (with a comment):
|
||||
# set_mempolicy(0x4 /* MPOL_??? */, NULL, 0) = 0
|
||||
# Let's cover this scenario as well
|
||||
grep -E "set_mempolicy\((MPOL_LOCAL|0x4 [^,]*), NULL" $straceLog
|
||||
|
||||
echo "PID1 NUMAPolicy support - Local policy w/ mask"
|
||||
writePID1NUMAPolicy "local" "0"
|
||||
pid1ReloadWithStrace
|
||||
grep -E "set_mempolicy\((MPOL_LOCAL|0x4 [^,]*), NULL" $straceLog
|
||||
|
||||
echo "Unit file NUMAPolicy support - Default policy w/o mask"
|
||||
writeTestUnitNUMAPolicy "default"
|
||||
pid1StartUnitWithStrace $testUnit
|
||||
systemctlCheckNUMAProperties $testUnit "default"
|
||||
pid1StopUnit $testUnit
|
||||
grep "set_mempolicy(MPOL_DEFAULT, NULL" $straceLog
|
||||
|
||||
echo "Unit file NUMAPolicy support - Default policy w/ mask"
|
||||
writeTestUnitNUMAPolicy "default" "0"
|
||||
pid1StartUnitWithStrace $testUnit
|
||||
systemctlCheckNUMAProperties $testUnit "default" "0"
|
||||
pid1StopUnit $testUnit
|
||||
# Maks must be ignored
|
||||
grep "set_mempolicy(MPOL_DEFAULT, NULL" $straceLog
|
||||
|
||||
echo "Unit file NUMAPolicy support - Bind policy w/o mask"
|
||||
writeTestUnitNUMAPolicy "bind"
|
||||
pid1StartUnitWithJournal $testUnit
|
||||
pid1StopUnit $testUnit
|
||||
grep "numa-test.service: Main process exited, code=exited, status=242/NUMA" $journalLog
|
||||
|
||||
echo "Unit file NUMAPolicy support - Bind policy w/ mask"
|
||||
writeTestUnitNUMAPolicy "bind" "0"
|
||||
pid1StartUnitWithStrace $testUnit
|
||||
systemctlCheckNUMAProperties $testUnit "bind" "0"
|
||||
pid1StopUnit $testUnit
|
||||
grep -P "set_mempolicy\(MPOL_BIND, \[0x0*1\]" $straceLog
|
||||
|
||||
echo "Unit file NUMAPolicy support - Interleave policy w/o mask"
|
||||
writeTestUnitNUMAPolicy "interleave"
|
||||
pid1StartUnitWithStrace $testUnit
|
||||
pid1StopUnit $testUnit
|
||||
grep "numa-test.service: Main process exited, code=exited, status=242/NUMA" $journalLog
|
||||
|
||||
echo "Unit file NUMAPolicy support - Interleave policy w/ mask"
|
||||
writeTestUnitNUMAPolicy "interleave" "0"
|
||||
pid1StartUnitWithStrace $testUnit
|
||||
systemctlCheckNUMAProperties $testUnit "interleave" "0"
|
||||
pid1StopUnit $testUnit
|
||||
grep -P "set_mempolicy\(MPOL_INTERLEAVE, \[0x0*1\]" $straceLog
|
||||
|
||||
echo "Unit file NUMAPolicy support - Preferred policy w/o mask"
|
||||
writeTestUnitNUMAPolicy "preferred"
|
||||
pid1StartUnitWithJournal $testUnit
|
||||
systemctlCheckNUMAProperties $testUnit "preferred"
|
||||
pid1StopUnit $testUnit
|
||||
! grep "numa-test.service: Main process exited, code=exited, status=242/NUMA" $journalLog
|
||||
|
||||
echo "Unit file NUMAPolicy support - Preferred policy w/ mask"
|
||||
writeTestUnitNUMAPolicy "preferred" "0"
|
||||
pid1StartUnitWithStrace $testUnit
|
||||
systemctlCheckNUMAProperties $testUnit "preferred" "0"
|
||||
pid1StopUnit $testUnit
|
||||
grep -P "set_mempolicy\(MPOL_PREFERRED, \[0x0*1\]" $straceLog
|
||||
|
||||
echo "Unit file NUMAPolicy support - Local policy w/o mask"
|
||||
writeTestUnitNUMAPolicy "local"
|
||||
pid1StartUnitWithStrace $testUnit
|
||||
systemctlCheckNUMAProperties $testUnit "local"
|
||||
pid1StopUnit $testUnit
|
||||
grep -E "set_mempolicy\((MPOL_LOCAL|0x4 [^,]*), NULL" $straceLog
|
||||
|
||||
echo "Unit file NUMAPolicy support - Local policy w/ mask"
|
||||
writeTestUnitNUMAPolicy "local" "0"
|
||||
pid1StartUnitWithStrace $testUnit
|
||||
systemctlCheckNUMAProperties $testUnit "local" "0"
|
||||
pid1StopUnit $testUnit
|
||||
# Maks must be ignored
|
||||
grep -E "set_mempolicy\((MPOL_LOCAL|0x4 [^,]*), NULL" $straceLog
|
||||
|
||||
echo "systemd-run NUMAPolicy support"
|
||||
runUnit='numa-systemd-run-test.service'
|
||||
|
||||
systemd-run -p NUMAPolicy=default --unit $runUnit sleep 1000
|
||||
systemctlCheckNUMAProperties $runUnit "default"
|
||||
pid1StopUnit $runUnit
|
||||
|
||||
systemd-run -p NUMAPolicy=default -p NUMAMask=0 --unit $runUnit sleep 1000
|
||||
systemctlCheckNUMAProperties $runUnit "default" ""
|
||||
pid1StopUnit $runUnit
|
||||
|
||||
systemd-run -p NUMAPolicy=bind -p NUMAMask=0 --unit $runUnit sleep 1000
|
||||
systemctlCheckNUMAProperties $runUnit "bind" "0"
|
||||
pid1StopUnit $runUnit
|
||||
|
||||
systemd-run -p NUMAPolicy=interleave -p NUMAMask=0 --unit $runUnit sleep 1000
|
||||
systemctlCheckNUMAProperties $runUnit "interleave" "0"
|
||||
pid1StopUnit $runUnit
|
||||
|
||||
systemd-run -p NUMAPolicy=preferred -p NUMAMask=0 --unit $runUnit sleep 1000
|
||||
systemctlCheckNUMAProperties $runUnit "preferred" "0"
|
||||
pid1StopUnit $runUnit
|
||||
|
||||
systemd-run -p NUMAPolicy=local --unit $runUnit sleep 1000
|
||||
systemctlCheckNUMAProperties $runUnit "local"
|
||||
pid1StopUnit $runUnit
|
||||
|
||||
systemd-run -p NUMAPolicy=local -p NUMAMask=0 --unit $runUnit sleep 1000
|
||||
systemctlCheckNUMAProperties $runUnit "local" ""
|
||||
pid1StopUnit $runUnit
|
||||
fi
|
||||
|
||||
# Cleanup
|
||||
rm -rf $testDir
|
||||
rm -rf $confDir
|
||||
systemctl daemon-reload
|
||||
|
||||
systemd-analyze log-level info
|
||||
|
||||
echo OK > /testok
|
||||
|
||||
exit 0
|
||||
@@ -209,6 +209,7 @@ $KERNEL_APPEND \
|
||||
-nographic \
|
||||
-kernel $KERNEL_BIN \
|
||||
-drive format=raw,cache=unsafe,file=${TESTDIR}/rootdisk.img \
|
||||
$QEMU_OPTIONS \
|
||||
"
|
||||
|
||||
if [[ "$INITRD" && "$SKIP_INITRD" != "yes" ]]; then
|
||||
|
||||
Reference in New Issue
Block a user