diff --git a/autotest.sh b/autotest.sh index 413abc8f8..184e0e4f3 100755 --- a/autotest.sh +++ b/autotest.sh @@ -35,7 +35,7 @@ fi # set up huge pages timing_enter afterboot -./scripts/configure_hugepages.sh 3072 +./scripts/configure_hugepages.sh 1024 timing_exit afterboot ./scripts/unbind_nvme.sh diff --git a/scripts/configure_hugepages.sh b/scripts/configure_hugepages.sh index 84ca1bc8d..0907d8e5c 100755 --- a/scripts/configure_hugepages.sh +++ b/scripts/configure_hugepages.sh @@ -8,22 +8,22 @@ function configure_linux { mount -t hugetlbfs nodev /mnt/huge fi - if [ "$1" = "" ]; then - NRHUGE=1024 - else - NRHUGE="$1" - fi - echo $NRHUGE > /proc/sys/vm/nr_hugepages } function configure_freebsd { kldunload contigmem.ko || true - kenv hw.contigmem.num_buffers=16 - kenv hw.contigmem.buffer_size=33554432 + kenv hw.contigmem.num_buffers=$((NRHUGE * 2 / 32)) + kenv hw.contigmem.buffer_size=$((32 * 1024 * 1024)) kldload contigmem.ko } +if [ "$1" = "" ]; then + NRHUGE=1024 +else + NRHUGE="$1" +fi + if [ `uname` = Linux ]; then configure_linux else