From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CD82041C4D; Thu, 9 Feb 2023 11:16:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 978AB4067B; Thu, 9 Feb 2023 11:16:18 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id A9464400D5 for ; Thu, 9 Feb 2023 11:16:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675937776; x=1707473776; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=4Ksi8MwJPbVdPM4nxVB2azWH8XXKhn9e8P3LOLpE9HA=; b=BpdYHWKu2c5dLE+CI41VP/hR93z0kJHS4VpJEYNA0SGCiuLVkXCXFoba 4PfzTCi/M/aDjyvnCOjCJtyfJhqKthb8DDpRUU+4Ym8lhsgBe8kMtm/qN XCNwBXtSXCedOoZKKkEWvN6hnYCXf204bK4HNcSQC9wMrrzfZaivLiDY+ Sd/qbKCVlYHngBcXEMpzD48ALYaxZmS4ADtAO3lBt7mEKRY0FchVsNYJw kZ7BPuuhp5dtOsJZ+CdXMq4YrYtWEgIg/ySLC4URNXf3vDdh2D3ag62Ep uJEpxizL0c68SBC2pocV1orP4OtkfA6PY6wcxa63jYnfzYM1Vfid3a3PW Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10615"; a="330093604" X-IronPort-AV: E=Sophos;i="5.97,283,1669104000"; d="scan'208";a="330093604" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2023 02:16:15 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10615"; a="791557576" X-IronPort-AV: E=Sophos;i="5.97,283,1669104000"; d="scan'208";a="791557576" Received: from unknown (HELO localhost.localdomain) ([10.239.252.96]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2023 02:16:14 -0800 From: Zhimin Huang To: dts@dpdk.org Cc: Zhimin Huang Subject: [dts][PATCH V1] kernelpf_iavf: add driver version check to adapt to dpdk changes Date: Thu, 9 Feb 2023 18:35:49 +0000 Message-Id: <20230209183549.367681-1-zhiminx.huang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 according to dpdk commit d048a0aaae27809523969904c2f7b71fe3cc1bb6, the ice driver version newer than 1.8.9 not support insert correct vlan tag in avx512. add driver version check in test script, newer than 1.8.9 will skip in test. Signed-off-by: Zhimin Huang --- test_plans/kernelpf_iavf_test_plan.rst | 5 ++++ tests/TestSuite_kernelpf_iavf.py | 34 +++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/test_plans/kernelpf_iavf_test_plan.rst b/test_plans/kernelpf_iavf_test_plan.rst index 5b91d38b..df98b65f 100644 --- a/test_plans/kernelpf_iavf_test_plan.rst +++ b/test_plans/kernelpf_iavf_test_plan.rst @@ -522,6 +522,11 @@ Test case: IAVF DUAL VLAN header stripping Test case: IAVF DUAL VLAN header insertion ========================================== +..note:: + + according to dpdk commit d048a0aaae27809523969904c2f7b71fe3cc1bb6, + when the ice driver version newer than 1.8.9, avx512 tx path not support insert correct vlag tag(outer of QinQ) + 1. enable vlan filtering on port VF:: testpmd> vlan set filter on 0 diff --git a/tests/TestSuite_kernelpf_iavf.py b/tests/TestSuite_kernelpf_iavf.py index 5e955feb..66c9094e 100644 --- a/tests/TestSuite_kernelpf_iavf.py +++ b/tests/TestSuite_kernelpf_iavf.py @@ -16,7 +16,11 @@ import time import framework.utils as utils from framework.packet import Packet from framework.pmd_output import PmdOutput -from framework.settings import DPDK_DCFMODE_SETTING, load_global_setting +from framework.settings import ( + DPDK_DCFMODE_SETTING, + DPDK_RXMODE_SETTING, + load_global_setting, +) from framework.test_case import TestCase, check_supported_nic from framework.utils import RED from framework.virt_common import VM @@ -81,6 +85,7 @@ class TestKernelpfIavf(TestCase): self.flag = "vf-vlan-pruning" self.default_stats = self.dut.get_priv_flags_state(self.host_intf, self.flag) self.dcf_mode = load_global_setting(DPDK_DCFMODE_SETTING) + self.rx_mode = load_global_setting(DPDK_RXMODE_SETTING) def set_up(self): @@ -1016,12 +1021,39 @@ class TestKernelpfIavf(TestCase): "port {} should not received a packets".format(port_id), ) + def convert_driver_version_value(self, check_version): + """ + convert the driver version to int list + take the first three values in the list for comparison and limit intree driver + for example: + 6.0.7-060007-generic: [6, 0, 7-060007-generic] + 1.11.0_rc59: [1, 11, 0] + 1.11.11: [1, 11, 11] + """ + try: + value_list = list(map(int, re.split(r"[.|_]", check_version)[:3])) + except ValueError as e: + self.logger.warning(e) + # the intree-driver has character, so set the return value is null list as the lowest driver version + return [] + return value_list + @check_supported_nic(ice_nic) def test_iavf_dual_vlan_insert(self): """ Test case: IAVF DUAL VLAN header insertion """ + + """ + according to dpdk commit d048a0aaae27809523969904c2f7b71fe3cc1bb6, + when the ice driver version newer than 1.8.9, avx512 tx path not support + insert correct vlag tag(outer of QinQ) + """ self.skip_case(not self.dcf_mode, "the case not support this dcf mode") + if self.rx_mode == "avx512" and self.convert_driver_version_value( + self.driver_version + ) > self.convert_driver_version_value("1.8.9"): + self.skip_case(False, "avx512 tx path not support insert correct vlan tag") out_vlan = 1 pkt_list = [ 'Ether(dst="%s",type=0x0800)/IP(src="196.222.232.221")/("X"*480)' -- 2.25.1