> -----Original Message----- > From: Zhang, Helin > Sent: Wednesday, July 22, 2015 5:51 PM > To: Ananyev, Konstantin > Cc: dev at dpdk.org > Subject: RE: [dpdk-dev] [PATCHv3 1/5] ethdev: add new API to retrieve RX/TX > queue information > > > > > -----Original Message----- > > From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of Konstantin Ananyev > > Sent: Monday, July 20, 2015 5:19 AM > > To: dev at dpdk.org > > Subject: [dpdk-dev] [PATCHv3 1/5] ethdev: add new API to retrieve RX/TX > > queue > > information > > > > Add the ability for the upper layer to query RX/TX queue information. > > > > Add new structures: > > struct rte_eth_rxq_info > > struct rte_eth_txq_info > > > > new functions: > > rte_eth_rx_queue_info_get > > rte_eth_tx_queue_info_get > > > > into rte_etdev API. > > > > Left extra free space in the queue info structures, so extra fields could > > be added > > later without ABI breakage. > > > > v2 changes: > > - Add formal check for the qinfo input parameter. > > - As suggested rename 'rx_qinfo/tx_qinfo' to 'rxq_info/txq_info' > > > > v3 changes: > > - Updated rte_ether_version.map > > - Merged with latest changes > > > > Signed-off-by: Konstantin Ananyev <konstantin.ananyev at intel.com> > > --- > > 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(-) > > > > 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, } > > > > 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 == NULL) > > + return -EINVAL; > > + > > + 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->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 == NULL) > > + return -EINVAL; > > + > > + 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->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; > > }; > > > > +/** > > + * 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; > > > > 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 */ > > > > +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. */ > > > > @@ -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? > > > > > /** > > + * 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 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_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 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_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); > > > > -#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 > R2.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 > need to create new {} for DPDK_2.1? > And should your changes be in DPDK_2.1?
Ah yes, I think you right - it should be in 2.1, not 2.0. Will re-spin. Konstantin > > Regards, > Helin > > > -- > > 1.8.3.1