* 1. change def_driver to vfio-pci * 2. add modprobe vfio-pci in vm Xiao Qimai (2): add modprobe vfio-pci in vm change vm default driver from igb_uio to vfio-pci conf/virt_global.cfg | 6 +++--- framework/project_dpdk.py | 16 +++++++++++----- 2 files changed, 14 insertions(+), 8 deletions(-) -- 1.8.3.1
Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com> --- framework/project_dpdk.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py index ebc008e..e8b5d0f 100644 --- a/framework/project_dpdk.py +++ b/framework/project_dpdk.py @@ -101,11 +101,17 @@ class DPDKdut(Dut): def setup_modules_linux(self, target, drivername, drivermode): if drivername == "vfio-pci": - self.send_expect("rmmod vfio_pci", "#", 70) - self.send_expect("rmmod vfio_iommu_type1", "#", 70) - self.send_expect("rmmod vfio", "#", 70) - self.send_expect("modprobe vfio", "#", 70) - self.send_expect("modprobe vfio-pci", "#", 70) + if 'VirtDut' in str(self.__class__): + self.send_expect("modprobe -r vfio_iommu_type1", "#") + self.send_expect("modprobe -r vfio", "#") + self.send_expect("modprobe vfio enable_unsafe_noiommu_mode=1", "#") + self.send_expect("modprobe vfio-pci", "#") + else: + self.send_expect("rmmod vfio_pci", "#", 70) + self.send_expect("rmmod vfio_iommu_type1", "#", 70) + self.send_expect("rmmod vfio", "#", 70) + self.send_expect("modprobe vfio", "#", 70) + self.send_expect("modprobe vfio-pci", "#", 70) out = self.send_expect("lsmod | grep vfio_iommu_type1", "#") if not out: out = self.send_expect("ls /sys/module |grep vfio_pci", "#") -- 1.8.3.1
Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com> --- conf/virt_global.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/virt_global.cfg b/conf/virt_global.cfg index e47c6f3..7ab0440 100644 --- a/conf/virt_global.cfg +++ b/conf/virt_global.cfg @@ -25,7 +25,7 @@ cpu = mem = size=2048; def_driver = - driver_name=igb_uio; + driver_name=vfio-pci; [KVM] cpu = model=host,number=4,cpupin=3 4 5 6; @@ -38,7 +38,7 @@ control = vnc = disable=False; def_driver = - driver_name=igb_uio; + driver_name=vfio-pci; [XEN] cpu = number=4,cpupin=3 4 5 6; @@ -47,4 +47,4 @@ mem = vif = mac=random,bridge=br0 def_driver = - driver_name=igb_uio; + driver_name=vfio-pci; -- 1.8.3.1
[-- Attachment #1: Type: text/plain, Size: 1977 bytes --] Tested-by: Xie,WeiX < weix.xie@intel.com> Regards, Xie Wei -----Original Message----- From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Xiao Qimai Sent: Friday, June 12, 2020 5:12 PM To: dts@dpdk.org Cc: Xiao, QimaiX <qimaix.xiao@intel.com> Subject: [dts] [PATCH V1 1/2]framework/project_dpdk: add modprobe vfio-pci in vm Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com> --- framework/project_dpdk.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py index ebc008e..e8b5d0f 100644 --- a/framework/project_dpdk.py +++ b/framework/project_dpdk.py @@ -101,11 +101,17 @@ class DPDKdut(Dut): def setup_modules_linux(self, target, drivername, drivermode): if drivername == "vfio-pci": - self.send_expect("rmmod vfio_pci", "#", 70) - self.send_expect("rmmod vfio_iommu_type1", "#", 70) - self.send_expect("rmmod vfio", "#", 70) - self.send_expect("modprobe vfio", "#", 70) - self.send_expect("modprobe vfio-pci", "#", 70) + if 'VirtDut' in str(self.__class__): + self.send_expect("modprobe -r vfio_iommu_type1", "#") + self.send_expect("modprobe -r vfio", "#") + self.send_expect("modprobe vfio enable_unsafe_noiommu_mode=1", "#") + self.send_expect("modprobe vfio-pci", "#") + else: + self.send_expect("rmmod vfio_pci", "#", 70) + self.send_expect("rmmod vfio_iommu_type1", "#", 70) + self.send_expect("rmmod vfio", "#", 70) + self.send_expect("modprobe vfio", "#", 70) + self.send_expect("modprobe vfio-pci", "#", 70) out = self.send_expect("lsmod | grep vfio_iommu_type1", "#") if not out: out = self.send_expect("ls /sys/module |grep vfio_pci", "#") -- 1.8.3.1 [-- Attachment #2: TestVfJumboFrame.log --] [-- Type: application/octet-stream, Size: 155826 bytes --]
[-- Attachment #1: Type: text/plain, Size: 1148 bytes --] Tested-by: Xie,WeiX < weix.xie@intel.com> Regards, Xie Wei -----Original Message----- From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Xiao Qimai Sent: Friday, June 12, 2020 5:12 PM To: dts@dpdk.org Cc: Xiao, QimaiX <qimaix.xiao@intel.com> Subject: [dts] [PATCH V1 2/2]conf/virt_global.cfg: change vm default driver from igb_uio to vfio-pci Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com> --- conf/virt_global.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/virt_global.cfg b/conf/virt_global.cfg index e47c6f3..7ab0440 100644 --- a/conf/virt_global.cfg +++ b/conf/virt_global.cfg @@ -25,7 +25,7 @@ cpu = mem = size=2048; def_driver = - driver_name=igb_uio; + driver_name=vfio-pci; [KVM] cpu = model=host,number=4,cpupin=3 4 5 6; @@ -38,7 +38,7 @@ control = vnc = disable=False; def_driver = - driver_name=igb_uio; + driver_name=vfio-pci; [XEN] cpu = number=4,cpupin=3 4 5 6; @@ -47,4 +47,4 @@ mem = vif = mac=random,bridge=br0 def_driver = - driver_name=igb_uio; + driver_name=vfio-pci; -- 1.8.3.1 [-- Attachment #2: TestVfJumboFrame.log --] [-- Type: application/octet-stream, Size: 155826 bytes --]
Applied the series, thanks -----Original Message----- From: dts <dts-bounces@dpdk.org> On Behalf Of Xiao Qimai Sent: 2020年6月12日 17:12 To: dts@dpdk.org Cc: Xiao, QimaiX <qimaix.xiao@intel.com> Subject: [dts] [PATCH V1 0/2] change vm default dpdk driver from igb_uio to vfio-pci * 1. change def_driver to vfio-pci * 2. add modprobe vfio-pci in vm Xiao Qimai (2): add modprobe vfio-pci in vm change vm default driver from igb_uio to vfio-pci conf/virt_global.cfg | 6 +++--- framework/project_dpdk.py | 16 +++++++++++----- 2 files changed, 14 insertions(+), 8 deletions(-) -- 1.8.3.1