d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ethdev: extract checking queue id into common functions

Browse Source 
This patch extract 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 <tangchengchang@huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
This commit is contained in:
Wei Hu (Xavier) 2020-10-13 19:50:53 +08:00 committed by Ferruh Yigit
parent 2f622174bf
commit 9b47c352e3
1 changed files with 50 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
lib/librte_ethdev/rte_ethdev.c
View File

@ -879,10 +879,43 @@ rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
return 0; 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 int
rte_eth_dev_rx_queue_start(uint16_t port_id, uint16_t rx_queue_id) rte_eth_dev_rx_queue_start(uint16_t port_id, uint16_t rx_queue_id)
{ {
struct rte_eth_dev *dev; struct rte_eth_dev *dev;
int ret;
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL); RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
@ -894,10 +927,9 @@ rte_eth_dev_rx_queue_start(uint16_t port_id, uint16_t rx_queue_id)
return -EINVAL; return -EINVAL;
} }
if (rx_queue_id >= dev->data->nb_rx_queues) { ret = eth_dev_validate_rx_queue(dev, rx_queue_id);
RTE_ETHDEV_LOG(ERR, "Invalid RX queue_id=%u\n", rx_queue_id); if (ret != 0)
return -EINVAL; return ret;
}
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_start, -ENOTSUP); RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_start, -ENOTSUP);
@ -924,14 +956,15 @@ int
rte_eth_dev_rx_queue_stop(uint16_t port_id, uint16_t rx_queue_id) rte_eth_dev_rx_queue_stop(uint16_t port_id, uint16_t rx_queue_id)
{ {
struct rte_eth_dev *dev; struct rte_eth_dev *dev;
int ret;
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL); RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
dev = &rte_eth_devices[port_id]; 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); ret = eth_dev_validate_rx_queue(dev, rx_queue_id);
return -EINVAL; if (ret != 0)
} return ret;
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_stop, -ENOTSUP); RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_stop, -ENOTSUP);
@ -957,6 +990,7 @@ int
rte_eth_dev_tx_queue_start(uint16_t port_id, uint16_t tx_queue_id) rte_eth_dev_tx_queue_start(uint16_t port_id, uint16_t tx_queue_id)
{ {
struct rte_eth_dev *dev; struct rte_eth_dev *dev;
int ret;
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL); RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
@ -968,10 +1002,9 @@ rte_eth_dev_tx_queue_start(uint16_t port_id, uint16_t tx_queue_id)
return -EINVAL; return -EINVAL;
} }
if (tx_queue_id >= dev->data->nb_tx_queues) { ret = eth_dev_validate_tx_queue(dev, tx_queue_id);
RTE_ETHDEV_LOG(ERR, "Invalid TX queue_id=%u\n", tx_queue_id); if (ret != 0)
return -EINVAL; return ret;
}
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_start, -ENOTSUP); RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_start, -ENOTSUP);
@ -996,14 +1029,15 @@ int
rte_eth_dev_tx_queue_stop(uint16_t port_id, uint16_t tx_queue_id) rte_eth_dev_tx_queue_stop(uint16_t port_id, uint16_t tx_queue_id)
{ {
struct rte_eth_dev *dev; struct rte_eth_dev *dev;
int ret;
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL); RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
dev = &rte_eth_devices[port_id]; 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); ret = eth_dev_validate_tx_queue(dev, tx_queue_id);
return -EINVAL; if (ret != 0)
} return ret;
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_stop, -ENOTSUP); RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_stop, -ENOTSUP);