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 A83E7A04C5; Fri, 4 Sep 2020 13:35:16 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 03E231C11B; Fri, 4 Sep 2020 13:34:46 +0200 (CEST) Received: from huawei.com (szxga06-in.huawei.com [45.249.212.32]) by dpdk.org (Postfix) with ESMTP id 3B1C11C0C6 for ; Fri, 4 Sep 2020 13:34:39 +0200 (CEST) Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 1E7931C28BB539276696; Fri, 4 Sep 2020 19:34:36 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.487.0; Fri, 4 Sep 2020 19:34:31 +0800 From: "Min Hu (Connor)" To: CC: , , , Date: Fri, 4 Sep 2020 19:32:12 +0800 Message-ID: <1599219135-53194-2-git-send-email-humin29@huawei.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1599219135-53194-1-git-send-email-humin29@huawei.com> References: <1598961165-20832-2-git-send-email-humin29@huawei.com> <1599219135-53194-1-git-send-email-humin29@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.69.192.56] X-CFilter-Loop: Reflected Subject: [dpdk-dev] [PATCH V2 1/4] ethdev: fix compiling errors for per-queue statistics 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: Huisong Li Currently, only statistics of rx/tx queues with queue_id less than RTE_ETHDEV_QUEUE_STAT_CNTRS can be displayed. If there is a certain application scenario that it needs to use 256 or more than 256 queues and display all statistics of rx/tx queue. At this moment, we have to change the macro to be equaled to the queue number. However, modifying the macro to be greater than 256 will trigger many errors and warnings from test-pmd, PMD driver and librte_ethdev during compiling dpdk project. But it is possible and permited that rx/tx queue number is greater than 256 and all statistics of rx/tx queue need to be displayed. In addition, the data type of rx/tx queue number in rte_eth_dev_configure API is 'uint16_t'. So It is unreasonable to use the 'uint8_t' type for variables that control which per-queue statistics can be displayed. Fixes: ed30d9b691b2 ("app/testpmd: add stats per queue") Fixes: 09c7e63a71f9 ("net/memif: introduce memory interface PMD") Fixes: abf7275bbaa2 ("ixgbe: move to drivers/net/") Fixes: e6defdfddc3b ("net/igc: enable statistics") Fixes: 2265e4b4e84b ("net/octeontx2: add basic stats operation") Fixes: 6c3169a3dc04 ("virtio: move to drivers/net/") Cc: stable@dpdk.org Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) Reviewed-by: Wei Hu (Xavier) Reviewed-by: Dongdong Liu --- app/proc-info/main.c | 2 +- app/test-pmd/cmdline.c | 2 +- app/test-pmd/config.c | 4 ++-- app/test-pmd/testpmd.c | 2 +- app/test-pmd/testpmd.h | 5 +++-- drivers/net/igc/igc_ethdev.c | 4 ++-- drivers/net/ixgbe/ixgbe_ethdev.c | 4 ++-- drivers/net/memif/rte_eth_memif.c | 2 +- drivers/net/octeontx2/otx2_ethdev.h | 2 +- drivers/net/octeontx2/otx2_stats.c | 2 +- drivers/net/virtio/virtio_ethdev.c | 4 ++-- lib/librte_ethdev/rte_ethdev.c | 6 +++--- lib/librte_ethdev/rte_ethdev.h | 4 ++-- lib/librte_ethdev/rte_ethdev_core.h | 2 +- 14 files changed, 23 insertions(+), 22 deletions(-) diff --git a/app/proc-info/main.c b/app/proc-info/main.c index abeca4a..2c70c33 100644 --- a/app/proc-info/main.c +++ b/app/proc-info/main.c @@ -348,7 +348,7 @@ static void nic_stats_display(uint16_t port_id) { struct rte_eth_stats stats; - uint8_t i; + uint16_t i; static const char *nic_stats_border = "########################"; diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 0a6ed85..40b6b17 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -8244,7 +8244,7 @@ struct cmd_set_qmap_result { cmdline_fixed_string_t what; portid_t port_id; uint16_t queue_id; - uint8_t map_value; + uint16_t map_value; }; static void diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 30bee33..9e7526d 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -160,7 +160,7 @@ nic_stats_display(portid_t port_id) uint64_t mpps_rx, mpps_tx, mbps_rx, mbps_tx; struct rte_eth_stats stats; struct rte_port *port = &ports[port_id]; - uint8_t i; + uint16_t i; static const char *nic_stats_border = "########################"; @@ -3623,7 +3623,7 @@ tx_vlan_pvid_set(portid_t port_id, uint16_t vlan_id, int on) } void -set_qmap(portid_t port_id, uint8_t is_rx, uint16_t queue_id, uint8_t map_value) +set_qmap(portid_t port_id, uint8_t is_rx, uint16_t queue_id, uint16_t map_value) { uint16_t i; uint8_t existing_mapping_found = 0; diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 7842c3b..d5503bc 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -1835,7 +1835,7 @@ fwd_stats_display(void) #endif } for (i = 0; i < cur_fwd_config.nb_fwd_ports; i++) { - uint8_t j; + uint16_t j; pt_id = fwd_ports_ids[i]; port = &ports[pt_id]; diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 25a12b1..4ac87b0 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -285,7 +285,7 @@ enum dcb_mode_enable struct queue_stats_mappings { portid_t port_id; uint16_t queue_id; - uint8_t stats_counter_id; + uint16_t stats_counter_id; } __rte_cache_aligned; extern struct queue_stats_mappings tx_queue_stats_mappings_array[]; @@ -768,7 +768,8 @@ void tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer); void tx_vlan_reset(portid_t port_id); void tx_vlan_pvid_set(portid_t port_id, uint16_t vlan_id, int on); -void set_qmap(portid_t port_id, uint8_t is_rx, uint16_t queue_id, uint8_t map_value); +void set_qmap(portid_t port_id, uint8_t is_rx, uint16_t queue_id, + uint16_t map_value); void set_xstats_hide_zero(uint8_t on_off); diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c index 6ab3ee9..7211505 100644 --- a/drivers/net/igc/igc_ethdev.c +++ b/drivers/net/igc/igc_ethdev.c @@ -221,7 +221,7 @@ static int eth_igc_xstats_get_names_by_id(struct rte_eth_dev *dev, static int eth_igc_xstats_reset(struct rte_eth_dev *dev); static int eth_igc_queue_stats_mapping_set(struct rte_eth_dev *dev, - uint16_t queue_id, uint8_t stat_idx, uint8_t is_rx); + uint16_t queue_id, uint16_t stat_idx, uint8_t is_rx); static int eth_igc_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id); static int @@ -2076,7 +2076,7 @@ eth_igc_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, static int eth_igc_queue_stats_mapping_set(struct rte_eth_dev *dev, - uint16_t queue_id, uint8_t stat_idx, uint8_t is_rx) + uint16_t queue_id, uint16_t stat_idx, uint8_t is_rx) { struct igc_adapter *igc = IGC_DEV_PRIVATE(dev); diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index fd0cb9b..8c418f5 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -178,7 +178,7 @@ static int ixgbe_dev_xstats_get_names_by_id( unsigned int limit); static int ixgbe_dev_queue_stats_mapping_set(struct rte_eth_dev *eth_dev, uint16_t queue_id, - uint8_t stat_idx, + uint16_t stat_idx, uint8_t is_rx); static int ixgbe_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size); @@ -897,7 +897,7 @@ ixgbe_reset_qstat_mappings(struct ixgbe_hw *hw) static int ixgbe_dev_queue_stats_mapping_set(struct rte_eth_dev *eth_dev, uint16_t queue_id, - uint8_t stat_idx, + uint16_t stat_idx, uint8_t is_rx) { #define QSM_REG_NB_BITS_PER_QMAP_FIELD 8 diff --git a/drivers/net/memif/rte_eth_memif.c b/drivers/net/memif/rte_eth_memif.c index c1c7e9f..696475c 100644 --- a/drivers/net/memif/rte_eth_memif.c +++ b/drivers/net/memif/rte_eth_memif.c @@ -1341,7 +1341,7 @@ memif_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) struct pmd_internals *pmd = dev->data->dev_private; struct memif_queue *mq; int i; - uint8_t tmp, nq; + uint16_t tmp, nq; stats->ipackets = 0; stats->ibytes = 0; diff --git a/drivers/net/octeontx2/otx2_ethdev.h b/drivers/net/octeontx2/otx2_ethdev.h index e9efe52..8c1cf78 100644 --- a/drivers/net/octeontx2/otx2_ethdev.h +++ b/drivers/net/octeontx2/otx2_ethdev.h @@ -476,7 +476,7 @@ int otx2_nix_dev_stats_get(struct rte_eth_dev *eth_dev, int otx2_nix_dev_stats_reset(struct rte_eth_dev *eth_dev); int otx2_nix_queue_stats_mapping(struct rte_eth_dev *dev, - uint16_t queue_id, uint8_t stat_idx, + uint16_t queue_id, uint16_t stat_idx, uint8_t is_rx); int otx2_nix_xstats_get(struct rte_eth_dev *eth_dev, struct rte_eth_xstat *xstats, unsigned int n); diff --git a/drivers/net/octeontx2/otx2_stats.c b/drivers/net/octeontx2/otx2_stats.c index 8aaf270..6efe122 100644 --- a/drivers/net/octeontx2/otx2_stats.c +++ b/drivers/net/octeontx2/otx2_stats.c @@ -145,7 +145,7 @@ otx2_nix_dev_stats_reset(struct rte_eth_dev *eth_dev) int otx2_nix_queue_stats_mapping(struct rte_eth_dev *eth_dev, uint16_t queue_id, - uint8_t stat_idx, uint8_t is_rx) + uint16_t stat_idx, uint8_t is_rx) { struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev); diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index dc0093b..8144bb2 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -82,7 +82,7 @@ static int virtio_intr_disable(struct rte_eth_dev *dev); static int virtio_dev_queue_stats_mapping_set( struct rte_eth_dev *eth_dev, uint16_t queue_id, - uint8_t stat_idx, + uint16_t stat_idx, uint8_t is_rx); static void virtio_notify_peers(struct rte_eth_dev *dev); @@ -2647,7 +2647,7 @@ virtio_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) */ static int virtio_dev_queue_stats_mapping_set(__rte_unused struct rte_eth_dev *eth_dev, -__rte_unused uint16_t queue_id, __rte_unused uint8_t stat_idx, +__rte_unused uint16_t queue_id, __rte_unused uint16_t stat_idx, __rte_unused uint8_t is_rx) { return 0; diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index 7858ad5..cf1f5d7 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -2905,7 +2905,7 @@ rte_eth_xstats_reset(uint16_t port_id) } static int -set_queue_stats_mapping(uint16_t port_id, uint16_t queue_id, uint8_t stat_idx, +set_queue_stats_mapping(uint16_t port_id, uint16_t queue_id, uint16_t stat_idx, uint8_t is_rx) { struct rte_eth_dev *dev; @@ -2932,7 +2932,7 @@ set_queue_stats_mapping(uint16_t port_id, uint16_t queue_id, uint8_t stat_idx, int rte_eth_dev_set_tx_queue_stats_mapping(uint16_t port_id, uint16_t tx_queue_id, - uint8_t stat_idx) + uint16_t stat_idx) { return eth_err(port_id, set_queue_stats_mapping(port_id, tx_queue_id, stat_idx, STAT_QMAP_TX)); @@ -2941,7 +2941,7 @@ rte_eth_dev_set_tx_queue_stats_mapping(uint16_t port_id, uint16_t tx_queue_id, int rte_eth_dev_set_rx_queue_stats_mapping(uint16_t port_id, uint16_t rx_queue_id, - uint8_t stat_idx) + uint16_t stat_idx) { return eth_err(port_id, set_queue_stats_mapping(port_id, rx_queue_id, stat_idx, STAT_QMAP_RX)); diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h index 70295d7..e073c0e 100644 --- a/lib/librte_ethdev/rte_ethdev.h +++ b/lib/librte_ethdev/rte_ethdev.h @@ -2610,7 +2610,7 @@ int rte_eth_xstats_reset(uint16_t port_id); * Zero if successful. Non-zero otherwise. */ int rte_eth_dev_set_tx_queue_stats_mapping(uint16_t port_id, - uint16_t tx_queue_id, uint8_t stat_idx); + uint16_t tx_queue_id, uint16_t stat_idx); /** * Set a mapping for the specified receive queue to the specified per-queue @@ -2631,7 +2631,7 @@ int rte_eth_dev_set_tx_queue_stats_mapping(uint16_t port_id, */ int rte_eth_dev_set_rx_queue_stats_mapping(uint16_t port_id, uint16_t rx_queue_id, - uint8_t stat_idx); + uint16_t stat_idx); /** * Retrieve the Ethernet address of an Ethernet device. diff --git a/lib/librte_ethdev/rte_ethdev_core.h b/lib/librte_ethdev/rte_ethdev_core.h index 32407dd..6061782 100644 --- a/lib/librte_ethdev/rte_ethdev_core.h +++ b/lib/librte_ethdev/rte_ethdev_core.h @@ -223,7 +223,7 @@ typedef int (*eth_xstats_get_names_by_id_t)(struct rte_eth_dev *dev, typedef int (*eth_queue_stats_mapping_set_t)(struct rte_eth_dev *dev, uint16_t queue_id, - uint8_t stat_idx, + uint16_t stat_idx, uint8_t is_rx); /**< @internal Set a queue statistics mapping for a tx/rx queue of an Ethernet device. */ -- 2.7.4