leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

selftests/vm/run_vmtests: adjust hugetlb size according to nr_cpus

Browse Source 
Fix userfaultfd_hugetlb on hosts which have more than 64 cpus.

  ---------------------------
  running userfaultfd_hugetlb
  ---------------------------
  invalid MiB
  Usage: <MiB> <bounces>
  [FAIL]

Via userfaultfd.c we can know, hugetlb_size needs to meet hugetlb_size
>= nr_cpus * hugepage_size.  hugepage_size is often 2M, so when host
cpus > 64, it requires more than 128M.

[zhijianx.li@intel.com: update changelog/comments and variable name]
 Link: http://lkml.kernel.org/r/20180302024356.83359-1-zhijianx.li@intel.com
 Link: http://lkml.kernel.org/r/20180303125027.81638-1-zhijianx.li@intel.com
Link: http://lkml.kernel.org/r/20180302024356.83359-1-zhijianx.li@intel.com
Signed-off-by: Li Zhijian <zhijianx.li@intel.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: SeongJae Park <sj38.park@gmail.com>
Cc: Philippe Ombredanne <pombredanne@nexb.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Li Zhijian 2018-03-09 15:51:16 -08:00 committed by Linus Torvalds
parent 864b75f9d6
commit 0627be7d3c
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tools/testing/selftests/vm/run_vmtests
View File

@ -2,25 +2,33 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
#please run as root #please run as root
#we need 256M, below is the size in kB
needmem=262144
mnt=./huge mnt=./huge
exitcode=0 exitcode=0
#get pagesize and freepages from /proc/meminfo #get huge pagesize and freepages from /proc/meminfo
while read name size unit; do while read name size unit; do
if [ "$name" = "HugePages_Free:" ]; then if [ "$name" = "HugePages_Free:" ]; then
freepgs=$size freepgs=$size
fi fi
if [ "$name" = "Hugepagesize:" ]; then if [ "$name" = "Hugepagesize:" ]; then
pgsize=$size hpgsize_KB=$size
fi fi
done < /proc/meminfo done < /proc/meminfo
# Simple hugetlbfs tests have a hardcoded minimum requirement of
# huge pages totaling 256MB (262144KB) in size. The userfaultfd
# hugetlb test requires a minimum of 2 * nr_cpus huge pages. Take
# both of these requirements into account and attempt to increase
# number of huge pages available.
nr_cpus=$(nproc)
hpgsize_MB=$((hpgsize_KB / 1024))
half_ufd_size_MB=$((((nr_cpus * hpgsize_MB + 127) / 128) * 128))
needmem_KB=$((half_ufd_size_MB * 2 * 1024))
#set proper nr_hugepages #set proper nr_hugepages
if [ -n "$freepgs" ] && [ -n "$pgsize" ]; then if [ -n "$freepgs" ] && [ -n "$hpgsize_KB" ]; then
nr_hugepgs=`cat /proc/sys/vm/nr_hugepages` nr_hugepgs=`cat /proc/sys/vm/nr_hugepages`
needpgs=`expr $needmem / $pgsize` needpgs=$((needmem_KB / hpgsize_KB))
tries=2 tries=2
while [ $tries -gt 0 ] && [ $freepgs -lt $needpgs ]; do while [ $tries -gt 0 ] && [ $freepgs -lt $needpgs ]; do
lackpgs=$(( $needpgs - $freepgs )) lackpgs=$(( $needpgs - $freepgs ))
@ -107,8 +115,9 @@ fi
echo "---------------------------" echo "---------------------------"
echo "running userfaultfd_hugetlb" echo "running userfaultfd_hugetlb"
echo "---------------------------" echo "---------------------------"
# 256MB total huge pages == 128MB src and 128MB dst # Test requires source and destination huge pages. Size of source
./userfaultfd hugetlb 128 32 $mnt/ufd_test_file # (half_ufd_size_MB) is passed as argument to test.
./userfaultfd hugetlb $half_ufd_size_MB 32 $mnt/ufd_test_file
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "[FAIL]" echo "[FAIL]"
exitcode=1 exitcode=1