From: "Wei Hu (Xavier)" <xavier.hu...@huawei.com> This patch extact checking rx_queue_id or tx_queue_id into two separate common functions named eth_dev_validate_rx_queue and eth_dev_validate_tx_queue.
Signed-off-by: Chengchang Tang <tangchengch...@huawei.com> Signed-off-by: Wei Hu (Xavier) <xavier.hu...@huawei.com> Signed-off-by: Chengwen Feng <fengcheng...@huawei.com> Acked-by: Stephen Hemminger <step...@networkplumber.org> Reviewed-by: Kalesh AP <kalesh-anakkur.pura...@broadcom.com> --- v4 -> v5: 1. remove inline. 2. add 'const' to dev to highlight that it changes nothing. 3. RX -> Rx, TX -> Tx. 4. log port ID in the error branch. 5. 'if (ret)' -> 'if (ret != 0)' 6. split the original patch into three separate patches. v3 -> v4: 1. dropping the 'rte_' prefix from the funcitons names. 2. get "struct rte_eth_dev *dev" as parameter and drop the port_id validation in the function named eth_dev_validate_rx_queue and eth_dev_validate_tx_queue. 3. replace "setupped" with "setup" in the commit log and titile. v2 -> v3: don't break lines in format strings. v1 -> v2: 1. replace %"PRIu16" with %u. 2. extact two common functions which validate RXQ/TXQ ids and whether it has been set up or not. --- lib/librte_ethdev/rte_ethdev.c | 66 ++++++++++++++++++++++++++++++++---------- 1 file changed, 50 insertions(+), 16 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index 892c246..11e54d9 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -877,10 +877,43 @@ rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues) return 0; } +static int +eth_dev_validate_rx_queue(const struct rte_eth_dev *dev, uint16_t rx_queue_id) +{ + uint16_t port_id; + + if (rx_queue_id >= dev->data->nb_rx_queues) { + port_id = dev->data->port_id; + RTE_ETHDEV_LOG(ERR, + "Invalid Rx queue_id=%u of device with port_id=%u\n", + rx_queue_id, port_id); + return -EINVAL; + } + + return 0; +} + +static int +eth_dev_validate_tx_queue(const struct rte_eth_dev *dev, uint16_t tx_queue_id) +{ + uint16_t port_id; + + if (tx_queue_id >= dev->data->nb_tx_queues) { + port_id = dev->data->port_id; + RTE_ETHDEV_LOG(ERR, + "Invalid Tx queue_id=%u of device with port_id=%u\n", + tx_queue_id, port_id); + return -EINVAL; + } + + return 0; +} + int rte_eth_dev_rx_queue_start(uint16_t port_id, uint16_t rx_queue_id) { struct rte_eth_dev *dev; + int ret; RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL); @@ -892,10 +925,9 @@ rte_eth_dev_rx_queue_start(uint16_t port_id, uint16_t rx_queue_id) return -EINVAL; } - if (rx_queue_id >= dev->data->nb_rx_queues) { - RTE_ETHDEV_LOG(ERR, "Invalid RX queue_id=%u\n", rx_queue_id); - return -EINVAL; - } + ret = eth_dev_validate_rx_queue(dev, rx_queue_id); + if (ret != 0) + return ret; RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_start, -ENOTSUP); @@ -922,14 +954,15 @@ int rte_eth_dev_rx_queue_stop(uint16_t port_id, uint16_t rx_queue_id) { struct rte_eth_dev *dev; + int ret; RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL); dev = &rte_eth_devices[port_id]; - if (rx_queue_id >= dev->data->nb_rx_queues) { - RTE_ETHDEV_LOG(ERR, "Invalid RX queue_id=%u\n", rx_queue_id); - return -EINVAL; - } + + ret = eth_dev_validate_rx_queue(dev, rx_queue_id); + if (ret != 0) + return ret; RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_stop, -ENOTSUP); @@ -955,6 +988,7 @@ int rte_eth_dev_tx_queue_start(uint16_t port_id, uint16_t tx_queue_id) { struct rte_eth_dev *dev; + int ret; RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL); @@ -966,10 +1000,9 @@ rte_eth_dev_tx_queue_start(uint16_t port_id, uint16_t tx_queue_id) return -EINVAL; } - if (tx_queue_id >= dev->data->nb_tx_queues) { - RTE_ETHDEV_LOG(ERR, "Invalid TX queue_id=%u\n", tx_queue_id); - return -EINVAL; - } + ret = eth_dev_validate_tx_queue(dev, tx_queue_id); + if (ret != 0) + return ret; RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_start, -ENOTSUP); @@ -994,14 +1027,15 @@ int rte_eth_dev_tx_queue_stop(uint16_t port_id, uint16_t tx_queue_id) { struct rte_eth_dev *dev; + int ret; RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL); dev = &rte_eth_devices[port_id]; - if (tx_queue_id >= dev->data->nb_tx_queues) { - RTE_ETHDEV_LOG(ERR, "Invalid TX queue_id=%u\n", tx_queue_id); - return -EINVAL; - } + + ret = eth_dev_validate_tx_queue(dev, tx_queue_id); + if (ret != 0) + return ret; RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_stop, -ENOTSUP); -- 2.9.5