From patchwork Fri Dec 11 07:08:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, HaiyangX" X-Patchwork-Id: 84998 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 71A70A04DB; Fri, 11 Dec 2020 08:15:03 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4250AC940; Fri, 11 Dec 2020 08:15:02 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 3C2E5BC86 for ; Fri, 11 Dec 2020 08:14:59 +0100 (CET) IronPort-SDR: eRYmSNN9snosX5Bt0GNun1ptTu0IPUhVzTQ/DCNX+/7X86Z2heQj9Edz/gTkfGLfrzN3hjhUSm U0QQeQcM4hJg== X-IronPort-AV: E=McAfee;i="6000,8403,9831"; a="154199144" X-IronPort-AV: E=Sophos;i="5.78,410,1599548400"; d="scan'208";a="154199144" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Dec 2020 23:14:58 -0800 IronPort-SDR: VLcMDJ6psu4l6tUSdwpS83FwefLi6ZMilA9hEoMUDNl3ccOvVVda9qdcgw5PQqsKLOUI/ZhRrR FyBnDG/YRzlQ== X-IronPort-AV: E=Sophos;i="5.78,410,1599548400"; d="scan'208";a="545101647" Received: from unknown (HELO localhost.localdomain) ([10.240.183.57]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Dec 2020 23:14:56 -0800 From: Haiyang Zhao To: dts@dpdk.org, lijuan.tu@intel.com Cc: Haiyang Zhao Date: Fri, 11 Dec 2020 15:08:26 +0800 Message-Id: <20201211070828.24244-2-haiyangx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201211070828.24244-1-haiyangx.zhao@intel.com> References: <20201211070828.24244-1-haiyangx.zhao@intel.com> Subject: [dts] [PATCH V1 1/3] framework/dut: add an attribute nic in dut X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 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" get the instance of NetDevice from the port_info, and save it in dut as attribute nic. Signed-off-by: Haiyang Zhao --- framework/dut.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/framework/dut.py b/framework/dut.py index dcf833b4..388fec04 100644 --- a/framework/dut.py +++ b/framework/dut.py @@ -81,6 +81,7 @@ class Dut(Crb): self.apps_name_conf = {} self.apps_name = {} self.dpdk_version = '' + self.nic = None def filter_cores_from_crb_cfg(self): # get core list from crbs.cfg @@ -405,6 +406,8 @@ class Dut(Crb): # print latest ports_info for port_info in self.ports_info: self.logger.info(port_info) + if self.nic is None: + self.nic = port_info['port'] if self.ports_map is None or len(self.ports_map) == 0: self.logger.warning("ports_map should not be empty, please check all links") From patchwork Fri Dec 11 07:08:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, HaiyangX" X-Patchwork-Id: 84999 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 69B11A09E0; Fri, 11 Dec 2020 08:15:04 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D7512C962; Fri, 11 Dec 2020 08:15:02 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id D7F7FBC86 for ; Fri, 11 Dec 2020 08:15:00 +0100 (CET) IronPort-SDR: 0gW/bjMiaeXjk8w3jjm4bZJoPYgN6GoJQCVOduEJhGwkdoKwzy25GBfcQnuB+fNhg4HEal0hGO zsvgCjR3nLig== X-IronPort-AV: E=McAfee;i="6000,8403,9831"; a="154199148" X-IronPort-AV: E=Sophos;i="5.78,410,1599548400"; d="scan'208";a="154199148" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Dec 2020 23:14:59 -0800 IronPort-SDR: /juA70ytzE87c+naO86kNY7W7pxCTg+RPryzZEN/QZy8EJ8CgEQHJ3dTiKJBfY2Y6xc11oCBcv PvV6BC8RqCbQ== X-IronPort-AV: E=Sophos;i="5.78,410,1599548400"; d="scan'208";a="545101659" Received: from unknown (HELO localhost.localdomain) ([10.240.183.57]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Dec 2020 23:14:58 -0800 From: Haiyang Zhao To: dts@dpdk.org, lijuan.tu@intel.com Cc: Haiyang Zhao Date: Fri, 11 Dec 2020 15:08:27 +0800 Message-Id: <20201211070828.24244-3-haiyangx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201211070828.24244-1-haiyangx.zhao@intel.com> References: <20201211070828.24244-1-haiyangx.zhao@intel.com> Subject: [dts] [PATCH V1 2/3] framework/project_dpdk: replace i40evf with iavf X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 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" replace i40evf with iavf in both host and vm dut, if the nic kernel driver is i40e. Signed-off-by: Haiyang Zhao --- framework/project_dpdk.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py index 259282f4..a8a128ac 100644 --- a/framework/project_dpdk.py +++ b/framework/project_dpdk.py @@ -278,6 +278,17 @@ class DPDKdut(Dut): shared_lib_path = load_global_setting(HOST_SHARED_LIB_PATH) if use_shared_lib == 'true' and 'Virt' not in str(self): self.set_build_options({'RTE_BUILD_SHARED_LIB': 'y'}) + kernel_driver = '' + if 'Virt' in str(self): + if self.host_dut.nic: + kernel_driver = self.host_dut.nic.default_driver + elif self.nic: + kernel_driver = self.nic.default_driver + + if kernel_driver == 'i40e': + self.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },/a { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },' drivers/net/iavf/iavf_ethdev.c", "# ") + self.send_expect("sed -i -e '/I40E_DEV_ID_VF/s/0x154C/0x164C/g' drivers/net/i40e/base/i40e_devids.h", "# ") + build_type = load_global_setting(HOST_BUILD_TYPE_SETTING) build_install_dpdk = getattr(self, 'build_install_dpdk_%s_%s' % (self.get_os_type(), build_type)) build_install_dpdk(target, extra_options) From patchwork Fri Dec 11 07:08:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, HaiyangX" X-Patchwork-Id: 85000 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 814A7A04DB; Fri, 11 Dec 2020 08:15:05 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 546D4C970; Fri, 11 Dec 2020 08:15:04 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 7C0ADBC86 for ; Fri, 11 Dec 2020 08:15:01 +0100 (CET) IronPort-SDR: vIDo+y/C/UMGMJGv6cJfzWu1/anSf2a8GL2c6CMYLIdgKw6sXJ2gs1USrgZCp6nZ6KL7gIt3EW BVGROTzDGQHA== X-IronPort-AV: E=McAfee;i="6000,8403,9831"; a="154199153" X-IronPort-AV: E=Sophos;i="5.78,410,1599548400"; d="scan'208";a="154199153" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Dec 2020 23:15:01 -0800 IronPort-SDR: oD77OwovUXoN0063aA4O+MkudWA1e6vSzK5jR4k/P9bfXddO+aAscmx0UV8tV2FAFcmYKit9dC VYL1FNgK0h0g== X-IronPort-AV: E=Sophos;i="5.78,410,1599548400"; d="scan'208";a="545101670" Received: from unknown (HELO localhost.localdomain) ([10.240.183.57]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Dec 2020 23:14:59 -0800 From: Haiyang Zhao To: dts@dpdk.org, lijuan.tu@intel.com Cc: Haiyang Zhao Date: Fri, 11 Dec 2020 15:08:28 +0800 Message-Id: <20201211070828.24244-4-haiyangx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201211070828.24244-1-haiyangx.zhao@intel.com> References: <20201211070828.24244-1-haiyangx.zhao@intel.com> Subject: [dts] [PATCH V1 3/3] tests/kernelpf_iavf: delete code of replacing i40evf X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 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" replace i40evf with iavf is completed in framework, so delete the code of replacing i40evf. Signed-off-by: Haiyang Zhao --- tests/TestSuite_kernelpf_iavf.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/tests/TestSuite_kernelpf_iavf.py b/tests/TestSuite_kernelpf_iavf.py index da925109..0420cfa1 100644 --- a/tests/TestSuite_kernelpf_iavf.py +++ b/tests/TestSuite_kernelpf_iavf.py @@ -174,21 +174,9 @@ class TestKernelpfIavf(TestCase): except Exception as e: self.destroy_vm_env() raise Exception(e) - netdev = self.dut.ports_info[0]['port'] - nic_drive = netdev.get_nic_driver() - if nic_drive == "i40e": - self.vm_dut.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },/a { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },' drivers/net/iavf/iavf_ethdev.c", "# ") - self.vm_dut.send_expect("sed -i -e '/I40E_DEV_ID_VF/s/0x154C/0x164C/g' drivers/net/i40e/base/i40e_devids.h", "# ") - self.vm_dut.build_install_dpdk(self.target) self.env_done = True def destroy_vm_env(self): - netdev = self.dut.ports_info[0]['port'] - nic_drive = netdev.get_nic_driver() - if nic_drive == "i40e": - self.vm_dut.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },/d' drivers/net/iavf/iavf_ethdev.c", "# ") - self.vm_dut.send_expect("sed -i -e '/I40E_DEV_ID_VF/s/0x164C/0x154C/g' drivers/net/i40e/base/i40e_devids.h", "# ") - self.vm_dut.build_install_dpdk(self.target) if getattr(self, 'vm', None): if getattr(self, 'vm_dut', None): self.vm_dut.kill_all()