* [dts] [PATCH V1 1/3] framework: modify dts because of i40evf removed
2021-10-20 16:28 [dts] [PATCH V1 0/3] *** modify dts because of i40evf removed *** Yan Xia
@ 2021-10-20 16:28 ` Yan Xia
2021-10-20 16:28 ` [dts] [PATCH V1 2/3] test_plans: " Yan Xia
2021-10-20 16:28 ` [dts] [PATCH V1 3/3] tests/vf_kernel: " Yan Xia
2 siblings, 0 replies; 4+ messages in thread
From: Yan Xia @ 2021-10-20 16:28 UTC (permalink / raw)
To: dts; +Cc: Yan Xia
modify dts because of i40evf removed
Signed-off-by: Yan Xia <yanx.xia@intel.com>
---
framework/dut.py | 3 +--
framework/settings.py | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/framework/dut.py b/framework/dut.py
index f5481d06..f3ef2cbe 100644
--- a/framework/dut.py
+++ b/framework/dut.py
@@ -507,8 +507,7 @@ class Dut(Crb):
break
else:
# try to bind nic with iavf
- if driver == 'i40evf':
- driver = 'iavf'
+ if driver == 'iavf':
self.send_expect('modprobe %s' % driver, '# ')
self.send_expect('echo %s > /sys/bus/pci/drivers/%s/bind'
% (pci_bus, driver), '# ')
diff --git a/framework/settings.py b/framework/settings.py
index c08b8709..bca4d59f 100644
--- a/framework/settings.py
+++ b/framework/settings.py
@@ -153,8 +153,8 @@ DRIVERS = {
'fortpark_1g': 'i40e',
'fortpark_TLV': 'i40e',
'fortpark_BASE-T': 'i40e',
- 'fortpark_TLV_vf': 'i40evf',
- 'fvl10g_vf': 'i40evf',
+ 'fortpark_TLV_vf': 'iavf',
+ 'fvl10g_vf': 'iavf',
'ConnectX3_MT4103': 'mlx4_core',
'ConnectX4_MT4115': 'mlx5_core',
'ConnectX4_LX_MT4117': 'mlx5_core',
--
2.33.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [dts] [PATCH V1 2/3] test_plans: modify dts because of i40evf removed
2021-10-20 16:28 [dts] [PATCH V1 0/3] *** modify dts because of i40evf removed *** Yan Xia
2021-10-20 16:28 ` [dts] [PATCH V1 1/3] framework: modify dts because of i40evf removed Yan Xia
@ 2021-10-20 16:28 ` Yan Xia
2021-10-20 16:28 ` [dts] [PATCH V1 3/3] tests/vf_kernel: " Yan Xia
2 siblings, 0 replies; 4+ messages in thread
From: Yan Xia @ 2021-10-20 16:28 UTC (permalink / raw)
To: dts; +Cc: Yan Xia
modify dts because of i40evf removed
Signed-off-by: Yan Xia <yanx.xia@intel.com>
---
test_plans/ddp_gtp_test_plan.rst | 2 +-
test_plans/ddp_mpls_test_plan.rst | 2 +-
test_plans/floating_veb_test_plan.rst | 4 ++--
test_plans/runtime_vf_queue_number_test_plan.rst | 2 +-
test_plans/veb_switch_test_plan.rst | 4 ++--
test_plans/vf_pf_reset_test_plan.rst | 4 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/test_plans/ddp_gtp_test_plan.rst b/test_plans/ddp_gtp_test_plan.rst
index cea2993f..9172b597 100644
--- a/test_plans/ddp_gtp_test_plan.rst
+++ b/test_plans/ddp_gtp_test_plan.rst
@@ -70,7 +70,7 @@ Prerequisites
3. Detach VF from the host::
- rmmod i40evf
+ rmmod iavf
4. Pass through VF 81:10.0 to vm0, start vm0.
diff --git a/test_plans/ddp_mpls_test_plan.rst b/test_plans/ddp_mpls_test_plan.rst
index cce8efb5..d76934c1 100644
--- a/test_plans/ddp_mpls_test_plan.rst
+++ b/test_plans/ddp_mpls_test_plan.rst
@@ -60,7 +60,7 @@ Prerequisites
2. Detach VF from the host::
- rmmod i40evf
+ rmmod iavf
3. Pass through VF 81:10.0 to vm0, start vm0.
diff --git a/test_plans/floating_veb_test_plan.rst b/test_plans/floating_veb_test_plan.rst
index 1522b53b..37f6fc09 100644
--- a/test_plans/floating_veb_test_plan.rst
+++ b/test_plans/floating_veb_test_plan.rst
@@ -99,8 +99,8 @@ Prerequisites for VEB testing
./dpdk-devbind.py -b igb_uio 05:00.0
echo 2 >/sys/bus/pci/devices/0000:05:00.0/max_vfs
./dpdk-devbind.py --st
- 0000:05:02.0 'XL710/X710 Virtual Function' unused=i40evf,igb_uio
- 0000:05:02.1 'XL710/X710 Virtual Function' unused=i40evf,igb_uio
+ 0000:05:02.0 'XL710/X710 Virtual Function' unused=iavf,igb_uio
+ 0000:05:02.1 'XL710/X710 Virtual Function' unused=iavf,igb_uio
4. Bind the VFs to dpdk driver::
diff --git a/test_plans/runtime_vf_queue_number_test_plan.rst b/test_plans/runtime_vf_queue_number_test_plan.rst
index 9d4f9538..b0c2c3a9 100644
--- a/test_plans/runtime_vf_queue_number_test_plan.rst
+++ b/test_plans/runtime_vf_queue_number_test_plan.rst
@@ -338,7 +338,7 @@ Verify error information::
Test case 7: Reserve VF queue number when VF bind to kernel driver
==================================================================
-1. bind vf to kernel driver i40evf::
+1. bind vf to kernel driver iavf::
./usertools/dpdk-devbind.py -b i40e 0000:18:02.0
diff --git a/test_plans/veb_switch_test_plan.rst b/test_plans/veb_switch_test_plan.rst
index ca8bd7e0..1d7d11c2 100644
--- a/test_plans/veb_switch_test_plan.rst
+++ b/test_plans/veb_switch_test_plan.rst
@@ -86,8 +86,8 @@ Prerequisites for VEB testing
./dpdk-devbind.py -b igb_uio 05:00.0
echo 2 >/sys/bus/pci/devices/0000:05:00.0/max_vfs
./dpdk-devbind.py --st
- 0000:05:02.0 'XL710/X710 Virtual Function' unused=i40evf,igb_uio
- 0000:05:02.1 'XL710/X710 Virtual Function' unused=i40evf,igb_uio
+ 0000:05:02.0 'XL710/X710 Virtual Function' unused=iavf,igb_uio
+ 0000:05:02.1 'XL710/X710 Virtual Function' unused=iavf,igb_uio
4. Bind the VFs to dpdk driver::
diff --git a/test_plans/vf_pf_reset_test_plan.rst b/test_plans/vf_pf_reset_test_plan.rst
index 009e99a9..574d4510 100644
--- a/test_plans/vf_pf_reset_test_plan.rst
+++ b/test_plans/vf_pf_reset_test_plan.rst
@@ -589,11 +589,11 @@ test Case 10: vf reset (two vfs passed through to two VM)
using `lspci -nn|grep -i ethernet` got VF device id, for example "8086 154c"::
echo "8086 154c" > /sys/bus/pci/drivers/pci-stub/new_id
- echo "0000:82:02.0" > /sys/bus/pci/drivers/i40evf/unbind
+ echo "0000:82:02.0" > /sys/bus/pci/drivers/iavf/unbind
echo "0000:82:02.0" > /sys/bus/pci/drivers/pci-stub/bind
echo "8086 154c" > /sys/bus/pci/drivers/pci-stub/new_id
- echo "0000:82:02.1" > /sys/bus/pci/drivers/i40evf/unbind
+ echo "0000:82:02.1" > /sys/bus/pci/drivers/iavf/unbind
echo "0000:82:02.1" > /sys/bus/pci/drivers/pci-stub/bind
3. Pass through VF0 81:02.0 to vm0, VF1 81:02.1 to vm1::
--
2.33.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [dts] [PATCH V1 3/3] tests/vf_kernel: modify dts because of i40evf removed
2021-10-20 16:28 [dts] [PATCH V1 0/3] *** modify dts because of i40evf removed *** Yan Xia
2021-10-20 16:28 ` [dts] [PATCH V1 1/3] framework: modify dts because of i40evf removed Yan Xia
2021-10-20 16:28 ` [dts] [PATCH V1 2/3] test_plans: " Yan Xia
@ 2021-10-20 16:28 ` Yan Xia
2 siblings, 0 replies; 4+ messages in thread
From: Yan Xia @ 2021-10-20 16:28 UTC (permalink / raw)
To: dts; +Cc: Yan Xia
modify dts because of i40evf removed
Signed-off-by: Yan Xia <yanx.xia@intel.com>
---
tests/TestSuite_vf_kernel.py | 37 +++++++++++++++++++++++++++---------
1 file changed, 28 insertions(+), 9 deletions(-)
diff --git a/tests/TestSuite_vf_kernel.py b/tests/TestSuite_vf_kernel.py
index a4e1e52a..e685db65 100755
--- a/tests/TestSuite_vf_kernel.py
+++ b/tests/TestSuite_vf_kernel.py
@@ -315,7 +315,10 @@ class TestVfKernel(TestCase):
self.verify("Link detected: yes" in out, "Wrong link status")
# Unload VF1 kernel driver and expect no problem for VF0
- self.vm1_dut.send_expect("rmmod %svf" % self.kdriver, "#")
+ if self.kdriver == "i40e":
+ self.vm1_dut.send_expect("rmmod iavf", "#")
+ else:
+ self.vm1_dut.send_expect("rmmod %svf" % self.kdriver, "#")
out = self.vm0_dut.send_expect("ethtool %s" % self.vm0_intf0, "#")
self.verify("Link detected: yes" in out, "Wrong link status")
vm0_vf0_mac = self.vm0_dut.ports_info[0]['port'].get_mac_addr()
@@ -330,20 +333,29 @@ class TestVfKernel(TestCase):
self.verify(self.verify_vm_tcpdump(self.vm0_dut, self.vm0_intf0,
vm0_vf0_mac), "reset PF testpmd impact VF RX failure")
- self.vm1_dut.send_expect("modprobe %svf" % self.kdriver, "#")
+ if self.kdriver == "i40e":
+ self.vm1_dut.send_expect("modprobe iavf", "#")
+ else:
+ self.vm1_dut.send_expect("modprobe %svf" % self.kdriver, "#")
out = self.vm0_dut.send_expect("ethtool %s" % self.vm0_intf0, "#")
self.verify("Link detected: yes" in out, "Wrong link status")
vm0_vf0_mac = self.vm0_dut.ports_info[0]['port'].get_mac_addr()
self.verify(self.verify_vm_tcpdump(self.vm0_dut, self.vm0_intf0,
vm0_vf0_mac), "load VF1 kernel driver impact VF0")
- self.vm1_dut.send_expect("rmmod %svf" % self.kdriver, "#")
+ if self.kdriver == "i40e":
+ self.vm1_dut.send_expect("rmmod iavf", "#")
+ else:
+ self.vm1_dut.send_expect("rmmod %svf" % self.kdriver, "#")
out = self.vm0_dut.send_expect("ethtool %s" % self.vm0_intf0, "#")
self.verify("Link detected: yes" in out, "Wrong link status")
vm0_vf0_mac = self.vm0_dut.ports_info[0]['port'].get_mac_addr()
self.verify(self.verify_vm_tcpdump(self.vm0_dut, self.vm0_intf0,
vm0_vf0_mac), "Reset VF1 kernel driver impact VF0")
- self.vm1_dut.send_expect("modprobe %svf" % self.kdriver, "#")
+ if self.kdriver == "i40e":
+ self.vm1_dut.send_expect("modprobe iavf", "#")
+ else:
+ self.vm1_dut.send_expect("modprobe %svf" % self.kdriver, "#")
def test_address(self):
"""
@@ -1048,12 +1060,19 @@ class TestVfKernel(TestCase):
Load kernel driver stress
"""
for i in range(100):
- out = self.vm0_dut.send_expect("rmmod %svf" % self.kdriver, "#")
- self.verify('error' not in out,
+ if self.kdriver == "i40e":
+ out = self.vm0_dut.send_expect("rmmod iavf", "#")
+ self.verify('error' not in out,
+ "stress error for rmmod iavf:%s" %out)
+ out = self.vm0_dut.send_expect("modprobe iavf", "#")
+ self.verify('error' not in out, "stress error for modprobe iavf:%s" %out)
+ else:
+ out = self.vm0_dut.send_expect("rmmod %svf" % self.kdriver, "#")
+ self.verify('error' not in out,
"stress error for rmmod %svf:%s" % (self.kdriver, out))
- out = self.vm0_dut.send_expect("modprobe %svf" % self.kdriver, "#")
- self.verify('error' not in out, "stress error for modprobe %svf:%s" % (
- self.kdriver, out))
+ out = self.vm0_dut.send_expect("modprobe %svf" % self.kdriver, "#")
+ self.verify('error' not in out, "stress error for modprobe %svf:%s" % (
+ self.kdriver, out))
def tear_down(self):
"""
--
2.33.1
^ permalink raw reply [flat|nested] 4+ messages in thread