From patchwork Fri Apr 1 14:55:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Mauricio_V=C3=A1squez?= X-Patchwork-Id: 604860 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3qc4Dz6zbwz9sdm for ; Sat, 2 Apr 2016 01:55:31 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=studenti.polito.it header.i=@studenti.polito.it header.b=SfyedHt1; dkim-atps=neutral Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id BF54A10982; Fri, 1 Apr 2016 07:55:30 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 52AAA1097D for ; Fri, 1 Apr 2016 07:55:30 -0700 (PDT) Received: from bar5.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id D1E18420114 for ; Fri, 1 Apr 2016 08:55:29 -0600 (MDT) X-ASG-Debug-ID: 1459522525-09eadd287c158000001-byXFYA Received: from mx3-pf2.cudamail.com ([192.168.14.1]) by bar5.cudamail.com with ESMTP id wQ4W4ltGrtow7t0Y (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 01 Apr 2016 08:55:26 -0600 (MDT) X-Barracuda-Envelope-From: mauricio.vasquezbernal@studenti.polito.it X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.1 Received: from unknown (HELO compass.polito.it) (130.192.55.110) by mx3-pf2.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 1 Apr 2016 14:55:24 -0000 Received-SPF: pass (mx3-pf2.cudamail.com: SPF record at studenti.polito.it designates 130.192.55.110 as permitted sender) X-Barracuda-Apparent-Source-IP: 130.192.55.110 X-Barracuda-RBL-IP: 130.192.55.110 Received: from localhost (localhost [127.0.0.1]) by compass.polito.it (Postfix) with ESMTP id 1ED181003FD; Fri, 1 Apr 2016 16:55:22 +0200 (CEST) Authentication-Results: compass.polito.it (amavisd-new); dkim=pass (1024-bit key) reason="pass (just generated, assumed good)" header.d=studenti.polito.it DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= studenti.polito.it; h=x-mailer:message-id:date:date:subject :subject:cc:to:from:from:received:received; s=y2k10; t= 1459522516; bh=59cMxftgXJ8zcF5xR0u95JQ4KcWnrmTwwoCNtZbXRg8=; b=S fyedHt12My35v+n9jzlGead0UI1zluUinmBnuVIHxPMCn+Pvn7VF23gpE1gRTkzI WFLUMJ29dOLy3oEmQX3IFyIubt4RU4vce2zwtxQLyuZkup6/LciK/IGZND4U0IRU rhAaRZqJ2LXNozu79VqBCeT5a+DkxioCz7OBji3kMk= X-Virus-Scanned: amavisd-new at studenti.polito.it X-Spam-Flag: NO X-Spam-Score: -5.809 X-Spam-Level: X-Spam-Status: No, score=-5.809 tagged_above=-100 required=3.5 tests=[ALL_TRUSTED=-5, AWL=0.691, BAYES_00=-1.5] autolearn=ham Received: from compass.polito.it ([127.0.0.1]) by localhost (compass.polito.it [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id LYWXrk6dtRj8; Fri, 1 Apr 2016 16:55:16 +0200 (CEST) Received: from localhost.localdomain (unknown [130.192.225.153]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: s203403@studenti.polito.it) by compass.polito.it (Postfix) with ESMTPSA id 489A81003EE; Fri, 1 Apr 2016 16:55:16 +0200 (CEST) X-CudaMail-Envelope-Sender: mauricio.vasquezbernal@studenti.polito.it From: Mauricio Vasquez B To: dev@openvswitch.org X-CudaMail-MID: CM-V2-331020292 X-CudaMail-DTE: 040116 X-CudaMail-Originating-IP: 130.192.55.110 Date: Fri, 1 Apr 2016 16:55:10 +0200 X-ASG-Orig-Subj: [##CM-V2-331020292##][PATCH v2] netdev-dpdk: add hotplug support Message-Id: <1459522510-6702-1-git-send-email-mauricio.vasquezbernal@studenti.polito.it> X-Mailer: git-send-email 1.9.1 X-GBUdb-Analysis: 0, 130.192.55.110, Ugly c=0 p=0 Source New X-MessageSniffer-Rules: 0-0-0-13712-c X-Barracuda-Connect: UNKNOWN[192.168.14.1] X-Barracuda-Start-Time: 1459522526 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 1.85 X-Barracuda-Spam-Status: No, SCORE=1.85 using per-user scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=4.0 tests=BSF_RULE_7580B, BSF_RULE_7582B, BSF_SC5_MJ1963, DKIM_SIGNED, RDNS_NONE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.28365 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 DKIM_SIGNED Domain Keys Identified Mail: message has a signature 0.50 BSF_RULE_7582B Custom Rule 7582B 0.10 RDNS_NONE Delivered to trusted network by a host with no rDNS 0.75 BSF_RULE_7580B Custom Rule 7580B 0.50 BSF_SC5_MJ1963 Custom Rule MJ1963 Subject: [ovs-dev] [PATCH v2] netdev-dpdk: add hotplug support X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" In order to use dpdk ports in ovs they have to be bound to a DPDK compatible driver before ovs is started. This patch adds the possibility to hotplug (or hot-unplug) a device after ovs has been started. The implementation adds an appctl command: netdev-dpdk/port-clt After the user attaches a new device, it has to be added to a bridge using the to use the add-port command, similarly, before detaching a device, it has to be removed using the del-port command. Signed-off-by: Mauricio Vasquez B --- INSTALL.DPDK.md | 26 +++++++++++++++- NEWS | 1 + lib/netdev-dpdk.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 107 insertions(+), 8 deletions(-) diff --git a/INSTALL.DPDK.md b/INSTALL.DPDK.md index 9ec8bf6..4095402 100644 --- a/INSTALL.DPDK.md +++ b/INSTALL.DPDK.md @@ -81,7 +81,7 @@ Using the DPDK with ovs-vswitchd: 1. Setup system boot Add the following options to the kernel bootline: - + `default_hugepagesz=1GB hugepagesz=1G hugepages=1` 2. Setup DPDK devices: @@ -227,6 +227,29 @@ Using the DPDK with ovs-vswitchd: For more details regarding egress-policer parameters please refer to the vswitch.xml. +9. Port Hotplug + + ovs supports port hotplugging, it allows to use ports that were not bound + to DPDK when vswitchd was started. + In order to attach a port, it has to be bound to DPDK using the + dpdk_nic_bind.py script: + + `$DPDK_DIR/tools/dpdk_nic_bind.py --bind=igb_uio 0000:01:00.0` + + Then it can be attached to OVS: + + `ovs-appctl netdev-dpdk/port-ctl attach 0000:01:00.0` + + At this point, the user can create a ovs port using the add-port command. + + It is also possible to detach a port from ovs, the user has to remove the + port using the del-port command, then it can be detached using: + + `ovs-appctl netdev-dpdk/port-ctl detach dpdk0` + + This feature is not supported by all the NICs, please refer to the + [DPDK Port Hotplug Framework] in order to get more information. + Performance Tuning: ------------------- @@ -959,3 +982,4 @@ Please report problems to bugs@openvswitch.org. [INSTALL.md]:INSTALL.md [DPDK Linux GSG]: http://www.dpdk.org/doc/guides/linux_gsg/build_dpdk.html#binding-and-unbinding-network-ports-to-from-the-igb-uioor-vfio-modules [DPDK Docs]: http://dpdk.org/doc +[DPDK Port Hotplug Framework]: http://dpdk.org/doc/guides/prog_guide/port_hotplug_framework.html diff --git a/NEWS b/NEWS index ea7f3a1..2ba8659 100644 --- a/NEWS +++ b/NEWS @@ -26,6 +26,7 @@ Post-v2.5.0 assignment. * Type of log messages from PMD threads changed from INFO to DBG. * QoS functionality with sample egress-policer implementation. + * Port Hotplug is now supported. - ovs-benchmark: This utility has been removed due to lack of use and bitrot. - ovs-appctl: diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c index e09b471..4fcab36 100644 --- a/lib/netdev-dpdk.c +++ b/lib/netdev-dpdk.c @@ -599,7 +599,7 @@ dpdk_eth_dev_init(struct netdev_dpdk *dev) OVS_REQUIRES(dpdk_mutex) int diag; int n_rxq, n_txq; - if (dev->port_id < 0 || dev->port_id >= rte_eth_dev_count()) { + if (!rte_eth_dev_is_valid_port(dev->port_id)) { return ENODEV; } @@ -1985,6 +1985,75 @@ netdev_dpdk_set_admin_state(struct unixctl_conn *conn, int argc, unixctl_command_reply(conn, "OK"); } +static void +netdev_dpdk_port_ctl(struct unixctl_conn *conn, int argc OVS_UNUSED, + const char *argv[], void *aux OVS_UNUSED) +{ + int ret; + uint8_t port_id; + unsigned int parsed_port; + char devname[RTE_ETH_NAME_MAX_LEN]; + char response[512]; + + ovs_mutex_lock(&dpdk_mutex); + + if (strcmp(argv[1], "attach") == 0) { + ret = rte_eth_dev_attach(argv[2], &port_id); + if (ret < 0) { + snprintf(response, sizeof(response), + "Error attaching device '%s'", argv[2]); + unixctl_command_reply_error(conn, response); + goto unlock; + } + + snprintf(response, sizeof(response), + "Device '%s' has been attached as 'dpdk%d'", argv[2], port_id); + unixctl_command_reply(conn, response); + + } else if (strcmp(argv[1], "detach") == 0) { + ret = dpdk_dev_parse_name(argv[2], "dpdk", &parsed_port); + if (ret) { + snprintf(response, sizeof(response), + "'%s' is not a valid dpdk device", argv[2]); + unixctl_command_reply_error(conn, response); + goto unlock; + } + + port_id = parsed_port; + + struct netdev *netdev = netdev_from_name(argv[2]); + if (netdev) { + netdev_close(netdev); + snprintf(response, sizeof(response), + "Port '%s' is being used. Remove it before detaching", + argv[2]); + unixctl_command_reply_error(conn, response); + goto unlock; + } + + rte_eth_dev_close(port_id); + + ret = rte_eth_dev_detach(port_id, devname); + if (ret < 0) { + snprintf(response, sizeof(response), + "Port '%s' can not be detached", argv[2]); + unixctl_command_reply_error(conn, response); + goto unlock; + } + + snprintf(response, sizeof(response), + "Port '%s' has been detached", argv[2]); + unixctl_command_reply(conn, response); + } else { + snprintf(response, sizeof(response), + "'%s' is not a valid argument", argv[1]); + unixctl_command_reply_error(conn, response); + } + +unlock: + ovs_mutex_unlock(&dpdk_mutex); +} + /* * Set virtqueue flags so that we do not receive interrupts. */ @@ -2282,6 +2351,10 @@ dpdk_common_init(void) "[netdev] up|down", 1, 2, netdev_dpdk_set_admin_state, NULL); + unixctl_command_register("netdev-dpdk/port-ctl", + "attach/detach device", 2, 2, + netdev_dpdk_port_ctl, NULL); + ovs_thread_create("dpdk_watchdog", dpdk_watchdog, NULL); } @@ -2293,7 +2366,7 @@ dpdk_ring_create(const char dev_name[], unsigned int port_no, { struct dpdk_ring *ivshmem; char ring_name[RTE_RING_NAMESIZE]; - int err; + int err, port_id; ivshmem = dpdk_rte_mzalloc(sizeof *ivshmem); if (ivshmem == NULL) { @@ -2327,19 +2400,20 @@ dpdk_ring_create(const char dev_name[], unsigned int port_no, return ENOMEM; } - err = rte_eth_from_rings(dev_name, &ivshmem->cring_rx, 1, - &ivshmem->cring_tx, 1, SOCKET0); + port_id = rte_eth_from_rings(dev_name, &ivshmem->cring_rx, 1, + &ivshmem->cring_tx, 1, SOCKET0); - if (err < 0) { + if (port_id < 0) { rte_free(ivshmem); return ENODEV; } ivshmem->user_port_id = port_no; - ivshmem->eth_port_id = rte_eth_dev_count() - 1; + ivshmem->eth_port_id = port_id; + *eth_port_id = port_id; + ovs_list_push_back(&dpdk_ring_list, &ivshmem->list_node); - *eth_port_id = ivshmem->eth_port_id; return 0; }