tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

selftests/mm: fix hugepages cleanup too early

Patch series "Fix va_high_addr_switch.sh test failure", v3.

These three patches fix the va_high_addr_switch.sh test failure on x86_64.

Patch 1 fixes the hugepage setup issue that nr_hugepages is reset too
early in run_vmtests.sh and break the later va_high_addr_switch testing.

Patch 2 adds hugepage setup in va_high_addr_switch test, so that it can
still work if vm_runtests.sh changes the hugepage setup someday.

Patch 3 fixes the test failure caused by the hint addr align method change
in hugetlb_get_unmapped_area().


This patch (of 3):

The nr_hugepgs variable is used to keep the original nr_hugepages at the
hugepage setup step at test beginning. After userfaultfd test, a cleaup
is executed, both /sys/kernel/mm/hugepages/hugepages-*/nr_hugepages and
/proc/sys//vm/nr_hugepages are reset to 'original' value before
userfaultfd test starts.

Issue here is the value used to restore /proc/sys/vm/nr_hugepages is
nr_hugepgs which is the initial value before the vm_runtests.sh runs, not
the value before userfaultfd test starts. 'va_high_addr_swith.sh' tests
runs after that will possibly see no hugepages available for test, and got
EINVAL when mmap(HUGETLB), making the result invalid.

And before pkey tests, nr_hugepgs is changed to be used as a temp variable
to save nr_hugepages before pkey test, and restore it after pkey tests
finish. The original nr_hugepages value is not tracked anymore, so no way
to restore it after all tests finish.

Add a new variable orig_nr_hugepgs to save the original nr_hugepages, and
and restore it to nr_hugepages after all tests finish. And change to use
the nr_hugepgs variable to save the /proc/sys/vm/nr_hugeages after
hugepage setup, it's also the value before userfaultfd test starts, and
the correct value to be restored after userfaultfd finishes. The
va_high_addr_switch.sh broken will be resolved.

Link: https://lkml.kernel.org/r/20250912013711.3002969-1-chuhu@redhat.com
Link: https://lkml.kernel.org/r/20250912013711.3002969-2-chuhu@redhat.com
Signed-off-by: Chunyu Hu <chuhu@redhat.com>
Acked-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Chunyu Hu and committed by
Andrew Morton 6e296bcf 60283726

+7 -2
+7 -2
tools/testing/selftests/mm/run_vmtests.sh
··· 174 174 175 175 # set proper nr_hugepages 176 176 if [ -n "$freepgs" ] && [ -n "$hpgsize_KB" ]; then 177 - nr_hugepgs=$(cat /proc/sys/vm/nr_hugepages) 177 + orig_nr_hugepgs=$(cat /proc/sys/vm/nr_hugepages) 178 178 needpgs=$((needmem_KB / hpgsize_KB)) 179 179 tries=2 180 180 while [ "$tries" -gt 0 ] && [ "$freepgs" -lt "$needpgs" ]; do 181 181 lackpgs=$((needpgs - freepgs)) 182 182 echo 3 > /proc/sys/vm/drop_caches 183 - if ! echo $((lackpgs + nr_hugepgs)) > /proc/sys/vm/nr_hugepages; then 183 + if ! echo $((lackpgs + orig_nr_hugepgs)) > /proc/sys/vm/nr_hugepages; then 184 184 echo "Please run this test as root" 185 185 exit $ksft_skip 186 186 fi ··· 191 191 done < /proc/meminfo 192 192 tries=$((tries - 1)) 193 193 done 194 + nr_hugepgs=$(cat /proc/sys/vm/nr_hugepages) 194 195 if [ "$freepgs" -lt "$needpgs" ]; then 195 196 printf "Not enough huge pages available (%d < %d)\n" \ 196 197 "$freepgs" "$needpgs" ··· 540 539 CATEGORY="page_frag" run_test ./test_page_frag.sh nonaligned 541 540 542 541 CATEGORY="rmap" run_test ./rmap 542 + 543 + if [ "${HAVE_HUGEPAGES}" = 1 ]; then 544 + echo "$orig_nr_hugepgs" > /proc/sys/vm/nr_hugepages 545 + fi 543 546 544 547 echo "SUMMARY: PASS=${count_pass} SKIP=${count_skip} FAIL=${count_fail}" | tap_prefix 545 548 echo "1..${count_total}" | tap_output