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

setup.sh: don't bind virtio-pci devices with active mountpoints

Browse Source 
Change-Id: I92aeb8259383fa3e207e6ab3059109f8275bc549
Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/393684
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Dariusz Stojaczyk 2018-01-04 22:16:30 +01:00 committed by Jim Harris
parent 380b3fc878
commit f869082a91
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/setup.sh
View File

@ -71,6 +71,18 @@ function get_nvme_name_from_bdf {
done done
} }
function get_virtio_name_from_bdf {
set +e
virtio_ctrlrs=`lsblk --nodeps --output "NAME,SUBSYSTEMS" | grep virtio | awk '{print $1}'`
set -e
for ctrlr in $virtio_ctrlrs; do
if readlink "/sys/block/$ctrlr" | grep -q "$1"; then
eval "$2=$ctrlr"
return
fi
done
}
function configure_linux_pci { function configure_linux_pci {
driver_name=vfio-pci driver_name=vfio-pci
if [ -z "$(ls /sys/kernel/iommu_groups)" ]; then if [ -z "$(ls /sys/kernel/iommu_groups)" ]; then
@ -116,7 +128,13 @@ function configure_linux_pci {
for dev_id in `cat $TMP`; do for dev_id in `cat $TMP`; do
for bdf in $(iter_pci_dev_id 1af4 $dev_id); do for bdf in $(iter_pci_dev_id 1af4 $dev_id); do
linux_bind_driver "$bdf" "$driver_name" blkname=''
get_virtio_name_from_bdf "$bdf" blkname
if mount | grep -q "/dev/$blkname"; then
echo Active mountpoints on /dev/$blkname, so not binding PCI dev $bdf
else
linux_bind_driver "$bdf" "$driver_name"
fi
done done
done done
rm $TMP rm $TMP