From patchwork Wed Oct 20 18:10:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yan Xia X-Patchwork-Id: 102405 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DFE0AA0C43; Wed, 20 Oct 2021 12:10:33 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D40B2411BB; Wed, 20 Oct 2021 12:10:33 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id 2B96740142 for ; Wed, 20 Oct 2021 12:10:32 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10142"; a="215909912" X-IronPort-AV: E=Sophos;i="5.87,166,1631602800"; d="scan'208";a="215909912" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2021 03:10:31 -0700 X-IronPort-AV: E=Sophos;i="5.87,166,1631602800"; d="scan'208";a="527000095" Received: from unknown (HELO dpdk.lan) ([10.240.183.77]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2021 03:10:30 -0700 From: Yan Xia To: dts@dpdk.org Cc: Yan Xia Date: Wed, 20 Oct 2021 18:10:03 +0000 Message-Id: <20211020181005.332986-2-yanx.xia@intel.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211020181005.332986-1-yanx.xia@intel.com> References: <20211020181005.332986-1-yanx.xia@intel.com> MIME-Version: 1.0 Subject: [dts] [PATCH V2 1/3] framework: modify dts because of i40evf removed X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" modify dts because of i40evf removed dpdk commit-id:c65f9258 Signed-off-by: Yan Xia Acked-by: Xueqin Lin --- 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', From patchwork Wed Oct 20 18:10:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yan Xia X-Patchwork-Id: 102406 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 09E3FA0C43; Wed, 20 Oct 2021 12:10:37 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 04B8141196; Wed, 20 Oct 2021 12:10:37 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id B713340142 for ; Wed, 20 Oct 2021 12:10:34 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10142"; a="215909915" X-IronPort-AV: E=Sophos;i="5.87,166,1631602800"; d="scan'208";a="215909915" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2021 03:10:34 -0700 X-IronPort-AV: E=Sophos;i="5.87,166,1631602800"; d="scan'208";a="527000114" Received: from unknown (HELO dpdk.lan) ([10.240.183.77]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2021 03:10:33 -0700 From: Yan Xia To: dts@dpdk.org Cc: Yan Xia Date: Wed, 20 Oct 2021 18:10:04 +0000 Message-Id: <20211020181005.332986-3-yanx.xia@intel.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211020181005.332986-1-yanx.xia@intel.com> References: <20211020181005.332986-1-yanx.xia@intel.com> MIME-Version: 1.0 Subject: [dts] [PATCH V2 2/3] test_plans: modify dts because of i40evf removed X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" modify dts because of i40evf removed dpdk commit-id:c65f9258 Signed-off-by: Yan Xia Acked-by: Xueqin Lin --- 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:: From patchwork Wed Oct 20 18:10:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yan Xia X-Patchwork-Id: 102407 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2FC1EA0C43; Wed, 20 Oct 2021 12:10:40 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2741D411E4; Wed, 20 Oct 2021 12:10:40 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id D181A40142 for ; Wed, 20 Oct 2021 12:10:37 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10142"; a="215909920" X-IronPort-AV: E=Sophos;i="5.87,166,1631602800"; d="scan'208";a="215909920" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2021 03:10:37 -0700 X-IronPort-AV: E=Sophos;i="5.87,166,1631602800"; d="scan'208";a="527000130" Received: from unknown (HELO dpdk.lan) ([10.240.183.77]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2021 03:10:36 -0700 From: Yan Xia To: dts@dpdk.org Cc: Yan Xia Date: Wed, 20 Oct 2021 18:10:05 +0000 Message-Id: <20211020181005.332986-4-yanx.xia@intel.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211020181005.332986-1-yanx.xia@intel.com> References: <20211020181005.332986-1-yanx.xia@intel.com> MIME-Version: 1.0 Subject: [dts] [PATCH V2 3/3] tests/vf_kernel: modify dts because of i40evf removed X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" modify dts because of i40evf removed dpdk commit-id: c65f9258 Signed-off-by: Yan Xia Tested-by: Yan Xia Acked-by: Xueqin Lin --- 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): """