From patchwork Wed Jun 1 07:49:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "humin (Q)" X-Patchwork-Id: 112202 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru 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 E2BF4A0548; Wed, 1 Jun 2022 09:51:14 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 238304281E; Wed, 1 Jun 2022 09:51:08 +0200 (CEST) Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by mails.dpdk.org (Postfix) with ESMTP id 01F8F40694 for ; Wed, 1 Jun 2022 09:51:06 +0200 (CEST) Received: from kwepemi500012.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4LChCK5SN3zDqbX for ; Wed, 1 Jun 2022 15:50:37 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by kwepemi500012.china.huawei.com (7.221.188.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 1 Jun 2022 15:50:48 +0800 From: "Min Hu (Connor)" To: Subject: [PATCH v3 1/4] ethdev: introduce ethdev HW desc dump PI Date: Wed, 1 Jun 2022 15:49:27 +0800 Message-ID: <20220601074930.10313-2-humin29@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220601074930.10313-1-humin29@huawei.com> References: <20220527023351.40577-1-humin29@huawei.com> <20220601074930.10313-1-humin29@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500012.china.huawei.com (7.221.188.12) 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 HW Rx desc dump API which provides functions for query HW 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) --- doc/guides/rel_notes/release_22_07.rst | 7 ++++ lib/ethdev/ethdev_driver.h | 42 ++++++++++++++++++++++++ lib/ethdev/rte_ethdev.c | 44 ++++++++++++++++++++++++++ lib/ethdev/rte_ethdev.h | 44 ++++++++++++++++++++++++++ lib/ethdev/version.map | 2 ++ 5 files changed, 139 insertions(+) diff --git a/doc/guides/rel_notes/release_22_07.rst b/doc/guides/rel_notes/release_22_07.rst index 8932a1d478..56c675121a 100644 --- a/doc/guides/rel_notes/release_22_07.rst +++ b/doc/guides/rel_notes/release_22_07.rst @@ -137,6 +137,13 @@ New Features * ``RTE_EVENT_QUEUE_ATTR_WEIGHT`` * ``RTE_EVENT_QUEUE_ATTR_AFFINITY`` +* **Added ethdev HW desc dump API, to dump Rx/Tx HW desc info from device.** + + Added the ethdev HW Rx desc dump API which provides functions for query + HW 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. + Removed Items ------------- diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h index 69d9dc21d8..9c1726eb2d 100644 --- a/lib/ethdev/ethdev_driver.h +++ b/lib/ethdev/ethdev_driver.h @@ -1073,6 +1073,42 @@ typedef int (*eth_ip_reassembly_conf_set_t)(struct rte_eth_dev *dev, */ typedef int (*eth_dev_priv_dump_t)(struct rte_eth_dev *dev, FILE *file); +/** + * @internal + * Dump ethdev Rx descriptor info to a file. + * + * @param file + * A pointer to a file for output. + * @param dev + * Port (ethdev) handle. + * @param queue_id + * The selected queue. + * @param desc_id + * The selected descriptor. + * @return + * Negative errno value on error, zero on success. + */ +typedef int (*eth_rx_hw_desc_dump_t)(FILE *file, const struct rte_eth_dev *dev, + uint16_t queue_id, uint16_t desc_id); + +/** + * @internal + * Dump ethdev Tx descriptor info to a file. + * + * @param file + * A pointer to a file for output. + * @param dev + * Port (ethdev) handle. + * @param queue_id + * The selected queue. + * @param desc_id + * The selected descriptor. + * @return + * Negative errno value on error, zero on success. + */ +typedef int (*eth_tx_hw_desc_dump_t)(FILE *file, const struct rte_eth_dev *dev, + uint16_t queue_id, uint16_t desc_id); + /** * @internal A structure containing the functions exported by an Ethernet driver. */ @@ -1283,6 +1319,12 @@ struct eth_dev_ops { /** Dump private info from device */ eth_dev_priv_dump_t eth_dev_priv_dump; + + /** Dump ethdev Rx descriptor info */ + eth_rx_hw_desc_dump_t eth_rx_hw_desc_dump; + + /** Dump ethdev Tx descriptor info */ + eth_tx_hw_desc_dump_t eth_tx_hw_desc_dump; }; /** diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 46c088dc88..bbd8439fa0 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -5876,6 +5876,50 @@ 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_hw_desc_dump(FILE *file, uint16_t port_id, uint16_t queue_id, + uint16_t desc_id) +{ + struct rte_eth_dev *dev; + int ret; + + 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; + } + + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->eth_rx_hw_desc_dump, -ENOTSUP); + ret = (*dev->dev_ops->eth_rx_hw_desc_dump)(file, dev, queue_id, + desc_id); + + return ret; +} + +int +rte_eth_tx_hw_desc_dump(FILE *file, uint16_t port_id, uint16_t queue_id, + uint16_t desc_id) +{ + struct rte_eth_dev *dev; + int ret; + + 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; + } + + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->eth_tx_hw_desc_dump, -ENOTSUP); + ret = (*dev->dev_ops->eth_tx_hw_desc_dump)(file, dev, queue_id, + desc_id); + + return ret; +} + 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 02df65d923..56ae630209 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -5456,6 +5456,50 @@ 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. + * + * @param file + * A pointer to a file for output. + * @param dev + * Port (ethdev) handle. + * @param queue_id + * The selected queue. + * @param desc_id + * The selected descriptor. + * @return + * - On success, zero. + * - On failure, a negative value. + */ +__rte_experimental +int rte_eth_rx_hw_desc_dump(FILE *file, uint16_t port_id, uint16_t queue_id, + uint16_t desc_id); + +/** + * @warning + * @b EXPERIMENTAL: this API may change, or be removed, without prior notice + * + * Dump ethdev Tx descriptor info to a file. + * + * @param file + * A pointer to a file for output. + * @param dev + * Port (ethdev) handle. + * @param queue_id + * The selected queue. + * @param desc_id + * The selected descriptor. + * @return + * - On success, zero. + * - On failure, a negative value. + */ +__rte_experimental +int rte_eth_tx_hw_desc_dump(FILE *file, uint16_t port_id, uint16_t queue_id, + uint16_t desc_id); + #include /** diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map index daca7851f2..109f4ea818 100644 --- a/lib/ethdev/version.map +++ b/lib/ethdev/version.map @@ -285,6 +285,8 @@ EXPERIMENTAL { rte_mtr_color_in_protocol_priority_get; rte_mtr_color_in_protocol_set; rte_mtr_meter_vlan_table_update; + rte_eth_rx_hw_desc_dump; + rte_eth_tx_hw_desc_dump; }; INTERNAL { From patchwork Wed Jun 1 07:49:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "humin (Q)" X-Patchwork-Id: 112201 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru 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 CDBFBA0548; Wed, 1 Jun 2022 09:51:08 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 36B344281A; Wed, 1 Jun 2022 09:50:55 +0200 (CEST) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by mails.dpdk.org (Postfix) with ESMTP id 477B840A84 for ; Wed, 1 Jun 2022 09:50:51 +0200 (CEST) Received: from kwepemi500012.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4LChBC1497zjXBd for ; Wed, 1 Jun 2022 15:49:39 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by kwepemi500012.china.huawei.com (7.221.188.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 1 Jun 2022 15:50:48 +0800 From: "Min Hu (Connor)" To: Subject: [PATCH v3 2/4] net/hns3: rename hns3 dump files Date: Wed, 1 Jun 2022 15:49:28 +0800 Message-ID: <20220601074930.10313-3-humin29@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220601074930.10313-1-humin29@huawei.com> References: <20220527023351.40577-1-humin29@huawei.com> <20220601074930.10313-1-humin29@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500012.china.huawei.com (7.221.188.12) 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 rename hns3 dump files and abstract a head file for dump. Signed-off-by: Min Hu (Connor) --- .../net/hns3/{hns3_ethdev_dump.c => hns3_dump.c} | 2 +- drivers/net/hns3/hns3_dump.h | 13 +++++++++++++ drivers/net/hns3/hns3_ethdev.c | 1 + drivers/net/hns3/hns3_ethdev.h | 1 - drivers/net/hns3/hns3_ethdev_vf.c | 1 + drivers/net/hns3/meson.build | 2 +- 6 files changed, 17 insertions(+), 3 deletions(-) rename drivers/net/hns3/{hns3_ethdev_dump.c => hns3_dump.c} (99%) create mode 100644 drivers/net/hns3/hns3_dump.h diff --git a/drivers/net/hns3/hns3_ethdev_dump.c b/drivers/net/hns3/hns3_dump.c similarity index 99% rename from drivers/net/hns3/hns3_ethdev_dump.c rename to drivers/net/hns3/hns3_dump.c index 1bb2ab7556..2cfab429af 100644 --- a/drivers/net/hns3/hns3_ethdev_dump.c +++ b/drivers/net/hns3/hns3_dump.c @@ -6,7 +6,7 @@ #include "hns3_logs.h" #include "hns3_regs.h" #include "hns3_rxtx.h" -#include "hns3_ethdev.h" +#include "hns3_dump.h" static const char * get_adapter_state_name(enum hns3_adapter_state state) diff --git a/drivers/net/hns3/hns3_dump.h b/drivers/net/hns3/hns3_dump.h new file mode 100644 index 0000000000..b0fe37ee21 --- /dev/null +++ b/drivers/net/hns3/hns3_dump.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(C) 2022 HiSilicon Limited + */ + +#ifndef _HNS3_DUMP_H_ +#define _HNS3_DUMP_H_ + +#include + +#include + +int hns3_eth_dev_priv_dump(struct rte_eth_dev *dev, FILE *file); +#endif /* _HNS3_DUMP_H_ */ diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 0b565a5614..6fa07c4c94 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -8,6 +8,7 @@ #include "hns3_ethdev.h" #include "hns3_common.h" +#include "hns3_dump.h" #include "hns3_logs.h" #include "hns3_rxtx.h" #include "hns3_intr.h" diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h index 5e8a746514..8de5a712f4 100644 --- a/drivers/net/hns3/hns3_ethdev.h +++ b/drivers/net/hns3/hns3_ethdev.h @@ -1062,7 +1062,6 @@ int hns3_timesync_read_time(struct rte_eth_dev *dev, struct timespec *ts); int hns3_timesync_write_time(struct rte_eth_dev *dev, const struct timespec *ts); int hns3_timesync_adjust_time(struct rte_eth_dev *dev, int64_t delta); -int hns3_eth_dev_priv_dump(struct rte_eth_dev *dev, FILE *file); static inline bool is_reset_pending(struct hns3_adapter *hns) diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index 589de0ab3a..5fc6515de9 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -10,6 +10,7 @@ #include "hns3_ethdev.h" #include "hns3_common.h" +#include "hns3_dump.h" #include "hns3_logs.h" #include "hns3_rxtx.h" #include "hns3_regs.h" diff --git a/drivers/net/hns3/meson.build b/drivers/net/hns3/meson.build index f2aede94ed..dc99cb0209 100644 --- a/drivers/net/hns3/meson.build +++ b/drivers/net/hns3/meson.build @@ -30,7 +30,7 @@ sources = files( 'hns3_tm.c', 'hns3_ptp.c', 'hns3_common.c', - 'hns3_ethdev_dump.c', + 'hns3_dump.c', ) deps += ['hash'] From patchwork Wed Jun 1 07:49:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "humin (Q)" X-Patchwork-Id: 112200 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru 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 4151CA0548; Wed, 1 Jun 2022 09:51:02 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4FFDC4113F; Wed, 1 Jun 2022 09:50:54 +0200 (CEST) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id 4090940694 for ; Wed, 1 Jun 2022 09:50:50 +0200 (CEST) Received: from kwepemi500012.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4LChBb0576zjXGS for ; Wed, 1 Jun 2022 15:49:58 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by kwepemi500012.china.huawei.com (7.221.188.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 1 Jun 2022 15:50:49 +0800 From: "Min Hu (Connor)" To: Subject: [PATCH v3 3/4] net/hns3: support Rx/Tx bd dump Date: Wed, 1 Jun 2022 15:49:29 +0800 Message-ID: <20220601074930.10313-4-humin29@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220601074930.10313-1-humin29@huawei.com> References: <20220527023351.40577-1-humin29@huawei.com> <20220601074930.10313-1-humin29@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500012.china.huawei.com (7.221.188.12) 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) --- drivers/net/hns3/hns3_dump.c | 64 +++++++++++++++++++++++++++++++ drivers/net/hns3/hns3_dump.h | 4 ++ drivers/net/hns3/hns3_ethdev.c | 2 + drivers/net/hns3/hns3_ethdev_vf.c | 2 + 4 files changed, 72 insertions(+) diff --git a/drivers/net/hns3/hns3_dump.c b/drivers/net/hns3/hns3_dump.c index 2cfab429af..74f687f0d7 100644 --- a/drivers/net/hns3/hns3_dump.c +++ b/drivers/net/hns3/hns3_dump.c @@ -8,6 +8,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 * get_adapter_state_name(enum hns3_adapter_state state) { @@ -911,3 +914,64 @@ hns3_eth_dev_priv_dump(struct rte_eth_dev *dev, FILE *file) return 0; } + +int hns3_rx_hw_desc_dump(FILE *file, const struct rte_eth_dev *dev, + uint16_t queue_id, uint16_t desc_id) +{ + 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; + int i; + + if (desc_id >= rxq->nb_rx_desc) { + hns3_err(hw, "Invalid Rx BD id=%u\n", desc_id); + return -EINVAL; + } + + 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)); + } + + return 0; +} + +int hns3_tx_hw_desc_dump(FILE *file, const struct rte_eth_dev *dev, + uint16_t queue_id, uint16_t desc_id) +{ + 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; + int i; + + if (desc_id >= txq->nb_tx_desc) { + hns3_err(hw, "Invalid Tx BD id=%u\n", desc_id); + return -EINVAL; + } + + 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)); + } + + return 0; +} diff --git a/drivers/net/hns3/hns3_dump.h b/drivers/net/hns3/hns3_dump.h index b0fe37ee21..3dcd9a0466 100644 --- a/drivers/net/hns3/hns3_dump.h +++ b/drivers/net/hns3/hns3_dump.h @@ -10,4 +10,8 @@ #include int hns3_eth_dev_priv_dump(struct rte_eth_dev *dev, FILE *file); +int hns3_rx_hw_desc_dump(FILE *file, const struct rte_eth_dev *dev, + uint16_t queue_id, uint16_t desc_id); +int hns3_tx_hw_desc_dump(FILE *file, const struct rte_eth_dev *dev, + uint16_t queue_id, uint16_t desc_id); #endif /* _HNS3_DUMP_H_ */ diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 6fa07c4c94..ad5018f8a1 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -6562,6 +6562,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_hw_desc_dump = hns3_rx_hw_desc_dump, + .eth_tx_hw_desc_dump = hns3_tx_hw_desc_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 5fc6515de9..26173442b2 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -2288,6 +2288,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_hw_desc_dump = hns3_rx_hw_desc_dump, + .eth_tx_hw_desc_dump = hns3_tx_hw_desc_dump, }; static const struct hns3_reset_ops hns3vf_reset_ops = { From patchwork Wed Jun 1 07:49:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "humin (Q)" X-Patchwork-Id: 112199 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru 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 98C52A0548; Wed, 1 Jun 2022 09:50:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6C84B40DF7; Wed, 1 Jun 2022 09:50:53 +0200 (CEST) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id 435804069F for ; Wed, 1 Jun 2022 09:50:51 +0200 (CEST) Received: from kwepemi500012.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4LChBb1jtszjXGT for ; Wed, 1 Jun 2022 15:49:59 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by kwepemi500012.china.huawei.com (7.221.188.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 1 Jun 2022 15:50:49 +0800 From: "Min Hu (Connor)" To: Subject: [PATCH v3 4/4] app/procinfo: support descriptor dump Date: Wed, 1 Jun 2022 15:49:30 +0800 Message-ID: <20220601074930.10313-5-humin29@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220601074930.10313-1-humin29@huawei.com> References: <20220527023351.40577-1-humin29@huawei.com> <20220601074930.10313-1-humin29@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500012.china.huawei.com (7.221.188.12) 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 HW Rx/Tx descriptor dump The command is like: dpdk-proc-info -a xxxx:xx:xx.x --file-prefix=xxx -- -- --show-rx-descriptor queue_id:descriptor_id dpdk-proc-info -a xxxx:xx:xx.x --file-prefix=xxx -- -- --show-tx-descriptor queue_id:descriptor_id Signed-off-by: Min Hu (Connor) --- app/proc-info/main.c | 81 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/app/proc-info/main.c b/app/proc-info/main.c index 56070a3317..eab1b546d1 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)(FILE *file, uint16_t port_id, uint16_t queue_id, + uint16_t desc_id); + /**< mask of enabled ports */ static unsigned long enabled_port_mask; /**< Enable stats. */ @@ -100,6 +103,12 @@ static char *mempool_iter_name; /**< Enable dump regs. */ static uint32_t enable_dump_regs; static char *dump_regs_file_prefix; +/**< Enable dump buffer descriptor. */ +#define MAX_NB_ITEM 2 +static uint16_t rx_nb_item; +static uint16_t tx_nb_item; +static uint16_t rx_item_opt[MAX_NB_ITEM]; +static uint16_t tx_item_opt[MAX_NB_ITEM]; /**< display usage */ static void @@ -127,6 +136,8 @@ 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:descriptor_id: to display ports Rx buffer description by queue id and descriptor id\n" + " --show-tx-descriptor queue_id:descriptor_id: to display ports Tx buffer description by queue id and descriptor id\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); @@ -179,6 +190,34 @@ parse_xstats_ids(char *list, uint64_t *ids, int limit) { return length; } +/* + * Parse ids value list into array + */ +static int +parse_descriptor_param(char *list, uint16_t *item_opt, int limit) +{ + int length; + char *token; + char *ctx = NULL; + char *endptr; + + length = 0; + token = strtok_r(list, ":", &ctx); + while (token != NULL) { + item_opt[length] = strtoul(token, &endptr, 10); + if (*endptr != '\0') + return -EINVAL; + + length++; + if (length > limit) + return -E2BIG; + + token = strtok_r(NULL, ":", &ctx); + } + + return length; +} + static int proc_info_preparse_args(int argc, char **argv) { @@ -238,6 +277,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} }; @@ -327,6 +368,26 @@ 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_item_opt, + MAX_NB_ITEM); + if (ret < MAX_NB_ITEM) { + printf("Rx descriptor param parse error.\n"); + return -1; + } + rx_nb_item = ret; + } else if (!strncmp(long_option[option_index].name, + "show-tx-descriptor", MAX_LONG_OPT_SZ)) { + int ret = parse_descriptor_param(optarg, + tx_item_opt, + MAX_NB_ITEM); + if (ret < MAX_NB_ITEM) { + printf("Tx descriptor param parse error.\n"); + return -1; + } + tx_nb_item = ret; } break; default: @@ -1450,6 +1511,20 @@ dump_regs(char *file_prefix) } } +static void +nic_descriptor_display(uint16_t port_id, uint16_t *item_opt, + desc_dump_t desc_dump) +{ + static const char *nic_desc_border = "###"; + uint16_t queue_id = item_opt[0]; + uint16_t desc_id = item_opt[1]; + + printf("%s NIC descriptor for port %u %s\n", + nic_desc_border, port_id, nic_desc_border); + + desc_dump(stdout, port_id, queue_id, desc_id); +} + int main(int argc, char **argv) { @@ -1533,6 +1608,12 @@ main(int argc, char **argv) else if (nb_xstats_ids > 0) nic_xstats_by_ids_display(i, xstats_ids, nb_xstats_ids); + else if (rx_nb_item > 0) + nic_descriptor_display(i, rx_item_opt, + rte_eth_rx_hw_desc_dump); + else if (tx_nb_item > 0) + nic_descriptor_display(i, tx_item_opt, + rte_eth_tx_hw_desc_dump); #ifdef RTE_LIB_METRICS else if (enable_metrics) metrics_display(i);