From patchwork Fri Sep 8 08:45:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 28499 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 78BCF19A60; Fri, 8 Sep 2017 10:46:42 +0200 (CEST) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0070.outbound.protection.outlook.com [104.47.37.70]) by dpdk.org (Postfix) with ESMTP id 15E8819A5B for ; Fri, 8 Sep 2017 10:46:40 +0200 (CEST) Received: from BN3PR03CA0089.namprd03.prod.outlook.com (2a01:111:e400:7a4d::49) by SN2PR03MB2270.namprd03.prod.outlook.com (2603:10b6:804:d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.35.12; Fri, 8 Sep 2017 08:46:38 +0000 Received: from BY2FFO11FD008.protection.gbl (2a01:111:f400:7c0c::192) by BN3PR03CA0089.outlook.office365.com (2a01:111:e400:7a4d::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10 via Frontend Transport; Fri, 8 Sep 2017 08:46:38 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD008.mail.protection.outlook.com (10.1.14.159) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1385.11 via Frontend Transport; Fri, 8 Sep 2017 08:46:38 +0000 Received: from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net [10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v888jmov023063; Fri, 8 Sep 2017 01:46:36 -0700 From: Hemant Agrawal To: CC: , Date: Fri, 8 Sep 2017 14:15:22 +0530 Message-ID: <1504860327-18451-26-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504860327-18451-1-git-send-email-hemant.agrawal@nxp.com> References: <1503658183-4078-1-git-send-email-hemant.agrawal@nxp.com> <1504860327-18451-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131493339983904097; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39380400002)(39860400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(105606002)(189998001)(2950100002)(97736004)(6916009)(48376002)(6666003)(2906002)(356003)(104016004)(86362001)(77096006)(8656003)(305945005)(85426001)(81156014)(53936002)(2351001)(5003940100001)(5660300001)(68736007)(106466001)(54906002)(47776003)(33646002)(8936002)(81166006)(498600001)(8676002)(50986999)(36756003)(50466002)(110136004)(76176999)(50226002)(4326008); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR03MB2270; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD008; 1:ixAxy+uvxHHEm/MQphvBHCXnP14/RwmJdRY5HBsGFUTFZr3gQ7eyd8u63CYgTGlqxqfvpsjkV1GrxVkjSptyr81mD6uP0lfnwDE5u1aeUksqdWvt/u5aKRuV0Xe8e12E MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 43d306d8-d90f-4235-fd61-08d4f6961e88 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603199)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:SN2PR03MB2270; X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2270; 3:QzqILNLCHOy+S+VR+3zGjlUz/aJzeNc9EgBG8kw37Daj9ljoFbaAvgHl0ZDPgt2/m6p1quA2ZhPKXj8lydq5wDR0aCW3k0La11DvAdvZdd2DRIfeEB7WwR09Ou0hVyHV3Nuh/YLnZ040NuBkUxgZajddszE1MaW+Jo+pKLukMC7dtMUDuCShrUaH/Nn5ZUOOdGpVk8kvoTPmC+frIONM0HFtPGt6W3aa6zFjawlZ1fwr4Q5GIc3YWOgW+T17ip+Hl2hQaLqlKtYyQT2tRFnvbSOev/PtMFaAvAfwk2v3a5n+S/+PMipUXTxo9DBvaE9lfctVCuTZti9pg0xuO4/DNxqiEBcoegYbCa8PuL1qwRQ=; 25:i5gkMBRLMIkLEwIl2ykHG+6VYJ+Q11dsZgRLNmDy9ObMW8xexlAK6E5pgoBzznGbJsw4PvqxxRJZ/6rDx4HDkTHYZ89ktx+LSrzn1bHshdtpj37Izousj7kOATemSixi8GRxOFQ4JK411pqNOe0tl0bWR/tktkxCa+gOz2dqMGSPB9Gr1jiVjNoN7SNoX2LtLru2W5Txp7Sj+GurXAtFp9oCYepo2Fg3qpIpIqFYTZWyL1gvZaSaOYU4LN1KatMjOWBPGkxRDvrkXXtUGoQo4GiYoi+09GqFDpSgkeaj/fuWLoZtqtSqaIHQog+ct3uq6tfj+c/YeZRzNWdpp4e/TA== X-MS-TrafficTypeDiagnostic: SN2PR03MB2270: X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2270; 31:kiKKjSXQpx81kqIhB0sAOjcmeM1yT8ku/Yv7ydSs6R5FVIrBrfuISLrPIMgO2V/QC7WocE7zdcRaza3BOodZWfbav6cDF+R9U9FOyLtD+5UpZKdRe1f70odtI+7COlqmd1ckG3weFKRyCyI08abMpriTmrHWZ9s65py3TWOmGKXUHf8kSZw7YHRq+Jk73GxeDCDkgQxcfTRwFgWBBNrr/uae7DyGyvnZDpnKHlPPreo=; 4:0EjHuePWst0Gh0PusDNiAGMZnFLetCpPW9HG73hdivAOxuW7qHPgBKOQNqWaYSK/IuFYMfY4ZHNO8btyfpEl7TW3hVEtJl1FWyV7ouWtSP8z/jKjxt7jN7rhS95E6hd6304MQRws3tYFULcZMVZDH7bqmATb5rfkB8BnMfNsQ0YvTiMtgl8iYtPO48EHBK2zyeKX61DaPtW6TnQhz7Ku0xMRcOd70BCBD7/1zt8cr2H8MvT3VLJ8yfUJ5wPebraAmRmI3ykGG+QdKfwML9vs96MD5ZmTa6Udwnc5a9xKK7c= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(3002001)(100000703101)(100105400095)(10201501046)(93006095)(93001095)(6055026)(6096035)(20161123565025)(20161123561025)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123556025)(20161123563025)(20161123559100)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN2PR03MB2270; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN2PR03MB2270; X-Forefront-PRVS: 04244E0DC5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR03MB2270; 23:21C6Hm6r7oq17ckgEkAe03A60OV/+eZxU6KjwTRgH?= 123t3qsgjWoesdgsJ8gp2XsHGUcE5D79jFBMu7OMZvqwPCgX19OeuIDTZ5zUqGkBAKtsC+RBOal4b6tInpqyz1j4hcB/4hfVgp05CREpGPLqCwsqBOW7Anv7jRCXq1+vRGVxYRkAiW3z5/7EHmrJhnWyXKGIQqfvIG4m2m6CpNI0k5o9hNx9HA9KP4QvDLRKAED+TS/cTORMXpTL3kf6jaVkvXeH68U4QlIU/UsaRGmFFbLNbUrsFP7dBRE/2rReF04yaqgjpINKeWmhy/A865MvHNn5anlS6uS/hJYi7UdOucXlVIB9mxiUgw68otYuzba+UxFm5heGC0kpWbCTILpTJyh08kgRgvWz+tOclEsdtfZKmYD+dI4VxEQVVXm8cmektcAQm+JqmgP5O2Abb4VjYYZm545BfIBrmyeAz5IveGMCFKSXf4TYVaZeaz4qRVALNguCSo9WAJ799yn4BUbQ/nIgsOhZekR+NcuwzLcCBwYJOKvhjdVABRIj7jWxJJXSIORCQRaYzVWREzb9IqPm+ZyPhy0VCKFo3xJeaeLKCWzN2cELhnVaIfGj7JrWFBCuM+25EuKUBEyRUMCZLuKHVLg44908+XvrOqrA7YhuDjNSYSZVl8eL2IX4ck3Kb7AbARLQnL0hFWdEaaJTTSp38/eFaYXF5SD9lyRhsueXZxIlTZ2tYKoag8Uib8Q+33K9Sq26H8Xl3ssfXlSUHLlgcqjp+45j6/vHNM7lPkAueKMcMzrINWQqZBxK4k/rNhL9l66cfwjk+qsFryflqmpa0HUe4pAcdWGgFn3JuRpCSYm9Fzf6DrUP2kr8AL9xE3SBNSy2e3eeVutcSV/9iQsw4lw92G5ZHnN09S6nuB0QY1rhDY0rge+PRPY+ZCVKey6BibPL68TQy0n372hHHeuU8FXEJA+aC8TO3OvIcPbQriSJqfjBiWBlTElikYQj/xW4UjUCWMi2FlHDw8qEcrvdf+uSUvN4dJcQIIypKK98NDb3xZHO5qJY2jLS4GuWYeHrpeM6G+HnO/cpkDm7G1mkzMlbMKpjs+3p1B/wvsX+9srDRicvLfb23do12RC9oI= X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2270; 6:gchzwOL5Xm5EDRkaGTEDgyQSNznb8Wy0v9OoU5zVdICV7+KOVH4wa5Bv5JTHAcPgA3kksFkNHmrhM9b4+uKXef/s0mrMhIp2zLbElqzX88u9XyU82wduXLXo/GFgqT9PUz161h8ahqFyIwEz5kwGx6aml1Edx+gSsL00n74epnGusIApb9POjSowCyvDQ7I/ubmuhEUId/2GABy0wI4Go876dwJowe4HOXjX3LJOVuq5mmOF9u7zGSlfMOv+y6oClFR3Wu8WyYSucCUOeWCWZhJpapz10+Vfl79FUE9rGjPPUrlhG2CLDCiVHX16IjlXCITG+ZWYDjtDjeM/9TA2/Q==; 5:R86Cg6ffR6imYyH+ckHYhUw/p9JhctD33t9B9HxDXzYNVTuP3aO7PjK8Xskiez3nIBs/5S6hdJSYDIS6J5lyC7nTJnJZeodD6s9ZXvl5FcU+v9Y7MopA89YFMlAK+b6vVdT0RI1E3WkxBsTGfwraAA==; 24:U0yhaNH0q3Q5XyOd5bXvVrm0vRwuu55hQ7JPLxPMK7+N8vndbYCkbcIsM9Jf9y2Mn84s23DTFb4GZtqsT826+f+JsETiYbB2lL9GIV3OVxA=; 7:O3MUnXiid++MIiDnkSWZpQqzSXg7Gm7t10uPkZdHutFJfz48SG/NMEWN+vPmf6TM/hOzUwje+8UoaHrgyS+fooq0VbefzJrPdAftPMachh9Jd+h45Qa5WQ+UzalxkqwKoZGYuojNCguOE8Txml9xtyHMDaipmh028ICd1PWOr1HvFWfQhzxRdEoZKqjQdvoe9ENnisYX2YnVO7BBroXRf9gnAd22MD5/JMtALuP2pHA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2017 08:46:38.2032 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR03MB2270 Subject: [dpdk-dev] [PATCH v2 25/30] net/dpaa2: add support for extra stats 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" Signed-off-by: Hemant Agrawal --- doc/guides/nics/features/dpaa2.ini | 1 + drivers/net/dpaa/dpaa_ethdev.c | 143 ++++++++++++++++++++++++++++++ drivers/net/dpaa/dpaa_ethdev.h | 40 +++++++++ drivers/net/dpaa2/dpaa2_ethdev.c | 174 ++++++++++++++++++++++++++++++++++++- 4 files changed, 356 insertions(+), 2 deletions(-) diff --git a/doc/guides/nics/features/dpaa2.ini b/doc/guides/nics/features/dpaa2.ini index ba4321c..6ebbab4 100644 --- a/doc/guides/nics/features/dpaa2.ini +++ b/doc/guides/nics/features/dpaa2.ini @@ -21,6 +21,7 @@ L3 checksum offload = Y L4 checksum offload = Y Packet type parsing = Y Basic stats = Y +Extended stats = Y FW version = Y Linux VFIO = Y ARMv8 = Y diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index e94cf7c..82a87f6 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -78,6 +78,40 @@ static int is_global_init; static struct rte_dpaa_driver rte_dpaa_pmd; +struct rte_dpaa_xstats_name_off { + char name[RTE_ETH_XSTATS_NAME_SIZE]; + uint32_t offset; +}; + +static const struct rte_dpaa_xstats_name_off dpaa_xstats_strings[] = { + {"rx_align_err", + offsetof(struct dpaa_if_stats, raln)}, + {"rx_valid_pause", + offsetof(struct dpaa_if_stats, rxpf)}, + {"rx_fcs_err", + offsetof(struct dpaa_if_stats, rfcs)}, + {"rx_vlan_frame", + offsetof(struct dpaa_if_stats, rvlan)}, + {"rx_frame_err", + offsetof(struct dpaa_if_stats, rerr)}, + {"rx_drop_err", + offsetof(struct dpaa_if_stats, rdrp)}, + {"rx_undersized", + offsetof(struct dpaa_if_stats, rund)}, + {"rx_oversize_err", + offsetof(struct dpaa_if_stats, rovr)}, + {"rx_fragment_pkt", + offsetof(struct dpaa_if_stats, rfrg)}, + {"tx_valid_pause", + offsetof(struct dpaa_if_stats, txpf)}, + {"tx_fcs_err", + offsetof(struct dpaa_if_stats, terr)}, + {"tx_vlan_frame", + offsetof(struct dpaa_if_stats, tvlan)}, + {"rx_undersized", + offsetof(struct dpaa_if_stats, tund)}, +}; + static int dpaa_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) { @@ -271,6 +305,110 @@ static void dpaa_eth_stats_reset(struct rte_eth_dev *dev) fman_if_stats_reset(dpaa_intf->fif); } +static int +dpaa_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats, + unsigned int n) +{ + struct dpaa_if *dpaa_intf = dev->data->dev_private; + unsigned int i = 0, num = RTE_DIM(dpaa_xstats_strings); + uint64_t values[sizeof(struct dpaa_if_stats) / 8]; + + if (xstats == NULL) + return 0; + + if (n < num) + return num; + + fman_if_stats_get_all(dpaa_intf->fif, values, + sizeof(struct dpaa_if_stats) / 8); + + for (i = 0; i < num; i++) { + xstats[i].id = i; + xstats[i].value = values[dpaa_xstats_strings[i].offset / 8]; + } + return i; +} + +static int +dpaa_xstats_get_names(__rte_unused struct rte_eth_dev *dev, + struct rte_eth_xstat_name *xstats_names, + __rte_unused unsigned int limit) +{ + unsigned int i, stat_cnt = RTE_DIM(dpaa_xstats_strings); + + if (xstats_names != NULL) + for (i = 0; i < stat_cnt; i++) + snprintf(xstats_names[i].name, + sizeof(xstats_names[i].name), + "%s", + dpaa_xstats_strings[i].name); + + return stat_cnt; +} + +static int +dpaa_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, + uint64_t *values, unsigned int n) +{ + unsigned int i, stat_cnt = RTE_DIM(dpaa_xstats_strings); + uint64_t values_copy[sizeof(struct dpaa_if_stats) / 8]; + + if (!ids) { + struct dpaa_if *dpaa_intf = dev->data->dev_private; + + if (n < stat_cnt) + return stat_cnt; + + if (!values) + return 0; + + fman_if_stats_get_all(dpaa_intf->fif, values_copy, + sizeof(struct dpaa_if_stats)); + + for (i = 0; i < stat_cnt; i++) + values[i] = + values_copy[dpaa_xstats_strings[i].offset / 8]; + + return stat_cnt; + } + + dpaa_xstats_get_by_id(dev, NULL, values_copy, stat_cnt); + + for (i = 0; i < n; i++) { + if (ids[i] >= stat_cnt) { + DPAA_PMD_ERR("id value isn't valid"); + return -1; + } + values[i] = values_copy[ids[i]]; + } + return n; +} + +static int +dpaa_xstats_get_names_by_id( + struct rte_eth_dev *dev, + struct rte_eth_xstat_name *xstats_names, + const uint64_t *ids, + unsigned int limit) +{ + unsigned int i, stat_cnt = RTE_DIM(dpaa_xstats_strings); + struct rte_eth_xstat_name xstats_names_copy[stat_cnt]; + + if (!ids) + return dpaa_xstats_get_names(dev, xstats_names, limit); + + dpaa_xstats_get_names(dev, xstats_names_copy, limit); + + for (i = 0; i < limit; i++) { + if (ids[i] >= stat_cnt) { + DPAA_PMD_ERR("id value isn't valid"); + return -1; + } + strcpy(xstats_names[i].name, xstats_names_copy[ids[i]].name); + } + return limit; +} + static void dpaa_eth_promiscuous_enable(struct rte_eth_dev *dev) { struct dpaa_if *dpaa_intf = dev->data->dev_private; @@ -538,6 +676,11 @@ static struct eth_dev_ops dpaa_devops = { .link_update = dpaa_eth_link_update, .stats_get = dpaa_eth_stats_get, + .xstats_get = dpaa_dev_xstats_get, + .xstats_get_by_id = dpaa_xstats_get_by_id, + .xstats_get_names_by_id = dpaa_xstats_get_names_by_id, + .xstats_get_names = dpaa_xstats_get_names, + .xstats_reset = dpaa_eth_stats_reset, .stats_reset = dpaa_eth_stats_reset, .promiscuous_enable = dpaa_eth_promiscuous_enable, .promiscuous_disable = dpaa_eth_promiscuous_disable, diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h index e1e062e..3f06d63 100644 --- a/drivers/net/dpaa/dpaa_ethdev.h +++ b/drivers/net/dpaa/dpaa_ethdev.h @@ -134,4 +134,44 @@ struct dpaa_if { struct rte_eth_fc_conf *fc_conf; }; +struct dpaa_if_stats { + /* Rx Statistics Counter */ + uint64_t reoct; /** #include "dpaa2_ethdev.h" +struct rte_dpaa2_xstats_name_off { + char name[RTE_ETH_XSTATS_NAME_SIZE]; + uint8_t page_id; /* dpni statistics page id */ + uint8_t stats_id; /* stats id in the given page */ +}; + +static const struct rte_dpaa2_xstats_name_off dpaa2_xstats_strings[] = { + {"ingress_multicast_frames", 0, 2}, + {"ingress_multicast_bytes", 0, 3}, + {"ingress_broadcast_frames", 0, 4}, + {"ingress_broadcast_bytes", 0, 5}, + {"egress_multicast_frames", 1, 2}, + {"egress_multicast_bytes", 1, 3}, + {"egress_broadcast_frames", 1, 4}, + {"egress_broadcast_bytes", 1, 5}, + {"ingress_filtered_frames", 2, 0}, + {"ingress_discarded_frames", 2, 1}, + {"ingress_nobuffer_discards", 2, 2}, + {"egress_discarded_frames", 2, 3}, + {"egress_confirmed_frames", 2, 4}, +}; + static struct rte_dpaa2_driver rte_dpaa2_pmd; static int dpaa2_dev_uninit(struct rte_eth_dev *eth_dev); static int dpaa2_dev_link_update(struct rte_eth_dev *dev, @@ -1090,8 +1112,151 @@ void dpaa2_dev_stats_get(struct rte_eth_dev *dev, return; }; -static -void dpaa2_dev_stats_reset(struct rte_eth_dev *dev) +static int +dpaa2_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats, + unsigned int n) +{ + struct dpaa2_dev_priv *priv = dev->data->dev_private; + struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw; + int32_t retcode; + union dpni_statistics value[3] = {}; + unsigned int i = 0, num = RTE_DIM(dpaa2_xstats_strings); + + if (xstats == NULL) + return 0; + + if (n < num) + return num; + + /* Get Counters from page_0*/ + retcode = dpni_get_statistics(dpni, CMD_PRI_LOW, priv->token, + 0, 0, &value[0]); + if (retcode) + goto err; + + /* Get Counters from page_1*/ + retcode = dpni_get_statistics(dpni, CMD_PRI_LOW, priv->token, + 1, 0, &value[1]); + if (retcode) + goto err; + + /* Get Counters from page_2*/ + retcode = dpni_get_statistics(dpni, CMD_PRI_LOW, priv->token, + 2, 0, &value[2]); + if (retcode) + goto err; + + for (i = 0; i < num; i++) { + xstats[i].id = i; + xstats[i].value = value[dpaa2_xstats_strings[i].page_id]. + raw.counter[dpaa2_xstats_strings[i].stats_id]; + } + return i; +err: + RTE_LOG(ERR, PMD, "Error in obtaining extended stats (%d)\n", retcode); + return retcode; +} + +static int +dpaa2_xstats_get_names(__rte_unused struct rte_eth_dev *dev, + struct rte_eth_xstat_name *xstats_names, + __rte_unused unsigned int limit) +{ + unsigned int i, stat_cnt = RTE_DIM(dpaa2_xstats_strings); + + if (xstats_names != NULL) + for (i = 0; i < stat_cnt; i++) + snprintf(xstats_names[i].name, + sizeof(xstats_names[i].name), + "%s", + dpaa2_xstats_strings[i].name); + + return stat_cnt; +} + +static int +dpaa2_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, + uint64_t *values, unsigned int n) +{ + unsigned int i, stat_cnt = RTE_DIM(dpaa2_xstats_strings); + uint64_t values_copy[stat_cnt]; + + if (!ids) { + struct dpaa2_dev_priv *priv = dev->data->dev_private; + struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw; + int32_t retcode; + union dpni_statistics value[3] = {}; + + if (n < stat_cnt) + return stat_cnt; + + if (!values) + return 0; + + /* Get Counters from page_0*/ + retcode = dpni_get_statistics(dpni, CMD_PRI_LOW, priv->token, + 0, 0, &value[0]); + if (retcode) + return 0; + + /* Get Counters from page_1*/ + retcode = dpni_get_statistics(dpni, CMD_PRI_LOW, priv->token, + 1, 0, &value[1]); + if (retcode) + return 0; + + /* Get Counters from page_2*/ + retcode = dpni_get_statistics(dpni, CMD_PRI_LOW, priv->token, + 2, 0, &value[2]); + if (retcode) + return 0; + + for (i = 0; i < stat_cnt; i++) { + values[i] = value[dpaa2_xstats_strings[i].page_id]. + raw.counter[dpaa2_xstats_strings[i].stats_id]; + } + return stat_cnt; + } + + dpaa2_xstats_get_by_id(dev, NULL, values_copy, stat_cnt); + + for (i = 0; i < n; i++) { + if (ids[i] >= stat_cnt) { + PMD_INIT_LOG(ERR, "id value isn't valid"); + return -1; + } + values[i] = values_copy[ids[i]]; + } + return n; +} + +static int +dpaa2_xstats_get_names_by_id( + struct rte_eth_dev *dev, + struct rte_eth_xstat_name *xstats_names, + const uint64_t *ids, + unsigned int limit) +{ + unsigned int i, stat_cnt = RTE_DIM(dpaa2_xstats_strings); + struct rte_eth_xstat_name xstats_names_copy[stat_cnt]; + + if (!ids) + return dpaa2_xstats_get_names(dev, xstats_names, limit); + + dpaa2_xstats_get_names(dev, xstats_names_copy, limit); + + for (i = 0; i < limit; i++) { + if (ids[i] >= stat_cnt) { + PMD_INIT_LOG(ERR, "id value isn't valid"); + return -1; + } + strcpy(xstats_names[i].name, xstats_names_copy[ids[i]].name); + } + return limit; +} + +static void +dpaa2_dev_stats_reset(struct rte_eth_dev *dev) { struct dpaa2_dev_priv *priv = dev->data->dev_private; struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw; @@ -1471,7 +1636,12 @@ static struct eth_dev_ops dpaa2_ethdev_ops = { .dev_set_link_down = dpaa2_dev_set_link_down, .link_update = dpaa2_dev_link_update, .stats_get = dpaa2_dev_stats_get, + .xstats_get = dpaa2_dev_xstats_get, + .xstats_get_by_id = dpaa2_xstats_get_by_id, + .xstats_get_names_by_id = dpaa2_xstats_get_names_by_id, + .xstats_get_names = dpaa2_xstats_get_names, .stats_reset = dpaa2_dev_stats_reset, + .xstats_reset = dpaa2_dev_stats_reset, .fw_version_get = dpaa2_fw_version_get, .dev_infos_get = dpaa2_dev_info_get, .dev_supported_ptypes_get = dpaa2_supported_ptypes_get,