From patchwork Wed Feb 8 07:33:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liu, Mingxia" X-Patchwork-Id: 123437 X-Patchwork-Delegate: qi.z.zhang@intel.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 721DE41C3C; Wed, 8 Feb 2023 09:31:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7B9C042D40; Wed, 8 Feb 2023 09:31:25 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 1CF3941151 for ; Wed, 8 Feb 2023 09:31:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675845083; x=1707381083; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QIYpXxiy57CB08hbHYJfQScgdsp5R6Jp5z15tCx4++Q=; b=EAlS7r4nKLFmlwZWe7t9ffuoTY/JuKZijc/ZfkjAg2zhNjD8pmcgds4o Z8PROPWb70xN3eu2qmOui6yNSofg2CiRJMtJEL/BSXEz8QBERnLXa1HBa F7i8L/K5a+1cTFk9r5shnt8aWHQOVnuavOSxh3F1OdUx7Zz72sZvMD4JB 5x33YcWC6SKcVdwkfuqoYMTOwLo4MeFYsIn/3vfF4urlvdtLo1qtDe/s2 c15ZwtTiLGzek/BlePfDi4ListEYzFidPxO5KpYjAnkQL8BecxKk6xFrC ctIbnnl0mzb0+bquy8zsrQ4EOnwyf2YDTfKqveahwyVfNRHwB02lhMIlD Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10614"; a="328399494" X-IronPort-AV: E=Sophos;i="5.97,280,1669104000"; d="scan'208";a="328399494" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2023 00:31:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10614"; a="841100148" X-IronPort-AV: E=Sophos;i="5.97,280,1669104000"; d="scan'208";a="841100148" Received: from dpdk-mingxial-01.sh.intel.com ([10.67.119.167]) by orsmga005.jf.intel.com with ESMTP; 08 Feb 2023 00:31:14 -0800 From: Mingxia Liu To: dev@dpdk.org Cc: jingjing.wu@intel.com, beilei.xing@intel.com, Mingxia Liu Subject: [PATCH v7 1/6] net/idpf: add hw statistics Date: Wed, 8 Feb 2023 07:33:56 +0000 Message-Id: <20230208073401.2468579-2-mingxia.liu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230208073401.2468579-1-mingxia.liu@intel.com> References: <20230207101650.2402452-1-mingxia.liu@intel.com> <20230208073401.2468579-1-mingxia.liu@intel.com> MIME-Version: 1.0 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 add hardware packets/bytes statistics. Signed-off-by: Mingxia Liu --- drivers/common/idpf/idpf_common_device.c | 17 +++++ drivers/common/idpf/idpf_common_device.h | 4 + drivers/common/idpf/idpf_common_virtchnl.c | 27 +++++++ drivers/common/idpf/idpf_common_virtchnl.h | 3 + drivers/common/idpf/version.map | 2 + drivers/net/idpf/idpf_ethdev.c | 86 ++++++++++++++++++++++ 6 files changed, 139 insertions(+) diff --git a/drivers/common/idpf/idpf_common_device.c b/drivers/common/idpf/idpf_common_device.c index 48b3e3c0dd..5475a3e52c 100644 --- a/drivers/common/idpf/idpf_common_device.c +++ b/drivers/common/idpf/idpf_common_device.c @@ -652,4 +652,21 @@ idpf_vport_info_init(struct idpf_vport *vport, return 0; } +void +idpf_vport_stats_update(struct virtchnl2_vport_stats *oes, struct virtchnl2_vport_stats *nes) +{ + nes->rx_bytes = nes->rx_bytes - oes->rx_bytes; + nes->rx_unicast = nes->rx_unicast - oes->rx_unicast; + nes->rx_multicast = nes->rx_multicast - oes->rx_multicast; + nes->rx_broadcast = nes->rx_broadcast - oes->rx_broadcast; + nes->rx_errors = nes->rx_errors - oes->rx_errors; + nes->rx_discards = nes->rx_discards - oes->rx_discards; + nes->tx_bytes = nes->tx_bytes - oes->tx_bytes; + nes->tx_unicast = nes->tx_unicast - oes->tx_unicast; + nes->tx_multicast = nes->tx_multicast - oes->tx_multicast; + nes->tx_broadcast = nes->tx_broadcast - oes->tx_broadcast; + nes->tx_errors = nes->tx_errors - oes->tx_errors; + nes->tx_discards = nes->tx_discards - oes->tx_discards; +} + RTE_LOG_REGISTER_SUFFIX(idpf_common_logtype, common, NOTICE); diff --git a/drivers/common/idpf/idpf_common_device.h b/drivers/common/idpf/idpf_common_device.h index 545117df79..1d8e7d405a 100644 --- a/drivers/common/idpf/idpf_common_device.h +++ b/drivers/common/idpf/idpf_common_device.h @@ -115,6 +115,8 @@ struct idpf_vport { bool tx_vec_allowed; bool rx_use_avx512; bool tx_use_avx512; + + struct virtchnl2_vport_stats eth_stats_offset; }; /* Message type read in virtual channel from PF */ @@ -191,5 +193,7 @@ int idpf_vport_irq_unmap_config(struct idpf_vport *vport, uint16_t nb_rx_queues) __rte_internal int idpf_vport_info_init(struct idpf_vport *vport, struct virtchnl2_create_vport *vport_info); +__rte_internal +void idpf_vport_stats_update(struct virtchnl2_vport_stats *oes, struct virtchnl2_vport_stats *nes); #endif /* _IDPF_COMMON_DEVICE_H_ */ diff --git a/drivers/common/idpf/idpf_common_virtchnl.c b/drivers/common/idpf/idpf_common_virtchnl.c index 31fadefbd3..40cff34c09 100644 --- a/drivers/common/idpf/idpf_common_virtchnl.c +++ b/drivers/common/idpf/idpf_common_virtchnl.c @@ -217,6 +217,7 @@ idpf_vc_cmd_execute(struct idpf_adapter *adapter, struct idpf_cmd_info *args) case VIRTCHNL2_OP_UNMAP_QUEUE_VECTOR: case VIRTCHNL2_OP_ALLOC_VECTORS: case VIRTCHNL2_OP_DEALLOC_VECTORS: + case VIRTCHNL2_OP_GET_STATS: /* for init virtchnl ops, need to poll the response */ err = idpf_vc_one_msg_read(adapter, args->ops, args->out_size, args->out_buffer); clear_cmd(adapter); @@ -806,6 +807,32 @@ idpf_vc_ptype_info_query(struct idpf_adapter *adapter) return err; } +int +idpf_vc_stats_query(struct idpf_vport *vport, + struct virtchnl2_vport_stats **pstats) +{ + struct idpf_adapter *adapter = vport->adapter; + struct virtchnl2_vport_stats vport_stats; + struct idpf_cmd_info args; + int err; + + vport_stats.vport_id = vport->vport_id; + args.ops = VIRTCHNL2_OP_GET_STATS; + args.in_args = (u8 *)&vport_stats; + args.in_args_size = sizeof(vport_stats); + args.out_buffer = adapter->mbx_resp; + args.out_size = IDPF_DFLT_MBX_BUF_SIZE; + + err = idpf_vc_cmd_execute(adapter, &args); + if (err) { + DRV_LOG(ERR, "Failed to execute command of VIRTCHNL2_OP_GET_STATS"); + *pstats = NULL; + return err; + } + *pstats = (struct virtchnl2_vport_stats *)args.out_buffer; + return 0; +} + #define IDPF_RX_BUF_STRIDE 64 int idpf_vc_rxq_config(struct idpf_vport *vport, struct idpf_rx_queue *rxq) diff --git a/drivers/common/idpf/idpf_common_virtchnl.h b/drivers/common/idpf/idpf_common_virtchnl.h index c105f02836..6b94fd5b8f 100644 --- a/drivers/common/idpf/idpf_common_virtchnl.h +++ b/drivers/common/idpf/idpf_common_virtchnl.h @@ -49,4 +49,7 @@ __rte_internal int idpf_vc_rxq_config(struct idpf_vport *vport, struct idpf_rx_queue *rxq); __rte_internal int idpf_vc_txq_config(struct idpf_vport *vport, struct idpf_tx_queue *txq); +__rte_internal +int idpf_vc_stats_query(struct idpf_vport *vport, + struct virtchnl2_vport_stats **pstats); #endif /* _IDPF_COMMON_VIRTCHNL_H_ */ diff --git a/drivers/common/idpf/version.map b/drivers/common/idpf/version.map index 8b33130bd6..e6a02828ba 100644 --- a/drivers/common/idpf/version.map +++ b/drivers/common/idpf/version.map @@ -46,6 +46,7 @@ INTERNAL { idpf_vc_rss_key_set; idpf_vc_rss_lut_set; idpf_vc_rxq_config; + idpf_vc_stats_query; idpf_vc_txq_config; idpf_vc_vectors_alloc; idpf_vc_vectors_dealloc; @@ -59,6 +60,7 @@ INTERNAL { idpf_vport_irq_map_config; idpf_vport_irq_unmap_config; idpf_vport_rss_config; + idpf_vport_stats_update; local: *; }; diff --git a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c index 33f5e90743..02ddb0330a 100644 --- a/drivers/net/idpf/idpf_ethdev.c +++ b/drivers/net/idpf/idpf_ethdev.c @@ -140,6 +140,87 @@ idpf_dev_supported_ptypes_get(struct rte_eth_dev *dev __rte_unused) return ptypes; } +static uint64_t +idpf_get_mbuf_alloc_failed_stats(struct rte_eth_dev *dev) +{ + uint64_t mbuf_alloc_failed = 0; + struct idpf_rx_queue *rxq; + int i = 0; + + for (i = 0; i < dev->data->nb_rx_queues; i++) { + rxq = dev->data->rx_queues[i]; + mbuf_alloc_failed += __atomic_load_n(&rxq->rx_stats.mbuf_alloc_failed, + __ATOMIC_RELAXED); + } + + return mbuf_alloc_failed; +} + +static int +idpf_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) +{ + struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; + struct virtchnl2_vport_stats *pstats = NULL; + int ret; + + ret = idpf_vc_stats_query(vport, &pstats); + if (ret == 0) { + uint8_t crc_stats_len = (dev->data->dev_conf.rxmode.offloads & + RTE_ETH_RX_OFFLOAD_KEEP_CRC) ? 0 : + RTE_ETHER_CRC_LEN; + + idpf_vport_stats_update(&vport->eth_stats_offset, pstats); + stats->ipackets = pstats->rx_unicast + pstats->rx_multicast + + pstats->rx_broadcast - pstats->rx_discards; + stats->opackets = pstats->tx_broadcast + pstats->tx_multicast + + pstats->tx_unicast; + stats->imissed = pstats->rx_discards; + stats->oerrors = pstats->tx_errors + pstats->tx_discards; + stats->ibytes = pstats->rx_bytes; + stats->ibytes -= stats->ipackets * crc_stats_len; + stats->obytes = pstats->tx_bytes; + + dev->data->rx_mbuf_alloc_failed = idpf_get_mbuf_alloc_failed_stats(dev); + stats->rx_nombuf = dev->data->rx_mbuf_alloc_failed; + } else { + PMD_DRV_LOG(ERR, "Get statistics failed"); + } + return ret; +} + +static void +idpf_reset_mbuf_alloc_failed_stats(struct rte_eth_dev *dev) +{ + struct idpf_rx_queue *rxq; + int i; + + for (i = 0; i < dev->data->nb_rx_queues; i++) { + rxq = dev->data->rx_queues[i]; + __atomic_store_n(&rxq->rx_stats.mbuf_alloc_failed, 0, __ATOMIC_RELAXED); + } +} + +static int +idpf_dev_stats_reset(struct rte_eth_dev *dev) +{ + struct idpf_vport *vport = + (struct idpf_vport *)dev->data->dev_private; + struct virtchnl2_vport_stats *pstats = NULL; + int ret; + + ret = idpf_vc_stats_query(vport, &pstats); + if (ret != 0) + return ret; + + /* set stats offset base on current values */ + vport->eth_stats_offset = *pstats; + + idpf_reset_mbuf_alloc_failed_stats(dev); + + return 0; +} + static int idpf_init_rss(struct idpf_vport *vport) { @@ -327,6 +408,9 @@ idpf_dev_start(struct rte_eth_dev *dev) goto err_vport; } + if (idpf_dev_stats_reset(dev)) + PMD_DRV_LOG(ERR, "Failed to reset stats"); + vport->stopped = 0; return 0; @@ -606,6 +690,8 @@ static const struct eth_dev_ops idpf_eth_dev_ops = { .tx_queue_release = idpf_dev_tx_queue_release, .mtu_set = idpf_dev_mtu_set, .dev_supported_ptypes_get = idpf_dev_supported_ptypes_get, + .stats_get = idpf_dev_stats_get, + .stats_reset = idpf_dev_stats_reset, }; static uint16_t