[validation][vpp][testpmd] move to vfio-pci

m4r1k · Mar 17, 2020 · 02dea30 · 02dea30
1 parent d3f059b
commit 02dea30
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/validation/nfvbench_l3_env/prepare_vpp.sh b/validation/nfvbench_l3_env/prepare_vpp.sh
@@ -29,8 +29,15 @@ tuned-adm profile cpu-partitioning
 sed 's/^\(GRUB_CMDLINE_LINUX=".*\)"/\1 default_hugepagesz=1GB hugepagesz=1G hugepages=8 isolcpus=1-6"/g' -i /etc/default/grub
 grub2-mkconfig -o /etc/grub2.cfg
 
-driverctl set-override 0000:00:04.0 uio_pci_generic
-driverctl set-override 0000:00:05.0 uio_pci_generic
+# https://bugzilla.redhat.com/show_bug.cgi?id=1762087
+# vIOMMU not supported
+cat > /etc/modprobe.d/vfio.conf << EOF
+options vfio enable_unsafe_noiommu_mode=Y
+options vfio_iommu_type1 allow_unsafe_interrupts=Y
+EOF
+
+driverctl set-override 0000:00:04.0 vfio-pci
+driverctl set-override 0000:00:05.0 vfio-pci
 
 dracut -f
 

diff --git a/validation/trex_l2_env/prepare_testpmd.sh b/validation/trex_l2_env/prepare_testpmd.sh
@@ -24,8 +24,15 @@ tuned-adm profile cpu-partitioning
 sed 's/^\(GRUB_CMDLINE_LINUX=".*\)"/\1 default_hugepagesz=1GB hugepagesz=1G hugepages=8 isolcpus=1-6"/g' -i /etc/default/grub
 grub2-mkconfig -o /etc/grub2.cfg
 
-driverctl set-override 0000:00:04.0 uio_pci_generic
-driverctl set-override 0000:00:05.0 uio_pci_generic
+# https://bugzilla.redhat.com/show_bug.cgi?id=1762087
+# vIOMMU not supported
+cat > /etc/modprobe.d/vfio.conf << EOF
+options vfio enable_unsafe_noiommu_mode=Y
+options vfio_iommu_type1 allow_unsafe_interrupts=Y
+EOF
+
+driverctl set-override 0000:00:04.0 vfio-pci
+driverctl set-override 0000:00:05.0 vfio-pci
 
 dracut -f