From patchwork Wed Nov 25 19:19:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ferruh Yigit X-Patchwork-Id: 84554 X-Patchwork-Delegate: thomas@monjalon.net 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 86A31A0545; Wed, 25 Nov 2020 20:20:00 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7B7F8C980; Wed, 25 Nov 2020 20:19:25 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id CF159C96E; Wed, 25 Nov 2020 20:19:22 +0100 (CET) IronPort-SDR: 3+Q/ZO5iAzAVJuhzpJ6t1Lge2CsUs66RHY22inyfJFDENglMiSP4eBe5qpKy859RWzqxCWv4qN PSdmbkZV+PDw== X-IronPort-AV: E=McAfee;i="6000,8403,9816"; a="151447611" X-IronPort-AV: E=Sophos;i="5.78,370,1599548400"; d="scan'208";a="151447611" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Nov 2020 11:19:20 -0800 IronPort-SDR: 5ReRRkOHvvbGpK+2cUIcN+KqySIxA5ws7NUnCUYAgPXYNRwMcG3oC0v8/Go/k/WK1nz3uLHObu ywzj8PhlLbqQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,370,1599548400"; d="scan'208";a="547413792" Received: from silpixa00399752.ir.intel.com (HELO silpixa00399752.ger.corp.intel.com) ([10.237.222.180]) by orsmga005.jf.intel.com with ESMTP; 25 Nov 2020 11:19:18 -0800 From: Ferruh Yigit To: Thomas Monjalon Cc: Ferruh Yigit , dev@dpdk.org, techboard@dpdk.org, Stephen Hemminger , Bruce Richardson Date: Wed, 25 Nov 2020 19:19:04 +0000 Message-Id: <20201125191908.1867106-3-ferruh.yigit@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201125191908.1867106-1-ferruh.yigit@intel.com> References: <20201125191908.1867106-1-ferruh.yigit@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 2/6] usertools/setup: remove inserting custom kernel modules X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Custom DPDK kernel module insert support relies on make based build variable 'RTE_TARGET' to find the location of the kernel modules, which is not valid anymore. Also 'igb_uio' kernel module moved to another git repository: https://git.dpdk.org/dpdk-kmods/ Signed-off-by: Ferruh Yigit Tested-by: Conor Walsh --- usertools/dpdk-setup.sh | 91 +++++++---------------------------------- 1 file changed, 14 insertions(+), 77 deletions(-) diff --git a/usertools/dpdk-setup.sh b/usertools/dpdk-setup.sh index d1eb188692a6..bcf0c843678f 100755 --- a/usertools/dpdk-setup.sh +++ b/usertools/dpdk-setup.sh @@ -78,39 +78,6 @@ remove_igb_uio_module() fi } -# -# Loads new igb_uio.ko (and uio module if needed). -# -load_igb_uio_module() -{ - if [ ! -f $RTE_SDK/$RTE_TARGET/kmod/igb_uio.ko ];then - echo "## ERROR: Target does not have the DPDK UIO Kernel Module." - echo " To fix, please try to rebuild target." - return - fi - - remove_igb_uio_module - - /sbin/lsmod | grep -s uio > /dev/null - if [ $? -ne 0 ] ; then - modinfo uio > /dev/null - if [ $? -eq 0 ]; then - echo "Loading uio module" - sudo /sbin/modprobe uio - fi - fi - - # UIO may be compiled into kernel, so it may not be an error if it can't - # be loaded. - - echo "Loading DPDK UIO module" - sudo /sbin/insmod $RTE_SDK/$RTE_TARGET/kmod/igb_uio.ko - if [ $? -ne 0 ] ; then - echo "## ERROR: Could not load kmod/igb_uio.ko." - quit - fi -} - # # Unloads VFIO modules. # @@ -171,30 +138,6 @@ remove_kni_module() fi } -# -# Loads the rte_kni.ko module. -# -load_kni_module() -{ - # Check that the KNI module is already built. - if [ ! -f $RTE_SDK/$RTE_TARGET/kmod/rte_kni.ko ];then - echo "## ERROR: Target does not have the DPDK KNI Module." - echo " To fix, please try to rebuild target." - return - fi - - # Unload existing version if present. - remove_kni_module - - # Now try load the KNI module. - echo "Loading DPDK KNI module" - sudo /sbin/insmod $RTE_SDK/$RTE_TARGET/kmod/rte_kni.ko - if [ $? -ne 0 ] ; then - echo "## ERROR: Could not load kmod/rte_kni.ko." - quit - fi -} - # # Sets appropriate permissions on /dev/vfio/* files # @@ -416,32 +359,26 @@ step1_func() { TITLE="Setup linux environment" - TEXT[1]="Insert IGB UIO module" - FUNC[1]="load_igb_uio_module" - - TEXT[2]="Insert VFIO module" - FUNC[2]="load_vfio_module" - - TEXT[3]="Insert KNI module" - FUNC[3]="load_kni_module" + TEXT[1]="Insert VFIO module" + FUNC[1]="load_vfio_module" - TEXT[4]="Setup hugepage mappings for non-NUMA systems" - FUNC[4]="set_non_numa_pages" + TEXT[2]="Setup hugepage mappings for non-NUMA systems" + FUNC[2]="set_non_numa_pages" - TEXT[5]="Setup hugepage mappings for NUMA systems" - FUNC[5]="set_numa_pages" + TEXT[3]="Setup hugepage mappings for NUMA systems" + FUNC[3]="set_numa_pages" - TEXT[6]="Display current Ethernet/Baseband/Crypto device settings" - FUNC[6]="show_devices" + TEXT[4]="Display current Ethernet/Baseband/Crypto device settings" + FUNC[4]="show_devices" - TEXT[7]="Bind Ethernet/Baseband/Crypto device to IGB UIO module" - FUNC[7]="bind_devices_to_igb_uio" + TEXT[5]="Bind Ethernet/Baseband/Crypto device to IGB UIO module" + FUNC[5]="bind_devices_to_igb_uio" - TEXT[8]="Bind Ethernet/Baseband/Crypto device to VFIO module" - FUNC[8]="bind_devices_to_vfio" + TEXT[6]="Bind Ethernet/Baseband/Crypto device to VFIO module" + FUNC[6]="bind_devices_to_vfio" - TEXT[9]="Setup VFIO permissions" - FUNC[9]="set_vfio_permissions" + TEXT[7]="Setup VFIO permissions" + FUNC[7]="set_vfio_permissions" } #