From patchwork Fri Mar 26 10:52:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xie, WeiX" X-Patchwork-Id: 89878 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 7FBD1A0A0A; Fri, 26 Mar 2021 03:28:20 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6F1E9140DFC; Fri, 26 Mar 2021 03:28:20 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 6C9D44067B for ; Fri, 26 Mar 2021 03:28:18 +0100 (CET) IronPort-SDR: qtoYiyoQrmNH8DftXxMoePYJrGbWEmzaN1FLQ55MXwOvx6gxpOqioKEV1zEZCCe2DTn6BHirGg /FY28VIWGgbw== X-IronPort-AV: E=McAfee;i="6000,8403,9934"; a="170429657" X-IronPort-AV: E=Sophos;i="5.81,279,1610438400"; d="scan'208";a="170429657" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2021 19:28:17 -0700 IronPort-SDR: 1uy7AWp4vq98SiaBMaedVUdTXlFHru2v6zEf+nOSlirdsYDmnDDE2JVR4sxfonHeX+It+Ou1zS zWrGqn71db6w== X-IronPort-AV: E=Sophos;i="5.81,279,1610438400"; d="scan'208";a="409656090" Received: from unknown (HELO localhost.localdomain) ([10.240.183.103]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2021 19:28:16 -0700 From: xiewei To: dts@dpdk.org Cc: xiewei Date: Fri, 26 Mar 2021 18:52:08 +0800 Message-Id: <20210326105209.6426-2-weix.xie@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210326105209.6426-1-weix.xie@intel.com> References: <20210326105209.6426-1-weix.xie@intel.com> Subject: [dts] [PATCH V1 1/2] tests/kernelpf_iavf: adapt to CVL NIC 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" a.adapt to framework and remove the code of getting kernel driver version. b.adapt to ice driver update for vlan issue on AVF/DCF: vf_add_pvid: remove vlan, the pkts with random vlan id 1-4095 shall not be received. vf_vlan_rx: remove vlan, the pkts with vlan 1 shall not be received. vf_vlan_strip: disable strip, the pkts with random vlan tag shall not be received. vf_vlan_filter: disable filter, the pkts with random vlan tag shall not be received. vf_vlan_promisc: disable filter and strip, the pkts with random vlan tag shall not be received. Signed-off-by: xiewei --- tests/TestSuite_kernelpf_iavf.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tests/TestSuite_kernelpf_iavf.py b/tests/TestSuite_kernelpf_iavf.py index 5db1ec00..9b340a99 100644 --- a/tests/TestSuite_kernelpf_iavf.py +++ b/tests/TestSuite_kernelpf_iavf.py @@ -67,6 +67,8 @@ class TestKernelpfIavf(TestCase): self.vf_mac = '00:01:23:45:67:89' self.add_addr = '00:11:22:33:44:55' self.wrong_mac = '00:11:22:33:44:99' + # get driver version + self.driver_version = self.nic_obj.driver_version self.port = self.dut_ports[0] self.vm_port = 0 @@ -155,10 +157,6 @@ class TestKernelpfIavf(TestCase): self.dut.send_expect("ip link set %s vf 0 mac %s" % (self.host_intf, self.vf_mac), "# ") - # get driver version - out = self.dut.send_expect("ethtool -i %s | awk -F':' 'NR==2{print $2}'" % self.host_intf, "# ") - self.driver_version = out.replace(" ", "") - try: for port in self.sriov_vfs_port: @@ -420,7 +418,7 @@ class TestKernelpfIavf(TestCase): out = self.send_and_getout(vlan=random_vlan, pkt_type="VLAN_UDP") tcpdump_out = self.get_tcpdump_package() receive_pkt = re.findall('vlan %s' % random_vlan, tcpdump_out) - if self.driver_version < "2.13.10" or self.kdriver == 'ice': + if self.kdriver == 'i40e' and self.driver_version < "2.13.10": self.verify(len(receive_pkt) == 2, "fail to tester received vlan packet!!!") self.verify(self.vf_mac in out, "Failed to received vlan packet!!!") else: @@ -489,7 +487,7 @@ class TestKernelpfIavf(TestCase): # send vlan 1 packet, vf can receive packet out = self.send_and_getout(vlan=1, pkt_type="VLAN_UDP") - if self.driver_version < "2.13.10" or self.kdriver == 'ice': + if self.kdriver == 'i40e' and self.driver_version < "2.13.10": self.verify(self.vf_mac in out, "received vlan 1 packet!!!") else: self.verify(self.vf_mac not in out, "Received vlan 1 packet!!!") @@ -537,7 +535,7 @@ class TestKernelpfIavf(TestCase): self.send_and_getout(vlan=random_vlan, pkt_type="VLAN_UDP") tcpdump_out = self.get_tcpdump_package() receive_pkt = re.findall('vlan %s' % random_vlan, tcpdump_out) - if self.driver_version < "2.13.10" or self.kdriver == 'ice': + if self.kdriver == 'i40e' and self.driver_version < "2.13.10": self.verify(len(receive_pkt) == 2, 'Failed to not received vlan packet!!!') else: self.verify(len(receive_pkt) == 1, 'Failed to not received vlan packet!!!') @@ -574,7 +572,7 @@ class TestKernelpfIavf(TestCase): time.sleep(1) tcpdump_out = self.get_tcpdump_package() receive_pkt = re.findall('vlan %s' % random_vlan, tcpdump_out) - if self.driver_version < "2.13.10" or self.kdriver == 'ice': + if self.kdriver == 'i40e' and self.driver_version < "2.13.10": self.verify(len(receive_pkt) == 2, 'Failed to received vlan packet!!!') else: self.verify(len(receive_pkt) == 1, 'Failed to received vlan packet!!!') @@ -917,7 +915,7 @@ class TestKernelpfIavf(TestCase): self.scapy_send_packet(self.vf_mac, self.tester_intf, vlan_flags=True, count=10) out = self.vm_dut.get_session_output() packets = len(re.findall('received 1 packets', out)) - if self.driver_version < "2.13.10" or self.kdriver == 'ice': + if self.kdriver == 'i40e' and self.driver_version < "2.13.10": self.verify(packets == 10, "Not receive expected packet") else: self.verify(packets == 0, "Receive expected packet") From patchwork Fri Mar 26 10:52:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xie, WeiX" X-Patchwork-Id: 89879 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 E8814A0A02; Fri, 26 Mar 2021 03:28:20 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 956FE140E03; Fri, 26 Mar 2021 03:28:20 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 3402E4067B for ; Fri, 26 Mar 2021 03:28:19 +0100 (CET) IronPort-SDR: XpVWO2YO633MTMnId5F5GoMiwXdcJfMcLpl8Pg0xOmWj8BRMU6oZh1WWan8Sl4YGg7NX2UH9tQ BNekBHIkzTPA== X-IronPort-AV: E=McAfee;i="6000,8403,9934"; a="170429659" X-IronPort-AV: E=Sophos;i="5.81,279,1610438400"; d="scan'208";a="170429659" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2021 19:28:18 -0700 IronPort-SDR: EWwdtTd/dUDR6MeMejWGckSp8jgZw56d1d95UC3bthxHhGPsVMR+fe15SnowGuECwEax7UYIf7 estEG4Wiw90A== X-IronPort-AV: E=Sophos;i="5.81,279,1610438400"; d="scan'208";a="409656102" Received: from unknown (HELO localhost.localdomain) ([10.240.183.103]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2021 19:28:17 -0700 From: xiewei To: dts@dpdk.org Cc: xiewei Date: Fri, 26 Mar 2021 18:52:09 +0800 Message-Id: <20210326105209.6426-3-weix.xie@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210326105209.6426-1-weix.xie@intel.com> References: <20210326105209.6426-1-weix.xie@intel.com> Subject: [dts] [PATCH V1 2/2] tests/vf_vlan: adapt to CVL NIC 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" a.adapt to framework and remove the code of getting kernel driver version. b.adapt to ice driver update for vlan issue on AVF/DCF: vf_vlan_rx: while vlan set filter on, the pkts with random vlan id 1-4095 shall not be received. add_pvid_vf: while ip link set pf_intf vf 0 vlan 0, the pkts with random vlan id 1-4095 shall not be received. Signed-off-by: xiewei --- tests/TestSuite_vf_vlan.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/TestSuite_vf_vlan.py b/tests/TestSuite_vf_vlan.py index 28650143..34ba75e7 100644 --- a/tests/TestSuite_vf_vlan.py +++ b/tests/TestSuite_vf_vlan.py @@ -65,6 +65,9 @@ class TestVfVlan(TestCase): self.vf_assign_method = 'vfio-pci' self.dut.send_expect('modprobe vfio-pci', '#') + # get driver version + self.driver_version = self.nic_obj.driver_version + def set_up(self): self.setup_vm_env() @@ -107,9 +110,6 @@ class TestVfVlan(TestCase): self.host_intf0 = self.dut.ports_info[self.used_dut_port_0]['intf'] tester_port = self.tester.get_local_port(self.used_dut_port_0) self.tester_intf0 = self.tester.get_interface(tester_port) - # get driver version - out = self.dut.send_expect("ethtool -i %s | awk -F':' 'NR==2{print $2}'" % self.host_intf0, "# ") - self.driver_version = out.replace(" ", "") self.dut.generate_sriov_vfs_by_port( self.used_dut_port_0, 1, driver=driver) @@ -276,7 +276,7 @@ class TestVfVlan(TestCase): self.vm0_testpmd.execute_cmd("start") out = self.send_and_getout(vlan=random_vlan, pkt_type="VLAN_UDP") - if self.driver_version < "2.13.10" or self.kdriver == 'ice': + if self.kdriver == 'i40e' and self.driver_version < "2.13.10": self.verify("received" in out, "Failed to received vlan packet!!!") else: self.verify( @@ -398,7 +398,7 @@ class TestVfVlan(TestCase): # send packet with vlan out = self.send_and_getout(vlan=random_vlan, pkt_type="VLAN_UDP") - if self.driver_version < "2.13.10" or self.kdriver == 'ice': + if self.kdriver == 'i40e' and self.driver_version < "2.13.10": self.verify( "received 1 packets" in out, "Received mismatched vlan packet while vlan filter on") else: