From patchwork Wed Mar 18 15:05:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Richter X-Patchwork-Id: 4045 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 6A2DD5A86; Wed, 18 Mar 2015 16:05:14 +0100 (CET) Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by dpdk.org (Postfix) with ESMTP id 0CA3C5A13 for ; Wed, 18 Mar 2015 16:05:13 +0100 (CET) Received: by wibdy8 with SMTP id dy8so92769606wib.0 for ; Wed, 18 Mar 2015 08:05:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=znsqLYlWaSCz+zHEoJoTzZ8ABbqLEsB/MxS3kjuWzWQ=; b=J7/CjcRrL5I6fByI5sbmacVinaSjDjgo8cqZdkPeYQHnrkZhu/1ysS9zqefzqWIoi/ LIN8OK4GMZ0WLHaZPSKMHVc6uasHb86B6Rie7cEtYZ+TdQjJGXIRSAO7oanStakZrgzg qAd7JQ5X1AjtfYETRyn4vT63rMB3ExBf6girayL5ICyPW0O8AI5QekCKSeCukpO/4g+y d9L7ThQybkPztgwbJknGC6pUF/eJo6j9F85Suz+qF6Tx9mAyI7168sIR+nTB8RmpjRAs N9Plmpa5fBUtyzb/sV5Pcrsn6S9G9S67Bigae62N/vKCUKGgl+fQmd1uMYOMCkhlymnl f7hA== X-Received: by 10.181.8.194 with SMTP id dm2mr7644698wid.15.1426691112929; Wed, 18 Mar 2015 08:05:12 -0700 (PDT) Received: from aramis-xeon1.lis.ei.tum.de (aramis-xeon1.lis.ei.tum.de. [129.187.155.172]) by mx.google.com with ESMTPSA id ka1sm24872915wjc.2.2015.03.18.08.05.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Mar 2015 08:05:12 -0700 (PDT) From: Andre Richter To: dev@dpdk.org Date: Wed, 18 Mar 2015 16:05:07 +0100 Message-Id: <1426691107-7399-1-git-send-email-andre.o.richter@gmail.com> X-Mailer: git-send-email 1.9.1 Subject: [dpdk-dev] [PATCH] tools: Fix some strings and functions regarding VFIO support X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch fixes several minor issues in setup.sh: - show_nics() would not display the current Ethernet settings if the user only loads the vfio-pci module, b/c it only checks for presence of igb_uio. Fix this by adding a check for vfio-pci. - unbind_nics(): Fix option naming and string inside function. - Exchange a forgotten "igb_uio" with "vfio-pci" in a comment. --- tools/setup.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/setup.sh b/tools/setup.sh index ac438c2..5a8b2f3 100755 --- a/tools/setup.sh +++ b/tools/setup.sh @@ -427,16 +427,16 @@ grep_meminfo() # show_nics() { - if /sbin/lsmod | grep -q igb_uio ; then + if /sbin/lsmod | grep -q -e igb_uio -e vfio_pci; then ${RTE_SDK}/tools/dpdk_nic_bind.py --status else - echo "# Please load the 'igb_uio' kernel module before querying or " - echo "# adjusting NIC device bindings" + echo "# Please load the 'igb_uio' or 'vfio-pci' kernel module before " + echo "# querying or adjusting NIC device bindings" fi } # -# Uses dpdk_nic_bind.py to move devices to work with igb_uio +# Uses dpdk_nic_bind.py to move devices to work with vfio-pci # bind_nics_to_vfio() { @@ -477,7 +477,7 @@ unbind_nics() { ${RTE_SDK}/tools/dpdk_nic_bind.py --status echo "" - echo -n "Enter PCI address of device to bind to IGB UIO driver: " + 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: " @@ -574,7 +574,7 @@ step5_func() TEXT[1]="Uninstall all targets" FUNC[1]="uninstall_targets" - TEXT[2]="Unbind NICs from IGB UIO driver" + TEXT[2]="Unbind NICs from IGB UIO or VFIO driver" FUNC[2]="unbind_nics" TEXT[3]="Remove IGB UIO module"