From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by dpdk.org (Postfix) with ESMTP id A9D269AE2 for ; Wed, 25 Feb 2015 05:05:35 +0100 (CET) Received: by padbj1 with SMTP id bj1so1997690pad.5 for ; Tue, 24 Feb 2015 20:05:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vvexAHqrXgQdNvoiAxCDddoOpwm7a4zRA3/eKc+LM3I=; b=iM74H6EGXKkDHRyER+1m7kUN0AO99gzFiMwQK7yR87koijUMGOLSlLZKSsTnz0c7DJ CDYKbAVbE4WV15f6OW9EnWfiJg9f9zrwW0OFJ1zqlFyhDmPRfKST9oSCD7HFfWbYIO2n 1UzvZX1Aa8/6z/NWG2tyeycNGt47sMigQYfx7yMB96yflP2BPz4Mwaeouop+EZN3Pazd xKGfwkKZSricMOXa1tbO6ehmgk/hjd+7QQ1BMqHYz7a6S+i6JCH5fqXhbxVKWnOsdbIL Wq0T975SxkwNmQUiCeLgGB3bNwHib2VCqyzI3SVgxEPsmkmc6RXv82sIIVewqe6NCdJJ JWhA== X-Gm-Message-State: ALoCoQlV1ye980duWsDXj9cKd6gJAjmK6NwAPBwqOgP4hOxWK5ljkkB/0Icf9dcgfNoupd10YTqE X-Received: by 10.68.115.196 with SMTP id jq4mr1986865pbb.150.1424837135124; Tue, 24 Feb 2015 20:05:35 -0800 (PST) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id y7sm3140021pdp.92.2015.02.24.20.05.33 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Feb 2015 20:05:34 -0800 (PST) From: Tetsuya Mukawa To: dev@dpdk.org Date: Wed, 25 Feb 2015 13:04:46 +0900 Message-Id: <1424837093-5661-9-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424837093-5661-1-git-send-email-mukawa@igel.co.jp> References: <1424060073-23484-2-git-send-email-mukawa@igel.co.jp> <1424837093-5661-1-git-send-email-mukawa@igel.co.jp> Subject: [dpdk-dev] [PATCH v14 08/13] ethdev: Add functions that will be used by port hotplug functions 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: , X-List-Received-Date: Wed, 25 Feb 2015 04:05:36 -0000 The patch adds following functions. - rte_eth_dev_save() The function is used for saving current rte_eth_dev structures. - rte_eth_dev_get_changed_port() The function receives the rte_eth_dev structures, then compare these with current values to know which port is actually attached or detached. - rte_eth_dev_get_addr_by_port() The function returns a pci address of an ethdev specified by port identifier. - rte_eth_dev_get_port_by_addr() The function returns a port identifier of an ethdev specified by pci address. - rte_eth_dev_get_name_by_port() The function returns a unique identifier name of an ethdev specified by port identifier. - Add rte_eth_dev_is_detachable() The function returns whether a PMD supports detach function. Also, the patch changes scope of rte_eth_dev_allocated() to global. This function will be called by virtual PMDs to support port hotplug. So change scope of the function to global. v10: - Change order of version.map. (Thanks to Thomas Monjalon) v9: - rte_eth_dev_check_detachable() is replaced by rte_eth_dev_is_detachable(). - strncpy() is replaced by strcpy(). (Thanks to Thomas Monjalon) - Add missing symbol in version map. (Thanks to Nail Horman) v8: - Add size parameter to rte_eth_dev_save(). - Add missing symbol in version map. (Thanks to Qiu, Michael and Iremonger, Bernard) v7: - Add pt_driver checking to rte_eth_dev_check_detachable(). (Thanks to Qiu, Michael) v5: - Fix return value of below functions. rte_eth_dev_get_changed_port(). rte_eth_dev_get_port_by_addr(). v4: - Add parameter checking. v3: - Fix if-condition bug while comparing pci addresses. - Add error checking codes. Reported-by: Mark Enright Signed-off-by: Tetsuya Mukawa --- lib/librte_ether/rte_ethdev.c | 103 ++++++++++++++++++++++++++++++++- lib/librte_ether/rte_ethdev.h | 83 ++++++++++++++++++++++++++ lib/librte_ether/rte_ether_version.map | 7 +++ 3 files changed, 192 insertions(+), 1 deletion(-) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 165ec74..1f6a066 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -201,7 +201,7 @@ rte_eth_dev_data_alloc(void) RTE_MAX_ETHPORTS * sizeof(*rte_eth_dev_data)); } -static struct rte_eth_dev * +struct rte_eth_dev * rte_eth_dev_allocated(const char *name) { unsigned i; @@ -426,6 +426,107 @@ rte_eth_dev_count(void) return (nb_ports); } +int +rte_eth_dev_save(struct rte_eth_dev *devs, size_t size) +{ + if ((devs == NULL) || + (size != sizeof(struct rte_eth_dev) * RTE_MAX_ETHPORTS)) + return -EINVAL; + + /* save current rte_eth_devices */ + memcpy(devs, rte_eth_devices, size); + return 0; +} + +int +rte_eth_dev_get_changed_port(struct rte_eth_dev *devs, uint8_t *port_id) +{ + if ((devs == NULL) || (port_id == NULL)) + return -EINVAL; + + /* check which port was attached or detached */ + for (*port_id = 0; *port_id < RTE_MAX_ETHPORTS; (*port_id)++, devs++) { + if (rte_eth_devices[*port_id].attached ^ devs->attached) + return 0; + } + return -ENODEV; +} + +int +rte_eth_dev_get_addr_by_port(uint8_t port_id, struct rte_pci_addr *addr) +{ + if (!rte_eth_dev_is_valid_port(port_id)) { + PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + return -EINVAL; + } + + if (addr == NULL) { + PMD_DEBUG_TRACE("Null pointer is specified\n"); + return -EINVAL; + } + + *addr = rte_eth_devices[port_id].pci_dev->addr; + return 0; +} + +int +rte_eth_dev_get_port_by_addr(struct rte_pci_addr *addr, uint8_t *port_id) +{ + struct rte_pci_addr *tmp; + + if ((addr == NULL) || (port_id == NULL)) { + PMD_DEBUG_TRACE("Null pointer is specified\n"); + return -EINVAL; + } + + for (*port_id = 0; *port_id < RTE_MAX_ETHPORTS; (*port_id)++) { + if (!rte_eth_devices[*port_id].attached) + continue; + if (!rte_eth_devices[*port_id].pci_dev) + continue; + tmp = &rte_eth_devices[*port_id].pci_dev->addr; + if (rte_eal_compare_pci_addr(tmp, addr) == 0) + return 0; + } + return -ENODEV; +} + +int +rte_eth_dev_get_name_by_port(uint8_t port_id, char *name) +{ + char *tmp; + + if (!rte_eth_dev_is_valid_port(port_id)) { + PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + return -EINVAL; + } + + if (name == NULL) { + PMD_DEBUG_TRACE("Null pointer is specified\n"); + return -EINVAL; + } + + /* shouldn't check 'rte_eth_devices[i].data', + * because it might be overwritten by VDEV PMD */ + tmp = rte_eth_dev_data[port_id].name; + strcpy(name, tmp); + return 0; +} + +int +rte_eth_dev_is_detachable(uint8_t port_id) +{ + uint32_t drv_flags; + + if (port_id >= RTE_MAX_ETHPORTS) { + PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + return -EINVAL; + } + + drv_flags = rte_eth_devices[port_id].driver->pci_drv.drv_flags; + return !(drv_flags & RTE_PCI_DRV_DETACHABLE); +} + static int rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues) { diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 37c3765..5519ce0 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -1528,6 +1528,89 @@ extern struct rte_eth_dev rte_eth_devices[]; extern uint8_t rte_eth_dev_count(void); /** + * Function for internal use by port hotplug functions. + * Copies current ethdev structures to the specified pointer. + * + * @param devs The pointer to the ethdev structures + * @param size The size of ethdev structures + * @return + * - 0 on success, negative on error + */ +extern int rte_eth_dev_save(struct rte_eth_dev *devs, size_t size); + +/** + * Function for internal use by port hotplug functions. + * Compare the specified ethdev structures with currents. Then + * if there is a port which status is changed, fill the specified pointer + * with the port id of that port. + * @param devs The pointer to the ethdev structures + * @param port_id The pointer to the port id + * @return + * - 0 on success, negative on error + */ +extern int rte_eth_dev_get_changed_port( + struct rte_eth_dev *devs, uint8_t *port_id); + +/** + * Function for internal use by port hotplug functions. + * Returns a pci address of a ethdev specified by port identifier. + * @param port_id + * The port identifier of the Ethernet device + * @param addr + * The pointer to the pci address + * @return + * - 0 on success, negative on error + */ +extern int rte_eth_dev_get_addr_by_port( + uint8_t port_id, struct rte_pci_addr *addr); + +/** + * Function for internal use by port hotplug functions. + * Returns a port identifier of a ethdev specified by pci address. + * @param addr + * The pointer to the pci address of the Ethernet device. + * @param port_id + * The pointer to the port identifier + * @return + * - 0 on success, negative on error + */ +extern int rte_eth_dev_get_port_by_addr( + struct rte_pci_addr *addr, uint8_t *port_id); + +/** + * Function for internal use by port hotplug functions. + * Returns a unique identifier name of a ethdev specified by port identifier. + * @param port_id + * The port identifier. + * @param name + * The pointer to the Unique identifier name for each Ethernet device + * @return + * - 0 on success, negative on error + */ +extern int rte_eth_dev_get_name_by_port(uint8_t port_id, char *name); + +/** + * Function for internal use by port hotplug functions. + * Check whether or not, a PMD that is handling the ethdev specified by port + * identifier can support detach function. + * @param port_id + * The port identifier + * @return + * - 0 on supporting detach function, negative on not supporting + */ +extern int rte_eth_dev_is_detachable(uint8_t port_id); + +/** + * Function for internal use by port hotplug functions. + * Returns a ethdev slot specified by the unique identifier name. + * @param name + * The pointer to the Unique identifier name for each Ethernet device + * @return + * - The pointer to the ethdev slot, on success. NULL on error + */ +extern struct rte_eth_dev *rte_eth_dev_allocated(const char *name); + +/** * Function for internal use by dummy drivers primarily, e.g. ring-based * driver. * Allocates a new ethdev slot for an ethernet device and returns the pointer diff --git a/lib/librte_ether/rte_ether_version.map b/lib/librte_ether/rte_ether_version.map index 94fd685..7db7085 100644 --- a/lib/librte_ether/rte_ether_version.map +++ b/lib/librte_ether/rte_ether_version.map @@ -8,6 +8,7 @@ DPDK_2.0 { rte_eth_allmulticast_enable; rte_eth_allmulticast_get; rte_eth_dev_allocate; + rte_eth_dev_allocated; rte_eth_dev_bypass_event_show; rte_eth_dev_bypass_event_store; rte_eth_dev_bypass_init; @@ -34,9 +35,14 @@ DPDK_2.0 { rte_eth_dev_filter_supported; rte_eth_dev_flow_ctrl_get; rte_eth_dev_flow_ctrl_set; + rte_eth_dev_get_addr_by_port; + rte_eth_dev_get_changed_port; rte_eth_dev_get_mtu; + rte_eth_dev_get_name_by_port; + rte_eth_dev_get_port_by_addr; rte_eth_dev_get_vlan_offload; rte_eth_dev_info_get; + rte_eth_dev_is_detachable; rte_eth_dev_mac_addr_add; rte_eth_dev_mac_addr_remove; rte_eth_dev_priority_flow_ctrl_set; @@ -46,6 +52,7 @@ DPDK_2.0 { rte_eth_dev_rss_reta_update; rte_eth_dev_rx_queue_start; rte_eth_dev_rx_queue_stop; + rte_eth_dev_save; rte_eth_dev_set_link_down; rte_eth_dev_set_link_up; rte_eth_dev_set_mtu; -- 1.9.1