From 9ad9ff476cac033ca76e7edb4d7797867c7be5b1 Mon Sep 17 00:00:00 2001 From: Lijun Ou Date: Mon, 19 Apr 2021 16:57:30 +0800 Subject: [PATCH] ethdev: add queue state in queried queue information Currently, upper-layer application could get queue state only through pointers such as dev->data->tx_queue_state[queue_id], this is not the recommended way to access it. So this patch add get queue state when call rte_eth_rx_queue_info_get and rte_eth_tx_queue_info_get API. Note: After add queue_state field, the 'struct rte_eth_rxq_info' size remains 128B, and the 'struct rte_eth_txq_info' size remains 64B, so it could be ABI compatible. Signed-off-by: Chengwen Feng Signed-off-by: Lijun Ou Acked-by: Konstantin Ananyev Acked-by: Thomas Monjalon Reviewed-by: Ferruh Yigit --- devtools/libabigail.abignore | 10 ++++++++++ doc/guides/rel_notes/release_21_05.rst | 7 +++++++ lib/ethdev/ethdev_driver.h | 7 ------- lib/ethdev/rte_ethdev.c | 3 +++ lib/ethdev/rte_ethdev.h | 9 +++++++++ 5 files changed, 29 insertions(+), 7 deletions(-) diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore index b216abd9a0..bc55c0ae5d 100644 --- a/devtools/libabigail.abignore +++ b/devtools/libabigail.abignore @@ -35,3 +35,13 @@ [suppress_type] name = rte_eventdev has_data_member_inserted_between = {offset_after(attached), end} + +; Ignore fields inserted in alignment hole of rte_eth_rxq_info +[suppress_type] + name = rte_eth_rxq_info + has_data_member_inserted_at = offset_after(scattered_rx) + +; Ignore fields inserted in cacheline boundary of rte_eth_txq_info +[suppress_type] + name = rte_eth_txq_info + has_data_member_inserted_between = {offset_after(nb_desc), end} diff --git a/doc/guides/rel_notes/release_21_05.rst b/doc/guides/rel_notes/release_21_05.rst index 565e764811..23b201c50f 100644 --- a/doc/guides/rel_notes/release_21_05.rst +++ b/doc/guides/rel_notes/release_21_05.rst @@ -81,6 +81,13 @@ New Features representor=[[c#]pf#]sf# sf[0,2-1023] /* 1023 SFs. */ representor=[c#]pf# c2pf[0,1] /* 2 PFs on controller 2. */ +* **Added queue state in queried Rx/Tx queue info.** + + * Added new field ``queue_state`` to ``rte_eth_rxq_info`` structure to + provide indicated Rx queue state. + * Added new field ``queue_state`` to ``rte_eth_txq_info`` structure to + provide indicated Tx queue state. + * **Added support for meter PPS profile.** Added packet mode in the meter profile parameters data structures diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h index 113129d5e1..40e474aa7e 100644 --- a/lib/ethdev/ethdev_driver.h +++ b/lib/ethdev/ethdev_driver.h @@ -951,13 +951,6 @@ struct eth_dev_ops { /**< Get representor info. */ }; -/** - * RX/TX queue states - */ -#define RTE_ETH_QUEUE_STATE_STOPPED 0 -#define RTE_ETH_QUEUE_STATE_STARTED 1 -#define RTE_ETH_QUEUE_STATE_HAIRPIN 2 - /** * @internal * Check if the selected Rx queue is hairpin queue. diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index c73d263c2f..d5adf4ff05 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -5038,6 +5038,8 @@ rte_eth_rx_queue_info_get(uint16_t port_id, uint16_t queue_id, memset(qinfo, 0, sizeof(*qinfo)); dev->dev_ops->rxq_info_get(dev, queue_id, qinfo); + qinfo->queue_state = dev->data->rx_queue_state[queue_id]; + return 0; } @@ -5078,6 +5080,7 @@ rte_eth_tx_queue_info_get(uint16_t port_id, uint16_t queue_id, memset(qinfo, 0, sizeof(*qinfo)); dev->dev_ops->txq_info_get(dev, queue_id, qinfo); + qinfo->queue_state = dev->data->tx_queue_state[queue_id]; return 0; } diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 3b773b6dd0..a0d01d2667 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -1587,6 +1587,13 @@ struct rte_eth_dev_info { void *reserved_ptrs[2]; /**< Reserved for future fields */ }; +/** + * RX/TX queue states + */ +#define RTE_ETH_QUEUE_STATE_STOPPED 0 +#define RTE_ETH_QUEUE_STATE_STARTED 1 +#define RTE_ETH_QUEUE_STATE_HAIRPIN 2 + /** * Ethernet device RX queue information structure. * Used to retrieve information about configured queue. @@ -1595,6 +1602,7 @@ 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. */ + uint8_t queue_state; /**< one of RTE_ETH_QUEUE_STATE_*. */ uint16_t nb_desc; /**< configured number of RXDs. */ uint16_t rx_buf_size; /**< hardware receive buffer size. */ } __rte_cache_min_aligned; @@ -1606,6 +1614,7 @@ struct rte_eth_rxq_info { struct rte_eth_txq_info { struct rte_eth_txconf conf; /**< queue config parameters. */ uint16_t nb_desc; /**< configured number of TXDs. */ + uint8_t queue_state; /**< one of RTE_ETH_QUEUE_STATE_*. */ } __rte_cache_min_aligned; /* Generic Burst mode flag definition, values can be ORed. */ -- 2.20.1