From c2e522ec9ea02ed7efc05684d45ff2c63dfb28d8 Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Fri, 24 Apr 2020 15:55:47 +0200 Subject: [PATCH] test/vhost: check if virtio dev can be used Check which driver is in use for detected virtio pci device. If it's not uio or vfio then don't use it. Signed-off-by: Karol Latecki Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2018 (master) (cherry-picked from commit df4e823cfce233bfeef2b433c64f9212c570003d) Change-Id: Ibf901c71e0125394c6cb8fd1499fc723f2308010 Signed-off-by: Karol Latecki Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2103 Reviewed-by: Ben Walker Reviewed-by: Darek Stojaczyk Reviewed-by: Tomasz Zawadzki Tested-by: SPDK CI Jenkins --- test/spdkcli/virtio.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/spdkcli/virtio.sh b/test/spdkcli/virtio.sh index f46b1624c..c1f9e1cb5 100755 --- a/test/spdkcli/virtio.sh +++ b/test/spdkcli/virtio.sh @@ -22,11 +22,11 @@ $spdkcli_job "'/bdevs/malloc create 32 512 Malloc0' 'Malloc0' True '/bdevs/malloc create 32 512 Malloc1' 'Malloc1' True " pci_blk=$(lspci -nn -D | grep '1af4:1001' | head -1 | awk '{print $1;}') -if [ -n "$pci_blk" ]; then +if [ -n "$pci_blk" ] && grep -Eq "DRIVER=(uio|vfio)" "/sys/bus/pci/devices/$pci_blk/uevent"; then $spdkcli_job "'/bdevs/virtioblk_disk create virtioblk_pci pci $pci_blk' 'virtioblk_pci' True" fi pci_scsi=$(lspci -nn -D | grep '1af4:1004' | head -1 | awk '{print $1;}') -if [ -n "$pci_scsi" ]; then +if [ -n "$pci_scsi" ] && grep -Eq "DRIVER=(uio|vfio)" "/sys/bus/pci/devices/$pci_scsi/uevent"; then $spdkcli_job "'/bdevs/virtioscsi_disk create virtioscsi_pci pci $pci_scsi' 'virtioscsi_pci' True" fi $spdkcli_job "'/vhost/scsi create sample_scsi' 'sample_scsi' True @@ -63,10 +63,10 @@ $spdkcli_job "'/vhost/block delete sample_block' 'sample_block' '/vhost/scsi/sample_scsi remove_target 0' 'Malloc0' '/vhost/scsi delete sample_scsi' 'sample_scsi' " -if [ -n "$pci_blk" ]; then +if [ -n "$pci_blk" ] && grep -Eq "DRIVER=(uio|vfio)" "/sys/bus/pci/devices/$pci_blk/uevent"; then $spdkcli_job "'/bdevs/virtioblk_disk delete virtioblk_pci' 'virtioblk_pci'" fi -if [ -n "$pci_scsi" ]; then +if [ -n "$pci_scsi" ] && grep -Eq "DRIVER=(uio|vfio)" "/sys/bus/pci/devices/$pci_scsi/uevent"; then $spdkcli_job "'/bdevs/virtioscsi_disk delete virtioscsi_pci' 'virtioscsi_pci'" fi $spdkcli_job "'/bdevs/malloc delete Malloc0' 'Malloc0'