diff --git a/scripts/setup.sh b/scripts/setup.sh index bd644ecd0..8f82e5ea2 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -77,7 +77,7 @@ function get_nvme_name_from_bdf { done } -function configure_linux { +function configure_linux_pci { driver_name=vfio-pci if [ -z "$(ls /sys/kernel/iommu_groups)" ]; then # No IOMMU. Use uio. @@ -101,7 +101,6 @@ function configure_linux { fi done - # IOAT TMP=`mktemp` #collect all the device_id info of ioat devices. @@ -129,6 +128,10 @@ function configure_linux { rm $TMP echo "1" > "/sys/bus/pci/rescan" +} + +function configure_linux { + configure_linux_pci hugetlbfs_mount=$(linux_hugetlbfs_mount) @@ -181,7 +184,7 @@ function configure_linux { fi } -function reset_linux { +function reset_linux_pci { # NVMe set +e lsmod | grep nvme > /dev/null @@ -195,7 +198,6 @@ function reset_linux { fi done - # IOAT TMP=`mktemp` #collect all the device_id info of ioat devices. @@ -236,6 +238,10 @@ function reset_linux { rm $TMP echo "1" > "/sys/bus/pci/rescan" +} + +function reset_linux { + reset_linux_pci hugetlbfs_mount=$(linux_hugetlbfs_mount) rm -f "$hugetlbfs_mount"/spdk*map_* @@ -286,7 +292,7 @@ function status_linux { done } -function configure_freebsd { +function configure_freebsd_pci { TMP=`mktemp` # NVMe @@ -308,6 +314,10 @@ function configure_freebsd { kenv hw.nic_uio.bdfs=$BDFS kldload nic_uio.ko rm $TMP +} + +function configure_freebsd { + configure_freebsd_pci kldunload contigmem.ko || true kenv hw.contigmem.num_buffers=$((HUGEMEM / 256))