From patchwork Mon Mar 23 12:06:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Richter X-Patchwork-Id: 4107 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 06DD13796; Mon, 23 Mar 2015 13:06:32 +0100 (CET) Received: from mail-wg0-f48.google.com (mail-wg0-f48.google.com [74.125.82.48]) by dpdk.org (Postfix) with ESMTP id 689CD106B for ; Mon, 23 Mar 2015 13:06:31 +0100 (CET) Received: by wgra20 with SMTP id a20so144086276wgr.3 for ; Mon, 23 Mar 2015 05:06:31 -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=esFXIgCstQCZTn60nheEzxuGgUbOFyPZCE1PYpbvoZw=; b=nFHc0IC/RTU1HJ2NFkxnyfYXLqK0eMSZhRrW8qw65etcBls0v4RJ4Tz/AipCyUpclU z9dWCNnK60S28ssWPvdr+4Td+pqort/pWuQLWDJhC+pbLOcdqjEjaZ+/bQJ2CDTi7sTc g1jooYODYAYnQIa4tNoF4972DogkN0CWqs0IC6xOs0QYJH3OLQk8T9TCuwfl+owRKZz6 kj/3G1486k22vTU4Fsz7vJpWpgoZAP/Q5uuLDcpcZYf7nBOiPCnL1mJ9RjWKxEzmqMWP MZgszke2sKr4PNn+fnuE3CqXfhOvyjTQwIdFa+UyiAxTg4ruGgvgQ84FmGQVX0Y9yaWE /43Q== X-Received: by 10.194.48.12 with SMTP id h12mr189303354wjn.74.1427112391326; Mon, 23 Mar 2015 05:06:31 -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 r3sm1117242wjw.7.2015.03.23.05.06.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Mar 2015 05:06:30 -0700 (PDT) From: Andre Richter To: dev@dpdk.org Date: Mon, 23 Mar 2015 13:06:25 +0100 Message-Id: <1427112386-2657-1-git-send-email-andre.o.richter@gmail.com> X-Mailer: git-send-email 1.9.1 Subject: [dpdk-dev] [PATCH 1/1] 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. Signed-off-by: Andre Richter --- 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"