* [dts] [PATCH V1 1/3] framework/project_dpdk: remove IAVF dpdk code modification
2021-06-18 9:26 [dts] [PATCH V1 0/3] remove enable IAVF function Jun Dong
@ 2021-06-18 9:26 ` Jun Dong
2021-06-18 9:26 ` [dts] [PATCH V1 2/3] test_plans/*: update test plan about enable IAVF Jun Dong
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Jun Dong @ 2021-06-18 9:26 UTC (permalink / raw)
To: junx.dong; +Cc: dts, Zhimin Huang
From: Zhimin Huang <zhiminx.huang@intel.com>
* IAVF is default VF driver for i40e NIC, so remove dpdk changes from dts
Signed-off-by: Jun Dong <junx.dong@intel.com>
---
framework/project_dpdk.py | 7 -------
1 file changed, 7 deletions(-)
diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py
index f7946664..c1719c49 100644
--- a/framework/project_dpdk.py
+++ b/framework/project_dpdk.py
@@ -288,13 +288,6 @@ class DPDKdut(Dut):
kernel_driver = self.nic.default_driver
nic_name = self.nic.name
- if nic_name in ['fortpark_TLV', 'fortpark_BASE-T']:
- self.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },/i { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_X722_VF) },' drivers/net/iavf/iavf_ethdev.c", "# ")
- self.send_expect("sed -i '/I40E_DEV_ID_X722_VF/d' drivers/net/i40e/i40e_ethdev_vf.c", "# ")
- elif kernel_driver == 'i40e':
- self.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },/a { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },' drivers/net/iavf/iavf_ethdev.c", "# ")
- self.send_expect("sed -i -e '/I40E_DEV_ID_VF/s/0x154C/0x164C/g' drivers/net/i40e/base/i40e_devids.h", "# ")
-
build_type = load_global_setting(HOST_BUILD_TYPE_SETTING)
build_install_dpdk = getattr(self, 'build_install_dpdk_%s_%s' % (self.get_os_type(), build_type))
build_install_dpdk(target, extra_options)
--
2.27.0
^ permalink raw reply [flat|nested] 5+ messages in thread* [dts] [PATCH V1 2/3] test_plans/*: update test plan about enable IAVF
2021-06-18 9:26 [dts] [PATCH V1 0/3] remove enable IAVF function Jun Dong
2021-06-18 9:26 ` [dts] [PATCH V1 1/3] framework/project_dpdk: remove IAVF dpdk code modification Jun Dong
@ 2021-06-18 9:26 ` Jun Dong
2021-06-18 9:26 ` [dts] [PATCH V1 3/3] tests/*: " Jun Dong
2021-06-22 7:07 ` [dts] [PATCH V1 0/3] remove enable IAVF function Tu, Lijuan
3 siblings, 0 replies; 5+ messages in thread
From: Jun Dong @ 2021-06-18 9:26 UTC (permalink / raw)
To: junx.dong; +Cc: dts
* update iavf test plan
* update vf_l3fwd test plan
Signed-off-by: Jun Dong <junx.dong@intel.com>
---
test_plans/iavf_test_plan.rst | 23 ++++-------------------
test_plans/vf_l3fwd_test_plan.rst | 5 -----
2 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/test_plans/iavf_test_plan.rst b/test_plans/iavf_test_plan.rst
index b760a633..4855e175 100644
--- a/test_plans/iavf_test_plan.rst
+++ b/test_plans/iavf_test_plan.rst
@@ -43,14 +43,7 @@ I40E driver NIC (Fortville XXV710, Fortville Spirit, Fortville Eagle)
Prerequisites
=======================
-1. Modify and build DPDK source code to enable IAVF function for I40E NIC::
-
- sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },/a { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },' drivers/net/iavf/iavf_ethdev.c
- sed -i -e '/I40E_DEV_ID_VF/s/0x154C/0x164C/g' drivers/net/i40e/base/i40e_devids.h
-
- make install RTE_SDK=`pwd` T=x86_64-native-linuxapp-gcc
-
-2. Configure PF and VF::
+1. Configure PF and VF::
modprobe uio;
insmod x86_64-native-linuxapp-gcc/kmod/igb_uio.ko;
@@ -59,14 +52,14 @@ Prerequisites
echo 1 > /sys/bus/pci/devices/0000\:08\:00.0/max_vfs
echo 1 > /sys/bus/pci/devices/0000\:08\:00.1/max_vfs
-3. Start testpmd on host to configure VF ports' mac::
+2. Start testpmd on host to configure VF ports' mac::
./x86_64-native-linuxapp-gcc/app/testpmd -l 1-5 -n 4 -- -i
testpmd>set vf mac addr 0 0 00:12:34:56:78:01
testpmd>set vf mac addr 1 0 00:12:34:56:78:02
-4. Pass through VF 09:02.0 and 09:0a.0 to VM0::
+3. Pass through VF 09:02.0 and 09:0a.0 to VM0::
taskset -c 24,25 qemu-system-x86_64 \
-name vm0 -enable-kvm -pidfile /tmp/.vm0.pid -daemonize -monitor unix:/tmp/vm0_monitor.sock,server,nowait \
@@ -76,15 +69,7 @@ Prerequisites
-device virtio-serial -device virtserialport,chardev=vm0_qga0,name=org.qemu.guest_agent.0 -vnc :1 \
-drive file=/home/image/sriov-fc25-1.img,format=raw,if=virtio,index=0,media=disk
-
-5. Modify and build DPDK source code to enable IAVF function for I40E NIC in VM::
-
- sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },/a { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },' drivers/net/iavf/iavf_ethdev.c
- sed -i -e '/I40E_DEV_ID_VF/s/0x154C/0x164C/g' drivers/net/i40e/base/i40e_devids.h
-
- make install RTE_SDK=`pwd` T=x86_64-native-linuxapp-gcc
-
-6. Bind VF to igb_uio or vfio-pic in VM::
+4. Bind VF to igb_uio or vfio-pic in VM::
./usertools/dpdk-devbind.py --bind=igb_uio 00:04.0 00:05.0
or
diff --git a/test_plans/vf_l3fwd_test_plan.rst b/test_plans/vf_l3fwd_test_plan.rst
index 6d816dd8..efdedda4 100644
--- a/test_plans/vf_l3fwd_test_plan.rst
+++ b/test_plans/vf_l3fwd_test_plan.rst
@@ -85,11 +85,6 @@ Prerequisites
* Case config:
For test vf_l3fwd perf, need to set "define RTE_TEST_RX_DESC_DEFAULT 2048" and "define RTE_TEST_TX_DESC_DEFAULT 2048"
in ./examples/l3fwd/l3fwd.h and re-build l3fwd.
- Note:
- Only FVL need to change code to support iavf, when dpdk use iavf as default vf driver, no need to change code.
- If test iavf on FVL, need to change "{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) }" to
- "a { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) }" in ./drivers/net/iavf/iavf_ethdev.c,
- and set "I40E_DEV_ID_VF 0x164C" in ./drivers/net/i40e/base/i40e_devids.h and re-build DPDK.
Setup overview
==============
--
2.27.0
^ permalink raw reply [flat|nested] 5+ messages in thread* [dts] [PATCH V1 3/3] tests/*: update test plan about enable IAVF
2021-06-18 9:26 [dts] [PATCH V1 0/3] remove enable IAVF function Jun Dong
2021-06-18 9:26 ` [dts] [PATCH V1 1/3] framework/project_dpdk: remove IAVF dpdk code modification Jun Dong
2021-06-18 9:26 ` [dts] [PATCH V1 2/3] test_plans/*: update test plan about enable IAVF Jun Dong
@ 2021-06-18 9:26 ` Jun Dong
2021-06-22 7:07 ` [dts] [PATCH V1 0/3] remove enable IAVF function Tu, Lijuan
3 siblings, 0 replies; 5+ messages in thread
From: Jun Dong @ 2021-06-18 9:26 UTC (permalink / raw)
To: junx.dong; +Cc: dts
* update iavf test suite
* update vf_l3fwd test suite
Signed-off-by: Jun Dong <junx.dong@intel.com>
---
tests/TestSuite_iavf.py | 12 ------------
tests/TestSuite_vf_l3fwd.py | 13 -------------
2 files changed, 25 deletions(-)
diff --git a/tests/TestSuite_iavf.py b/tests/TestSuite_iavf.py
index 248bd8d1..9656b4fc 100644
--- a/tests/TestSuite_iavf.py
+++ b/tests/TestSuite_iavf.py
@@ -84,9 +84,6 @@ class TestIavf(TestCase):
else:
self.vf_assign_method = 'vfio-pci'
self.dut.send_expect('modprobe vfio-pci', '#')
- self.dut.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },/a { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },' drivers/net/iavf/iavf_ethdev.c", "# ")
- self.dut.send_expect("sed -i -e '/I40E_DEV_ID_VF/s/0x154C/0x164C/g' drivers/net/i40e/base/i40e_devids.h", "# ")
- self.dut.build_install_dpdk(self.target)
self.setup_vm_env()
def set_up(self):
@@ -153,9 +150,6 @@ class TestIavf(TestCase):
self.vm0_dut_ports = self.vm_dut_0.get_ports('any')
self.vm0_testpmd = PmdOutput(self.vm_dut_0)
- self.vm_dut_0.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },/a { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },' drivers/net/iavf/iavf_ethdev.c", "# ")
- self.vm_dut_0.send_expect("sed -i -e '/I40E_DEV_ID_VF/s/0x154C/0x164C/g' drivers/net/i40e/base/i40e_devids.h", "# ")
- self.vm_dut_0.build_install_dpdk(self.target)
self.env_done = True
def bind_nic_driver(self, ports, driver=""):
@@ -183,9 +177,6 @@ class TestIavf(TestCase):
netdev.bind_driver(driver=driver)
def destroy_vm_env(self):
- self.vm_dut_0.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },/d' drivers/net/iavf/iavf_ethdev.c", "# ")
- self.vm_dut_0.send_expect("sed -i -e '/I40E_DEV_ID_VF/s/0x164C/0x154C/g' drivers/net/i40e/base/i40e_devids.h", "# ")
- self.vm_dut_0.build_install_dpdk(self.target)
if getattr(self, 'vm0', None):
if getattr(self, 'vm_dut_0', None):
self.vm_dut_0.kill_all()
@@ -771,9 +762,6 @@ class TestIavf(TestCase):
self.dut.send_expect("quit", "# ")
if self.env_done is True:
self.destroy_vm_env()
- self.dut.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },/d' drivers/net/iavf/iavf_ethdev.c", "# ")
- self.dut.send_expect("sed -i -e '/I40E_DEV_ID_VF/s/0x164C/0x154C/g' drivers/net/i40e/base/i40e_devids.h", "# ")
- self.dut.build_install_dpdk(self.target)
self.env_done = False
else:
pass
diff --git a/tests/TestSuite_vf_l3fwd.py b/tests/TestSuite_vf_l3fwd.py
index 60a2bea4..a9bc7fa4 100644
--- a/tests/TestSuite_vf_l3fwd.py
+++ b/tests/TestSuite_vf_l3fwd.py
@@ -307,21 +307,9 @@ class TestVfL3fwd(TestCase):
for idx in self.dut_ports:
self.verify(self.dut.ports_info[idx]['port'].default_driver == 'i40e', 'The case is only designed for Fortville')
- self.build_iavf()
self.set_rxtx_descriptor_2048_and_rebuild_l3fwd()
self.measure_vf_performance(host_driver='default', vf_driver=self.get_kernel_pf_vf_driver())
- def build_iavf(self):
- self.dut.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },/a { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },' drivers/net/iavf/iavf_ethdev.c", "# ")
- self.dut.send_expect("sed -i -e '/I40E_DEV_ID_VF/s/0x154C/0x164C/g' drivers/net/i40e/base/i40e_devids.h", "# ")
- self.dut.build_install_dpdk(self.target)
-
- def restore_dpdk(self):
- if self.running_case == "test_perf_kernel_pf_dpdk_iavf_perf_host_only":
- self.dut.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) }/d' drivers/net/iavf/iavf_ethdev.c", "# ")
- self.dut.send_expect("sed -i -e '/I40E_DEV_ID_VF/s/0x164C/0x154C/g' drivers/net/i40e/base/i40e_devids.h", "# ")
- self.dut.build_install_dpdk(self.target)
-
def set_rxtx_descriptor_2048_and_rebuild_l3fwd(self):
"""
Set RX/TX descriptor to 2048 and rebuild l3fwd
@@ -344,7 +332,6 @@ class TestVfL3fwd(TestCase):
def tear_down(self):
self.destroy_vf_env()
- self.restore_dpdk()
def tear_down_all(self):
self.dut.bind_interfaces_linux(self.drivername)
--
2.27.0
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [dts] [PATCH V1 0/3] remove enable IAVF function
2021-06-18 9:26 [dts] [PATCH V1 0/3] remove enable IAVF function Jun Dong
` (2 preceding siblings ...)
2021-06-18 9:26 ` [dts] [PATCH V1 3/3] tests/*: " Jun Dong
@ 2021-06-22 7:07 ` Tu, Lijuan
3 siblings, 0 replies; 5+ messages in thread
From: Tu, Lijuan @ 2021-06-22 7:07 UTC (permalink / raw)
To: Dong, JunX, Dong, JunX; +Cc: dts
> IAVF is the default VF driver for Intel 700 serial (i40e) NIC family in DPDK 21.05,
> and DTS improvement WG have agreed to remove these changes from
> DTS.Therefore.
>
> Jun Dong (4):
> test_plans/iavf_test_plan: remove enable IAVF function steps
> test_plans/vf_l3fwd_test_plan: remove enable IAVF function steps
> tests/TestSuite_iavf: remvove enable IAVF function code
> tests/TestSuite_vf_l3fwd: remove enable IAVF function code
Applied, thanks
^ permalink raw reply [flat|nested] 5+ messages in thread