From patchwork Wed Jun 17 16:54:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ananyev, Konstantin" X-Patchwork-Id: 5482 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 56554C4DA; Wed, 17 Jun 2015 18:55:00 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 182A0C484 for ; Wed, 17 Jun 2015 18:54:53 +0200 (CEST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP; 17 Jun 2015 09:54:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,633,1427785200"; d="scan'208";a="589672408" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga003.jf.intel.com with ESMTP; 17 Jun 2015 09:54:51 -0700 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id t5HGso6m023817; Wed, 17 Jun 2015 17:54:50 +0100 Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id t5HGsoHx024299; Wed, 17 Jun 2015 17:54:50 +0100 Received: (from kananye1@localhost) by sivswdev02.ir.intel.com with id t5HGsoJJ024295; Wed, 17 Jun 2015 17:54:50 +0100 From: Konstantin Ananyev To: dev@dpdk.org Date: Wed, 17 Jun 2015 17:54:40 +0100 Message-Id: <1434560084-21237-2-git-send-email-konstantin.ananyev@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1434560084-21237-1-git-send-email-konstantin.ananyev@intel.com> References: <1434560084-21237-1-git-send-email-konstantin.ananyev@intel.com> Subject: [dpdk-dev] [PATCH 1/5] ethdev: add new API to retrieve RX/TX queue information 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" Add the ability for the upper layer to query RX/TX queue information. Add new structures: struct rte_eth_rx_qinfo struct rte_eth_tx_qinfo new functions: rte_eth_rx_queue_info_get rte_eth_tx_queue_info_get into rte_etdev API. Left extra free space in the qinfo structures, so extra fields could be added later without ABI breakage. Signed-off-by: Konstantin Ananyev Acked-by: Helin Zhang Acked-by: David Harton --- lib/librte_ether/rte_ethdev.c | 48 +++++++++++++++++++++++++++ lib/librte_ether/rte_ethdev.h | 77 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 124 insertions(+), 1 deletion(-) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index e13fde5..6b9a7ef 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -3629,6 +3629,54 @@ rte_eth_remove_tx_callback(uint8_t port_id, uint16_t queue_id, } int +rte_eth_rx_queue_info_get(uint8_t port_id, uint16_t queue_id, + struct rte_eth_rx_qinfo *qinfo) +{ + struct rte_eth_dev *dev; + + memset(qinfo, 0, sizeof(*qinfo)); + + if (!rte_eth_dev_is_valid_port(port_id)) { + PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + return -EINVAL; + } + + dev = &rte_eth_devices[port_id]; + if (queue_id >= dev->data->nb_rx_queues) { + PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", queue_id); + return -EINVAL; + } + + FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_qinfo_get, -ENOTSUP); + dev->dev_ops->rx_qinfo_get(dev, queue_id, qinfo); + return 0; +} + +int +rte_eth_tx_queue_info_get(uint8_t port_id, uint16_t queue_id, + struct rte_eth_tx_qinfo *qinfo) +{ + struct rte_eth_dev *dev; + + memset(qinfo, 0, sizeof(*qinfo)); + + if (!rte_eth_dev_is_valid_port(port_id)) { + PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + return -EINVAL; + } + + dev = &rte_eth_devices[port_id]; + if (queue_id >= dev->data->nb_tx_queues) { + PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", queue_id); + return -EINVAL; + } + + FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_qinfo_get, -ENOTSUP); + dev->dev_ops->tx_qinfo_get(dev, queue_id, qinfo); + return 0; +} + +int rte_eth_dev_set_mc_addr_list(uint8_t port_id, struct ether_addr *mc_addr_set, uint32_t nb_mc_addr) diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 04c192d..45afdd3 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -942,6 +942,30 @@ struct rte_eth_xstats { uint64_t value; }; +/** + * Ethernet device RX queue information strcuture. + * Used to retieve information about configured queue. + */ +struct rte_eth_rx_qinfo { + struct rte_mempool *mp; /**< mempool used by that queue. */ + struct rte_eth_rxconf conf; /**< queue config parameters. */ + uint8_t scattered_rx; /**< scattered packets RX supported. */ + uint16_t nb_desc; /**< configured number of RXDs. */ + uint16_t max_desc; /**< max allowed number of RXDs. */ + uint16_t min_desc; /**< min allowed number of RXDs. */ +} __rte_cache_aligned; + +/** + * Ethernet device TX queue information strcuture. + * Used to retieve information about configured queue. + */ +struct rte_eth_tx_qinfo { + struct rte_eth_txconf conf; /**< queue config parameters. */ + uint16_t nb_desc; /**< configured number of TXDs. */ + uint16_t max_desc; /**< max allowed number of TXDs. */ + uint16_t min_desc; /**< min allowed number of TXDs. */ +} __rte_cache_aligned; + struct rte_eth_dev; struct rte_eth_dev_callback; @@ -1045,6 +1069,12 @@ typedef uint32_t (*eth_rx_queue_count_t)(struct rte_eth_dev *dev, typedef int (*eth_rx_descriptor_done_t)(void *rxq, uint16_t offset); /**< @Check DD bit of specific RX descriptor */ +typedef void (*eth_rx_qinfo_get_t)(struct rte_eth_dev *dev, + uint16_t rx_queue_id, struct rte_eth_rx_qinfo *qinfo); + +typedef void (*eth_tx_qinfo_get_t)(struct rte_eth_dev *dev, + uint16_t tx_queue_id, struct rte_eth_tx_qinfo *qinfo); + typedef int (*mtu_set_t)(struct rte_eth_dev *dev, uint16_t mtu); /**< @internal Set MTU. */ @@ -1389,8 +1419,13 @@ struct eth_dev_ops { rss_hash_update_t rss_hash_update; /** Get current RSS hash configuration. */ rss_hash_conf_get_t rss_hash_conf_get; - eth_filter_ctrl_t filter_ctrl; /**< common filter control*/ + eth_filter_ctrl_t filter_ctrl; + /**< common filter control. */ eth_set_mc_addr_list_t set_mc_addr_list; /**< set list of mcast addrs */ + eth_rx_qinfo_get_t rx_qinfo_get; + /**< retrieve RX queue information. */ + eth_tx_qinfo_get_t tx_qinfo_get; + /**< retrieve TX queue information. */ }; /** @@ -3616,6 +3651,46 @@ int rte_eth_remove_rx_callback(uint8_t port_id, uint16_t queue_id, int rte_eth_remove_tx_callback(uint8_t port_id, uint16_t queue_id, struct rte_eth_rxtx_callback *user_cb); +/** + * Retrieve information about given port's RX queue. + * + * @param port_id + * The port identifier of the Ethernet device. + * @param queue_id + * The RX queue on the Ethernet device for which information + * will be retrieved. + * @param qinfo + * A pointer to a structure of type *rte_eth_rx_qinfo_info* to be filled with + * the information of the Ethernet device. + * + * @return + * - 0: Success + * - -ENOTSUP: routine is not supported by the device PMD. + * - -EINVAL: The port_id or the queue_id is out of range. + */ +int rte_eth_rx_queue_info_get(uint8_t port_id, uint16_t queue_id, + struct rte_eth_rx_qinfo *qinfo); + +/** + * Retrieve information about given port's TX queue. + * + * @param port_id + * The port identifier of the Ethernet device. + * @param queue_id + * The TX queue on the Ethernet device for which information + * will be retrieved. + * @param qinfo + * A pointer to a structure of type *rte_eth_tx_qinfo_info* to be filled with + * the information of the Ethernet device. + * + * @return + * - 0: Success + * - -ENOTSUP: routine is not supported by the device PMD. + * - -EINVAL: The port_id or the queue_id is out of range. + */ +int rte_eth_tx_queue_info_get(uint8_t port_id, uint16_t queue_id, + struct rte_eth_tx_qinfo *qinfo); + #ifdef __cplusplus } #endif