From patchwork Mon Jun 5 02:27:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dengdui Huang X-Patchwork-Id: 128066 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 677B742C2F; Mon, 5 Jun 2023 04:28:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A858042D12; Mon, 5 Jun 2023 04:27:48 +0200 (CEST) Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by mails.dpdk.org (Postfix) with ESMTP id 5F27C40E25 for ; Mon, 5 Jun 2023 04:27:44 +0200 (CEST) Received: from dggpeml500011.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4QZHSx24qlz18Llp; Mon, 5 Jun 2023 10:22:57 +0800 (CST) Received: from localhost.huawei.com (10.50.163.32) by dggpeml500011.china.huawei.com (7.185.36.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 5 Jun 2023 10:27:41 +0800 From: Dengdui Huang To: CC: , , , , , , , , , Subject: [PATCH v5 1/2] ethdev: add API to check if queue is valid Date: Mon, 5 Jun 2023 10:27:40 +0800 Message-ID: <20230605022741.1473230-2-huangdengdui@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20230605022741.1473230-1-huangdengdui@huawei.com> References: <20230516110021.1801443-1-huangdengdui@huawei.com> <20230605022741.1473230-1-huangdengdui@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.50.163.32] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpeml500011.china.huawei.com (7.185.36.84) X-CFilter-Loop: Reflected X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The API rte_eth_dev_is_valid_rxq/txq which is used to check if Rx/Tx queue is valid. If the queue has been setup, it is considered valid. Signed-off-by: Dengdui Huang Acked-by: Ferruh Yigit --- doc/guides/rel_notes/release_23_07.rst | 6 ++++ lib/ethdev/rte_ethdev.c | 22 +++++++++++++++ lib/ethdev/rte_ethdev.h | 38 ++++++++++++++++++++++++++ lib/ethdev/version.map | 2 ++ 4 files changed, 68 insertions(+) diff --git a/doc/guides/rel_notes/release_23_07.rst b/doc/guides/rel_notes/release_23_07.rst index 0b5561a6c6..e351be59e4 100644 --- a/doc/guides/rel_notes/release_23_07.rst +++ b/doc/guides/rel_notes/release_23_07.rst @@ -65,6 +65,12 @@ New Features Added RTE_ETH_FEC_LLRS to rte_eth_fec_mode. +* **Added ethdev Rx/Tx queue ID check API.** + + Added ethdev Rx/Tx queue ID check API which provides functions + for check if Rx/Tx queue is valid. If the queue has been setup, + it is considered valid. + * **Added flow matching of tx queue.** Added ``RTE_FLOW_ITEM_TYPE_TX_QUEUE`` rte_flow pattern to match tx queue of diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index d46e74504e..a134928c8a 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -771,6 +771,28 @@ eth_dev_validate_tx_queue(const struct rte_eth_dev *dev, uint16_t tx_queue_id) return 0; } +int +rte_eth_dev_is_valid_rxq(uint16_t port_id, uint16_t queue_id) +{ + struct rte_eth_dev *dev; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + + return eth_dev_validate_rx_queue(dev, queue_id); +} + +int +rte_eth_dev_is_valid_txq(uint16_t port_id, uint16_t queue_id) +{ + struct rte_eth_dev *dev; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + + return eth_dev_validate_tx_queue(dev, queue_id); +} + int rte_eth_dev_rx_queue_start(uint16_t port_id, uint16_t rx_queue_id) { diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 9932413c33..a37c0bdf76 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -2666,6 +2666,44 @@ int rte_eth_dev_socket_id(uint16_t port_id); */ int rte_eth_dev_is_valid_port(uint16_t port_id); +/** + * @warning + * @b EXPERIMENTAL: this API may change, or be removed, without prior notice + * + * Check if Rx queue is valid. If the queue has been setup, + * it is considered valid. + * + * @param port_id + * The port identifier of the Ethernet device. + * @param queue_id + * The index of the receive queue. + * @return + * - -ENODEV: if *port_id* is invalid. + * - -EINVAL: if queue_id is out of range or queue is not been setup. + * - 0 if Rx queue is valid. + */ +__rte_experimental +int rte_eth_dev_is_valid_rxq(uint16_t port_id, uint16_t queue_id); + +/** + * @warning + * @b EXPERIMENTAL: this API may change, or be removed, without prior notice + * + * Check if Tx queue is valid. If the queue has been setup, + * it is considered valid. + * + * @param port_id + * The port identifier of the Ethernet device. + * @param queue_id + * The index of the transmit queue. + * @return + * - -ENODEV: if *port_id* is invalid. + * - -EINVAL: if queue_id is out of range or queue is not been setup. + * - 0 if Tx queue is valid. + */ +__rte_experimental +int rte_eth_dev_is_valid_txq(uint16_t port_id, uint16_t queue_id); + /** * Start specified Rx queue of a port. It is used when rx_deferred_start * flag of the specified queue is true. diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map index 9d418091ef..1a33d72668 100644 --- a/lib/ethdev/version.map +++ b/lib/ethdev/version.map @@ -301,6 +301,8 @@ EXPERIMENTAL { rte_flow_async_create_by_index; # added in 23.07 + rte_eth_dev_is_valid_rxq; + rte_eth_dev_is_valid_txq; rte_flow_action_list_handle_create; rte_flow_action_list_handle_destroy; rte_flow_action_list_handle_query_update; From patchwork Mon Jun 5 02:27:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dengdui Huang X-Patchwork-Id: 128064 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A3AE942C2F; Mon, 5 Jun 2023 04:27:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 29B5740DF6; Mon, 5 Jun 2023 04:27:46 +0200 (CEST) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by mails.dpdk.org (Postfix) with ESMTP id 1DB174003C for ; Mon, 5 Jun 2023 04:27:43 +0200 (CEST) Received: from dggpeml500011.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4QZHVw51fPzLq9k; Mon, 5 Jun 2023 10:24:40 +0800 (CST) Received: from localhost.huawei.com (10.50.163.32) by dggpeml500011.china.huawei.com (7.185.36.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 5 Jun 2023 10:27:41 +0800 From: Dengdui Huang To: CC: , , , , , , , , , Subject: [PATCH v5 2/2] app/testpmd: fix segment fault with invalid queue ID Date: Mon, 5 Jun 2023 10:27:41 +0800 Message-ID: <20230605022741.1473230-3-huangdengdui@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20230605022741.1473230-1-huangdengdui@huawei.com> References: <20230516110021.1801443-1-huangdengdui@huawei.com> <20230605022741.1473230-1-huangdengdui@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.50.163.32] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpeml500011.china.huawei.com (7.185.36.84) X-CFilter-Loop: Reflected X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org When input queue ID is invalid, it will lead to Segmentation fault, like: dpdk-testpmd -a 0000:01:00.0 -- -i testpmd> show port 0 txq/rxq 99 desc 0 status Segmentation fault dpdk-testpmd -a 0000:01:00.0 -- -i testpmd> show port 0 rxq 99 desc used count Segmentation fault This patch fixes it. Fixes: fae9aa717d6c ("app/testpmd: support checking descriptor status") Fixes: 3f9acb5c83bb ("ethdev: avoid non-dataplane checks in Rx queue count") Cc: stable@dpdk.org Signed-off-by: Dengdui Huang Acked-by: Ferruh Yigit --- app/test-pmd/cmdline.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 5333ba72c3..a15a442a06 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -12282,12 +12282,13 @@ cmd_show_rx_tx_desc_status_parsed(void *parsed_result, struct cmd_show_rx_tx_desc_status_result *res = parsed_result; int rc; - if (!rte_eth_dev_is_valid_port(res->cmd_pid)) { - fprintf(stderr, "invalid port id %u\n", res->cmd_pid); - return; - } - if (!strcmp(res->cmd_keyword, "rxq")) { + if (rte_eth_dev_is_valid_rxq(res->cmd_pid, res->cmd_qid) != 0) { + fprintf(stderr, + "Invalid input: port id = %d, queue id = %d\n", + res->cmd_pid, res->cmd_qid); + return; + } rc = rte_eth_rx_descriptor_status(res->cmd_pid, res->cmd_qid, res->cmd_did); if (rc < 0) { @@ -12303,6 +12304,12 @@ cmd_show_rx_tx_desc_status_parsed(void *parsed_result, else printf("Desc status = UNAVAILABLE\n"); } else if (!strcmp(res->cmd_keyword, "txq")) { + if (rte_eth_dev_is_valid_txq(res->cmd_pid, res->cmd_qid) != 0) { + fprintf(stderr, + "Invalid input: port id = %d, queue id = %d\n", + res->cmd_pid, res->cmd_qid); + return; + } rc = rte_eth_tx_descriptor_status(res->cmd_pid, res->cmd_qid, res->cmd_did); if (rc < 0) { @@ -12382,8 +12389,10 @@ cmd_show_rx_queue_desc_used_count_parsed(void *parsed_result, struct cmd_show_rx_queue_desc_used_count_result *res = parsed_result; int rc; - if (!rte_eth_dev_is_valid_port(res->cmd_pid)) { - fprintf(stderr, "invalid port id %u\n", res->cmd_pid); + if (rte_eth_dev_is_valid_rxq(res->cmd_pid, res->cmd_qid) != 0) { + fprintf(stderr, + "Invalid input: port id = %d, queue id = %d\n", + res->cmd_pid, res->cmd_qid); return; }