From patchwork Mon Nov 21 08:05:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiyuan Li X-Patchwork-Id: 119983 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 46DA7A055D; Mon, 21 Nov 2022 09:05:55 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4C4A442D23; Mon, 21 Nov 2022 09:05:54 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id CB52641148 for ; Mon, 21 Nov 2022 09:05:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669017953; x=1700553953; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DHNNhEuahxgMn++exv0XoCzGLVRCHrMgWssJn8SurhA=; b=myxYm4O3ySUAljQBGQwT4BERKbNBKXkEB4CbVPxIJgBm8AVRpU8tf6+K lY20MU8Tx/JiJ0bgj5/qUSTUWD3KzsdAzZvI0gPEljW6dWtocu37AYtYC Z37aoOeXOR4xXEqpn3n0gt2tUrRMySf/Ximb9uVY62FTTS8nUCLp1C9bG wcCdtUVk9xj2clktOGl7WYASNJtYFz+Q/lK6vCpju3kV9xRKsTMu0jySB 2NQZZ6u7BYX143V7aVOAQUhGP2nWI8vmv/bGnPeiZgaqBzP8xHS24UgOg E+f7uTBmi0/EjmFBUpCfbQiFE+ZzY2rZ+O3NJuIZM7/kLbBcwJIw+I4xy g==; X-IronPort-AV: E=McAfee;i="6500,9779,10537"; a="312201089" X-IronPort-AV: E=Sophos;i="5.96,180,1665471600"; d="scan'208";a="312201089" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 00:05:35 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10537"; a="635099774" X-IronPort-AV: E=Sophos;i="5.96,180,1665471600"; d="scan'208";a="635099774" Received: from unknown (HELO localhost.localdomain) ([10.239.252.248]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 00:05:32 -0800 From: Weiyuan Li To: dts@dpdk.org Cc: Weiyuan Li , Song Jiale Subject: [dts][PATCH V3 6/8] tests/vlan_ethertype_config: modify script and test plan to support i40e fimware >= 8.4 Date: Mon, 21 Nov 2022 16:05:07 +0800 Message-Id: <20221121080509.10128-6-weiyuanx.li@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20221121080509.10128-1-weiyuanx.li@intel.com> References: <20221121080509.10128-1-weiyuanx.li@intel.com> 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 Modify script and test plan to i40e support fimware >= 8.4. When the fimrware >= 8.4, if the filter is to take effect need to enable extend. Signed-off-by: Weiyuan Li --- Tested-by: Song Jiale v2: -use the firmware version to judge whether to add command `extend on`. v3: -modify description. tests/TestSuite_vlan_ethertype_config.py | 25 +++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/tests/TestSuite_vlan_ethertype_config.py b/tests/TestSuite_vlan_ethertype_config.py index b641d928..7147c490 100644 --- a/tests/TestSuite_vlan_ethertype_config.py +++ b/tests/TestSuite_vlan_ethertype_config.py @@ -56,6 +56,17 @@ class TestVlanEthertypeConfig(TestCase): """ self.pmdout = PmdOutput(self.dut) self.pmdout.start_testpmd("Default", "--portmask=%s" % self.portmask) + # Get the firmware version information + try: + self.fwversion, _, _ = self.pmdout.get_firmware_version( + self.dut.get_ports()[0] + ).split() + except ValueError: + # nic IXGBE, IGC + self.fwversion = self.pmdout.get_firmware_version( + self.dut.get_ports()[0] + ).split() + if self.kdriver == "i40e": self.dut.send_expect("set promisc all off", "testpmd> ") @@ -194,6 +205,12 @@ class TestVlanEthertypeConfig(TestCase): self.dut.send_expect( "vlan set filter on %s" % dutRxPortId, "testpmd> " ) + # Because the kernel forces enable Qinq and cannot be closed, + # the dpdk can only add 'extend on' to make the VLAN filter work normally. + if self.kdriver == "i40e" and self.fwversion >= "8.40": + self.dut.send_expect( + "vlan set extend on %s" % dutRxPortId, "testpmd> " + ) self.dut.send_expect("start", "testpmd> ") self.check_vlan_packets(rx_vlan, tpid, self.rxItf, False) # test vlan filter off @@ -209,8 +226,12 @@ class TestVlanEthertypeConfig(TestCase): random_vlan = random.randint(1, MAX_VLAN - 1) rx_vlans = [1, random_vlan, MAX_VLAN] self.dut.send_expect("set fwd mac", "testpmd> ") - self.dut.send_expect("vlan set filter on %s" % dutRxPortId, "testpmd> ") + self.dut.send_expect("vlan set filter on %s" % dutRxPortId, "testpmd> ") self.dut.send_expect("vlan set strip off %s" % dutRxPortId, "testpmd> ", 20) + # Because the kernel forces enable Qinq and cannot be closed, + # the dpdk can only add 'extend on' to make the VLAN filter work normally. + if self.kdriver == "i40e" and self.fwversion >= "8.40": + self.dut.send_expect("vlan set extend on %s" % dutRxPortId, "testpmd> ") self.dut.send_expect("start", "testpmd> ") # caium_a063 card support only default '0x8100' tpid in rx mode @@ -359,6 +380,8 @@ class TestVlanEthertypeConfig(TestCase): """ Run after each test case. """ + if self.kdriver == "i40e" and self.fwversion >= "8.40": + self.dut.send_expect("vlan set extend off %s" % dutRxPortId, "testpmd> ") self.dut.send_expect("stop", "testpmd> ", 30) self.dut.send_expect("quit", "# ", 30) pass