From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-0016ce01.pphosted.com (mx0a-0016ce01.pphosted.com [67.231.148.157]) by dpdk.org (Postfix) with ESMTP id C6DC85A40 for ; Sat, 7 May 2016 06:30:54 +0200 (CEST) Received: from pps.filterd (m0095336.ppops.net [127.0.0.1]) by mx0a-0016ce01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u474U2Hc018819 for ; Fri, 6 May 2016 21:30:54 -0700 Received: from avcashub1.qlogic.com ([198.186.0.117]) by mx0a-0016ce01.pphosted.com with ESMTP id 22s2eqgh8j-1 (version=TLSv1 cipher=AES128-SHA bits=128 verify=NOT) for ; Fri, 06 May 2016 21:30:53 -0700 Received: from avluser05.qlc.com (10.1.113.115) by qlc.com (10.1.4.192) with Microsoft SMTP Server id 14.3.235.1; Fri, 6 May 2016 21:30:53 -0700 Received: (from rmody@localhost) by avluser05.qlc.com (8.14.4/8.14.4/Submit) id u474UrIg022585; Fri, 6 May 2016 21:30:53 -0700 X-Authentication-Warning: avluser05.qlc.com: rmody set sender to rasesh.mody@qlogic.com using -f From: Rasesh Mody To: CC: , Rasesh Mody Date: Fri, 6 May 2016 21:30:18 -0700 Message-ID: <1462595421-22505-7-git-send-email-rasesh.mody@qlogic.com> X-Mailer: git-send-email 1.7.10.3 In-Reply-To: <1462595421-22505-1-git-send-email-rasesh.mody@qlogic.com> References: <1462595421-22505-1-git-send-email-rasesh.mody@qlogic.com> MIME-Version: 1.0 Content-Type: text/plain disclaimer: bypass X-Proofpoint-Virus-Version: vendor=nai engine=5800 definitions=8157 signatures=670715 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 impostorscore=0 lowpriorityscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1603290000 definitions=main-1605070067 Subject: [dpdk-dev] [PATCH 6/9] qede: add support for xstats 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: , X-List-Received-Date: Sat, 07 May 2016 04:30:55 -0000 This patch adds support for extended statistics for QEDE PMD. Signed-off-by: Rasesh Mody --- doc/guides/nics/overview.rst | 2 +- drivers/net/qede/qede_ethdev.c | 152 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 145 insertions(+), 9 deletions(-) diff --git a/doc/guides/nics/overview.rst b/doc/guides/nics/overview.rst index 41ab760..28c6436 100644 --- a/doc/guides/nics/overview.rst +++ b/doc/guides/nics/overview.rst @@ -128,7 +128,7 @@ Most of these differences are summarized below. Packet type parsing Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Timesync Y Y Y Y Y Basic stats Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y - Extended stats Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y + Extended stats Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Stats per queue Y Y Y Y Y Y Y Y Y Y Y Y Y Y EEPROM dump Y Y Y Registers dump Y Y Y Y Y Y diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c index af16277..4abe168 100644 --- a/drivers/net/qede/qede_ethdev.c +++ b/drivers/net/qede/qede_ethdev.c @@ -12,6 +12,125 @@ static const struct qed_eth_ops *qed_ops; static const char *drivername = "qede pmd"; +static const struct rte_eth_xstats qede_eth_stats[] = { + {"no_buff_discards", + offsetof(struct ecore_eth_stats, no_buff_discards)}, + {"packet_too_big_discard", + offsetof(struct ecore_eth_stats, packet_too_big_discard)}, + {"ttl0_discard", offsetof(struct ecore_eth_stats, ttl0_discard)}, + {"rx_ucast_bytes", offsetof(struct ecore_eth_stats, rx_ucast_bytes)}, + {"rx_mcast_bytes", offsetof(struct ecore_eth_stats, rx_mcast_bytes)}, + {"rx_bcast_bytes", offsetof(struct ecore_eth_stats, rx_bcast_bytes)}, + {"rx_ucast_pkts", offsetof(struct ecore_eth_stats, rx_ucast_pkts)}, + {"rx_mcast_pkts", offsetof(struct ecore_eth_stats, rx_mcast_pkts)}, + {"rx_bcast_pkts", offsetof(struct ecore_eth_stats, rx_bcast_pkts)}, + {"mftag_filter_discards", + offsetof(struct ecore_eth_stats, mftag_filter_discards)}, + {"mac_filter_discards", + offsetof(struct ecore_eth_stats, mac_filter_discards)}, + {"tx_ucast_bytes", offsetof(struct ecore_eth_stats, tx_ucast_bytes)}, + {"tx_mcast_bytes", offsetof(struct ecore_eth_stats, tx_mcast_bytes)}, + {"tx_bcast_bytes", offsetof(struct ecore_eth_stats, tx_bcast_bytes)}, + {"tx_ucast_pkts", offsetof(struct ecore_eth_stats, tx_ucast_pkts)}, + {"tx_mcast_pkts", offsetof(struct ecore_eth_stats, tx_mcast_pkts)}, + {"tx_bcast_pkts", offsetof(struct ecore_eth_stats, tx_bcast_pkts)}, + {"tx_err_drop_pkts", + offsetof(struct ecore_eth_stats, tx_err_drop_pkts)}, + {"tpa_coalesced_pkts", + offsetof(struct ecore_eth_stats, tpa_coalesced_pkts)}, + {"tpa_coalesced_events", + offsetof(struct ecore_eth_stats, tpa_coalesced_events)}, + {"tpa_aborts_num", offsetof(struct ecore_eth_stats, tpa_aborts_num)}, + {"tpa_not_coalesced_pkts", + offsetof(struct ecore_eth_stats, tpa_not_coalesced_pkts)}, + {"tpa_coalesced_bytes", + offsetof(struct ecore_eth_stats, tpa_coalesced_bytes)}, + {"rx_64_byte_packets", + offsetof(struct ecore_eth_stats, rx_64_byte_packets)}, + {"rx_65_to_127_byte_packets", + offsetof(struct ecore_eth_stats, rx_65_to_127_byte_packets)}, + {"rx_128_to_255_byte_packets", + offsetof(struct ecore_eth_stats, rx_128_to_255_byte_packets)}, + {"rx_256_to_511_byte_packets", + offsetof(struct ecore_eth_stats, rx_256_to_511_byte_packets)}, + {"rx_512_to_1023_byte_packets", + offsetof(struct ecore_eth_stats, rx_512_to_1023_byte_packets)}, + {"rx_1024_to_1518_byte_packets", + offsetof(struct ecore_eth_stats, rx_1024_to_1518_byte_packets)}, + {"rx_1519_to_1522_byte_packets", + offsetof(struct ecore_eth_stats, rx_1519_to_1522_byte_packets)}, + {"rx_1519_to_2047_byte_packets", + offsetof(struct ecore_eth_stats, rx_1519_to_2047_byte_packets)}, + {"rx_2048_to_4095_byte_packets", + offsetof(struct ecore_eth_stats, rx_2048_to_4095_byte_packets)}, + {"rx_4096_to_9216_byte_packets", + offsetof(struct ecore_eth_stats, rx_4096_to_9216_byte_packets)}, + {"rx_9217_to_16383_byte_packets", offsetof(struct ecore_eth_stats, + rx_9217_to_16383_byte_packets)}, + {"rx_crc_errors", offsetof(struct ecore_eth_stats, rx_crc_errors)}, + {"rx_mac_crtl_frames", + offsetof(struct ecore_eth_stats, rx_mac_crtl_frames)}, + {"rx_pause_frames", offsetof(struct ecore_eth_stats, rx_pause_frames)}, + {"rx_prio_flow_ctrl_frames", + offsetof(struct ecore_eth_stats, rx_pfc_frames)}, + {"rx_align_errors", offsetof(struct ecore_eth_stats, rx_align_errors)}, + {"rx_carrier_errors", + offsetof(struct ecore_eth_stats, rx_carrier_errors)}, + {"rx_oversize_packets", + offsetof(struct ecore_eth_stats, rx_oversize_packets)}, + {"rx_jabbers", offsetof(struct ecore_eth_stats, rx_jabbers)}, + {"rx_undersize_packets", + offsetof(struct ecore_eth_stats, rx_undersize_packets)}, + {"rx_fragments", offsetof(struct ecore_eth_stats, rx_fragments)}, + {"tx_64_byte_packets", + offsetof(struct ecore_eth_stats, tx_64_byte_packets)}, + {"tx_65_to_127_byte_packets", + offsetof(struct ecore_eth_stats, tx_65_to_127_byte_packets)}, + {"tx_128_to_255_byte_packets", + offsetof(struct ecore_eth_stats, tx_128_to_255_byte_packets)}, + {"tx_256_to_511_byte_packets", + offsetof(struct ecore_eth_stats, tx_256_to_511_byte_packets)}, + {"tx_512_to_1023_byte_packets", + offsetof(struct ecore_eth_stats, tx_512_to_1023_byte_packets)}, + {"tx_1024_to_1518_byte_packets", + offsetof(struct ecore_eth_stats, tx_1024_to_1518_byte_packets)}, + {"tx_1519_to_2047_byte_packets", + offsetof(struct ecore_eth_stats, tx_1519_to_2047_byte_packets)}, + {"tx_2048_to_4095_byte_packets", + offsetof(struct ecore_eth_stats, tx_2048_to_4095_byte_packets)}, + {"tx_4096_to_9216_byte_packets", + offsetof(struct ecore_eth_stats, tx_4096_to_9216_byte_packets)}, + {"tx_9217_to_16383_byte_packets", offsetof(struct ecore_eth_stats, + tx_9217_to_16383_byte_packets)}, + {"tx_pause_frames", offsetof(struct ecore_eth_stats, tx_pause_frames)}, + {"tx_prio_flow_ctrl_frames", + offsetof(struct ecore_eth_stats, tx_pfc_frames)}, + {"tx_lpi_entry_count", + offsetof(struct ecore_eth_stats, tx_lpi_entry_count)}, + {"tx_total_collisions", + offsetof(struct ecore_eth_stats, tx_total_collisions)}, + {"rx_buf_truncates", offsetof(struct ecore_eth_stats, brb_truncates)}, + {"rx_buf_discards", offsetof(struct ecore_eth_stats, brb_discards)}, + {"rx_mac_bytes", offsetof(struct ecore_eth_stats, rx_mac_bytes)}, + {"rx_mac_uc_packets", + offsetof(struct ecore_eth_stats, rx_mac_uc_packets)}, + {"rx_mac_mc_packets", + offsetof(struct ecore_eth_stats, rx_mac_mc_packets)}, + {"rx_mac_bc_packets", + offsetof(struct ecore_eth_stats, rx_mac_bc_packets)}, + {"rx_mac_frames_ok", + offsetof(struct ecore_eth_stats, rx_mac_frames_ok)}, + {"tx_mac_bytes", offsetof(struct ecore_eth_stats, tx_mac_bytes)}, + {"tx_mac_uc_packets", + offsetof(struct ecore_eth_stats, tx_mac_uc_packets)}, + {"tx_mac_mc_packets", + offsetof(struct ecore_eth_stats, tx_mac_mc_packets)}, + {"tx_mac_bc_packets", + offsetof(struct ecore_eth_stats, tx_mac_bc_packets)}, + {"tx_mac_ctrl_frames", + offsetof(struct ecore_eth_stats, tx_mac_ctrl_frames)}, +}; + static void qede_interrupt_action(struct ecore_hwfn *p_hwfn) { ecore_int_sp_dpc((osal_int_ptr_t)(p_hwfn)); @@ -611,15 +730,30 @@ qede_get_stats(struct rte_eth_dev *eth_dev, struct rte_eth_stats *eth_stats) stats.tx_mcast_bytes + stats.tx_bcast_bytes; eth_stats->oerrors = stats.tx_err_drop_pkts; +} + +static int +qede_get_xstats(struct rte_eth_dev *dev, struct rte_eth_xstats *xstats, + unsigned int n) +{ + struct qede_dev *qdev = dev->data->dev_private; + struct ecore_dev *edev = &qdev->edev; + struct ecore_eth_stats stats; + unsigned int num = RTE_DIM(qede_eth_stats); + + if (n < num) + return num; + + qdev->ops->get_vport_stats(edev, &stats); + + for (num = 0; num < n; num++) { + snprintf(xstats[num].name, sizeof(xstats[num].name), "%s", + qede_eth_stats[num].name); + xstats[num].value = *(u64 *)(((char *)&stats) + + qede_eth_stats[num].value); + } - DP_INFO(edev, - "no_buff_discards=%" PRIu64 "" - " mac_filter_discards=%" PRIu64 "" - " brb_truncates=%" PRIu64 "" - " brb_discards=%" PRIu64 "\n", - stats.no_buff_discards, - stats.mac_filter_discards, - stats.brb_truncates, stats.brb_discards); + return num; } int qede_dev_set_link_state(struct rte_eth_dev *eth_dev, bool link_up) @@ -935,6 +1069,7 @@ static const struct eth_dev_ops qede_eth_dev_ops = { .dev_stop = qede_dev_stop, .dev_close = qede_dev_close, .stats_get = qede_get_stats, + .xstats_get = qede_get_xstats, .stats_reset = qede_reset_stats, .mac_addr_add = qede_mac_addr_add, .mac_addr_remove = qede_mac_addr_remove, @@ -969,6 +1104,7 @@ static const struct eth_dev_ops qede_eth_vf_dev_ops = { .dev_stop = qede_dev_stop, .dev_close = qede_dev_close, .stats_get = qede_get_stats, + .xstats_get = qede_get_xstats, .stats_reset = qede_reset_stats, .vlan_offload_set = qede_vlan_offload_set, .vlan_filter_set = qede_vlan_filter_set, -- 1.7.10.3