[PATCH v3] shell: enable OOM protection by default
Andrea Cervesato <[email protected]> Tue, 04 Aug 2026 11:22:11 +0200
| Newsgroups | gmane.linux.ltp |
|---|---|
| Message-ID | <[email protected]> |
From: Andrea Cervesato <andrea.cervesato-IBi9RG/[email protected]> Add TST_OOM_PROTECTION to activate/deactivate OOM protection in shell tests. When enabled, the shell harness shields itself from the OOM killer and runs the test in a child process, so it survives memory pressure and can still report results (e.g. during memcg stress tests). Signed-off-by: Andrea Cervesato <andrea.cervesato-IBi9RG/[email protected]> --- Under Li's idea, implement a OOM protection mechanism for the shell tests so we can avoid OOM for memcg stress tests. --- Changes in v3: - simplify oom code - enable OOM protection by default - Link to v2: https://lore.kernel.org/20260730-shell_oom_protection-v2-0-be1de2baa83d-IBi9RG/[email protected] Changes in v2: - update shell OOM protection functional test - Link to v1: https://lore.kernel.org/20260713-shell_oom_protection-v1-0-b732e8647894-IBi9RG/[email protected] --- doc/developers/writing_tests.rst | 3 +++ lib/newlib_tests/runtest.sh | 1 + lib/newlib_tests/shell/tst_oom_protection.sh | 31 ++++++++++++++++++++++++ testcases/lib/tst_test.sh | 35 +++++++++++++++++++++++++++- 4 files changed, 69 insertions(+), 1 deletion(-) diff --git a/doc/developers/writing_tests.rst b/doc/developers/writing_tests.rst index 4db57898fcf08b83e68be996f666e91c418838fc..2d5bc294083fa2b89212714f0a6c5e5c3f22777a 100644 --- a/doc/developers/writing_tests.rst +++ b/doc/developers/writing_tests.rst @@ -549,6 +549,9 @@ LTP C And Shell Test API Comparison * - not applicable - TST_FS_TYPE + * - not applicable + - TST_OOM_PROTECTION + .. list-table:: :header-rows: 1 diff --git a/lib/newlib_tests/runtest.sh b/lib/newlib_tests/runtest.sh index 71808ef8b8d5545f52d6014bc070145f952915e9..7e2d0a2ac329fc1d825c2fe0b6f7c09d4f2b0064 100755 --- a/lib/newlib_tests/runtest.sh +++ b/lib/newlib_tests/runtest.sh @@ -44,6 +44,7 @@ shell/tst_check_driver.sh shell/tst_check_kconfig0[1-5].sh shell/tst_mount_device.sh shell/tst_mount_device_tmpfs.sh +shell/tst_oom_protection.sh shell/tst_skip_filesystems.sh shell/net/*.sh}" diff --git a/lib/newlib_tests/shell/tst_oom_protection.sh b/lib/newlib_tests/shell/tst_oom_protection.sh new file mode 100755 index 0000000000000000000000000000000000000000..22993511c64845712e4fa9fc942e9869121d7e0b --- /dev/null +++ b/lib/newlib_tests/shell/tst_oom_protection.sh @@ -0,0 +1,31 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2026 Linux Test Project + +TST_TESTFUNC=do_test + +read_oom_score_adj() { + cat "/proc/$1/oom_score_adj" 2>/dev/null +} + +do_test() { + local harness_score child_score + + harness_score=$(read_oom_score_adj "$$") + + if [ "$harness_score" = -1000 ]; then + tst_res TPASS "shell harness is protected from OOM by default" + + child_score=$(tst_oom_unprotect read_oom_score_adj self) + if [ "$child_score" = 0 ]; then + tst_res TPASS "unprotected child process has oom_score_adj reset to 0" + else + tst_res TFAIL "unprotected child process oom_score_adj is $child_score, expected 0" + fi + else + tst_res TCONF "shell harness OOM protection unavailable" + fi +} + +. tst_test.sh +tst_run diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh index b3e7e29bbf7b52de4cb65665751005cb4df156a8..70fa19e4dadfdceb92821a02fbce7cf6686d9c4e 100644 --- a/testcases/lib/tst_test.sh +++ b/testcases/lib/tst_test.sh @@ -15,6 +15,7 @@ export TST_CONF=0 export TST_COUNT=1 export TST_ITERATIONS=1 export TST_TMPDIR_RHOST=0 +export TST_OOM_PROTECTION="${TST_OOM_PROTECTION:-1}" export TST_LIB_LOADED=1 # see testcases/lib/tst_runas.c @@ -28,6 +29,34 @@ export TST_USR_GID="${LTP_USR_GID:-65534}" trap "tst_brk TBROK 'test interrupted'" INT trap "unset _tst_setup_timer_pid; tst_brk TBROK 'test terminated'" TERM +_tst_set_oom_score_adj() +{ + local value="$1" + local path="/proc/self/oom_score_adj" + + [ -e "$path" ] || return 0 + + echo "$value" > "$path" 2>/dev/null || return 0 +} + +_tst_enable_oom_protection() +{ + _tst_set_oom_score_adj -1000 +} + +_tst_disable_oom_protection() +{ + _tst_set_oom_score_adj 0 +} + +tst_oom_unprotect() +{ + _tst_disable_oom_protection + if [ $# -gt 0 ]; then + "$@" + fi +} + _tst_do_cleanup() { if [ -n "$TST_DO_CLEANUP" -a -n "$TST_CLEANUP" -a -z "$LTP_NO_CLEANUP" ]; then @@ -681,12 +710,16 @@ tst_run() local _tst_pattern='[='\''"} \t\/:`$\;|].*' local ret + if [ "$TST_OOM_PROTECTION" = 1 ]; then + _tst_enable_oom_protection + fi + if [ -n "$TST_TEST_PATH" ]; then for _tst_i in $(grep '^[^#]*\<TST_' "$TST_TEST_PATH" | sed "s/.*TST_//; s/$_tst_pattern//"); do case "$_tst_i" in ALL_FILESYSTEMS|DISABLE_APPARMOR|DISABLE_SELINUX);; SETUP|CLEANUP|TESTFUNC|ID|CNT|MIN_KVER);; - OPTS|USAGE|PARSE_ARGS|POS_ARGS);; + OPTS|USAGE|PARSE_ARGS|POS_ARGS|OOM_PROTECTION);; NEEDS_ROOT|NEEDS_TMPDIR|TMPDIR|NEEDS_DEVICE|DEVICE);; NEEDS_CMDS|NEEDS_MODULE|MODPATH|DATAROOT);; NEEDS_DRIVERS|FS_TYPE|MNTPOINT|MNT_PARAMS);; --- base-commit: 51f722d233efa06304b1d178e24a01048cf80f10 change-id: 20260713-shell_oom_protection-6221ab825220 Best regards, -- Andrea Cervesato <andrea.cervesato-IBi9RG/[email protected]> -- Mailing list info: https://lists.linux.it/listinfo/ltp