aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZoltan Kiss <zoltan.kiss@linaro.org>2015-11-06 18:24:59 +0000
committerZoltan Kiss <zoltan.kiss@linaro.org>2015-11-06 18:30:47 +0000
commit8cc2fe669adc2a5a2f39f44aea91ec0fd8091a03 (patch)
tree628490590b9f03036203e6a4ff849174f7186b9a
parentf19b00bdcfe3099d602941e7378c75c184782ce8 (diff)
linux-dpdk: test: detect hugepages mount error and prefer 1G pages
Signed-off-by: Zoltan Kiss <zoltan.kiss@linaro.org>
-rwxr-xr-xplatform/linux-dpdk/test/wrapper-script.sh16
1 files changed, 14 insertions, 2 deletions
diff --git a/platform/linux-dpdk/test/wrapper-script.sh b/platform/linux-dpdk/test/wrapper-script.sh
index 0ed206fce..743ad4908 100755
--- a/platform/linux-dpdk/test/wrapper-script.sh
+++ b/platform/linux-dpdk/test/wrapper-script.sh
@@ -23,8 +23,20 @@ if grep -qs "$HUGEPAGEDIR" /proc/mounts; then
sudo umount -a -t hugetlbfs
fi
echo "Mounting hugetlbfs"
-sudo mount -t hugetlbfs nodev $HUGEPAGEDIR
-sudo sh -c 'echo 256 > /sys/devices/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages'
+sudo mount -t hugetlbfs -o pagesize=1G nodev $HUGEPAGEDIR 2>/dev/null
+res=$?
+if [ $res -ne 0 ]; then
+ echo "1GB pagesize doesn't work, retry with 2MB"
+ sudo mount -t hugetlbfs nodev $HUGEPAGEDIR
+ res=$?
+ if [ $res -ne 0 ]; then
+ echo "ERROR: can't mount hugepages"
+ exit $res
+ fi
+ sudo sh -c 'echo 256 > /sys/devices/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages'
+else
+ sudo sh -c 'echo 1 > /sys/devices/system/node/node0/hugepages/hugepages-1048576kB/nr_hugepages'
+fi
echo "Total number: `cat /sys/devices/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages`"
echo "Free pages: `cat /sys/devices/system/node/node0/hugepages/hugepages-2048kB/free_hugepages`"
echo "running $1!"