From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 7A4235A29 for ; Wed, 22 Jul 2015 18:51:08 +0200 (CEST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP; 22 Jul 2015 09:50:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,523,1432623600"; d="scan'208";a="610858249" Received: from pgsmsx103.gar.corp.intel.com ([10.221.44.82]) by orsmga003.jf.intel.com with ESMTP; 22 Jul 2015 09:50:38 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by PGSMSX103.gar.corp.intel.com (10.221.44.82) with Microsoft SMTP Server (TLS) id 14.3.224.2; Thu, 23 Jul 2015 00:50:37 +0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.129]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.146]) with mapi id 14.03.0224.002; Thu, 23 Jul 2015 00:50:36 +0800 From: "Zhang, Helin" To: "Ananyev, Konstantin" Thread-Topic: [dpdk-dev] [PATCHv3 1/5] ethdev: add new API to retrieve RX/TX queue information Thread-Index: AQHQwuZoWe036ZRwLEOVJpXHqlQuHp3ntcnw Date: Wed, 22 Jul 2015 16:50:35 +0000 Message-ID: References: <1437394750-5965-1-git-send-email-konstantin.ananyev@intel.com> <1437394750-5965-2-git-send-email-konstantin.ananyev@intel.com> In-Reply-To: <1437394750-5965-2-git-send-email-konstantin.ananyev@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Cc: "dev@dpdk.org" Subject: Re: [dpdk-dev] [PATCHv3 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: , X-List-Received-Date: Wed, 22 Jul 2015 16:51:09 -0000 > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Konstantin Ananyev > Sent: Monday, July 20, 2015 5:19 AM > To: dev@dpdk.org > Subject: [dpdk-dev] [PATCHv3 1/5] ethdev: add new API to retrieve RX/TX q= ueue > information >=20 > Add the ability for the upper layer to query RX/TX queue information. >=20 > Add new structures: > struct rte_eth_rxq_info > struct rte_eth_txq_info >=20 > new functions: > rte_eth_rx_queue_info_get > rte_eth_tx_queue_info_get >=20 > into rte_etdev API. >=20 > Left extra free space in the queue info structures, so extra fields could= be added > later without ABI breakage. >=20 > v2 changes: > - Add formal check for the qinfo input parameter. > - As suggested rename 'rx_qinfo/tx_qinfo' to 'rxq_info/txq_info' >=20 > v3 changes: > - Updated rte_ether_version.map > - Merged with latest changes >=20 > Signed-off-by: Konstantin Ananyev > --- > lib/librte_ether/rte_ethdev.c | 54 +++++++++++++++++++++ > lib/librte_ether/rte_ethdev.h | 87 > +++++++++++++++++++++++++++++++--- > lib/librte_ether/rte_ether_version.map | 2 + > 3 files changed, 137 insertions(+), 6 deletions(-) >=20 > diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.= c index > 94104ce..a94c119 100644 > --- a/lib/librte_ether/rte_ethdev.c > +++ b/lib/librte_ether/rte_ethdev.c > @@ -3341,6 +3341,60 @@ rte_eth_remove_tx_callback(uint8_t port_id, uint16= _t > queue_id, } >=20 > int > +rte_eth_rx_queue_info_get(uint8_t port_id, uint16_t queue_id, > + struct rte_eth_rxq_info *qinfo) > +{ > + struct rte_eth_dev *dev; > + > + if (qinfo =3D=3D NULL) > + return -EINVAL; > + > + if (!rte_eth_dev_is_valid_port(port_id)) { > + PMD_DEBUG_TRACE("Invalid port_id=3D%d\n", port_id); > + return -EINVAL; > + } > + > + dev =3D &rte_eth_devices[port_id]; > + if (queue_id >=3D dev->data->nb_rx_queues) { > + PMD_DEBUG_TRACE("Invalid RX queue_id=3D%d\n", queue_id); > + return -EINVAL; > + } > + > + FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rxq_info_get, -ENOTSUP); > + > + memset(qinfo, 0, sizeof(*qinfo)); > + dev->dev_ops->rxq_info_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_txq_info *qinfo) > +{ > + struct rte_eth_dev *dev; > + > + if (qinfo =3D=3D NULL) > + return -EINVAL; > + > + if (!rte_eth_dev_is_valid_port(port_id)) { > + PMD_DEBUG_TRACE("Invalid port_id=3D%d\n", port_id); > + return -EINVAL; > + } > + > + dev =3D &rte_eth_devices[port_id]; > + if (queue_id >=3D dev->data->nb_tx_queues) { > + PMD_DEBUG_TRACE("Invalid TX queue_id=3D%d\n", queue_id); > + return -EINVAL; > + } > + > + FUNC_PTR_OR_ERR_RET(*dev->dev_ops->txq_info_get, -ENOTSUP); > + > + memset(qinfo, 0, sizeof(*qinfo)); > + dev->dev_ops->txq_info_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 > c901a2c..0c6705e 100644 > --- a/lib/librte_ether/rte_ethdev.h > +++ b/lib/librte_ether/rte_ethdev.h > @@ -960,6 +960,30 @@ struct rte_eth_xstats { > uint64_t value; > }; >=20 > +/** > + * Ethernet device RX queue information strcuture. > + * Used to retieve information about configured queue. > + */ > +struct rte_eth_rxq_info { > + 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_txq_info { > + 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; >=20 > struct rte_eth_dev_callback; > @@ -1063,6 +1087,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); /**< @internal Check DD bit of specific RX descriptor = */ >=20 > +typedef void (*eth_rxq_info_get_t)(struct rte_eth_dev *dev, > + uint16_t rx_queue_id, struct rte_eth_rxq_info *qinfo); > + > +typedef void (*eth_txq_info_get_t)(struct rte_eth_dev *dev, > + uint16_t tx_queue_id, struct rte_eth_txq_info *qinfo); > + > typedef int (*mtu_set_t)(struct rte_eth_dev *dev, uint16_t mtu); /**< > @internal Set MTU. */ >=20 > @@ -1451,9 +1481,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_rxq_info_get_t rxq_info_get; > + /**< retrieve RX queue information. */ > + eth_txq_info_get_t txq_info_get; > + /**< retrieve TX queue information. */ > /** Turn IEEE1588/802.1AS timestamping on. */ > eth_timesync_enable_t timesync_enable; > /** Turn IEEE1588/802.1AS timestamping off. */ @@ -3721,6 +3755,46 @@ > int rte_eth_remove_tx_callback(uint8_t port_id, uint16_t queue_id, > struct rte_eth_rxtx_callback *user_cb); Is it targeting R2.1? If no, the new ops should be added at the end of this= structure? >=20 > /** > + * 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_rxq_info_info* to be fill= ed 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_rxq_info *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_txq_info_info* to be fill= ed 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_txq_info *qinfo); > + > +/* > * Retrieve number of available registers for access > * > * @param port_id > @@ -3793,10 +3867,6 @@ int rte_eth_dev_get_eeprom(uint8_t port_id, struct > rte_dev_eeprom_info *info); > */ > int rte_eth_dev_set_eeprom(uint8_t port_id, struct rte_dev_eeprom_info > *info); >=20 > -#ifdef __cplusplus > -} > -#endif > - > /** > * Set the list of multicast addresses to filter on an Ethernet device. > * > @@ -3882,4 +3952,9 @@ extern int > rte_eth_timesync_read_rx_timestamp(uint8_t port_id, > */ > extern int rte_eth_timesync_read_tx_timestamp(uint8_t port_id, > struct timespec *timestamp); > + > +#ifdef __cplusplus > +} > +#endif This is fix for the issue introduced by new ieee1588. It must be added in R= 2.1 no matter these patches can be applied or not. > + > #endif /* _RTE_ETHDEV_H_ */ > diff --git a/lib/librte_ether/rte_ether_version.map > b/lib/librte_ether/rte_ether_version.map > index 23cfee9..8de0928 100644 > --- a/lib/librte_ether/rte_ether_version.map > +++ b/lib/librte_ether/rte_ether_version.map > @@ -92,6 +92,7 @@ DPDK_2.0 { > rte_eth_rx_burst; > rte_eth_rx_descriptor_done; > rte_eth_rx_queue_count; > + rte_eth_rx_queue_info_get; > rte_eth_rx_queue_setup; > rte_eth_set_queue_rate_limit; > rte_eth_set_vf_rate_limit; > @@ -99,6 +100,7 @@ DPDK_2.0 { > rte_eth_stats_get; > rte_eth_stats_reset; > rte_eth_tx_burst; > + rte_eth_tx_queue_info_get; > rte_eth_tx_queue_setup; > rte_eth_xstats_get; > rte_eth_xstats_reset; I am not quite sure about the version map. But I have a question: does it n= eed to create new {} for DPDK_2.1? And should your changes be in DPDK_2.1? Regards, Helin > -- > 1.8.3.1