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): """