From patchwork Tue Sep 29 14:32:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Van Haaren, Harry" X-Patchwork-Id: 7274 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 6E3228E8D; Tue, 29 Sep 2015 16:33:43 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 4D2958E8D for ; Tue, 29 Sep 2015 16:33:41 +0200 (CEST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP; 29 Sep 2015 07:33:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,608,1437462000"; d="scan'208";a="570543189" Received: from sie-lab-212-222.ir.intel.com (HELO silpixa00366884.ir.intel.com) ([10.237.212.222]) by FMSMGA003.fm.intel.com with ESMTP; 29 Sep 2015 07:33:40 -0700 From: Harry van Haaren To: dev@dpdk.org Date: Tue, 29 Sep 2015 15:32:55 +0100 Message-Id: <1443537175-13809-12-git-send-email-harry.van.haaren@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1443537175-13809-1-git-send-email-harry.van.haaren@intel.com> References: <1443537175-13809-1-git-send-email-harry.van.haaren@intel.com> Subject: [dpdk-dev] [PATCH 11/11] fm10k: add xstats() implementation X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add xstats() functions and statistic strings. Signed-off-by: Harry van Haaren --- drivers/net/fm10k/fm10k_ethdev.c | 82 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c index a69c990..5ef3553 100644 --- a/drivers/net/fm10k/fm10k_ethdev.c +++ b/drivers/net/fm10k/fm10k_ethdev.c @@ -68,6 +68,37 @@ fm10k_MACVLAN_remove_all(struct rte_eth_dev *dev); static void fm10k_tx_queue_release(void *queue); static void fm10k_rx_queue_release(void *queue); +struct rte_fm10k_xstats_name_off { + char name[RTE_ETH_XSTATS_NAME_SIZE]; + unsigned offset; +}; + +struct rte_fm10k_xstats_name_off rte_fm10k_hw_stats_strings[] = { + {"completion_timeout_count", offsetof(struct fm10k_hw_stats, timeout)}, + {"unsupported_requests_count", offsetof(struct fm10k_hw_stats, ur)}, + {"completer_abort_count", offsetof(struct fm10k_hw_stats, ca)}, + {"unsupported_message_count", offsetof(struct fm10k_hw_stats, um)}, + {"checksum_error_count", offsetof(struct fm10k_hw_stats, xec)}, + {"vlan_drops", offsetof(struct fm10k_hw_stats, vlan_drop)}, + {"loopback_drops", offsetof(struct fm10k_hw_stats, loopback_drop)}, + {"no_descriptor_drops", offsetof(struct fm10k_hw_stats, nodesc_drop)}, +}; + +struct rte_fm10k_xstats_name_off rte_fm10k_hw_stats_q_strings[] = { + {"tx_q_bytes", offsetof(struct fm10k_hw_stats_q, tx_bytes)}, + {"tx_q_packets", offsetof(struct fm10k_hw_stats_q, tx_packets)}, + {"rx_q_bytes", offsetof(struct fm10k_hw_stats_q, rx_bytes)}, + {"rx_q_packets", offsetof(struct fm10k_hw_stats_q, rx_packets)}, + {"rx_q_dropped", offsetof(struct fm10k_hw_stats_q, rx_drops)}, +}; + +#define FM10K_NB_HW_XSTATS (sizeof(rte_fm10k_hw_stats_strings) / \ + sizeof(rte_fm10k_hw_stats_strings[0])) +#define FM10K_NB_Q_XSTATS (sizeof(rte_fm10k_hw_stats_q_strings) / \ + sizeof(rte_fm10k_hw_stats_q_strings[0])) +#define FM10K_NB_XSTATS (FM10K_NB_HW_XSTATS + FM10K_NB_Q_XSTATS * \ + FM10K_MAX_QUEUES_PF) + static void fm10k_mbx_initlock(struct fm10k_hw *hw) { @@ -867,6 +898,55 @@ fm10k_link_update(struct rte_eth_dev *dev, return 0; } +static int +fm10k_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstats *xstats, + unsigned n) +{ + struct fm10k_hw_stats *hw_stats = + FM10K_DEV_PRIVATE_TO_STATS(dev->data->dev_private); + unsigned i, q, count = 0; + + if(n < FM10K_NB_XSTATS) + return FM10K_NB_XSTATS; + + /* Global stats */ + for(i = 0; i < FM10K_NB_HW_XSTATS; i++) { + snprintf(xstats[count].name, sizeof(xstats[count].name), + "%s", rte_fm10k_hw_stats_strings[count].name); + xstats[count].value = *(uint64_t *)(((char *)hw_stats) + + rte_fm10k_hw_stats_strings[count].offset); + count++; + } + + /* PF queue stats */ + for(q = 0; q < FM10K_MAX_QUEUES_PF; q++) { + for(i = 0; i < FM10K_NB_Q_XSTATS; i++) { + memcpy(xstats[count].name, rte_fm10k_hw_stats_q_strings, + sizeof(char) * 4); + snprintf(&xstats[count].name[4], + sizeof(xstats[count].name) - 4, + "%d%s", q, + &rte_fm10k_hw_stats_q_strings[i].name[4]); + xstats[count].value = + *(uint64_t *)(((char *)&hw_stats->q[q]) + + rte_fm10k_hw_stats_q_strings[i].offset); + count++; + } + } + + /* Stats per queue */ + for(q = 0; q < FM10K_MAX_QUEUES; q++) { + memcpy(xstats[count].name, rte_fm10k_hw_stats_q_strings[i].name, + sizeof(char) * 4); + snprintf(&xstats[count].name[4], 36, "%d%s", q, + &rte_fm10k_hw_stats_q_strings[i].name[4]); + count++; + /* TODO: more stats - do we want to present them this way? */ + } + + return FM10K_NB_XSTATS; +} + static void fm10k_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) { @@ -2034,7 +2114,9 @@ static const struct eth_dev_ops fm10k_eth_dev_ops = { .allmulticast_enable = fm10k_dev_allmulticast_enable, .allmulticast_disable = fm10k_dev_allmulticast_disable, .stats_get = fm10k_stats_get, + .xstats_get = fm10k_xstats_get, .stats_reset = fm10k_stats_reset, + .xstats_reset = fm10k_stats_reset, .link_update = fm10k_link_update, .dev_infos_get = fm10k_dev_infos_get, .vlan_filter_set = fm10k_vlan_filter_set,