From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f176.google.com (mail-pd0-f176.google.com [209.85.192.176]) by dpdk.org (Postfix) with ESMTP id 920DA5A9B for ; Mon, 19 Jan 2015 11:41:10 +0100 (CET) Received: by mail-pd0-f176.google.com with SMTP id r10so35921728pdi.7 for ; Mon, 19 Jan 2015 02:41:09 -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=2tJnxluzWFBhUP/vL1gd3LBx/7HnImoOW/EJTETENlQ=; b=aRhKAV6cPqrSFrkZDAM+3nmtFTdq1dkaaaHEtT7d8cZohnp90+5eCjxGrEowdsrosh GoJ0fK32JrDLtv/A6bdZ/JTBhn9LoVRM2eQXWE0joJGDM2a/VBKwAZg3uWsJnp+k1mx+ c3/79CGIJqmolCwx8Qp/lnxU0KTf4PS+QEKS4c/yKfJGPXgsju79Lk8drrk9hj5038/w HZP7ogRJ7uPGj0ldfOSEIwYp0/yw9Kam+TC/ybUJkHAo2nFlwhWj5U0ETod3EJb+VQqR bpvaPmsQ0cwEiCrkHeAT0kiP6xeuIpDVioXkIq6287LK3o0XkZOJvH9EFZd2DMOcqVq3 BstQ== X-Gm-Message-State: ALoCoQngHSr1ba725J3IC5uXbgAh7b2tTJxWy1CZRNWWfdy3VQjgIdAiY2T7jQJNPTxgRP6oedxX X-Received: by 10.66.97.97 with SMTP id dz1mr16257148pab.90.1421664069875; Mon, 19 Jan 2015 02:41:09 -0800 (PST) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id a13sm11337588pdm.44.2015.01.19.02.41.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Jan 2015 02:41:08 -0800 (PST) From: Tetsuya Mukawa To: dev@dpdk.org Date: Mon, 19 Jan 2015 19:40:17 +0900 Message-Id: <1421664027-17971-2-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1421664027-17971-1-git-send-email-mukawa@igel.co.jp> References: <1418106629-22227-2-git-send-email-mukawa@igel.co.j> <1421664027-17971-1-git-send-email-mukawa@igel.co.jp> Subject: [dpdk-dev] [PATCH v4 01/11] eal/pci, ethdev: Remove assumption that port will not be detached 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: Mon, 19 Jan 2015 10:41:11 -0000 To remove assumption, do like followings. This patch adds "RTE_PCI_DRV_DETACHABLE" to drv_flags of rte_pci_driver structure. The flags indicates the driver can detach devices at runtime. Also remove assumption that port will not be detached. To remove the assumption. - Add 'attached' member to rte_eth_dev structure. This member is used for indicating the port is attached, or not. - Add rte_eth_dev_allocate_new_port(). This function is used for allocating new port. v4: - Use braces with 'for' loop. - Fix indent of 'if' statement. Signed-off-by: Tetsuya Mukawa --- lib/librte_eal/common/include/rte_pci.h | 2 + lib/librte_ether/rte_ethdev.c | 248 ++++++++++++++++++-------------- lib/librte_ether/rte_ethdev.h | 5 + 3 files changed, 151 insertions(+), 104 deletions(-) diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h index 66ed793..dd1da28 100644 --- a/lib/librte_eal/common/include/rte_pci.h +++ b/lib/librte_eal/common/include/rte_pci.h @@ -199,6 +199,8 @@ struct rte_pci_driver { #define RTE_PCI_DRV_FORCE_UNBIND 0x0004 /** Device driver supports link state interrupt */ #define RTE_PCI_DRV_INTR_LSC 0x0008 +/** Device driver supports detaching capability */ +#define RTE_PCI_DRV_DETACHABLE 0x0010 /**< Internal use only - Macro used by pci addr parsing functions **/ #define GET_PCIADDR_FIELD(in, fd, lim, dlm) \ diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 077d430..46cabaf 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -175,6 +175,16 @@ enum { STAT_QMAP_RX }; +enum { + DEV_INVALID = 0, + DEV_VALID, +}; + +enum { + DEV_DISCONNECTED = 0, + DEV_CONNECTED +}; + static inline void rte_eth_dev_data_alloc(void) { @@ -201,19 +211,34 @@ rte_eth_dev_allocated(const char *name) { unsigned i; - for (i = 0; i < nb_ports; i++) { - if (strcmp(rte_eth_devices[i].data->name, name) == 0) + for (i = 0; i < RTE_MAX_ETHPORTS; i++) { + if ((rte_eth_devices[i].attached == DEV_CONNECTED) && + strcmp(rte_eth_devices[i].data->name, name) == 0) return &rte_eth_devices[i]; } return NULL; } +static uint8_t +rte_eth_dev_allocate_new_port(void) +{ + unsigned i; + + for (i = 0; i < RTE_MAX_ETHPORTS; i++) { + if (rte_eth_devices[i].attached == DEV_DISCONNECTED) + return i; + } + return RTE_MAX_ETHPORTS; +} + struct rte_eth_dev * rte_eth_dev_allocate(const char *name) { + uint8_t port_id; struct rte_eth_dev *eth_dev; - if (nb_ports == RTE_MAX_ETHPORTS) { + port_id = rte_eth_dev_allocate_new_port(); + if (port_id == RTE_MAX_ETHPORTS) { PMD_DEBUG_TRACE("Reached maximum number of Ethernet ports\n"); return NULL; } @@ -226,10 +251,12 @@ rte_eth_dev_allocate(const char *name) return NULL; } - eth_dev = &rte_eth_devices[nb_ports]; - eth_dev->data = &rte_eth_dev_data[nb_ports]; + eth_dev = &rte_eth_devices[port_id]; + eth_dev->data = &rte_eth_dev_data[port_id]; snprintf(eth_dev->data->name, sizeof(eth_dev->data->name), "%s", name); - eth_dev->data->port_id = nb_ports++; + eth_dev->data->port_id = port_id; + eth_dev->attached = DEV_CONNECTED; + nb_ports++; return eth_dev; } @@ -283,6 +310,7 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv, (unsigned) pci_dev->id.device_id); if (rte_eal_process_type() == RTE_PROC_PRIMARY) rte_free(eth_dev->data->dev_private); + eth_dev->attached = DEV_DISCONNECTED; nb_ports--; return diag; } @@ -308,10 +336,22 @@ rte_eth_driver_register(struct eth_driver *eth_drv) rte_eal_pci_register(ð_drv->pci_drv); } +static int +rte_eth_dev_validate_port(uint8_t port_id) +{ + if (port_id >= RTE_MAX_ETHPORTS) + return DEV_INVALID; + + if (rte_eth_devices[port_id].attached == DEV_CONNECTED) + return DEV_VALID; + else + return DEV_INVALID; +} + int rte_eth_dev_socket_id(uint8_t port_id) { - if (port_id >= nb_ports) + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) return -1; return rte_eth_devices[port_id].pci_dev->numa_node; } @@ -369,7 +409,7 @@ rte_eth_dev_rx_queue_start(uint8_t port_id, uint16_t rx_queue_id) * in a multi-process setup*/ PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } @@ -395,7 +435,7 @@ rte_eth_dev_rx_queue_stop(uint8_t port_id, uint16_t rx_queue_id) * in a multi-process setup*/ PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } @@ -421,7 +461,7 @@ rte_eth_dev_tx_queue_start(uint8_t port_id, uint16_t tx_queue_id) * in a multi-process setup*/ PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } @@ -447,7 +487,7 @@ rte_eth_dev_tx_queue_stop(uint8_t port_id, uint16_t tx_queue_id) * in a multi-process setup*/ PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } @@ -703,7 +743,7 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, * in a multi-process setup*/ PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); - if (port_id >= nb_ports || port_id >= RTE_MAX_ETHPORTS) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-EINVAL); } @@ -888,7 +928,7 @@ rte_eth_dev_start(uint8_t port_id) * in a multi-process setup*/ PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%" PRIu8 "\n", port_id); return (-EINVAL); } @@ -923,7 +963,7 @@ rte_eth_dev_stop(uint8_t port_id) * in a multi-process setup*/ PROC_PRIMARY_OR_RET(); - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%" PRIu8 "\n", port_id); return; } @@ -951,7 +991,7 @@ rte_eth_dev_set_link_up(uint8_t port_id) * in a multi-process setup*/ PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } @@ -970,7 +1010,7 @@ rte_eth_dev_set_link_down(uint8_t port_id) * in a multi-process setup*/ PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } @@ -989,7 +1029,7 @@ rte_eth_dev_close(uint8_t port_id) * in a multi-process setup*/ PROC_PRIMARY_OR_RET(); - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } @@ -1017,7 +1057,7 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id, * in a multi-process setup*/ PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-EINVAL); } @@ -1090,7 +1130,7 @@ rte_eth_tx_queue_setup(uint8_t port_id, uint16_t tx_queue_id, * in a multi-process setup*/ PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); - if (port_id >= RTE_MAX_ETHPORTS || port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-EINVAL); } @@ -1123,7 +1163,7 @@ rte_eth_promiscuous_enable(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } @@ -1139,7 +1179,7 @@ rte_eth_promiscuous_disable(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } @@ -1155,7 +1195,7 @@ rte_eth_promiscuous_get(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -1; } @@ -1169,7 +1209,7 @@ rte_eth_allmulticast_enable(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } @@ -1185,7 +1225,7 @@ rte_eth_allmulticast_disable(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } @@ -1201,7 +1241,7 @@ rte_eth_allmulticast_get(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -1; } @@ -1229,7 +1269,7 @@ rte_eth_link_get(uint8_t port_id, struct rte_eth_link *eth_link) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } @@ -1249,7 +1289,7 @@ rte_eth_link_get_nowait(uint8_t port_id, struct rte_eth_link *eth_link) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } @@ -1269,7 +1309,7 @@ rte_eth_stats_get(uint8_t port_id, struct rte_eth_stats *stats) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } @@ -1286,7 +1326,7 @@ rte_eth_stats_reset(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } @@ -1307,7 +1347,7 @@ rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstats *xstats, uint64_t val; char *stats_ptr; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -1; } @@ -1376,7 +1416,7 @@ rte_eth_xstats_reset(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } @@ -1398,7 +1438,7 @@ set_queue_stats_mapping(uint8_t port_id, uint16_t queue_id, uint8_t stat_idx, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -1433,7 +1473,7 @@ rte_eth_dev_info_get(uint8_t port_id, struct rte_eth_dev_info *dev_info) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } @@ -1453,7 +1493,7 @@ rte_eth_macaddr_get(uint8_t port_id, struct ether_addr *mac_addr) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } @@ -1467,7 +1507,7 @@ rte_eth_dev_get_mtu(uint8_t port_id, uint16_t *mtu) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -1483,7 +1523,7 @@ rte_eth_dev_set_mtu(uint8_t port_id, uint16_t mtu) int ret; struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -1503,7 +1543,7 @@ rte_eth_dev_vlan_filter(uint8_t port_id, uint16_t vlan_id, int on) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -1528,7 +1568,7 @@ rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, int o { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -1550,7 +1590,7 @@ rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tpid) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -1570,7 +1610,7 @@ rte_eth_dev_set_vlan_offload(uint8_t port_id, int offload_mask) int mask = 0; int cur, org = 0; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -1615,7 +1655,7 @@ rte_eth_dev_get_vlan_offload(uint8_t port_id) struct rte_eth_dev *dev; int ret = 0; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -1639,7 +1679,7 @@ rte_eth_dev_set_vlan_pvid(uint8_t port_id, uint16_t pvid, int on) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -1657,7 +1697,7 @@ rte_eth_dev_fdir_add_signature_filter(uint8_t port_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -1691,7 +1731,7 @@ rte_eth_dev_fdir_update_signature_filter(uint8_t port_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -1725,7 +1765,7 @@ rte_eth_dev_fdir_remove_signature_filter(uint8_t port_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -1756,7 +1796,7 @@ rte_eth_dev_fdir_get_infos(uint8_t port_id, struct rte_eth_fdir *fdir) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -1781,7 +1821,7 @@ rte_eth_dev_fdir_add_perfect_filter(uint8_t port_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -1821,7 +1861,7 @@ rte_eth_dev_fdir_update_perfect_filter(uint8_t port_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -1859,7 +1899,7 @@ rte_eth_dev_fdir_remove_perfect_filter(uint8_t port_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -1895,7 +1935,7 @@ rte_eth_dev_fdir_set_masks(uint8_t port_id, struct rte_fdir_masks *fdir_mask) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -1915,7 +1955,7 @@ rte_eth_dev_flow_ctrl_get(uint8_t port_id, struct rte_eth_fc_conf *fc_conf) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -1931,7 +1971,7 @@ rte_eth_dev_flow_ctrl_set(uint8_t port_id, struct rte_eth_fc_conf *fc_conf) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -1951,7 +1991,7 @@ rte_eth_dev_priority_flow_ctrl_set(uint8_t port_id, struct rte_eth_pfc_conf *pfc { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -2030,7 +2070,7 @@ rte_eth_dev_rss_reta_update(uint8_t port_id, struct rte_eth_dev *dev; int ret; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -2081,7 +2121,7 @@ rte_eth_dev_rss_hash_update(uint8_t port_id, struct rte_eth_rss_conf *rss_conf) struct rte_eth_dev *dev; uint16_t rss_hash_protos; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -2103,7 +2143,7 @@ rte_eth_dev_rss_hash_conf_get(uint8_t port_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -2118,7 +2158,7 @@ rte_eth_dev_udp_tunnel_add(uint8_t port_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -2144,7 +2184,7 @@ rte_eth_dev_udp_tunnel_delete(uint8_t port_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -2169,7 +2209,7 @@ rte_eth_led_on(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -2184,7 +2224,7 @@ rte_eth_led_off(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -2224,7 +2264,7 @@ rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr, int index; uint64_t pool_mask; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -2275,7 +2315,7 @@ rte_eth_dev_mac_addr_remove(uint8_t port_id, struct ether_addr *addr) struct rte_eth_dev *dev; int index; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -2309,7 +2349,7 @@ rte_eth_dev_set_vf_rxmode(uint8_t port_id, uint16_t vf, struct rte_eth_dev *dev; struct rte_eth_dev_info dev_info; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("set VF RX mode:Invalid port_id=%d\n", port_id); return (-ENODEV); @@ -2364,7 +2404,7 @@ rte_eth_dev_uc_hash_table_set(uint8_t port_id, struct ether_addr *addr, int ret; struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("unicast hash setting:Invalid port_id=%d\n", port_id); return (-ENODEV); @@ -2417,7 +2457,7 @@ rte_eth_dev_uc_all_hash_table_set(uint8_t port_id, uint8_t on) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("unicast hash setting:Invalid port_id=%d\n", port_id); return (-ENODEV); @@ -2436,7 +2476,7 @@ rte_eth_dev_set_vf_rx(uint8_t port_id,uint16_t vf, uint8_t on) struct rte_eth_dev *dev; struct rte_eth_dev_info dev_info; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -2462,7 +2502,7 @@ rte_eth_dev_set_vf_tx(uint8_t port_id,uint16_t vf, uint8_t on) struct rte_eth_dev *dev; struct rte_eth_dev_info dev_info; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("set pool tx:Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -2487,7 +2527,7 @@ rte_eth_dev_set_vf_vlan_filter(uint8_t port_id, uint16_t vlan_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("VF VLAN filter:invalid port id=%d\n", port_id); return (-ENODEV); @@ -2518,7 +2558,7 @@ int rte_eth_set_queue_rate_limit(uint8_t port_id, uint16_t queue_idx, struct rte_eth_dev_info dev_info; struct rte_eth_link link; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("set queue rate limit:invalid port id=%d\n", port_id); return -ENODEV; @@ -2555,7 +2595,7 @@ int rte_eth_set_vf_rate_limit(uint8_t port_id, uint16_t vf, uint16_t tx_rate, if (q_msk == 0) return 0; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("set VF rate limit:invalid port id=%d\n", port_id); return -ENODEV; @@ -2589,7 +2629,7 @@ rte_eth_mirror_rule_set(uint8_t port_id, { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -2630,7 +2670,7 @@ rte_eth_mirror_rule_reset(uint8_t port_id, uint8_t rule_id) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -2655,7 +2695,7 @@ rte_eth_rx_burst(uint8_t port_id, uint16_t queue_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return 0; } @@ -2675,7 +2715,7 @@ rte_eth_tx_burst(uint8_t port_id, uint16_t queue_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return 0; } @@ -2695,7 +2735,7 @@ rte_eth_rx_queue_count(uint8_t port_id, uint16_t queue_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return 0; } @@ -2709,7 +2749,7 @@ rte_eth_rx_descriptor_done(uint8_t port_id, uint16_t queue_id, uint16_t offset) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -2730,7 +2770,7 @@ rte_eth_dev_callback_register(uint8_t port_id, if (!cb_fn) return (-EINVAL); - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-EINVAL); } @@ -2770,7 +2810,7 @@ rte_eth_dev_callback_unregister(uint8_t port_id, if (!cb_fn) return (-EINVAL); - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-EINVAL); } @@ -2830,7 +2870,7 @@ int rte_eth_dev_bypass_init(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -2850,7 +2890,7 @@ rte_eth_dev_bypass_state_show(uint8_t port_id, uint32_t *state) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -2869,7 +2909,7 @@ rte_eth_dev_bypass_state_set(uint8_t port_id, uint32_t *new_state) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -2889,7 +2929,7 @@ rte_eth_dev_bypass_event_show(uint8_t port_id, uint32_t event, uint32_t *state) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -2909,7 +2949,7 @@ rte_eth_dev_bypass_event_store(uint8_t port_id, uint32_t event, uint32_t state) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -2929,7 +2969,7 @@ rte_eth_dev_wd_timeout_store(uint8_t port_id, uint32_t timeout) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -2949,7 +2989,7 @@ rte_eth_dev_bypass_ver_show(uint8_t port_id, uint32_t *ver) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -2969,7 +3009,7 @@ rte_eth_dev_bypass_wd_timeout_show(uint8_t port_id, uint32_t *wd_timeout) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -2989,7 +3029,7 @@ rte_eth_dev_bypass_wd_reset(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return (-ENODEV); } @@ -3011,7 +3051,7 @@ rte_eth_dev_add_syn_filter(uint8_t port_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -3026,7 +3066,7 @@ rte_eth_dev_remove_syn_filter(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -3045,7 +3085,7 @@ rte_eth_dev_get_syn_filter(uint8_t port_id, if (filter == NULL || rx_queue == NULL) return -EINVAL; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -3061,7 +3101,7 @@ rte_eth_dev_add_ethertype_filter(uint8_t port_id, uint16_t index, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -3082,7 +3122,7 @@ rte_eth_dev_remove_ethertype_filter(uint8_t port_id, uint16_t index) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -3101,7 +3141,7 @@ rte_eth_dev_get_ethertype_filter(uint8_t port_id, uint16_t index, if (filter == NULL || rx_queue == NULL) return -EINVAL; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -3118,7 +3158,7 @@ rte_eth_dev_add_2tuple_filter(uint8_t port_id, uint16_t index, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -3140,7 +3180,7 @@ rte_eth_dev_remove_2tuple_filter(uint8_t port_id, uint16_t index) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -3159,7 +3199,7 @@ rte_eth_dev_get_2tuple_filter(uint8_t port_id, uint16_t index, if (filter == NULL || rx_queue == NULL) return -EINVAL; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -3175,7 +3215,7 @@ rte_eth_dev_add_5tuple_filter(uint8_t port_id, uint16_t index, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -3198,7 +3238,7 @@ rte_eth_dev_remove_5tuple_filter(uint8_t port_id, uint16_t index) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -3217,7 +3257,7 @@ rte_eth_dev_get_5tuple_filter(uint8_t port_id, uint16_t index, if (filter == NULL || rx_queue == NULL) return -EINVAL; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -3234,7 +3274,7 @@ rte_eth_dev_add_flex_filter(uint8_t port_id, uint16_t index, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -3249,7 +3289,7 @@ rte_eth_dev_remove_flex_filter(uint8_t port_id, uint16_t index) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -3268,7 +3308,7 @@ rte_eth_dev_get_flex_filter(uint8_t port_id, uint16_t index, if (filter == NULL || rx_queue == NULL) return -EINVAL; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -3284,7 +3324,7 @@ rte_eth_dev_filter_supported(uint8_t port_id, enum rte_filter_type filter_type) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -3301,7 +3341,7 @@ rte_eth_dev_filter_ctrl(uint8_t port_id, enum rte_filter_type filter_type, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (rte_eth_dev_validate_port(port_id) == DEV_INVALID) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index ce0528f..616a44a 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -1565,6 +1565,7 @@ struct rte_eth_dev { struct eth_dev_ops *dev_ops; /**< Functions exported by PMD */ struct rte_pci_device *pci_dev; /**< PCI info. supplied by probing */ struct rte_eth_dev_cb_list callbacks; /**< User application callbacks */ + uint8_t attached; /**< Flag indicating the port is attached */ }; struct rte_eth_dev_sriov { @@ -1630,6 +1631,10 @@ extern struct rte_eth_dev rte_eth_devices[]; * initialized by the [matching] Ethernet driver during the PCI probing phase. * All devices whose port identifier is in the range * [0, rte_eth_dev_count() - 1] can be operated on by network applications. + * immediately after invoking rte_eal_init(). + * If the application unplugs a port using hotplug function, The enabled port + * numbers may be noncontiguous. In the case, the applications need to manage + * enabled port by themselves. * * @return * - The total number of usable Ethernet devices. -- 1.9.1