The quilt patch titled
Subject: selftests/mm: on-fault-limit: run test without root privileges otherwise skip
has been removed from the -mm tree. Its filename was
selftests-mm-run_vmtests-remove-sudo-and-conform-to-tap-fix.patch
This patch was dropped because it was folded into selftests-mm-run_vmtests-remove-sudo-and-conform-to-tap.patch
------------------------------------------------------
From: Muhammad Usama Anjum <usama.anjum@xxxxxxxxxxxxx>
Subject: selftests/mm: on-fault-limit: run test without root privileges otherwise skip
Date: Thu, 1 Feb 2024 18:05:36 +0500
The mmap() respects rlimit only for normal users. This test should be run
as normal user, without root privileges. Also add back the sudo -u nobody
as run_vmtests.sh is run as root most of the times. Skip the test instead
if sudo isn't present to lower the privileges.
Link: https://lkml.kernel.org/r/20240201130538.1404897-1-usama.anjum@xxxxxxxxxxxxx
Fixes: b6221771d468 ("selftests/mm: run_vmtests: remove sudo and conform to tap")
Signed-off-by: Muhammad Usama Anjum <usama.anjum@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
tools/testing/selftests/mm/on-fault-limit.c | 6 +++---
tools/testing/selftests/mm/run_vmtests.sh | 7 ++++++-
2 files changed, 9 insertions(+), 4 deletions(-)
--- a/tools/testing/selftests/mm/on-fault-limit.c~selftests-mm-run_vmtests-remove-sudo-and-conform-to-tap-fix
+++ a/tools/testing/selftests/mm/on-fault-limit.c
@@ -21,7 +21,7 @@ static void test_limit(void)
map = mmap(NULL, 2 * lims.rlim_max, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS | MAP_POPULATE, -1, 0);
- ksft_test_result(map == MAP_FAILED, "Failed mmap\n");
+ ksft_test_result(map == MAP_FAILED, "The map failed respecting mlock limits\n");
if (map != MAP_FAILED)
munmap(map, 2 * lims.rlim_max);
@@ -33,8 +33,8 @@ int main(int argc, char **argv)
ksft_print_header();
ksft_set_plan(1);
- if (getuid())
- ksft_test_result_skip("Require root privileges to run\n");
+ if (!getuid())
+ ksft_test_result_skip("The test must be run from a normal user\n");
else
test_limit();
--- a/tools/testing/selftests/mm/run_vmtests.sh~selftests-mm-run_vmtests-remove-sudo-and-conform-to-tap-fix
+++ a/tools/testing/selftests/mm/run_vmtests.sh
@@ -291,7 +291,12 @@ echo "$nr_hugepgs" > /proc/sys/vm/nr_hug
CATEGORY="compaction" run_test ./compaction_test
-CATEGORY="mlock" run_test ./on-fault-limit
+if command -v sudo &> /dev/null;
+then
+ CATEGORY="mlock" run_test sudo -u nobody ./on-fault-limit
+else
+ echo "# SKIP ./on-fault-limit"
+fi
CATEGORY="mmap" run_test ./map_populate
_
Patches currently in -mm which might be from usama.anjum@xxxxxxxxxxxxx are
selftests-mm-hugetlb_reparenting_test-do-not-unmount.patch
selftests-mm-run_vmtests-remove-sudo-and-conform-to-tap.patch
selftests-mm-save-and-restore-nr_hugepages-value.patch
selftests-mm-protection_keys-save-restore-nr_hugepages-settings.patch
selftests-mm-run_vmtestssh-add-missing-tests.patch
selftests-mm-run_vmtestssh-add-missing-tests-fix.patch
