From: Xiao Qimai <qimaix.xiao@intel.com>
To: dts@dpdk.org
Cc: Xiao Qimai <qimaix.xiao@intel.com>
Subject: [dts] [PATCH V1 3/5]framework/project_dpdk: update method setup_modules_linux for vfio-pci in vm
Date: Tue, 30 Jun 2020 17:46:36 +0800 [thread overview]
Message-ID: <1593510398-51509-4-git-send-email-qimaix.xiao@intel.com> (raw)
In-Reply-To: <1593510398-51509-1-git-send-email-qimaix.xiao@intel.com>
Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
---
framework/project_dpdk.py | 26 ++++++++------------------
1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py
index e8b5d0f..b8cb2bd 100644
--- a/framework/project_dpdk.py
+++ b/framework/project_dpdk.py
@@ -101,25 +101,15 @@ class DPDKdut(Dut):
def setup_modules_linux(self, target, drivername, drivermode):
if drivername == "vfio-pci":
- 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", "#")
- assert ("vfio_pci" in out), "Failed to insmod vfio_pci"
-
-
+ self.send_expect("rmmod vfio_pci", "#")
+ self.send_expect("rmmod vfio_iommu_type1", "#")
+ self.send_expect("rmmod vfio", "#")
+ self.send_expect("modprobe vfio", "#")
+ self.send_expect("modprobe vfio-pci", "#")
if drivermode == "noiommu":
- self.send_expect("echo 1 > /sys/module/vfio/parameters/enable_unsafe_noiommu_mode", "#", 70)
+ self.send_expect("echo 1 > /sys/module/vfio/parameters/enable_unsafe_noiommu_mode", "#")
+ out = self.send_expect("ls /sys/module|grep vfio_pci", "#")
+ assert ("vfio_pci" in out), "load vfio_pci failed"
elif drivername == "uio_pci_generic":
self.send_expect("modprobe uio", "#", 70)
--
1.8.3.1
next prev parent reply other threads:[~2020-06-30 9:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-30 9:46 [dts] [PATCH V1 0/5] update framework to support vfio-pci and new version of OS Xiao Qimai
2020-06-30 9:46 ` [dts] [PATCH V1 1/5]conf/virt_global.cfg: vfio-pci should be loaded with noiommu mode in vm Xiao Qimai
2020-06-30 9:46 ` [dts] [PATCH V1 2/5]framework/dut.py: update method of restore_interfaces_linux Xiao Qimai
2020-06-30 9:46 ` Xiao Qimai [this message]
2020-06-30 9:46 ` [dts] [PATCH V1 4/5]framework/qemu_kvm: remove cat command Xiao Qimai
2020-06-30 9:46 ` [dts] [PATCH V1 5/5]framework/ssh_pexpect: add retry when connect to vm Xiao Qimai
2020-06-30 9:56 ` [dts] [PATCH V1 0/5] update framework to support vfio-pci and new version of OS Xiao, QimaiX
2020-07-01 6:19 ` Tu, Lijuan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1593510398-51509-4-git-send-email-qimaix.xiao@intel.com \
--to=qimaix.xiao@intel.com \
--cc=dts@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).