ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts/setup.sh: use correct hugetlbfs mount point

Browse Source 
If we created /mnt/huge due to no hugetlbfs mount point existing, we
should also use that path in the chown step for VFIO.

Change-Id: I11614a67b16dbda6626b9adf58d8faea10205cab
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2017-03-28 10:09:31 -07:00
parent 1aaa9475ce
commit 9603193f86
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/setup.sh
View File

@ -41,6 +41,10 @@ function linux_bind_driver() {
fi fi
} }
function linux_hugetlbfs_mount() {
mount | grep '^hugetlbfs ' | awk '{ print $3 }'
}
function configure_linux { function configure_linux {
driver_name=vfio-pci driver_name=vfio-pci
if [ -z "$(ls /sys/kernel/iommu_groups)" ]; then if [ -z "$(ls /sys/kernel/iommu_groups)" ]; then
@ -71,15 +75,19 @@ function configure_linux {
echo "1" > "/sys/bus/pci/rescan" echo "1" > "/sys/bus/pci/rescan"
if ! mount | grep -q hugetlbfs; then hugetlbfs_mount=$(linux_hugetlbfs_mount)
mkdir -p /mnt/huge
mount -t hugetlbfs nodev /mnt/huge if [ -z "$hugetlbfs_mount" ]; then
hugetlbfs_mount=/mnt/huge
echo "Mounting hugetlbfs at $hugetlbfs_mount"
mkdir -p "$hugetlbfs_mount"
mount -t hugetlbfs nodev "$hugetlbfs_mount"
fi fi
echo "$NRHUGE" > /proc/sys/vm/nr_hugepages echo "$NRHUGE" > /proc/sys/vm/nr_hugepages
if [ "$driver_name" = "vfio-pci" ]; then if [ "$driver_name" = "vfio-pci" ]; then
if [ "$username" != "" ]; then if [ "$username" != "" ]; then
chown "$username" /dev/hugepages chown "$username" "$hugetlbfs_mount"
fi fi
MEMLOCK_AMNT=`ulimit -l` MEMLOCK_AMNT=`ulimit -l`