From patchwork Tue Nov 22 07:09:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiyuan Li X-Patchwork-Id: 120043 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 B6BDFA057F; Tue, 22 Nov 2022 08:09:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B000342D45; Tue, 22 Nov 2022 08:09:39 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id A3820427EB for ; Tue, 22 Nov 2022 08:09:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669100977; x=1700636977; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=D4Le7/PFky7p5rLL7JmmPVAkSvMjRgOvawZAly+B7Es=; b=NQ5j308Nitvki/SkksaTAMKjaWo7GKORw0fFKUDbeJyu9o+fr5JxHzoZ EJDB80i+RVefNRAkojjgL84Jfhdey7oa1WQ0w63grydBYSm5YWQVHwyCX dfsuzHmYbRvSgBQ1EPHTlFFCeab+0zeEJG8V26FPGZ6WNQRFDSDCvphmt 5w7GFTf4/Rj8PNMoDPrirgBga91/Jww9R9UutfKNpdOGdAn3ohZfjw0I3 EopeT/Ejuw3buVjn2ljZ3uGyG98HD8J5z/SCaBtCaswA69jkRUbeaXSmf MWwAmLvf/WWInfTg6KZ98LNOUTvQqEEeIIbErh6/TRbg7BcZ6Pd+2rF/t w==; X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="314899804" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208";a="314899804" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 23:09:36 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="730296294" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208";a="730296294" Received: from unknown (HELO localhost.localdomain) ([10.239.252.248]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 23:09:34 -0800 From: Weiyuan Li To: dts@dpdk.org Cc: Weiyuan Li , Song Jiale Subject: [dts][PATCH V4 1/8] test_plans/dual_vlan: modify script and test plan to support i40e fimware >= 8.4 Date: Tue, 22 Nov 2022 15:09:20 +0800 Message-Id: <20221122070927.7634-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 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. v4: -modify comments. -dual_vlan test plan modify table and add header. test_plans/dual_vlan_test_plan.rst | 83 ++++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 4 deletions(-) diff --git a/test_plans/dual_vlan_test_plan.rst b/test_plans/dual_vlan_test_plan.rst index fab18515..4436226b 100644 --- a/test_plans/dual_vlan_test_plan.rst +++ b/test_plans/dual_vlan_test_plan.rst @@ -35,6 +35,11 @@ The -n command is used to select the number of memory channels. It should match Test Case: Enable/Disable VLAN packets filtering ================================================ +Due to the kernel enables Qinq and cannot be closed, the DPDK cn only add `extend on` to make the VLAN filter +work normally. Therefore, if the i40e firmware version >= 8.4 the dpdk can only add 'extend on' to make the VLAN filter work normally:: + + testpmd> vlan set extend on 0 + Setup the ``mac`` forwarding mode:: testpmd> set fwd mac @@ -61,9 +66,7 @@ Check whether the mode is set successful:: Allmulticast mode: disabled Maximum number of MAC addresses: 127 VLAN offload: - strip off - filter on - qinq(extend) off + strip off, filter on, extend on, qinq strip off start forwarding packets:: @@ -112,6 +115,11 @@ Disable VLAN packet extend and strip port ``0``:: testpmd> vlan set extend off 0 testpmd> vlan set strip off 0 +Due to the kernel enables Qinq and cannot be closed, the DPDK cn only add `extend on` to make the VLAN filter +work normally. Therefore, if the i40e firmware version >= 8.4 the dpdk can only add 'extend on' to make the VLAN filter work normally:: + + testpmd> vlan set extend on 0 + Enable VLAN filtering on port ``0``:: testpmd> vlan set filter on 0 @@ -301,7 +309,9 @@ Do the synthetic test following the below table and check the result is the same as the table(the inserted VLAN Tag Identifier is limited to ``0x3``, and all modes except insert are set on rx port). -+-------+-------+--------+------------+--------+--------+-------+-------+-------+ ++-------------------------------------------------------+-----------------------+ +| Configure setting | Result | ++=======+=======+========+============+========+========+=======+=======+=======+ | Outer | Inner | Vlan | Vlan | Vlan | Vlan | Pass/ | Outer | Inner | | vlan | vlan | strip | filter | extend | insert | Drop | vlan | vlan | +-------+-------+--------+------------+--------+--------+-------+-------+-------+ @@ -358,6 +368,71 @@ except insert are set on rx port). | 0x1 | 0x2 | yes | yes,0x2 | yes | yes | pass | 0x3 | 0x1 | +-------+-------+--------+------------+--------+--------+-------+-------+-------+ +Due to the kernel enables Qinq and cannot be closed, the DPDK cn only add `extend on` to make the VLAN filter +work normally. Therefore, if the i40e firmware >= 8.4 the synthetic test according to the following table. +In addition, filter inner vlan when firmware <= 8.3, filter outer vlan when firmware >= 8.4. + ++-------------------------------------------------------+-----------------------+ +| Configure setting | Result | ++=======+=======+========+============+========+========+=======+=======+=======+ +| Outer | Inner | Vlan | Vlan | Vlan | Vlan | Pass/ | Outer | Inner | +| vlan | vlan | strip | filter | extend | insert | Drop | vlan | vlan | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | no | no | no | no | pass | 0x1 | 0x2 | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | yes | no | no | no | pass | no | 0x2 | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | no | yes,0x1 | no | no | pass | 0x1 | 0x2 | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | no | yes,0x2 | no | no | pass | 0x1 | 0x2 | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | yes | yes,0x1 | no | no | pass | no | 0x2 | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | yes | yes,0x2 | no | no | pass | no | 0x2 | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | no | no | yes | no | pass | 0x1 | 0x2 | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | yes | no | yes | no | pass | no | 0x1 | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | no | yes,0x1 | yes | no | pass | 0x1 | 0x2 | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | no | yes,0x2 | yes | no | drop | no | no | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | yes | yes,0x1 | yes | no | pass | no | 0x1 | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | yes | yes,0x2 | yes | no | drop | no | no | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | no | no | no | yes | pass | 0x3 | 0x1 | +| | | | | | | | | 0x2 | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | yes | no | no | yes | pass | 0x3 | 0x2 | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | no | yes,0x1 | no | yes | pass | 0x3 | 0x1 | +| | | | | | | | | 0x2 | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | no | yes,0x2 | no | yes | pass | 0x3 | 0x1 | +| | | | | | | | | 0x2 | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | yes | yes,0x1 | no | yes | pass | 0x3 | 0x2 | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | yes | yes,0x2 | no | yes | drop | no | no | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | no | no | yes | yes | pass | 0x3 | 0x1 | +| | | | | | | | | 0x2 | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | yes | no | yes | yes | pass | 0x3 | 0x1 | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | no | yes,0x1 | yes | yes | pass | 0x3 | 0x1 | +| | | | | | | | | 0x2 | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | no | yes,0x2 | yes | yes | pass | 0x3 | 0x1 | +| | | | | | | | | 0x2 | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | yes | yes,0x1 | yes | yes | pass | 0x3 | 0x1 | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ +| 0x1 | 0x2 | yes | yes,0x2 | yes | yes | drop | no | no | ++-------+-------+--------+------------+--------+--------+-------+-------+-------+ + Test Case: Strip/Filter/Extend/Insert enable/disable random test ================================================================ From patchwork Tue Nov 22 07:09:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Weiyuan Li X-Patchwork-Id: 120044 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 D4C87A057F; Tue, 22 Nov 2022 08:09:41 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CF64842D4C; Tue, 22 Nov 2022 08:09:41 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id A71C9427EB for ; Tue, 22 Nov 2022 08:09:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669100979; x=1700636979; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Fyiyi9euDpabqAj4yE2ALXiuYyXnDSUUMm1peRpteF0=; b=eZZ1viaWG6aGD+hzbeDQ298dOiGkY1q5lehr8B+8TmXVBKgy5dqRwyov 5w11VX/AyWf+ZutwYN/PyVpLEzcsVKcfKwWONKCp8kHWXfdCX+LELS4Nq hg4iYUWdgryDsl/07VTtnCEZyuJvxKV5Nbe9IwTa//FaqV1UcvbZW8udA ORdw8xCjD660Fe00nTYAhNi/XMF8e/cMM8BoXn+4C8n+3kXozUz0/b0Dy P58CBYeDQ1eZAf/wfkm0496wO+HGiSAS6Y4XPJ6x6l0+pa0gAJ1/OG1RK U22tRAZNuDfuvYESODxCeP0shJP6nejxM9VSHYsMFuiTxVv/1hX1eu5dc g==; X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="314899808" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208";a="314899808" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 23:09:39 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="730296305" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208";a="730296305" Received: from unknown (HELO localhost.localdomain) ([10.239.252.248]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 23:09:36 -0800 From: Weiyuan Li To: dts@dpdk.org Cc: Weiyuan Li , Song Jiale Subject: [dts][PATCH V4 2/8] tests/dual_vlan: modify script and test plan to support i40e fimware >= 8.4 Date: Tue, 22 Nov 2022 15:09:21 +0800 Message-Id: <20221122070927.7634-2-weiyuanx.li@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20221122070927.7634-1-weiyuanx.li@intel.com> References: <20221122070927.7634-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. v4: -modify comments. -dual_vlan test plan modify table and add header. tests/TestSuite_dual_vlan.py | 393 ++++++++++++++++++++++------------- 1 file changed, 252 insertions(+), 141 deletions(-) diff --git a/tests/TestSuite_dual_vlan.py b/tests/TestSuite_dual_vlan.py index 614e70eb..b5cf7a62 100644 --- a/tests/TestSuite_dual_vlan.py +++ b/tests/TestSuite_dual_vlan.py @@ -14,65 +14,6 @@ import re import time import framework.utils as utils - -txvlan = 3 -outvlan = 1 -invlan = 2 - -allResult = { - "TX+OUTER+INNER": (txvlan, outvlan, invlan), - "TX+INNER": (txvlan, invlan), - "TX+OUTER": (txvlan, outvlan), - "OUTER+INNER": (outvlan, invlan), - "INNER": (invlan,), - "OUTER": (outvlan,), - "NONE": ("No",), -} - -stripCase = 0x1 -filterCase = 0x2 -qinqCase = 0x4 -txCase = 0x8 - -vlanCaseDef = [ - 0, - stripCase, - filterCase, - filterCase | stripCase, - qinqCase, - qinqCase | stripCase, - qinqCase | filterCase, - qinqCase | filterCase | stripCase, - txCase, - txCase | stripCase, - txCase | filterCase, - txCase | filterCase | stripCase, - txCase | qinqCase, - txCase | qinqCase | stripCase, - txCase | qinqCase | filterCase, - txCase | qinqCase | filterCase | stripCase, -] - -vlanCase = [ - "OUTER+INNER", - "INNER", - ("OUTER+INNER", "NONE"), - ("INNER", "NONE"), - "OUTER+INNER", - "OUTER", - ("NONE", "OUTER+INNER"), - ("NONE", "OUTER"), - "TX+OUTER+INNER", - "TX+INNER", - ("TX+OUTER+INNER", "NONE"), - ("TX+INNER", "NONE"), - "TX+OUTER+INNER", - "TX+OUTER", - ("NONE", "TX+OUTER+INNER"), - ("NONE", "TX+OUTER"), -] - - from framework.pmd_output import PmdOutput from framework.test_case import TestCase @@ -104,6 +45,15 @@ class TestDualVlan(TestCase): "Default", "--portmask=%s" % portMask, socket=self.ports_socket ) + # Get the firmware version information + try: + self.fwversion, _, _ = self.pmdout.get_firmware_version( + self.dut_ports[0] + ).split() + except ValueError: + # nic IXGBE, IGC + self.fwversion = self.pmdout.get_firmware_version(self.dut_ports[0]).split() + if self.nic in [ "I40E_10G-SFP_XL710", "I40E_40G-QSFP_A", @@ -120,6 +70,124 @@ class TestDualVlan(TestCase): self.verify("Set mac packet forwarding mode" in out, "set fwd mac error") out = self.dut.send_expect("start", "testpmd> ", 120) + # Vlan id + self.txvlanId = 3 + self.outvlanId = 1 + self.invlanId = 2 + + if self.kdriver == "i40e" and self.fwversion >= "8.40": + self.config_i40e_firmware_vlan() + else: + self.config_original() + + def config_original(self): + self.allResult = { + "TX+OUTER+INNER": (self.txvlanId, self.outvlanId, self.invlanId), + "TX+INNER": (self.txvlanId, self.invlanId), + "TX+OUTER": (self.txvlanId, self.outvlanId), + "OUTER+INNER": (self.outvlanId, self.invlanId), + "INNER": (self.invlanId,), + "OUTER": (self.outvlanId,), + "NONE": ("No",), + } + + self.stripCase = 0x1 + self.filterCase = 0x2 + self.qinqCase = 0x4 + self.txCase = 0x8 + + self.vlanCaseDef = [ + 0, + self.stripCase, + self.filterCase, + self.filterCase | self.stripCase, + self.qinqCase, + self.qinqCase | self.stripCase, + self.qinqCase | self.filterCase, + self.qinqCase | self.filterCase | self.stripCase, + self.txCase, + self.txCase | self.stripCase, + self.txCase | self.filterCase, + self.txCase | self.filterCase | self.stripCase, + self.txCase | self.qinqCase, + self.txCase | self.qinqCase | self.stripCase, + self.txCase | self.qinqCase | self.filterCase, + self.txCase | self.qinqCase | self.filterCase | self.stripCase, + ] + + self.vlanCase = [ + "OUTER+INNER", + "INNER", + ("OUTER+INNER", "NONE"), + ("INNER", "NONE"), + "OUTER+INNER", + "OUTER", + ("NONE", "OUTER+INNER"), + ("NONE", "OUTER"), + "TX+OUTER+INNER", + "TX+INNER", + ("TX+OUTER+INNER", "NONE"), + ("TX+INNER", "NONE"), + "TX+OUTER+INNER", + "TX+OUTER", + ("NONE", "TX+OUTER+INNER"), + ("NONE", "TX+OUTER"), + ] + + def config_i40e_firmware_vlan(self): + self.allResult = { + "TX+OUTER+INNER": (self.txvlanId, self.outvlanId, self.invlanId), + "TX+INNER": (self.txvlanId, self.invlanId), + "TX+OUTER": (self.txvlanId, self.outvlanId), + "OUTER+INNER": (self.outvlanId, self.invlanId), + "INNER": (self.invlanId,), + "OUTER": (self.outvlanId,), + "NONE": ("No",), + } + + self.stripCase = 0x1 + self.filterCase = 0x2 + self.qinqCase = 0x4 + self.txCase = 0x8 + + self.vlanCaseDef = [ + 0, + self.stripCase, + self.filterCase | self.qinqCase, + self.filterCase | self.qinqCase | self.stripCase, + self.qinqCase, + self.qinqCase | self.stripCase, + self.qinqCase | self.filterCase, + self.qinqCase | self.filterCase | self.stripCase, + self.txCase, + self.txCase | self.stripCase, + self.txCase | self.filterCase | self.qinqCase, + self.txCase | self.filterCase | self.qinqCase | self.stripCase, + self.txCase | self.qinqCase, + self.txCase | self.qinqCase | self.stripCase, + self.txCase | self.qinqCase | self.filterCase, + self.txCase | self.qinqCase | self.filterCase | self.stripCase, + ] + + self.vlanCase = [ + "OUTER+INNER", + "INNER", + ("OUTER+INNER", "NONE"), + ("OUTER", "NONE"), + "OUTER+INNER", + "OUTER", + ("OUTER+INNER", "NONE"), + ("OUTER", "NONE"), + "TX+OUTER+INNER", + "TX+INNER", + ("TX+OUTER+INNER", "NONE"), + ("TX+OUTER", "NONE"), + "TX+OUTER+INNER", + "TX+OUTER", + ("TX+OUTER+INNER", "NONE"), + ("TX+OUTER", "NONE"), + ] + def start_tcpdump(self, rxItf): self.tester.send_expect("rm -rf ./getPackageByTcpdump.cap", "#") @@ -174,14 +242,10 @@ class TestDualVlan(TestCase): # Intel® Ethernet 700 Series NIC vlan filter can't close, if want close need remove rx_vlan if mode == "filter": if modeName[mode] == "off": - self.dut.send_expect( - "rx_vlan add %s %s" % (outvlan, dutRxPortId), "testpmd> " - ) + self.dut.send_expect("vlan set filter off all", "testpmd> ") continue else: - self.dut.send_expect( - "rx_vlan rm %s %s" % (outvlan, dutRxPortId), "testpmd> " - ) + self.dut.send_expect("vlan set filter on all", "testpmd> ") continue if mode == "stripq": @@ -209,14 +273,10 @@ class TestDualVlan(TestCase): # Intel® Ethernet 700 Series NIC vlan filter can't close, if want close need remove rx_vlan if mode == "filter": if modeName[mode] == "off": - self.dut.send_expect( - "rx_vlan add %s %s" % (outvlan, dutRxPortId), "testpmd> " - ) + self.dut.send_expect("vlan set filter off all", "testpmd> ") continue else: - self.dut.send_expect( - "rx_vlan rm %s %s" % (outvlan, dutRxPortId), "testpmd> " - ) + self.dut.send_expect("vlan set filter on all", "testpmd> ") continue if mode == "extend": @@ -235,22 +295,22 @@ class TestDualVlan(TestCase): """ Setup Strip/Filter/Extend/Insert enable/disable for synthetic test. """ - caseDef = vlanCaseDef[caseIndex] + caseDef = self.vlanCaseDef[caseIndex] temp = [] - temp.append("on") if (caseDef & stripCase) != 0 else temp.append("off") - temp.append("on") if (caseDef & filterCase) != 0 else temp.append("off") - temp.append("on") if (caseDef & qinqCase) != 0 else temp.append("off") + temp.append("on") if (caseDef & self.stripCase) != 0 else temp.append("off") + temp.append("on") if (caseDef & self.filterCase) != 0 else temp.append("off") + temp.append("on") if (caseDef & self.qinqCase) != 0 else temp.append("off") if (self.nic in ["cavium_a063", "cavium_a064"]) and temp[2] == "on": ## Skip QinQ for cavium devices as it is not supported. return self.mode_config(strip=temp[0], filter=temp[1], extend=temp[2]) - if (caseDef & txCase) != 0: + if (caseDef & self.txCase) != 0: self.dut.send_expect("stop", "testpmd> ") self.dut.send_expect("port stop all", "testpmd> ") self.dut.send_expect( - "tx_vlan set %s %s" % (dutTxPortId, txvlan), "testpmd> " + "tx_vlan set %s %s" % (dutTxPortId, self.txvlanId), "testpmd> " ) self.dut.send_expect("port start all", "testpmd> ") self.dut.send_expect("start", "testpmd> ") @@ -259,27 +319,27 @@ class TestDualVlan(TestCase): temp[0], temp[1], temp[2], - "on" if (caseDef & txCase) != 0 else "off", + "on" if (caseDef & self.txCase) != 0 else "off", ) - if (caseDef & filterCase) != 0: + if (caseDef & self.filterCase) != 0: self.dut.send_expect( - "rx_vlan add %s %s" % (outvlan, dutRxPortId), "testpmd> " + "rx_vlan add %s %s" % (self.outvlanId, dutRxPortId), "testpmd> " ) - self.vlan_send_packet(outvlan, invlan) - self.check_result(vlanCase[caseIndex][0], configMode + " result Error") + self.vlan_send_packet(self.outvlanId, self.invlanId) + self.check_result(self.vlanCase[caseIndex][0], configMode + " result Error") self.dut.send_expect( - "rx_vlan rm %s %s" % (outvlan, dutRxPortId), "testpmd> " + "rx_vlan rm %s %s" % (self.outvlanId, dutRxPortId), "testpmd> " ) self.dut.send_expect( - "rx_vlan add %s %s" % (invlan, dutRxPortId), "testpmd> " + "rx_vlan add %s %s" % (self.invlanId, dutRxPortId), "testpmd> " ) - self.vlan_send_packet(outvlan, invlan) - self.check_result(vlanCase[caseIndex][1], configMode + " result Error") + self.vlan_send_packet(self.outvlanId, self.invlanId) + self.check_result(self.vlanCase[caseIndex][1], configMode + " result Error") self.dut.send_expect( - "rx_vlan rm %s %s" % (invlan, dutRxPortId), "testpmd> " + "rx_vlan rm %s %s" % (self.invlanId, dutRxPortId), "testpmd> " ) - if (caseDef & txCase) != 0: + if (caseDef & self.txCase) != 0: self.dut.send_expect("stop", "testpmd> ") self.dut.send_expect("port stop all", "testpmd> ") self.dut.send_expect("tx_vlan reset %s" % dutTxPortId, "testpmd> ") @@ -288,24 +348,24 @@ class TestDualVlan(TestCase): else: self.dut.send_expect( - "rx_vlan add %s %s" % (invlan, dutRxPortId), "testpmd> " + "rx_vlan add %s %s" % (self.invlanId, dutRxPortId), "testpmd> " ) self.dut.send_expect( - "rx_vlan add %s %s" % (outvlan, dutRxPortId), "testpmd> " + "rx_vlan add %s %s" % (self.outvlanId, dutRxPortId), "testpmd> " ) - self.vlan_send_packet(outvlan, invlan) - self.check_result(vlanCase[caseIndex], configMode + " result Error") - if (caseDef & txCase) != 0: + self.vlan_send_packet(self.outvlanId, self.invlanId) + self.check_result(self.vlanCase[caseIndex], configMode + " result Error") + if (caseDef & self.txCase) != 0: self.dut.send_expect("stop", "testpmd> ") self.dut.send_expect("port stop all", "testpmd> ") self.dut.send_expect("tx_vlan reset %s" % dutTxPortId, "testpmd> ") self.dut.send_expect("port start all", "testpmd> ") self.dut.send_expect("start", "testpmd> ") self.dut.send_expect( - "rx_vlan rm %s %s" % (invlan, dutRxPortId), "testpmd> " + "rx_vlan rm %s %s" % (self.invlanId, dutRxPortId), "testpmd> " ) self.dut.send_expect( - "rx_vlan rm %s %s" % (outvlan, dutRxPortId), "testpmd> " + "rx_vlan rm %s %s" % (self.outvlanId, dutRxPortId), "testpmd> " ) def check_result(self, resultKey, errorString): @@ -314,14 +374,15 @@ class TestDualVlan(TestCase): """ print(("vlan flage config:%s" % errorString)) out = self.get_tcpdump_package() - if allResult[resultKey][0] == "No": + if self.allResult[resultKey][0] == "No": self.verify("vlan" not in out, errorString) else: resultList = [] - for i in range(len(allResult[resultKey]) - 1): - resultList.append("vlan %s" % allResult[resultKey][i]) + for i in range(len(self.allResult[resultKey]) - 1): + resultList.append("vlan %s" % self.allResult[resultKey][i]) resultList.append( - "vlan %s" % allResult[resultKey][len(allResult[resultKey]) - 1] + "vlan %s" + % self.allResult[resultKey][len(self.allResult[resultKey]) - 1] ) for line in resultList: self.verify(line in out, "receive packet is wrong:%s" % out) @@ -338,15 +399,24 @@ class TestDualVlan(TestCase): """ self.mode_config(filter="on") self.mode_config(strip="off") - self.mode_config(extend="off") - self.vlan_send_packet(outvlan) + # 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.mode_config(extend="on") + self.dut.send_expect( + "rx_vlan rm %s %s" % (self.outvlanId, dutRxPortId), "testpmd> " + ) + else: + self.mode_config(extend="off") + + self.vlan_send_packet(self.outvlanId) out = self.get_tcpdump_package() print(out) self.verify( - out is not None and "vlan %s" % outvlan not in out, + out is not None and "vlan %s" % self.outvlanId not in out, "Vlan filter enable error: " + out, ) - + self.logger.debug(self.nic) if self.nic not in [ "ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP", @@ -359,18 +429,22 @@ class TestDualVlan(TestCase): "I40E_10G-10G_BASE_T_X722", ]: self.mode_config(filter="off") - self.vlan_send_packet(outvlan) + self.vlan_send_packet(self.outvlanId) out = self.get_tcpdump_package() - self.verify("vlan %s" % outvlan in out, "Vlan filter disable error: " + out) + self.verify( + "vlan %s" % self.outvlanId in out, "Vlan filter disable error: " + out + ) else: self.dut.send_expect( - "rx_vlan add %s %s" % (outvlan, dutRxPortId), "testpmd> " + "rx_vlan add %s %s" % (self.outvlanId, dutRxPortId), "testpmd> " ) - self.vlan_send_packet(outvlan) + self.vlan_send_packet(self.outvlanId) out = self.get_tcpdump_package() - self.verify("vlan %s" % outvlan in out, "Vlan filter disable error: " + out) + self.verify( + "vlan %s" % self.outvlanId in out, "Vlan filter disable error: " + out + ) self.dut.send_expect( - "rx_vlan rm %s %s" % (outvlan, dutRxPortId), "testpmd> " + "rx_vlan rm %s %s" % (self.outvlanId, dutRxPortId), "testpmd> " ) def test_vlan_filter_table(self): @@ -380,20 +454,28 @@ class TestDualVlan(TestCase): self.mode_config(filter="on") self.mode_config(strip="off") - self.mode_config(extend="off") - - self.dut.send_expect("rx_vlan add %s %s" % (outvlan, dutRxPortId), "testpmd> ") - self.vlan_send_packet(outvlan) + # 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.mode_config(extend="on") + else: + self.mode_config(extend="off") + self.dut.send_expect( + "rx_vlan add %s %s" % (self.outvlanId, dutRxPortId), "testpmd> " + ) + self.vlan_send_packet(self.outvlanId) out = self.get_tcpdump_package() self.verify( - "vlan %s" % outvlan in out, "vlan filter table enable error: " + out + "vlan %s" % self.outvlanId in out, "vlan filter table enable error: " + out ) - self.dut.send_expect("rx_vlan rm %s %s" % (outvlan, dutRxPortId), "testpmd> ") - self.vlan_send_packet(outvlan) + self.dut.send_expect( + "rx_vlan rm %s %s" % (self.outvlanId, dutRxPortId), "testpmd> " + ) + self.vlan_send_packet(self.outvlanId) out = self.get_tcpdump_package() self.verify( - out is not None and "vlan %s" % outvlan not in out, + out is not None and "vlan %s" % self.outvlanId not in out, "vlan filter table disable error: " + out, ) @@ -417,16 +499,20 @@ class TestDualVlan(TestCase): "I40E_10G-10G_BASE_T_X722", ]: self.dut.send_expect( - "rx_vlan add %s %s" % (outvlan, dutRxPortId), "testpmd> " + "rx_vlan add %s %s" % (self.outvlanId, dutRxPortId), "testpmd> " ) - self.vlan_send_packet(outvlan) + self.vlan_send_packet(self.outvlanId) out = self.get_tcpdump_package() - self.verify("vlan %s" % outvlan not in out, "Vlan strip enable error: " + out) + self.verify( + "vlan %s" % self.outvlanId not in out, "Vlan strip enable error: " + out + ) self.mode_config(strip="off") - self.vlan_send_packet(outvlan) + self.vlan_send_packet(self.outvlanId) out = self.get_tcpdump_package() - self.verify("vlan %s" % outvlan in out, "Vlan strip disable error: " + out) + self.verify( + "vlan %s" % self.outvlanId in out, "Vlan strip disable error: " + out + ) if self.nic in [ "ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP", @@ -439,7 +525,7 @@ class TestDualVlan(TestCase): "I40E_10G-10G_BASE_T_X722", ]: self.dut.send_expect( - "rx_vlan rm %s %s" % (outvlan, dutRxPortId), "testpmd> " + "rx_vlan rm %s %s" % (self.outvlanId, dutRxPortId), "testpmd> " ) def test_vlan_stripq_config(self): @@ -450,23 +536,25 @@ class TestDualVlan(TestCase): self.mode_config(extend="off") self.mode_config(strip="off") self.mode_config(stripq="off") - self.vlan_send_packet(outvlan) + self.vlan_send_packet(self.outvlanId) out = self.get_tcpdump_package() self.verify( - "vlan %s" % outvlan in out, "vlan strip queue disable error : " + out + "vlan %s" % self.outvlanId in out, "vlan strip queue disable error : " + out ) # if self.nic in ["I40E_10G-SFP_XL710", "I40E_40G-QSFP_A", "I40E_40G-QSFP_B"]: self.mode_config(strip="on") self.mode_config(stripq="on") - self.vlan_send_packet(outvlan) + self.vlan_send_packet(self.outvlanId) out = self.get_tcpdump_package() - self.verify("vlan %s" % outvlan not in out, "vlan strip enable error: " + out) + self.verify( + "vlan %s" % self.outvlanId not in out, "vlan strip enable error: " + out + ) self.mode_config(stripq="off") - self.vlan_send_packet(outvlan) + self.vlan_send_packet(self.outvlanId) out = self.get_tcpdump_package() self.verify( - "vlan %s" % outvlan in out, "vlan strip queue disable error: " + out + "vlan %s" % self.outvlanId in out, "vlan strip queue disable error: " + out ) def test_vlan_insert_config(self): @@ -482,13 +570,17 @@ class TestDualVlan(TestCase): self.dut.send_expect("stop", "testpmd> ") self.dut.send_expect("port stop all", "testpmd> ") - self.dut.send_expect("tx_vlan set %s %s" % (dutTxPortId, txvlan), "testpmd> ") + self.dut.send_expect( + "tx_vlan set %s %s" % (dutTxPortId, self.txvlanId), "testpmd> " + ) self.dut.send_expect("port start all", "testpmd> ") self.dut.send_expect("start", "testpmd> ") self.vlan_send_packet() out = self.get_tcpdump_package() - self.verify("vlan %s" % txvlan in out, "vlan insert enable error: " + out) + self.verify( + "vlan %s" % self.txvlanId in out, "vlan insert enable error: " + out + ) self.dut.send_expect("stop", "testpmd> ") self.dut.send_expect("port stop all", "testpmd> ") @@ -498,7 +590,9 @@ class TestDualVlan(TestCase): self.vlan_send_packet() out = self.get_tcpdump_package() - self.verify("vlan %s" % txvlan not in out, "vlan insert disable error: " + out) + self.verify( + "vlan %s" % self.txvlanId not in out, "vlan insert disable error: " + out + ) def test_vlan_tpid_config(self): """ @@ -517,23 +611,40 @@ class TestDualVlan(TestCase): ) self.mode_config(filter="on", strip="on", extend="on") + # i40e set VLAN id + self.dut.send_expect( + "rx_vlan add %s %s" % (self.outvlanId, dutRxPortId), + "testpmd> ", + ) # nic only support inner model, except Intel® Ethernet 700 Series nic self.dut.send_expect("vlan set inner tpid 0x1234 %s" % dutRxPortId, "testpmd> ") - self.vlan_send_packet(outvlan, invlan) + self.vlan_send_packet(self.outvlanId, self.invlanId) out = self.get_tcpdump_package() self.verify("0x8100" in out, "tpid is error: " + out) - self.verify("vlan %s" % outvlan in out, "vlan tpid disable error: " + out) - self.verify("vlan %s" % invlan in out, "vlan tpid disable error: " + out) + self.verify( + "vlan %s" % self.outvlanId in out, "vlan tpid disable error: " + out + ) + self.verify("vlan %s" % self.invlanId in out, "vlan tpid disable error: " + out) self.dut.send_expect("vlan set inner tpid 0x8100 %s" % dutRxPortId, "testpmd> ") - self.vlan_send_packet(outvlan, invlan) + self.vlan_send_packet(self.outvlanId, self.invlanId) out = self.get_tcpdump_package() - self.verify("0x8100" in out, "tpid is error: " + out) - self.verify( - out is not None and "vlan" not in out, "vlane tpid enable error: " + out - ) + # Because the kernel forces enable Qinq and cannot be closed, + # the dpdk can only add 'extend on' to make the VLAN filter work normally. + # The kernel driver uses the outer VLAN filter, and the DPDK synchronously modifies, + # DPDK filter outer VLAN when firmware >= 8.4, the test result check strip inner. + if self.kdriver == "i40e" and self.fwversion >= "8.40": + self.verify("0x8100" in out, "tpid is error: " + out) + self.verify( + out is not None and f"vlan {self.invlanId}" not in out, + "vlane tpid enable error: " + out, + ) + else: + self.verify( + out is not None and "vlan" not in out, "vlane tpid enable error: " + out + ) def test_vlan_synthetic_test(self): """ @@ -542,7 +653,7 @@ class TestDualVlan(TestCase): self.verify( self.nic != "IGB_1G-82574L", "sorry, dual vlan cannot support this self.nic" ) - for i in range(len(vlanCase)): + for i in range(len(self.vlanCase)): self.multimode_test(i) def test_vlan_random_test(self): From patchwork Tue Nov 22 07:09:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiyuan Li X-Patchwork-Id: 120045 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 25793A0580; Tue, 22 Nov 2022 08:09:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EE59D42D53; Tue, 22 Nov 2022 08:09:41 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 6B5EB427EB for ; Tue, 22 Nov 2022 08:09:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669100981; x=1700636981; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uwcHIHGWM8z5kIXlQ47J5MBXYY3Sr8F8HW1J+MbuN8E=; b=nrm1GFtT8lx8yBqo9B/oUbIuwHa8yQaSLe+zeSCK3f8lOI4CS8b7P3D8 PTFRS6YjBurPoTdJbCFfwoP9cwm2B+cLnvoWzvLLc1UVjpy8LmTG4s5D0 EEBsOH0y7EQ7cxa+dP3fXUQNXpsmbCC/V2EdGjhkgGpLGFLBgT6Oi2ehS 1bS/ijb7iBxUSGwvU2nFwRU3ycyVYB+QXcgHatoK3UHLlVzOO2nA0Fb58 SCcs24WNZijkzm420JgF5fUWr6Ge3d3ivX/e0T6ZtoowlR/Dras+ibDcx TOuv+dD4JuO8Nka+sM3xySWDDBmyI54kFi9KJ+cyJYuzn3UQRvppsp9ml Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="314899810" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208";a="314899810" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 23:09:41 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="730296311" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208";a="730296311" Received: from unknown (HELO localhost.localdomain) ([10.239.252.248]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 23:09:39 -0800 From: Weiyuan Li To: dts@dpdk.org Cc: Weiyuan Li , Song Jiale Subject: [dts][PATCH V4 3/8] test_plans/ipgre: modify script and test plan to support i40e fimware >= 8.4 Date: Tue, 22 Nov 2022 15:09:22 +0800 Message-Id: <20221122070927.7634-3-weiyuanx.li@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20221122070927.7634-1-weiyuanx.li@intel.com> References: <20221122070927.7634-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. v4: -modify comments. -dual_vlan test plan modify table and add header. test_plans/ipgre_test_plan.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test_plans/ipgre_test_plan.rst b/test_plans/ipgre_test_plan.rst index 693432ef..43fc690c 100644 --- a/test_plans/ipgre_test_plan.rst +++ b/test_plans/ipgre_test_plan.rst @@ -58,6 +58,10 @@ Start testpmd and enable rxonly forwarding mode:: testpmd> set verbose 1 testpmd> start + Due to the kernel enables Qinq and cannot be closed, the DPDK cn only add `extend on` to make the VLAN filter + work normally. Therefore, if the i40e firmware version >= 8.4 the dpdk can only add 'extend on' to make the VLAN filter work normally: + testpmd> vlan set extend on 0 + Send packet as table listed and packet type match each layer:: Ether()/IPv6(nh=47)/GRE()/IP()/UDP()/Raw('x'*40) From patchwork Tue Nov 22 07:09:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiyuan Li X-Patchwork-Id: 120046 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 18F6CA057F; Tue, 22 Nov 2022 08:09:45 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 145D642D4F; Tue, 22 Nov 2022 08:09:45 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id C093842D43 for ; Tue, 22 Nov 2022 08:09:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669100984; x=1700636984; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=D0znbAlm20D3gB4X871dUBftKhHdmIVf++jXwpaQHNk=; b=MwcgxpT4DR/9hs0fYFJPayQXcnDXV1t1rfcpaVLaKVpa3A2dRqQsp3po hf1Y+G81BPDi1ka8XnWRMzfF9Fvv2PrrdqlamD1WIwPndZygKlIDB3Iu4 1M1eGtVLymxvkTtNsl51+YLmURdGV09QeEEAOIaZJjfGYn3fTKXH6qSgU x+ZQImlC0CNIEgDX99URS10vSVb39+hJEavXgSKIPcioAwSpKFvhP8X0B c7yRTtfTI0kigQeH0Xjz4eetXoo8/Xkh/Dp0P96sKD4VGeoTI7j9E5cYo lGTfESwFeary0tW4iYsi/9qBe6Cf5auJ8WahvHrJ3N4+dQOiDpXReYD/L Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="314899811" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208";a="314899811" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 23:09:43 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="730296323" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208";a="730296323" Received: from unknown (HELO localhost.localdomain) ([10.239.252.248]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 23:09:41 -0800 From: Weiyuan Li To: dts@dpdk.org Cc: Weiyuan Li , Song Jiale Subject: [dts][PATCH V4 4/8] tests/ipgre: modify script and test plan to support i40e fimware >= 8.4 Date: Tue, 22 Nov 2022 15:09:23 +0800 Message-Id: <20221122070927.7634-4-weiyuanx.li@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20221122070927.7634-1-weiyuanx.li@intel.com> References: <20221122070927.7634-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. v4: -modify comments. -dual_vlan test plan modify table and add header. tests/TestSuite_ipgre.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/TestSuite_ipgre.py b/tests/TestSuite_ipgre.py index cd50c1c4..ecd8e19c 100644 --- a/tests/TestSuite_ipgre.py +++ b/tests/TestSuite_ipgre.py @@ -309,9 +309,22 @@ class TestIpgre(TestCase): socket=self.ports_socket, ) + # Get the firmware version information + try: + fwversion, _, _ = self.pmdout.get_firmware_version( + self.dut_ports[0] + ).split() + except ValueError: + # nic IXGBE, IGC + fwversion = self.pmdout.get_firmware_version(self.dut_ports[0]).split() + self.dut.send_expect("set fwd rxonly", "testpmd>") self.dut.send_expect("set verbose 1", "testpmd>") self.dut.send_expect("start", "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 fwversion >= "8.40": + self.dut.send_expect("vlan set extend off 0", "testpmd>") # inner ipv4 config_layers = { From patchwork Tue Nov 22 07:09:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiyuan Li X-Patchwork-Id: 120047 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 35B2AA057F; Tue, 22 Nov 2022 08:09:47 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 31C0442D4B; Tue, 22 Nov 2022 08:09:47 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id D717742D43 for ; Tue, 22 Nov 2022 08:09:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669100986; x=1700636986; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gIsAPqtKknR5megxjvehwuvViK5WdGcMbE/lXmg6Rls=; b=FNsndzB5pmC6jAVLmvO+XTotRdHqHwtHnLEOx8hvCXwHws6MMwIWAbNx CBp1Ijym+aNycB4rPDsFlEdFymU2HFDdSs4RLBXRtK6hD9P+wE3CANogz XEWxkEnt4Vd+p81oQ6rdbFbNFJQBXhHo6lxFLRj9JeB1iVONxn7WQdT9M 8FusUe9luhWOUrq+rbbuTVXPgolt7BsSG9ehDDYVtsssBte3T5y/k5+If K2EBUxAcqsbd/YNKog1R5h7W/KAZTFVFjABAqPiG+ABHye4YcBFJPBOBt LDKR/kM1DoEV7SMGsvzumKZo917dizSP1VThf/VqMRMR1cxALhO6JmyZU w==; X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="314899813" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208";a="314899813" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 23:09:45 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="730296336" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208";a="730296336" Received: from unknown (HELO localhost.localdomain) ([10.239.252.248]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 23:09:43 -0800 From: Weiyuan Li To: dts@dpdk.org Cc: Weiyuan Li , Song Jiale Subject: [dts][PATCH V4 5/8] test_plans/vlan_ethertype_config: modify script and test plan to support i40e fimware >= 8.4 Date: Tue, 22 Nov 2022 15:09:24 +0800 Message-Id: <20221122070927.7634-5-weiyuanx.li@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20221122070927.7634-1-weiyuanx.li@intel.com> References: <20221122070927.7634-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. v4: -modify comments. -dual_vlan test plan modify table and add header. test_plans/vlan_ethertype_config_test_plan.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test_plans/vlan_ethertype_config_test_plan.rst b/test_plans/vlan_ethertype_config_test_plan.rst index 80a6ee28..752e5849 100644 --- a/test_plans/vlan_ethertype_config_test_plan.rst +++ b/test_plans/vlan_ethertype_config_test_plan.rst @@ -52,6 +52,10 @@ Test Case 2: test VLAN filtering on/off testpmd> vlan set filter on 0 testpmd> start + Due to the kernel enables Qinq and cannot be closed, the DPDK cn only add `extend on` to make the VLAN filter + work normally. Therefore, if the i40e firmware version >= 8.4 the dpdk can only add 'extend on' to make the VLAN filter work normally: + testpmd> vlan set extend on 0 + 2. Send 1 packet with VLAN TPID 0xA100 and VLAN Tag 16 on port ``A``, Verify that the VLAN packet cannot be received in port ``B``. @@ -77,6 +81,10 @@ Test Case 3: test adding VLAN Tag Identifier with changing VLAN TPID testpmd> vlan set strip off 0 testpmd> start + Due to the kernel enables Qinq and cannot be closed, the DPDK cn only add `extend on` to make the VLAN filter + work normally. Therefore, if the i40e firmware version >= 8.4 the dpdk can only add 'extend on' to make the VLAN filter work normally: + testpmd> vlan set extend on 0 + 2. Add a VLAN Tag Identifier ``16`` on port ``0``:: testpmd> rx_vlan add 16 0 From patchwork Tue Nov 22 07:09:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiyuan Li X-Patchwork-Id: 120048 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 51C56A057F; Tue, 22 Nov 2022 08:09:49 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4E47342D43; Tue, 22 Nov 2022 08:09:49 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id D78DE42D43 for ; Tue, 22 Nov 2022 08:09:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669100988; x=1700636988; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=luz9pvHjtQ4jXcRvNw8BYCe/u96kg1ySFLVuQzQDU/Q=; b=ApM907kwDlTw+/Q0mC7RZl7p2aELLrhSVuVSpZfuBvRVC1GLzQNyiVb5 hkEBreaTeR03/OJb/+aQBUppd7yi4WhM6Xyc4xrIHAvNiMnedYgbQCc6n LBwSF2CadyJHRehx0lMu2TkqPGA/TVxkjp+NAWl8rmR39/BikpKXa/m6l bJME+2UxE9kYr85+gKw5ImZMCwaDvbKbl71Rim3t4ioUU14dGb/3jB7gE v1aXqnqFYnuWxYG+TSd6sJdaBPF6+ro/LtEWg+phsgWszIx+4jUsRb+7k a7Xd5Z9SB9KYbQGEl4QM6lqJ3AZx7KpN6+gzRgdpmc2sUTDsP4Nx8gZVE w==; X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="314899816" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208";a="314899816" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 23:09:47 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="730296344" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208";a="730296344" Received: from unknown (HELO localhost.localdomain) ([10.239.252.248]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 23:09:45 -0800 From: Weiyuan Li To: dts@dpdk.org Cc: Weiyuan Li , Song Jiale Subject: [dts][PATCH V4 6/8] tests/vlan_ethertype_config: modify script and test plan to support i40e fimware >= 8.4 Date: Tue, 22 Nov 2022 15:09:25 +0800 Message-Id: <20221122070927.7634-6-weiyuanx.li@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20221122070927.7634-1-weiyuanx.li@intel.com> References: <20221122070927.7634-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. v4: -modify comments. -dual_vlan test plan modify table and add header. 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 From patchwork Tue Nov 22 07:09:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiyuan Li X-Patchwork-Id: 120049 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 80E6DA0580; Tue, 22 Nov 2022 08:09:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7D76D42D5F; Tue, 22 Nov 2022 08:09:51 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id E579142D5B for ; Tue, 22 Nov 2022 08:09:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669100990; x=1700636990; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xTIBa28Do1glHF8vsG5XWgouRSHE3WEH5FG+CgLrANw=; b=GqkY2b9hVTmO7QP5u2MUaBFfWhxRbEuf8IjpyIEUNkShHdI6asDv2A3p MZss5I+wFcPisvvbbO+ZwRaqGNzKfLarDdzLC6zs+zrLUHSNNCFikymMG qfUoBFLEXJRbAcYwMnzEfuJToT3NpoKprW51xdlkE5d16i+gbVwt4YFvq v6sO/+MCj5d8UDcuLR6YsdCfBuHKBoK+Z4RIe7EQpXgb4bIcDUVMA1v8Y lX/OpboloesWi0e8bnzaub2UsAKvEaB3sJsPHacexI0FZZZc7TLUvN0QX AiQbSXneg+nEfNAQbJgyiG2ysuRd9q5xAr+kda3Lcfi+uY/eLeqrW38Os g==; X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="314899821" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208";a="314899821" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 23:09:49 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="730296357" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208";a="730296357" Received: from unknown (HELO localhost.localdomain) ([10.239.252.248]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 23:09:47 -0800 From: Weiyuan Li To: dts@dpdk.org Cc: Weiyuan Li , Song Jiale Subject: [dts][PATCH V4 7/8] test_plans/vlan: modify script and test plan to support i40e fimware >= 8.4 Date: Tue, 22 Nov 2022 15:09:26 +0800 Message-Id: <20221122070927.7634-7-weiyuanx.li@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20221122070927.7634-1-weiyuanx.li@intel.com> References: <20221122070927.7634-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. v4: -modify comments. -dual_vlan test plan modify table and add header. test_plans/vlan_test_plan.rst | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/test_plans/vlan_test_plan.rst b/test_plans/vlan_test_plan.rst index 6e2bf74e..cf5fe712 100644 --- a/test_plans/vlan_test_plan.rst +++ b/test_plans/vlan_test_plan.rst @@ -61,6 +61,11 @@ Enable the receipt of VLAN packets with VLAN Tag Identifier 1 on port 0:: testpmd> rx_vlan add 1 0 testpmd> vlan set strip off 0 + + Due to the kernel enables Qinq and cannot be closed, the DPDK cn only add `extend on` to make the VLAN filter + work normally. Therefore, if the i40e firmware version >= 8.4 the dpdk can only add 'extend on' to make the VLAN filter work normally: + testpmd> vlan set extend on 0 + testpmd> start rxonly packet forwarding - CRC stripping disabled - packets/burst=32 nb forwarding cores=1 - nb forwarding ports=10 @@ -111,7 +116,11 @@ Test Case: Disable receipt of VLAN packets Disable the receipt of VLAN packets with Tag Identifier ``1`` on port 0. Send VLAN packets with the Tag Identifier ``1`` check that no packet is received on port ``B``, meaning that VLAN packets are now dropped on port 0:: - + + Due to the kernel enables Qinq and cannot be closed, the DPDK cn only add `extend on` to make the VLAN filter + work normally. Therefore, if the i40e firmware version >= 8.4 the dpdk can only add 'extend on' to make the VLAN filter work normally: + testpmd> vlan set extend on 0 + testpmd> rx_vlan rm 1 0 testpmd> start rxonly packet forwarding - CRC stripping disabled - packets/burst=32 From patchwork Tue Nov 22 07:09:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiyuan Li X-Patchwork-Id: 120050 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 5CE8EA057F; Tue, 22 Nov 2022 08:09:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 585AC42D4E; Tue, 22 Nov 2022 08:09:54 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id A77AD42D62 for ; Tue, 22 Nov 2022 08:09:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669100991; x=1700636991; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jTHPKmH4Y6+FZxm0kLCaectBDWmA/aX/+0ufMmjzK78=; b=QLmAGoTjUl4YnMLp+n4LC441Qe6u9xKrb0t31eDrdeYJUtAc4JRc9Yvm lt+HI942mZTFT8EqJdw7pq21yja7o11JpZh+SdVrBDs/D9YVnBJuite4L u9cmOMnS62vIbQtyuZcz2kOd8hvwRnmWEWdwprRATQ86bN6+ojPA+70c6 Y0LyzDT6VRdaIwgWI16M9SZF0PAgstYekXd3I+76uPSMHGwNtvEMPjN08 FBgKJGnDY9KC17Pwoc46VLdjRQ21LtejjAQqNA5oLHgJdcxNj8JlHOGfi pwPtsXevOXHLjY8pBMyHoEtCF+H47RV56zOBdW0Rpadd6PU4IpWrMvxBv A==; X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="314899828" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208";a="314899828" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 23:09:51 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="730296370" X-IronPort-AV: E=Sophos;i="5.96,183,1665471600"; d="scan'208";a="730296370" Received: from unknown (HELO localhost.localdomain) ([10.239.252.248]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 23:09:49 -0800 From: Weiyuan Li To: dts@dpdk.org Cc: Weiyuan Li , Song Jiale Subject: [dts][PATCH V4 8/8] tests/vlan: modify script and test plan to support i40e fimware >= 8.4 Date: Tue, 22 Nov 2022 15:09:27 +0800 Message-Id: <20221122070927.7634-8-weiyuanx.li@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20221122070927.7634-1-weiyuanx.li@intel.com> References: <20221122070927.7634-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. v4: -modify comments. -dual_vlan test plan modify table and add header. tests/TestSuite_vlan.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/tests/TestSuite_vlan.py b/tests/TestSuite_vlan.py index 3d8811f9..1bdac137 100644 --- a/tests/TestSuite_vlan.py +++ b/tests/TestSuite_vlan.py @@ -48,7 +48,14 @@ class TestVlan(TestCase): self.pmdout.start_testpmd( "Default", "--portmask=%s --port-topology=loop" % portMask ) - + # Get the firmware version information + try: + self.fwversion, _, _ = self.pmdout.get_firmware_version( + self.dut_ports[0] + ).split() + except ValueError: + # nic IXGBE, IGC + self.fwversion = self.pmdout.get_firmware_version(self.dut_ports[0]).split() self.dut.send_expect("set verbose 1", "testpmd> ") self.dut.send_expect("set fwd mac", "testpmd> ") self.dut.send_expect("set promisc all off", "testpmd> ") @@ -105,6 +112,10 @@ class TestVlan(TestCase): self.dut.send_expect( "rx_vlan add %d %s" % (self.vlan, 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("vlan set strip off %s" % dutRxPortId, "testpmd> ") self.dut.send_expect("start", "testpmd> ", 120) out = self.dut.send_expect("show port info %s" % dutRxPortId, "testpmd> ", 20) @@ -127,6 +138,10 @@ class TestVlan(TestCase): Disable receipt of VLAN packets """ self.dut.send_expect("rx_vlan rm %d %s" % (self.vlan, 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> ", 120) self.vlan_send_packet(self.vlan) @@ -187,7 +202,8 @@ class TestVlan(TestCase): """ Run after each test case. """ - pass + if self.kdriver == "i40e" and self.fwversion >= "8.40": + self.dut.send_expect("vlan set extend off %s" % dutRxPortId, "testpmd> ") def tear_down_all(self): """