From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4D06AA04B6; Tue, 13 Oct 2020 04:41:44 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 992D01D9BE; Tue, 13 Oct 2020 04:41:42 +0200 (CEST) Received: from incedge.chinasoftinc.com (unknown [114.113.233.8]) by dpdk.org (Postfix) with ESMTP id ECC312B84 for ; Tue, 13 Oct 2020 04:41:39 +0200 (CEST) X-ASG-Debug-ID: 1602556896-149d114cae1c2a90001-TfluYd Received: from mail.chinasoftinc.com ([10.168.0.51]) by incedge.chinasoftinc.com with ESMTP id v6ahOgj7DARWqTVd (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Oct 2020 10:41:36 +0800 (CST) X-Barracuda-Envelope-From: huwei013@chinasoftinc.com X-Barracuda-RBL-Trusted-Forwarder: 10.168.0.51 X-ASG-Whitelist: Client Received: from localhost.localdomain (120.133.139.157) by INCCAS001.ito.icss (10.168.0.60) with Microsoft SMTP Server id 14.3.487.0; Tue, 13 Oct 2020 10:41:35 +0800 From: "Wei Hu (Xavier)" X-Barracuda-RBL-Trusted-Forwarder: 10.168.0.60 To: , , , CC: Date: Tue, 13 Oct 2020 10:41:26 +0800 X-ASG-Orig-Subj: [PATCH v4] ethdev: check if queue setup in queue-related APIs Message-ID: <20201013024126.26492-1-huwei013@chinasoftinc.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20201010071212.24086-1-huwei013@chinasoftinc.com> References: <20201010071212.24086-1-huwei013@chinasoftinc.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [120.133.139.157] X-Barracuda-Connect: UNKNOWN[10.168.0.51] X-Barracuda-Start-Time: 1602556896 X-Barracuda-Encrypted: ECDHE-RSA-AES256-SHA X-Barracuda-URL: https://incspam.chinasofti.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at chinasoftinc.com X-Barracuda-Scan-Msg-Size: 6526 Subject: [dpdk-dev] [PATCH v4] ethdev: check if queue setup in queue-related APIs X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Chengchang Tang This patch adds checking whether the related Tx or Rx queue has been setup in the queue-related API functions to avoid illegal address access. And validity check of the queue_id is also added in the API functions rte_eth_dev_rx_intr_enable and rte_eth_dev_rx_intr_disable. Signed-off-by: Chengchang Tang Signed-off-by: Wei Hu (Xavier) Signed-off-by: Chengwen Feng Acked-by: Stephen Hemminger --- 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 | 86 ++++++++++++++++++++++++++++++++++-------- lib/librte_ethdev/rte_ethdev.h | 3 +- 2 files changed, 72 insertions(+), 17 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index 892c246..04d30f9 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -877,10 +877,53 @@ rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues) return 0; } +static inline int +eth_dev_validate_rx_queue(struct rte_eth_dev *dev, uint16_t rx_queue_id) +{ + uint16_t 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; + } + + if (dev->data->rx_queues[rx_queue_id] == NULL) { + port_id = dev->data->port_id; + RTE_ETHDEV_LOG(ERR, + "Queue %u of device with port_id=%u has not been setup\n", + rx_queue_id, port_id); + return -EINVAL; + } + + return 0; +} + +static inline int +eth_dev_validate_tx_queue(struct rte_eth_dev *dev, uint16_t tx_queue_id) +{ + uint16_t 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; + } + + if (dev->data->tx_queues[tx_queue_id] == NULL) { + port_id = dev->data->port_id; + RTE_ETHDEV_LOG(ERR, + "Queue %u of device with port_id=%u has not been setup\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 +935,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) + return ret; RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_start, -ENOTSUP); @@ -922,14 +964,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) + return ret; RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_stop, -ENOTSUP); @@ -955,6 +998,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 +1010,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) + return ret; RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_start, -ENOTSUP); @@ -994,14 +1037,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) + return ret; RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_stop, -ENOTSUP); @@ -4458,11 +4502,16 @@ rte_eth_dev_rx_intr_enable(uint16_t port_id, uint16_t queue_id) { struct rte_eth_dev *dev; + int ret; RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; + ret = eth_dev_validate_rx_queue(dev, queue_id); + if (ret) + return ret; + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_intr_enable, -ENOTSUP); return eth_err(port_id, (*dev->dev_ops->rx_queue_intr_enable)(dev, queue_id)); @@ -4473,11 +4522,16 @@ rte_eth_dev_rx_intr_disable(uint16_t port_id, uint16_t queue_id) { struct rte_eth_dev *dev; + int ret; RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; + ret = eth_dev_validate_rx_queue(dev, queue_id); + if (ret) + return ret; + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_intr_disable, -ENOTSUP); return eth_err(port_id, (*dev->dev_ops->rx_queue_intr_disable)(dev, queue_id)); diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h index 5bcfbb8..f4cc591 100644 --- a/lib/librte_ethdev/rte_ethdev.h +++ b/lib/librte_ethdev/rte_ethdev.h @@ -4721,7 +4721,8 @@ rte_eth_rx_queue_count(uint16_t port_id, uint16_t queue_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL); dev = &rte_eth_devices[port_id]; RTE_FUNC_PTR_OR_ERR_RET(*dev->rx_queue_count, -ENOTSUP); - if (queue_id >= dev->data->nb_rx_queues) + if (queue_id >= dev->data->nb_rx_queues || + dev->data->rx_queues[queue_id] == NULL) return -EINVAL; return (int)(*dev->rx_queue_count)(dev, queue_id); -- 2.9.5