From patchwork Thu Dec 15 21:59:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 18000 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id AF39C5587; Thu, 15 Dec 2016 22:59:56 +0100 (CET) Received: from mail-wj0-f178.google.com (mail-wj0-f178.google.com [209.85.210.178]) by dpdk.org (Postfix) with ESMTP id 548A5316B for ; Thu, 15 Dec 2016 22:59:32 +0100 (CET) Received: by mail-wj0-f178.google.com with SMTP id tk12so78499273wjb.3 for ; Thu, 15 Dec 2016 13:59:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=AIw1+ulJyLbyp2ng6eJoVmArBObUGvlQ6OIVSZnz1P8=; b=t5+eVzm2yYizBORixl7DXyx9811A5S/wpLQuTxgU/hM6nWnqw6F3BDXFpAjVIDFcb5 fj4BbOVluI2IJzIv1ebQWB1uHYfHiZEkC+kYYDZsPVtQ/Y9XosC1SxnE5bVoiCaSkuNx nm1tsm8ag8/7gLrqpLPeKDnH+REVVOTjIorkbJDSAjBmwdVncuUhLmEA4ZZHjA/knehF H+Igno1Fa+FVam1UBF7e4EQGffdGmwt5njKZM407nk0VKypqdYd3ENvb7gcnkilnUWzK ERD9knMLk1J1js0QzqmSmg4jJ18c7eXnD9n9Sq9me+gbQRWH3jseb6w8LieTpr+Dsp9H TxzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AIw1+ulJyLbyp2ng6eJoVmArBObUGvlQ6OIVSZnz1P8=; b=txF7gNPNVY5B6VZneD7a1BQitj3vuyAX+6RQfR5V7dmL+1zg7DFir0oQlTXivkxHkK HlXmYHEJEuXN2sUAKucvHV9xYT2GQBW4aB0qa+JRL56pMx04rzgz1L165arGRH9a7DW0 TlGwWxjmf1CrTJ+t1Zexi2kfaCw27gft7e1xcWG4oVU3xvdXcUXIQuFNamMziqJaAVr3 HVtz0gAI0lbes3IwF0m/5dR3ElN+PuS3v8vxvnsrCNUYPOD3Dnr3rHK6RiPxlf2+KHEk mUuAfq4gpZwTkoDxQi6FVafsl8sBGMon+21aPlydhZpix83dLW3M33aoFGGn25wawlQU 2/qA== X-Gm-Message-State: AKaTC02XF4wE22HGV6fNBkdgRrx4h9WWsSsfdowOAAqw1YTTxG44HBEJuXyGrwd1cwrZmVR7 X-Received: by 10.194.2.110 with SMTP id 14mr3301678wjt.206.1481839171534; Thu, 15 Dec 2016 13:59:31 -0800 (PST) Received: from XPS13.localdomain (184.203.134.77.rev.sfr.net. [77.134.203.184]) by smtp.gmail.com with ESMTPSA id w8sm440819wmw.4.2016.12.15.13.59.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Dec 2016 13:59:31 -0800 (PST) From: Thomas Monjalon To: dev@dpdk.org Date: Thu, 15 Dec 2016 22:59:09 +0100 Message-Id: <1481839149-26684-4-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1481839149-26684-1-git-send-email-thomas.monjalon@6wind.com> References: <1481839149-26684-1-git-send-email-thomas.monjalon@6wind.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 3/3] tools: move to usertools 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" Rename tools/ into usertools/ to differentiate from buildtools/ and devtools/ while making clear these scripts are part of DPDK runtime. Signed-off-by: Thomas Monjalon --- MAINTAINERS | 2 +- doc/guides/cryptodevs/qat.rst | 2 +- doc/guides/faq/faq.rst | 2 +- doc/guides/howto/lm_bond_virtio_sriov.rst | 8 ++++---- doc/guides/howto/lm_virtio_vhost_user.rst | 16 +++++++-------- doc/guides/linux_gsg/build_dpdk.rst | 14 ++++++------- doc/guides/linux_gsg/nic_perf_intel_platform.rst | 6 +++--- doc/guides/linux_gsg/quick_start.rst | 4 ++-- doc/guides/nics/bnx2x.rst | 4 ++-- doc/guides/nics/cxgbe.rst | 4 ++-- doc/guides/nics/ena.rst | 2 +- doc/guides/nics/i40e.rst | 4 ++-- doc/guides/nics/qede.rst | 2 +- doc/guides/nics/thunderx.rst | 26 ++++++++++++------------ doc/guides/nics/virtio.rst | 2 +- doc/guides/sample_app_ug/vhost.rst | 2 +- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 10 ++++----- doc/guides/xen/pkt_switch.rst | 2 +- lib/librte_eal/common/eal_common_options.c | 2 +- mk/rte.sdkinstall.mk | 10 +++------ pkg/dpdk.spec | 2 +- {tools => usertools}/cpu_layout.py | 0 {tools => usertools}/dpdk-devbind.py | 0 {tools => usertools}/dpdk-pmdinfo.py | 0 {tools => usertools}/dpdk-setup.sh | 14 ++++++------- 25 files changed, 68 insertions(+), 72 deletions(-) rename {tools => usertools}/cpu_layout.py (100%) rename {tools => usertools}/dpdk-devbind.py (100%) rename {tools => usertools}/dpdk-pmdinfo.py (100%) rename {tools => usertools}/dpdk-setup.sh (97%) diff --git a/MAINTAINERS b/MAINTAINERS index e779a5d..3fdd92a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -74,7 +74,7 @@ F: scripts/validate-abi.sh Driver information F: buildtools/pmdinfogen/ -F: tools/dpdk-pmdinfo.py +F: usertools/dpdk-pmdinfo.py F: doc/guides/tools/pmdinfo.rst diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst index 52a9ae3..03d5c2d 100644 --- a/doc/guides/cryptodevs/qat.rst +++ b/doc/guides/cryptodevs/qat.rst @@ -413,4 +413,4 @@ The other way to bind the VFs to the DPDK UIO driver is by using the ``dpdk-devb .. code-block:: console cd $RTE_SDK - ./tools/dpdk-devbind.py -b igb_uio 0000:03:01.1 + ./usertools/dpdk-devbind.py -b igb_uio 0000:03:01.1 diff --git a/doc/guides/faq/faq.rst b/doc/guides/faq/faq.rst index 0adc549..5a324b2 100644 --- a/doc/guides/faq/faq.rst +++ b/doc/guides/faq/faq.rst @@ -50,7 +50,7 @@ When you stop and restart the test application, it looks to see if the pages are If you look in the directory, you will see ``n`` number of 2M pages files. If you specified 1024, you will see 1024 page files. These are then placed in memory segments to get contiguous memory. -If you need to change the number of pages, it is easier to first remove the pages. The tools/dpdk-setup.sh script provides an option to do this. +If you need to change the number of pages, it is easier to first remove the pages. The usertools/dpdk-setup.sh script provides an option to do this. See the "Quick Start Setup Script" section in the :ref:`DPDK Getting Started Guide ` for more information. diff --git a/doc/guides/howto/lm_bond_virtio_sriov.rst b/doc/guides/howto/lm_bond_virtio_sriov.rst index fe9803e..169b64e 100644 --- a/doc/guides/howto/lm_bond_virtio_sriov.rst +++ b/doc/guides/howto/lm_bond_virtio_sriov.rst @@ -613,17 +613,17 @@ Set up DPDK in the Virtual Machine cat /sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages ifconfig -a - /root/dpdk/tools/dpdk-devbind.py --status + /root/dpdk/usertools/dpdk-devbind.py --status rmmod virtio-pci ixgbevf modprobe uio insmod /root/dpdk/x86_64-default-linuxapp-gcc/kmod/igb_uio.ko - /root/dpdk/tools/dpdk-devbind.py -b igb_uio 0000:00:03.0 - /root/dpdk/tools/dpdk-devbind.py -b igb_uio 0000:00:04.0 + /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:03.0 + /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:04.0 - /root/dpdk/tools/dpdk-devbind.py --status + /root/dpdk/usertools/dpdk-devbind.py --status run_testpmd_bonding_in_vm.sh ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/howto/lm_virtio_vhost_user.rst b/doc/guides/howto/lm_virtio_vhost_user.rst index 4937781..0a0fcfc 100644 --- a/doc/guides/howto/lm_virtio_vhost_user.rst +++ b/doc/guides/howto/lm_virtio_vhost_user.rst @@ -90,14 +90,14 @@ For Fortville NIC. .. code-block:: console - cd /root/dpdk/tools + cd /root/dpdk/usertools ./dpdk-devbind.py -b igb_uio 0000:02:00.0 For Niantic NIC. .. code-block:: console - cd /root/dpdk/tools + cd /root/dpdk/usertools ./dpdk-devbind.py -b igb_uio 0000:09:00.0 On host_server_1: Terminal 3 @@ -171,14 +171,14 @@ For Fortville NIC. .. code-block:: console - cd /root/dpdk/tools + cd /root/dpdk/usertools ./dpdk-devbind.py -b igb_uio 0000:03:00.0 For Niantic NIC. .. code-block:: console - cd /root/dpdk/tools + cd /root/dpdk/usertools ./dpdk-devbind.py -b igb_uio 0000:06:00.0 On host_server_2: Terminal 3 @@ -444,17 +444,17 @@ setup_dpdk_virtio_in_vm.sh cat /sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages ifconfig -a - /root/dpdk/tools/dpdk-devbind.py --status + /root/dpdk/usertools/dpdk-devbind.py --status rmmod virtio-pci modprobe uio insmod /root/dpdk/x86_64-default-linuxapp-gcc/kmod/igb_uio.ko - /root/dpdk/tools/dpdk-devbind.py -b igb_uio 0000:00:03.0 - /root/dpdk/tools/dpdk-devbind.py -b igb_uio 0000:00:04.0 + /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:03.0 + /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:04.0 - /root/dpdk/tools/dpdk-devbind.py --status + /root/dpdk/usertools/dpdk-devbind.py --status run_testpmd_in_vm.sh ~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/linux_gsg/build_dpdk.rst b/doc/guides/linux_gsg/build_dpdk.rst index 527c38d..f0a096e 100644 --- a/doc/guides/linux_gsg/build_dpdk.rst +++ b/doc/guides/linux_gsg/build_dpdk.rst @@ -58,7 +58,7 @@ The DPDK is composed of several directories: * examples: Source code of DPDK application examples -* config, tools, scripts, mk: Framework-related makefiles, scripts and configuration +* config, buildtools, mk: Framework-related makefiles, scripts and configuration Installation of DPDK Target Environments ---------------------------------------- @@ -188,7 +188,7 @@ however please consult your distributions documentation to make sure that is the Also, to use VFIO, both kernel and BIOS must support and be configured to use IO virtualization (such as Intel® VT-d). For proper operation of VFIO when running DPDK applications as a non-privileged user, correct permissions should also be set up. -This can be done by using the DPDK setup script (called dpdk-setup.sh and located in the tools directory). +This can be done by using the DPDK setup script (called dpdk-setup.sh and located in the usertools directory). .. _linux_gsg_binding_kernel: @@ -208,7 +208,7 @@ Any network ports under Linux* control will be ignored by the DPDK poll-mode dri To bind ports to the ``uio_pci_generic``, ``igb_uio`` or ``vfio-pci`` module for DPDK use, and then subsequently return ports to Linux* control, -a utility script called dpdk_nic _bind.py is provided in the tools subdirectory. +a utility script called dpdk_nic _bind.py is provided in the usertools subdirectory. This utility can be used to provide a view of the current state of the network ports on the system, and to bind and unbind those ports from the different kernel modules, including the uio and vfio modules. The following are some examples of how the script can be used. @@ -235,7 +235,7 @@ To see the status of all network ports on the system: .. code-block:: console - ./tools/dpdk-devbind.py --status + ./usertools/dpdk-devbind.py --status Network devices using DPDK-compatible driver ============================================ @@ -257,16 +257,16 @@ To bind device ``eth1``,``04:00.1``, to the ``uio_pci_generic`` driver: .. code-block:: console - ./tools/dpdk-devbind.py --bind=uio_pci_generic 04:00.1 + ./usertools/dpdk-devbind.py --bind=uio_pci_generic 04:00.1 or, alternatively, .. code-block:: console - ./tools/dpdk-devbind.py --bind=uio_pci_generic eth1 + ./usertools/dpdk-devbind.py --bind=uio_pci_generic eth1 To restore device ``82:00.0`` to its original kernel binding: .. code-block:: console - ./tools/dpdk-devbind.py --bind=ixgbe 82:00.0 + ./usertools/dpdk-devbind.py --bind=ixgbe 82:00.0 diff --git a/doc/guides/linux_gsg/nic_perf_intel_platform.rst b/doc/guides/linux_gsg/nic_perf_intel_platform.rst index d4a8362..8f34faf 100644 --- a/doc/guides/linux_gsg/nic_perf_intel_platform.rst +++ b/doc/guides/linux_gsg/nic_perf_intel_platform.rst @@ -158,7 +158,7 @@ Configurations before running DPDK cd dpdk_folder - tools/cpu_layout.py + usertools/cpu_layout.py Or run ``lscpu`` to check the the cores on each socket. @@ -192,10 +192,10 @@ Configurations before running DPDK # Bind ports 82:00.0 and 85:00.0 to dpdk driver - ./dpdk_folder/tools/dpdk-devbind.py -b igb_uio 82:00.0 85:00.0 + ./dpdk_folder/usertools/dpdk-devbind.py -b igb_uio 82:00.0 85:00.0 # Check the port driver status - ./dpdk_folder/tools/dpdk-devbind.py --status + ./dpdk_folder/usertools/dpdk-devbind.py --status See ``dpdk-devbind.py --help`` for more details. diff --git a/doc/guides/linux_gsg/quick_start.rst b/doc/guides/linux_gsg/quick_start.rst index 6e858c2..b158d0f 100644 --- a/doc/guides/linux_gsg/quick_start.rst +++ b/doc/guides/linux_gsg/quick_start.rst @@ -33,7 +33,7 @@ Quick Start Setup Script ======================== -The dpdk-setup.sh script, found in the tools subdirectory, allows the user to perform the following tasks: +The dpdk-setup.sh script, found in the usertools subdirectory, allows the user to perform the following tasks: * Build the DPDK libraries @@ -108,7 +108,7 @@ Some options in the script prompt the user for further data before proceeding. .. code-block:: console - source tools/dpdk-setup.sh + source usertools/dpdk-setup.sh ------------------------------------------------------------------------ diff --git a/doc/guides/nics/bnx2x.rst b/doc/guides/nics/bnx2x.rst index 6d1768a..c011df1 100644 --- a/doc/guides/nics/bnx2x.rst +++ b/doc/guides/nics/bnx2x.rst @@ -207,7 +207,7 @@ devices managed by ``librte_pmd_bnx2x`` in Linux operating system. #. Bind the QLogic adapters to ``igb_uio`` or ``vfio-pci`` loaded in the previous step:: - ./tools/dpdk-devbind.py --bind igb_uio 0000:84:00.0 0000:84:00.1 + ./usertools/dpdk-devbind.py --bind igb_uio 0000:84:00.0 0000:84:00.1 or @@ -219,7 +219,7 @@ devices managed by ``librte_pmd_bnx2x`` in Linux operating system. sudo chmod 0666 /dev/vfio/* - ./tools/dpdk-devbind.py --bind vfio-pci 0000:84:00.0 0000:84:00.1 + ./usertools/dpdk-devbind.py --bind vfio-pci 0000:84:00.0 0000:84:00.1 #. Start ``testpmd`` with basic parameters: diff --git a/doc/guides/nics/cxgbe.rst b/doc/guides/nics/cxgbe.rst index d8236b0..7aa6953 100644 --- a/doc/guides/nics/cxgbe.rst +++ b/doc/guides/nics/cxgbe.rst @@ -285,7 +285,7 @@ devices managed by librte_pmd_cxgbe in Linux operating system. .. code-block:: console - ./tools/dpdk-devbind.py --bind igb_uio 0000:02:00.4 + ./usertools/dpdk-devbind.py --bind igb_uio 0000:02:00.4 or @@ -297,7 +297,7 @@ devices managed by librte_pmd_cxgbe in Linux operating system. sudo chmod 0666 /dev/vfio/* - ./tools/dpdk-devbind.py --bind vfio-pci 0000:02:00.4 + ./usertools/dpdk-devbind.py --bind vfio-pci 0000:02:00.4 .. note:: diff --git a/doc/guides/nics/ena.rst b/doc/guides/nics/ena.rst index 073b35a..c2738e8 100644 --- a/doc/guides/nics/ena.rst +++ b/doc/guides/nics/ena.rst @@ -225,7 +225,7 @@ devices managed by librte_pmd_ena. .. code-block:: console - ./tools/dpdk-devbind.py --bind=igb_uio 0000:02:00.1 + ./usertools/dpdk-devbind.py --bind=igb_uio 0000:02:00.1 #. Start testpmd with basic parameters: diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst index 5780268..0cc9268 100644 --- a/doc/guides/nics/i40e.rst +++ b/doc/guides/nics/i40e.rst @@ -164,13 +164,13 @@ devices managed by ``librte_pmd_i40e`` in the Linux operating system. .. code-block:: console - ./tools/dpdk-devbind.py --bind igb_uio 0000:83:00.0 + ./usertools/dpdk-devbind.py --bind igb_uio 0000:83:00.0 Or setup VFIO permissions for regular users and then bind to ``vfio-pci``: .. code-block:: console - ./tools/dpdk-devbind.py --bind vfio-pci 0000:83:00.0 + ./usertools/dpdk-devbind.py --bind vfio-pci 0000:83:00.0 #. Start ``testpmd`` with basic parameters: diff --git a/doc/guides/nics/qede.rst b/doc/guides/nics/qede.rst index d22ecdd..9d70217 100644 --- a/doc/guides/nics/qede.rst +++ b/doc/guides/nics/qede.rst @@ -175,7 +175,7 @@ devices managed by ``librte_pmd_qede`` in Linux operating system. .. code-block:: console - ./tools/dpdk-devbind.py --bind igb_uio 0000:84:00.0 0000:84:00.1 \ + ./usertools/dpdk-devbind.py --bind igb_uio 0000:84:00.0 0000:84:00.1 \ 0000:84:00.2 0000:84:00.3 #. Start ``testpmd`` with basic parameters: diff --git a/doc/guides/nics/thunderx.rst b/doc/guides/nics/thunderx.rst index 187c9a4..e6ac441 100644 --- a/doc/guides/nics/thunderx.rst +++ b/doc/guides/nics/thunderx.rst @@ -149,7 +149,7 @@ managed by ``librte_pmd_thunderx_nicvf`` in the Linux operating system. .. code-block:: console - ./tools/dpdk-devbind.py --bind vfio-pci 0002:01:00.2 + ./usertools/dpdk-devbind.py --bind vfio-pci 0002:01:00.2 #. Start ``testpmd`` with basic parameters: @@ -253,7 +253,7 @@ This section provides instructions to configure SR-IOV with Linux OS. .. code-block:: console - ./tools/dpdk-devbind.py --status + ./usertools/dpdk-devbind.py --status Example output: @@ -275,14 +275,14 @@ This section provides instructions to configure SR-IOV with Linux OS. .. code-block:: console - ./tools/dpdk-devbind.py --bind vfio-pci 0002:01:00.1 - ./tools/dpdk-devbind.py --bind vfio-pci 0002:01:00.2 + ./usertools/dpdk-devbind.py --bind vfio-pci 0002:01:00.1 + ./usertools/dpdk-devbind.py --bind vfio-pci 0002:01:00.2 #. Verify VF bind using ``dpdk-devbind.py``: .. code-block:: console - ./tools/dpdk-devbind.py --status + ./usertools/dpdk-devbind.py --status Example output: @@ -352,7 +352,7 @@ driver' list, secondary VFs are on the remaining on the remaining part of the li .. note:: The VNIC driver in the multiqueue setup works differently than other drivers like `ixgbe`. - We need to bind separately each specific queue set device with the ``tools/dpdk-devbind.py`` utility. + We need to bind separately each specific queue set device with the ``usertools/dpdk-devbind.py`` utility. .. note:: @@ -372,7 +372,7 @@ on a non-NUMA machine. .. code-block:: console - # tools/dpdk-devbind.py --status + # usertools/dpdk-devbind.py --status Network devices using DPDK-compatible driver ============================================ @@ -416,17 +416,17 @@ We will choose four secondary queue sets from the ending of the list (0002:01:01 .. code-block:: console - tools/dpdk-devbind.py -b vfio-pci 0002:01:00.2 - tools/dpdk-devbind.py -b vfio-pci 0002:01:00.3 + usertools/dpdk-devbind.py -b vfio-pci 0002:01:00.2 + usertools/dpdk-devbind.py -b vfio-pci 0002:01:00.3 #. Bind four primary VFs to the ``vfio-pci`` driver: .. code-block:: console - tools/dpdk-devbind.py -b vfio-pci 0002:01:01.7 - tools/dpdk-devbind.py -b vfio-pci 0002:01:02.0 - tools/dpdk-devbind.py -b vfio-pci 0002:01:02.1 - tools/dpdk-devbind.py -b vfio-pci 0002:01:02.2 + usertools/dpdk-devbind.py -b vfio-pci 0002:01:01.7 + usertools/dpdk-devbind.py -b vfio-pci 0002:01:02.0 + usertools/dpdk-devbind.py -b vfio-pci 0002:01:02.1 + usertools/dpdk-devbind.py -b vfio-pci 0002:01:02.2 The nicvf thunderx driver will make use of attached secondary VFs automatically during the interface configuration stage. diff --git a/doc/guides/nics/virtio.rst b/doc/guides/nics/virtio.rst index 5431015..c90e517 100644 --- a/doc/guides/nics/virtio.rst +++ b/doc/guides/nics/virtio.rst @@ -172,7 +172,7 @@ Host2VM communication example modprobe uio echo 512 > /sys/devices/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages modprobe uio_pci_generic - python tools/dpdk-devbind.py -b uio_pci_generic 00:03.0 + python usertools/dpdk-devbind.py -b uio_pci_generic 00:03.0 We use testpmd as the forwarding application in this example. diff --git a/doc/guides/sample_app_ug/vhost.rst b/doc/guides/sample_app_ug/vhost.rst index 1f6d0d9..95db988 100644 --- a/doc/guides/sample_app_ug/vhost.rst +++ b/doc/guides/sample_app_ug/vhost.rst @@ -115,7 +115,7 @@ could be done by: .. code-block:: console modprobe uio_pci_generic - $RTE_SDK/tools/dpdk-devbind.py -b=uio_pci_generic 0000:00:04.0 + $RTE_SDK/usertools/dpdk-devbind.py -b=uio_pci_generic 0000:00:04.0 Then start testpmd for packet forwarding testing. diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index f1c269a..f82dcfb 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -1061,7 +1061,7 @@ For example, to move a pci device using ixgbe under DPDK management: .. code-block:: console # Check the status of the available devices. - ./tools/dpdk-devbind.py --status + ./usertools/dpdk-devbind.py --status Network devices using DPDK-compatible driver ============================================ @@ -1073,11 +1073,11 @@ For example, to move a pci device using ixgbe under DPDK management: # Bind the device to igb_uio. - sudo ./tools/dpdk-devbind.py -b igb_uio 0000:0a:00.0 + sudo ./usertools/dpdk-devbind.py -b igb_uio 0000:0a:00.0 # Recheck the status of the devices. - ./tools/dpdk-devbind.py --status + ./usertools/dpdk-devbind.py --status Network devices using DPDK-compatible driver ============================================ 0000:0a:00.0 '82599ES 10-Gigabit' drv=igb_uio unused= @@ -1180,9 +1180,9 @@ For example, to move a pci device under kernel management: .. code-block:: console - sudo ./tools/dpdk-devbind.py -b ixgbe 0000:0a:00.0 + sudo ./usertools/dpdk-devbind.py -b ixgbe 0000:0a:00.0 - ./tools/dpdk-devbind.py --status + ./usertools/dpdk-devbind.py --status Network devices using DPDK-compatible driver ============================================ diff --git a/doc/guides/xen/pkt_switch.rst b/doc/guides/xen/pkt_switch.rst index a45841b..0b4ddfd 100644 --- a/doc/guides/xen/pkt_switch.rst +++ b/doc/guides/xen/pkt_switch.rst @@ -323,7 +323,7 @@ Building and Running the Switching Backend .. code-block:: console modprobe uio_pci_generic - python tools/dpdk-devbind.py -b uio_pci_generic 0000:09:00:00.0 + python usertools/dpdk-devbind.py -b uio_pci_generic 0000:09:00:00.0 In this case, 0000:09:00.0 is the PCI address for the NIC controller. diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c index 6ca8af1..a9936bf 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c @@ -118,7 +118,7 @@ static const char *default_solib_dir = RTE_EAL_PMD_PATH; /* * Stringified version of solib path used by dpdk-pmdinfo.py * Note: PLEASE DO NOT ALTER THIS without making a corresponding - * change to tools/dpdk-pmdinfo.py + * change to usertools/dpdk-pmdinfo.py */ static const char dpdk_solib_path[] __attribute__((used)) = "DPDK_PLUGIN_PATH=" RTE_EAL_PMD_PATH; diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk index 896bc14..dbac2a2 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -124,15 +124,11 @@ install-runtime: tar -xf - -C $(DESTDIR)$(bindir) --strip-components=1 \ --keep-newer-files $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) - $(Q)cp -a $(RTE_SDK)/tools $(DESTDIR)$(datadir) - $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk-setup.sh, \ - $(DESTDIR)$(datadir)/tools/setup.sh) - $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk-devbind.py, \ - $(DESTDIR)$(datadir)/tools/dpdk_nic_bind.py) + $(Q)cp -a $(RTE_SDK)/usertools $(DESTDIR)$(datadir) $(Q)$(call rte_mkdir, $(DESTDIR)$(sbindir)) - $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk-devbind.py, \ + $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-devbind.py, \ $(DESTDIR)$(sbindir)/dpdk-devbind) - $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk-pmdinfo.py, \ + $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-pmdinfo.py, \ $(DESTDIR)$(bindir)/dpdk-pmdinfo) ifneq ($(wildcard $O/doc/man/*/*.1),) $(Q)$(call rte_mkdir, $(DESTDIR)$(mandir)/man1) diff --git a/pkg/dpdk.spec b/pkg/dpdk.spec index d12509a..43ff954 100644 --- a/pkg/dpdk.spec +++ b/pkg/dpdk.spec @@ -94,7 +94,7 @@ make install O=%{target} DESTDIR=%{buildroot} \ %files %dir %{_datadir}/dpdk -%{_datadir}/dpdk/tools +%{_datadir}/dpdk/usertools /lib/modules/%(uname -r)/extra/* %{_sbindir}/* %{_bindir}/* diff --git a/tools/cpu_layout.py b/usertools/cpu_layout.py similarity index 100% rename from tools/cpu_layout.py rename to usertools/cpu_layout.py diff --git a/tools/dpdk-devbind.py b/usertools/dpdk-devbind.py similarity index 100% rename from tools/dpdk-devbind.py rename to usertools/dpdk-devbind.py diff --git a/tools/dpdk-pmdinfo.py b/usertools/dpdk-pmdinfo.py similarity index 100% rename from tools/dpdk-pmdinfo.py rename to usertools/dpdk-pmdinfo.py diff --git a/tools/dpdk-setup.sh b/usertools/dpdk-setup.sh similarity index 97% rename from tools/dpdk-setup.sh rename to usertools/dpdk-setup.sh index 14ed590..c4fec5a 100755 --- a/tools/dpdk-setup.sh +++ b/usertools/dpdk-setup.sh @@ -428,7 +428,7 @@ grep_meminfo() show_devices() { if [ -d /sys/module/vfio_pci -o -d /sys/module/igb_uio ]; then - ${RTE_SDK}/tools/dpdk-devbind.py --status + ${RTE_SDK}/usertools/dpdk-devbind.py --status else echo "# Please load the 'igb_uio' or 'vfio-pci' kernel module before " echo "# querying or adjusting device bindings" @@ -441,11 +441,11 @@ show_devices() bind_devices_to_vfio() { if [ -d /sys/module/vfio_pci ]; then - ${RTE_SDK}/tools/dpdk-devbind.py --status + ${RTE_SDK}/usertools/dpdk-devbind.py --status echo "" echo -n "Enter PCI address of device to bind to VFIO driver: " read PCI_PATH - sudo ${RTE_SDK}/tools/dpdk-devbind.py -b vfio-pci $PCI_PATH && + sudo ${RTE_SDK}/usertools/dpdk-devbind.py -b vfio-pci $PCI_PATH && echo "OK" else echo "# Please load the 'vfio-pci' kernel module before querying or " @@ -459,11 +459,11 @@ bind_devices_to_vfio() bind_devices_to_igb_uio() { if [ -d /sys/module/igb_uio ]; then - ${RTE_SDK}/tools/dpdk-devbind.py --status + ${RTE_SDK}/usertools/dpdk-devbind.py --status echo "" echo -n "Enter PCI address of device to bind to IGB UIO driver: " read PCI_PATH - sudo ${RTE_SDK}/tools/dpdk-devbind.py -b igb_uio $PCI_PATH && echo "OK" + sudo ${RTE_SDK}/usertools/dpdk-devbind.py -b igb_uio $PCI_PATH && echo "OK" else echo "# Please load the 'igb_uio' kernel module before querying or " echo "# adjusting device bindings" @@ -475,14 +475,14 @@ bind_devices_to_igb_uio() # unbind_devices() { - ${RTE_SDK}/tools/dpdk-devbind.py --status + ${RTE_SDK}/usertools/dpdk-devbind.py --status echo "" echo -n "Enter PCI address of device to unbind: " read PCI_PATH echo "" echo -n "Enter name of kernel driver to bind the device to: " read DRV - sudo ${RTE_SDK}/tools/dpdk-devbind.py -b $DRV $PCI_PATH && echo "OK" + sudo ${RTE_SDK}/usertools/dpdk-devbind.py -b $DRV $PCI_PATH && echo "OK" } #