From patchwork Thu Oct 6 12:05:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongdong Liu X-Patchwork-Id: 117458 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 CABC7A00C2; Thu, 6 Oct 2022 14:07:09 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B497042C42; Thu, 6 Oct 2022 14:07:05 +0200 (CEST) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by mails.dpdk.org (Postfix) with ESMTP id 9532742BF0 for ; Thu, 6 Oct 2022 14:07:03 +0200 (CEST) Received: from kwepemi500017.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Mjqmv10S9zHtsY; Thu, 6 Oct 2022 20:02:07 +0800 (CST) Received: from localhost.localdomain (10.28.79.22) by kwepemi500017.china.huawei.com (7.221.188.110) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 6 Oct 2022 20:07:01 +0800 From: Dongdong Liu To: , , , , , , CC: Dongdong Liu , Min Hu Subject: [PATCH v5 1/3] ethdev: introduce ethdev desc dump API Date: Thu, 6 Oct 2022 20:05:12 +0800 Message-ID: <20221006120514.28830-2-liudongdong3@huawei.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20221006120514.28830-1-liudongdong3@huawei.com> References: <20220527023351.40577-1-humin29@huawei.com> <20221006120514.28830-1-liudongdong3@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.28.79.22] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemi500017.china.huawei.com (7.221.188.110) 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 Added the ethdev Rx/Tx desc dump API which provides functions for query descriptor from device. HW descriptor info differs in different NICs. The information demonstrates I/O process which is important for debug. As the information is different between NICs, the new API is introduced. Signed-off-by: Min Hu (Connor) Signed-off-by: Dongdong Liu Reviewed-by: Ferruh Yigit --- doc/guides/rel_notes/release_22_11.rst | 6 +++ lib/ethdev/ethdev_driver.h | 53 +++++++++++++++++++++++++ lib/ethdev/rte_ethdev.c | 52 ++++++++++++++++++++++++ lib/ethdev/rte_ethdev.h | 55 ++++++++++++++++++++++++++ lib/ethdev/version.map | 2 + 5 files changed, 168 insertions(+) diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index f1cc129933..453562fe69 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -144,6 +144,12 @@ New Features into single event containing ``rte_event_vector`` whose event type is ``RTE_EVENT_TYPE_CRYPTODEV_VECTOR``. +* **Added ethdev desc dump API, to dump Rx/Tx desc info from device.** + Added the ethdev Rx/Tx desc dump API which provides functions for query + descriptor from device. The descriptor info differs in different NICs. + The information demonstrates I/O process which is important for debug. + As the information is different between NICs, the new API is introduced. + The dump format is vendor-specific. Removed Items ------------- diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h index ea93f0418a..6505772a24 100644 --- a/lib/ethdev/ethdev_driver.h +++ b/lib/ethdev/ethdev_driver.h @@ -1094,6 +1094,54 @@ typedef int (*eth_rx_queue_avail_thresh_query_t)(struct rte_eth_dev *dev, uint16_t *rx_queue_id, uint8_t *avail_thresh); +/** + * @internal + * Dump Rx descriptor info to a file. + * + * It is used for debugging, not a dataplane API. + * + * @param dev + * Port (ethdev) handle. + * @param queue_id + * A Rx queue identifier on this port. + * @param offset + * The offset of the descriptor starting from tail. (0 is the next + * packet to be received by the driver). + * @param num + * The number of the descriptors to dump. + * @param file + * A pointer to a file for output. + * @return + * Negative errno value on error, zero on success. + */ +typedef int (*eth_rx_descriptor_dump_t)(const struct rte_eth_dev *dev, + uint16_t queue_id, uint16_t offset, + uint16_t num, FILE *file); + +/** + * @internal + * Dump Tx descriptor info to a file. + * + * This API is used for debugging, not a dataplane API. + * + * @param dev + * Port (ethdev) handle. + * @param queue_id + * A Tx queue identifier on this port. + * @param offset + * The offset of the descriptor starting from tail. (0 is the place where + * the next packet will be send). + * @param num + * The number of the descriptors to dump. + * @param file + * A pointer to a file for output. + * @return + * Negative errno value on error, zero on success. + */ +typedef int (*eth_tx_descriptor_dump_t)(const struct rte_eth_dev *dev, + uint16_t queue_id, uint16_t offset, + uint16_t num, FILE *file); + /** * @internal A structure containing the functions exported by an Ethernet driver. */ @@ -1309,6 +1357,11 @@ struct eth_dev_ops { eth_rx_queue_avail_thresh_set_t rx_queue_avail_thresh_set; /** Query Rx queue available descriptors threshold event */ eth_rx_queue_avail_thresh_query_t rx_queue_avail_thresh_query; + + /** Dump Rx descriptor info */ + eth_rx_descriptor_dump_t eth_rx_descriptor_dump; + /** Dump Tx descriptor info */ + eth_tx_descriptor_dump_t eth_tx_descriptor_dump; }; /** diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 01c141a039..c34d943631 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -6044,6 +6044,58 @@ rte_eth_dev_priv_dump(uint16_t port_id, FILE *file) return eth_err(port_id, (*dev->dev_ops->eth_dev_priv_dump)(dev, file)); } +int +rte_eth_rx_descriptor_dump(uint16_t port_id, uint16_t queue_id, + uint16_t offset, uint16_t num, FILE *file) +{ + struct rte_eth_dev *dev; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + + if (queue_id >= dev->data->nb_rx_queues) { + RTE_ETHDEV_LOG(ERR, "Invalid Rx queue_id=%u\n", queue_id); + return -EINVAL; + } + + if (file == NULL) { + RTE_ETHDEV_LOG(ERR, "Invalid file (NULL)\n"); + return -EINVAL; + } + + if (*dev->dev_ops->eth_rx_descriptor_dump == NULL) + return -ENOTSUP; + + return eth_err(port_id, (*dev->dev_ops->eth_rx_descriptor_dump)(dev, + queue_id, offset, num, file)); +} + +int +rte_eth_tx_descriptor_dump(uint16_t port_id, uint16_t queue_id, + uint16_t offset, uint16_t num, FILE *file) +{ + struct rte_eth_dev *dev; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + + if (queue_id >= dev->data->nb_tx_queues) { + RTE_ETHDEV_LOG(ERR, "Invalid Tx queue_id=%u\n", queue_id); + return -EINVAL; + } + + if (file == NULL) { + RTE_ETHDEV_LOG(ERR, "Invalid file (NULL)\n"); + return -EINVAL; + } + + if (*dev->dev_ops->eth_tx_descriptor_dump == NULL) + return -ENOTSUP; + + return eth_err(port_id, (*dev->dev_ops->eth_tx_descriptor_dump)(dev, + queue_id, offset, num, file)); +} + RTE_LOG_REGISTER_DEFAULT(rte_eth_dev_logtype, INFO); RTE_INIT(ethdev_init_telemetry) diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index e0158480dd..7e6571b25a 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -5312,6 +5312,61 @@ typedef struct { __rte_experimental int rte_eth_dev_priv_dump(uint16_t port_id, FILE *file); +/** + * @warning + * @b EXPERIMENTAL: this API may change, or be removed, without prior notice + * + * Dump ethdev Rx descriptor info to a file. + * + * This API is used for debugging, not a dataplane API. + * + * @param port_id + * The port identifier of the Ethernet device. + * @param queue_id + * A Rx queue identifier on this port. + * @param offset + * The offset of the descriptor starting from tail. (0 is the next + * packet to be received by the driver). + * @param num + * The number of the descriptors to dump. + * @param file + * A pointer to a file for output. + * @return + * - On success, zero. + * - On failure, a negative value. + */ +__rte_experimental +int rte_eth_rx_descriptor_dump(uint16_t port_id, uint16_t queue_id, + uint16_t offset, uint16_t num, FILE *file); + +/** + * @warning + * @b EXPERIMENTAL: this API may change, or be removed, without prior notice + * + * Dump ethdev Tx descriptor info to a file. + * + * This API is used for debugging, not a dataplane API. + * + * @param port_id + * The port identifier of the Ethernet device. + * @param queue_id + * A Tx queue identifier on this port. + * @param offset + * The offset of the descriptor starting from tail. (0 is the place where + * the next packet will be send). + * @param num + * The number of the descriptors to dump. + * @param file + * A pointer to a file for output. + * @return + * - On success, zero. + * - On failure, a negative value. + */ +__rte_experimental +int rte_eth_tx_descriptor_dump(uint16_t port_id, uint16_t queue_id, + uint16_t offset, uint16_t num, FILE *file); + + #include /** diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map index 3651ceb234..375e30adeb 100644 --- a/lib/ethdev/version.map +++ b/lib/ethdev/version.map @@ -290,6 +290,8 @@ EXPERIMENTAL { rte_flow_async_action_handle_query; rte_mtr_meter_policy_get; rte_mtr_meter_profile_get; + rte_eth_rx_descriptor_dump; + rte_eth_tx_descriptor_dump; }; INTERNAL { From patchwork Thu Oct 6 12:05:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongdong Liu X-Patchwork-Id: 117459 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 46559A00C2; Thu, 6 Oct 2022 14:07:15 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 92A1042C47; Thu, 6 Oct 2022 14:07:06 +0200 (CEST) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id DBD7142C3C for ; Thu, 6 Oct 2022 14:07:03 +0200 (CEST) Received: from kwepemi500017.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Mjqq12sK3zpSxX; Thu, 6 Oct 2022 20:03:57 +0800 (CST) Received: from localhost.localdomain (10.28.79.22) by kwepemi500017.china.huawei.com (7.221.188.110) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 6 Oct 2022 20:07:01 +0800 From: Dongdong Liu To: , , , , , , CC: Dongdong Liu , Min Hu , Yisen Zhuang Subject: [PATCH v5 2/3] net/hns3: support Rx/Tx bd dump Date: Thu, 6 Oct 2022 20:05:13 +0800 Message-ID: <20221006120514.28830-3-liudongdong3@huawei.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20221006120514.28830-1-liudongdong3@huawei.com> References: <20220527023351.40577-1-humin29@huawei.com> <20221006120514.28830-1-liudongdong3@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.28.79.22] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemi500017.china.huawei.com (7.221.188.110) 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 This patch support query HW descriptor from hns3 device. HW descriptor is also called BD(buffer description) which is shared memory between software and hardware. Signed-off-by: Min Hu (Connor) Signed-off-by: Dongdong Liu Acked-by: Ferruh Yigit --- drivers/net/hns3/hns3_dump.c | 88 +++++++++++++++++++++++++++++++ drivers/net/hns3/hns3_dump.h | 5 ++ drivers/net/hns3/hns3_ethdev.c | 2 + drivers/net/hns3/hns3_ethdev_vf.c | 2 + 4 files changed, 97 insertions(+) diff --git a/drivers/net/hns3/hns3_dump.c b/drivers/net/hns3/hns3_dump.c index 95b64f8896..ae62bb56c8 100644 --- a/drivers/net/hns3/hns3_dump.c +++ b/drivers/net/hns3/hns3_dump.c @@ -10,6 +10,9 @@ #include "hns3_rxtx.h" #include "hns3_dump.h" +#define HNS3_BD_DW_NUM 8 +#define HNS3_BD_ADDRESS_LAST_DW 2 + static const char * hns3_get_adapter_state_name(enum hns3_adapter_state state) { @@ -931,3 +934,88 @@ hns3_eth_dev_priv_dump(struct rte_eth_dev *dev, FILE *file) return 0; } + +int +hns3_rx_descriptor_dump(const struct rte_eth_dev *dev, uint16_t queue_id, + uint16_t offset, uint16_t num, FILE *file) +{ + struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct hns3_rx_queue *rxq = dev->data->rx_queues[queue_id]; + uint32_t *bd_data; + uint16_t count = 0; + uint16_t desc_id; + int i; + + if (offset >= rxq->nb_rx_desc) + return -EINVAL; + + if (num > rxq->nb_rx_desc) { + hns3_err(hw, "Invalid BD num=%u\n", num); + return -EINVAL; + } + + while (count < num) { + desc_id = (rxq->next_to_use + offset + count) % rxq->nb_rx_desc; + bd_data = (uint32_t *)(&rxq->rx_ring[desc_id]); + fprintf(file, "Rx queue id:%u BD id:%u\n", queue_id, desc_id); + for (i = 0; i < HNS3_BD_DW_NUM; i++) { + /* + * For the sake of security, first 8 bytes of BD which + * stands for physical address of packet should not be + * shown. + */ + if (i < HNS3_BD_ADDRESS_LAST_DW) { + fprintf(file, "RX BD WORD[%d]:0x%08x\n", i, 0); + continue; + } + fprintf(file, "RX BD WORD[%d]:0x%08x\n", i, + *(bd_data + i)); + } + count++; + } + + return 0; +} + +int +hns3_tx_descriptor_dump(const struct rte_eth_dev *dev, uint16_t queue_id, + uint16_t offset, uint16_t num, FILE *file) +{ + struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct hns3_tx_queue *txq = dev->data->tx_queues[queue_id]; + uint32_t *bd_data; + uint16_t count = 0; + uint16_t desc_id; + int i; + + if (offset >= txq->nb_tx_desc) + return -EINVAL; + + if (num > txq->nb_tx_desc) { + hns3_err(hw, "Invalid BD num=%u\n", num); + return -EINVAL; + } + + while (count < num) { + desc_id = (txq->next_to_use + offset + count) % txq->nb_tx_desc; + bd_data = (uint32_t *)(&txq->tx_ring[desc_id]); + fprintf(file, "Tx queue id:%u BD id:%u\n", queue_id, desc_id); + for (i = 0; i < HNS3_BD_DW_NUM; i++) { + /* + * For the sake of security, first 8 bytes of BD which + * stands for physical address of packet should not be + * shown. + */ + if (i < HNS3_BD_ADDRESS_LAST_DW) { + fprintf(file, "TX BD WORD[%d]:0x%08x\n", i, 0); + continue; + } + + fprintf(file, "Tx BD WORD[%d]:0x%08x\n", i, + *(bd_data + i)); + } + count++; + } + + return 0; +} diff --git a/drivers/net/hns3/hns3_dump.h b/drivers/net/hns3/hns3_dump.h index 43e983a42f..54f6c67e63 100644 --- a/drivers/net/hns3/hns3_dump.h +++ b/drivers/net/hns3/hns3_dump.h @@ -10,4 +10,9 @@ #include int hns3_eth_dev_priv_dump(struct rte_eth_dev *dev, FILE *file); + +int hns3_rx_descriptor_dump(const struct rte_eth_dev *dev, uint16_t queue_id, + uint16_t offset, uint16_t num, FILE *file); +int hns3_tx_descriptor_dump(const struct rte_eth_dev *dev, uint16_t queue_id, + uint16_t offset, uint16_t num, FILE *file); #endif /* HNS3_DUMP_H */ diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 813fcedc6a..b4365b78be 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -6558,6 +6558,8 @@ static const struct eth_dev_ops hns3_eth_dev_ops = { .timesync_read_time = hns3_timesync_read_time, .timesync_write_time = hns3_timesync_write_time, .eth_dev_priv_dump = hns3_eth_dev_priv_dump, + .eth_rx_descriptor_dump = hns3_rx_descriptor_dump, + .eth_tx_descriptor_dump = hns3_tx_descriptor_dump, }; static const struct hns3_reset_ops hns3_reset_ops = { diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index c1bbcf42b1..d220522c43 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -2302,6 +2302,8 @@ static const struct eth_dev_ops hns3vf_eth_dev_ops = { .dev_supported_ptypes_get = hns3_dev_supported_ptypes_get, .tx_done_cleanup = hns3_tx_done_cleanup, .eth_dev_priv_dump = hns3_eth_dev_priv_dump, + .eth_rx_descriptor_dump = hns3_rx_descriptor_dump, + .eth_tx_descriptor_dump = hns3_tx_descriptor_dump, }; static const struct hns3_reset_ops hns3vf_reset_ops = { From patchwork Thu Oct 6 12:05:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongdong Liu X-Patchwork-Id: 117460 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 DD0A5A00C2; Thu, 6 Oct 2022 14:07:19 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9062242C4D; Thu, 6 Oct 2022 14:07:07 +0200 (CEST) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id 5EBCA42B70 for ; Thu, 6 Oct 2022 14:07:04 +0200 (CEST) Received: from kwepemi500017.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4MjqnR4dKQzlXW3; Thu, 6 Oct 2022 20:02:35 +0800 (CST) Received: from localhost.localdomain (10.28.79.22) by kwepemi500017.china.huawei.com (7.221.188.110) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 6 Oct 2022 20:07:02 +0800 From: Dongdong Liu To: , , , , , , CC: Dongdong Liu , Min Hu , Maryam Tahhan Subject: [PATCH v5 3/3] app/procinfo: support descriptor dump Date: Thu, 6 Oct 2022 20:05:14 +0800 Message-ID: <20221006120514.28830-4-liudongdong3@huawei.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20221006120514.28830-1-liudongdong3@huawei.com> References: <20220527023351.40577-1-humin29@huawei.com> <20221006120514.28830-1-liudongdong3@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.28.79.22] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemi500017.china.huawei.com (7.221.188.110) 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 This patch support Rx/Tx descriptor dump The command is like: dpdk-proc-info -a xxxx:xx:xx.x --file-prefix=xxx -- --show-rx-descriptor queue_id:offset:num dpdk-proc-info -a xxxx:xx:xx.x --file-prefix=xxx -- --show-tx-descriptor queue_id:offset:num queue_id: A queue identifier on this port. offset: The offset of the descriptor starting from tail. num: The number of the descriptors to dump. Signed-off-by: Min Hu (Connor) Signed-off-by: Dongdong Liu --- app/proc-info/main.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/app/proc-info/main.c b/app/proc-info/main.c index d52ac8a038..d8a9639ad2 100644 --- a/app/proc-info/main.c +++ b/app/proc-info/main.c @@ -48,6 +48,9 @@ #define STATS_BDR_STR(w, s) printf("%.*s%s%.*s\n", w, \ STATS_BDR_FMT, s, w, STATS_BDR_FMT) +typedef int (*desc_dump_t)(uint16_t port_id, uint16_t queue_id, + uint16_t offset, uint16_t num, FILE *file); + /**< mask of enabled ports */ static unsigned long enabled_port_mask; /**< Enable stats. */ @@ -103,6 +106,19 @@ static char *mempool_iter_name; static uint32_t enable_dump_regs; static char *dump_regs_file_prefix; +/* Enable dump Rx/Tx descriptor. */ +#define DESC_PARAM_NUM 3 + +struct desc_param { + uint16_t queue_id; /* A queue identifier on this port. */ + uint16_t offset; /* The offset of the descriptor starting from tail. */ + uint16_t num; /* The number of the descriptors to dump. */ + bool valid; +}; + +static struct desc_param rx_desc_param; +static struct desc_param tx_desc_param; + /**< display usage */ static void proc_info_usage(const char *prgname) @@ -130,6 +146,14 @@ proc_info_usage(const char *prgname) " --show-crypto: to display crypto information\n" " --show-ring[=name]: to display ring information\n" " --show-mempool[=name]: to display mempool information\n" + " --show-rx-descriptor queue_id:offset:num to display ports Rx descriptor information. " + "queue_id: A Rx queue identifier on this port. " + "offset: The offset of the descriptor starting from tail. " + "num: The number of the descriptors to dump.\n" + " --show-tx-descriptor queue_id:offset:num to display ports Tx descriptor information. " + "queue_id: A Tx queue identifier on this port. " + "offset: The offset of the descriptor starting from tail. " + "num: The number of the descriptors to dump.\n" " --iter-mempool=name: iterate mempool elements to display content\n" " --dump-regs=file-prefix: dump registers to file with the file-prefix\n", prgname); @@ -182,6 +206,23 @@ parse_xstats_ids(char *list, uint64_t *ids, int limit) { return length; } +static int +parse_descriptor_param(char *list, struct desc_param *desc) +{ + int ret; + + ret = sscanf(list, "%hu:%hu:%hu", &desc->queue_id, &desc->offset, + &desc->num); + if (ret != DESC_PARAM_NUM) { + desc->valid = false; + return -EINVAL; + } + + desc->valid = true; + + return 0; +} + static int proc_info_preparse_args(int argc, char **argv) { @@ -242,6 +283,8 @@ proc_info_parse_args(int argc, char **argv) {"show-mempool", optional_argument, NULL, 0}, {"iter-mempool", required_argument, NULL, 0}, {"dump-regs", required_argument, NULL, 0}, + {"show-rx-descriptor", required_argument, NULL, 1}, + {"show-tx-descriptor", required_argument, NULL, 1}, {NULL, 0, 0, 0} }; @@ -334,6 +377,22 @@ proc_info_parse_args(int argc, char **argv) return -1; } nb_xstats_ids = ret; + } else if (!strncmp(long_option[option_index].name, + "show-rx-descriptor", MAX_LONG_OPT_SZ)) { + int ret = parse_descriptor_param(optarg, + &rx_desc_param); + if (ret < 0) { + printf("Rx descriptor param parse error.\n"); + return -1; + } + } else if (!strncmp(long_option[option_index].name, + "show-tx-descriptor", MAX_LONG_OPT_SZ)) { + int ret = parse_descriptor_param(optarg, + &tx_desc_param); + if (ret < 0) { + printf("Tx descriptor param parse error.\n"); + return -1; + } } break; default: @@ -1476,6 +1535,21 @@ dump_regs(char *file_prefix) } } +static void +nic_descriptor_display(uint16_t port_id, struct desc_param *desc, + desc_dump_t desc_dump) +{ + static const char *nic_desc_border = "###"; + uint16_t queue_id = desc->queue_id; + uint16_t offset = desc->offset; + uint16_t num = desc->num; + + printf("%s NIC descriptor for port %u %s\n", + nic_desc_border, port_id, nic_desc_border); + + desc_dump(port_id, queue_id, offset, num, stdout); +} + int main(int argc, char **argv) { @@ -1564,6 +1638,12 @@ main(int argc, char **argv) metrics_display(i); #endif + if (rx_desc_param.valid) + nic_descriptor_display(i, &rx_desc_param, + rte_eth_rx_descriptor_dump); + if (tx_desc_param.valid) + nic_descriptor_display(i, &tx_desc_param, + rte_eth_tx_descriptor_dump); } #ifdef RTE_LIB_METRICS