From patchwork Tue Jul 5 07:18:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiyuan Li X-Patchwork-Id: 113668 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 98C92A0542; Tue, 5 Jul 2022 09:18:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6FDFF4021D; Tue, 5 Jul 2022 09:18:44 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id B4680400D7 for ; Tue, 5 Jul 2022 09:18:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657005522; x=1688541522; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=5BjNO5MPhvWOR4RsT5lNYowsmWJzIibk1NiHYa7ZZwM=; b=mQfH5Pzqxw+ZeuHpq6/yx/War7zPP64ILV4NBusP2YHRvp7zDgx3uWnY DrdNrojo5SZ8rfAW9OLz8NEcCgDihd8bbDPNwX0WuApRXP2RLhLgyeTu9 n5pCHyIScGo1enFm0F48c383IIFnN5CpRryHe5HzWXLcYeKFN8fL36Beg lQYrWVgdKGsJKakDmr2eyDWu3WjMndtcRib988EJLZsfiG6X45yFC7N1f 2WwaF9BhQtGd3G+TcIVbsJnRS4G9ZOF90dMIsFeHC5kvZJjPSIhxU93EL knuP7rFmSba1qef87Rx9lYa7jL6OqFMmUHlIFCXujKIvdy6eTH9HIrkEk A==; X-IronPort-AV: E=McAfee;i="6400,9594,10398"; a="308814497" X-IronPort-AV: E=Sophos;i="5.92,245,1650956400"; d="scan'208";a="308814497" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2022 00:18:41 -0700 X-IronPort-AV: E=Sophos;i="5.92,245,1650956400"; d="scan'208";a="625346203" Received: from unknown (HELO localhost.localdomain) ([10.239.252.248]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2022 00:18:39 -0700 From: Weiyuan Li To: dts@dpdk.org, yuan.peng@intel.com Cc: Weiyuan Li Subject: [dts][PATCH V1 1/4] tests/kernelpf_iavf: update dts code for driver change Date: Tue, 5 Jul 2022 15:18:32 +0800 Message-Id: <20220705071835.17187-1-weiyuanx.li@intel.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 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 The out-tree driver has vf-vlan-pruning option,but in-tree driver has not. So we need different action to enable vlan filter when we validate the vlan filter function with in-tree and out-tree kernel drvier. Signed-off-by: Weiyuan Li --- tests/TestSuite_kernelpf_iavf.py | 34 ++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/tests/TestSuite_kernelpf_iavf.py b/tests/TestSuite_kernelpf_iavf.py index d7d17ac4..8d051931 100644 --- a/tests/TestSuite_kernelpf_iavf.py +++ b/tests/TestSuite_kernelpf_iavf.py @@ -96,7 +96,26 @@ class TestKernelpfIavf(TestCase): # bind to default driver self.bind_nic_driver(self.dut_ports, driver="") self.used_dut_port = self.dut_ports[0] - if self.is_eth_series_nic(800) and self.default_stats: + # check out tree driver whether there is flag vf-vlan-pruning. + # out tree path: /lib/modules/4.18.0-305.19.1.el8_4.x86_64/updates/drivers/net/ethernet/intel/i40e/i40e.ko + # in tree path:/lib/modules/5.15.0-27-generic/kernel/drivers/net/ethernet/intel/ice/ice.ko + out = self.dut.send_expect(f"modinfo {self.kdriver}", "# ") + pattern = "/lib/modules/(.*?)/updates/drivers" + regex = re.compile(pattern) + mo = regex.search(out) + if mo: + search_results = mo.group(0) + else: + search_results = '' + if "updates" in search_results and not self.default_stats: + self.verify( + False, + f"{self.kdriver} driver out tree does not have vf-vlan-pruning flag. Please confirm whether the driver is correct.", + ) + if ( + any([self.is_eth_series_nic(800), self.kdriver == "i40e"]) + and self.default_stats + ): self.dut.send_expect( "ethtool --set-priv-flags %s %s on" % (self.host_intf, self.flag), "# " ) @@ -119,7 +138,6 @@ class TestKernelpfIavf(TestCase): self.dut.send_expect( "ip link set %s vf 0 mac %s" % (self.host_intf, self.vf_mac), "# " ) - try: for port in self.sriov_vfs_port: @@ -453,7 +471,11 @@ class TestKernelpfIavf(TestCase): time.sleep(1) tcpdump_out = self.get_tcpdump_package() receive_pkt = re.findall("vlan %s" % random_vlan, tcpdump_out) - if self.kdriver == "i40e" and self.driver_version < "2.13.10": + if ( + (self.kdriver == "i40e" and self.driver_version < "2.13.10") + or (self.kdriver == "i40e" and not self.default_stats) + or (self.kdriver == "ice" and not self.default_stats) + ): self.verify(len(receive_pkt) == 2, "Failed to received vlan packet!!!") else: self.verify(len(receive_pkt) == 1, "Failed to received vlan packet!!!") @@ -853,7 +875,11 @@ 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.kdriver == "i40e" and self.driver_version < "2.13.10": + if ( + (self.kdriver == "i40e" and self.driver_version < "2.13.10") + or (self.kdriver == "i40e" and not self.default_stats) + or (self.kdriver == "ice" and not self.default_stats) + ): self.verify(packets == 10, "Not receive expected packet") else: self.verify(packets == 0, "Receive expected packet")