From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0088.outbound.protection.outlook.com [104.47.1.88]) by dpdk.org (Postfix) with ESMTP id DBD821B7CE; Mon, 9 Apr 2018 12:25:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=BkDs9XPh6FRPan5s01WlhaEbkXPYea/YMmvk4tB6vGw=; b=SrJmim9RZlhk90YRCc1283CAzzKTtH0d80FJ0bOQLwcolJp1MjNRJGXugaOCjVhD7FhgIZ897f/jYLUwBveYM5I12IpzmdDbHB+vIwGEKnaCG8YApsEpN0rS4nEyKdz2jLtAp64VrwnYWdler/nrlJkBRBBKHoxeDkw4O7HhazQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by AM2PR04MB0756.eurprd04.prod.outlook.com (2a01:111:e400:8411::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.653.12; Mon, 9 Apr 2018 10:25:56 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: ferruh.yigit@intel.com, stable@dpdk.org Date: Mon, 9 Apr 2018 15:52:50 +0530 Message-Id: <1523269371-28799-7-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523269371-28799-1-git-send-email-hemant.agrawal@nxp.com> References: <1522918464-4586-1-git-send-email-hemant.agrawal@nxp.com> <1523269371-28799-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: PN1PR0101CA0067.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c00:d::29) To AM2PR04MB0756.eurprd04.prod.outlook.com (2a01:111:e400:8411::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: c844fcd3-dbce-4186-e75c-08d59e044826 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM2PR04MB0756; X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0756; 3:1ik4ihdSGYsvblYyjeJBw+L2jyQFtfNl4PSB+XFfIzqc2yViOqukUGImN1L4rlDy6psavBAnMP3+kqJ3lBsB9YWxO7LfYm4zBtmasuQlHA5gqabZRnHP/SL0vAbMMd3d+xqgKni4jKftkSN9NVav47zZLukgWbR4dw2Ke9gDY6SJ0134DSf0VjyfEUsF/wJXc+62JY7vmeLrquku9tkkAH/YfHfzQpoUmfiFMQs1bIDLgAMQgn6hwsieV8NFy12T; 25:mTzTBqcglsGfaWdwDi5AzBgMaG2+dcUUz4R6QpcPYJNlvb/9Rtc0yA363QsODlcPr1O8RVHd9sPi6LWOvfH9GB+HCyu0t00NwqkNdR4/aIkzMp6igh6xXR2uLJ5cGLtu0f8iLKZUeJsVZ6wDPRQiBKqnisvJF+JF2vaKdP0AqHz3wo7U37Pgc+8czckfDeZNTGwSmaGsQf1CuC4BbGMiNJiJ+Qcivry7+gp0FIN4yMnJ413u+GTxyEX0WfADkDDRsqOMFYc9J3pKjiUyfxc5qzVURkxDs+8O19ikhDcGWvyDDt183GgtrkXcfiGUSbCSSWlI4WA3W5BIKe/jjZvgpw==; 31:yklKy6XVZ7sCb0edCmpxRuKecF5wMU2qUXDNG+zGUmQ8y2NpJGcag0f8QLZvmb1aPtEQH601EkcgRzrXu77nQD3KDz2aCOlOvCHYgM7UlFaDOzI1wLLsdwhC3vx0ZlC0ijcBR1fyDcRTC3AWge9+0w5RuK2LsM0AwQ8X68me4M8Ce0f2zm6TLcWV6XmNTz+CmlBswo7aRgy0Un/2KFQP8LZp5exieYJ4vkoHc4LG3rY= X-MS-TrafficTypeDiagnostic: AM2PR04MB0756: X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0756; 20:DJGu5RUhjLAjHDLTSo5UWDcNRKH5eNN+i13rJHjDgcglAZQ6USdG46KsuXPYU/v3JTWF4sJ357kNRp269O9vAjPeDXuYpIQq4jv2n2Z+GuiKOGK5dCWxDrz+SPt4baJGDeR8ob+ON4naL0UJjjOu2WYj6BNcDWn0falwU5ZBjDdB26j4ZSAZ2BQ4zUw3e5Fk3unNCt8yN1xpT8vIRkcng0RzQI+X0CVv+vi7gdUSD04wfZxPnpXCLKelqo+vcZz/fX7nG31dARa6w8pSjRYg/MrviSL9ngsBHyoDMi0wIeqHohTul7Pl+BCO39pXi2ppTtmNX4+Cv32Sp/Ianci6OZgB1G88rYogPTwm479kUw0akduCMD87tTCDC/xJ3hfc4MryA6fke5oDcjfJbN6PQlRiFxztohgWAEhYn8bHUl5s0QMtTZdGoKgzIrTQnU3LIVHApgLzhgWqnOIcHdr6udTDJXF7Vboq9R4fNREByIQ2h4/jUHVR15IIP0j7rrYT; 4:2vOwVMOfbBwHyg0a21WpASc/tz+044bfq0P5vpave1cIE0wgnASgmklttKQmsGmnywfh92P/fOb7k1sHaTZaM2JFYCJFXQVRmWdqHJezdL48h88O/ozfadkqqzkzp7hi3RDDQqR0B0ucas0sPenbLk/02Nx2ZcsufuryeNzjA++exKbimREOqdTxKMILSvGw2WcYXjSxutoXlQtc+gtjbQbdpVg6a33mh0hBJPDj0ZMABZ9Q/RlP78OxKmBKXc5xbqoMy+Nykc/oS44+JKaFJWF3yQNiYIGKie2o2ulTXPLYTP0A0wwHV8unyq9wG0zg X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231221)(944501327)(52105095)(6055026)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:AM2PR04MB0756; BCL:0; PCL:0; RULEID:; SRVR:AM2PR04MB0756; X-Forefront-PRVS: 0637FCE711 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(346002)(39380400002)(39860400002)(396003)(366004)(199004)(189003)(36756003)(48376002)(50466002)(8936002)(6486002)(6916009)(81156014)(50226002)(6666003)(81166006)(8676002)(106356001)(68736007)(316002)(16526019)(3846002)(16586007)(2351001)(2361001)(47776003)(2616005)(26005)(6506007)(386003)(59450400001)(55236004)(66066001)(6116002)(305945005)(97736004)(76176011)(7736002)(956004)(52116002)(51416003)(476003)(486006)(53936002)(186003)(2906002)(86362001)(4326008)(6512007)(25786009)(446003)(5660300001)(478600001)(105586002)(5009440100003)(11346002)(110426004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM2PR04MB0756; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM2PR04MB0756; 23:K4yL4OXHhex/ECylhqZfXwY4X6HxHSXcQo4N7+JrG?= =?us-ascii?Q?C9kjIgMa1HC4JyZm5dMzumCNupnRtayqFq7fW5EG2EC/REHTq6nyZAd0APhN?= =?us-ascii?Q?rPUl2yBVILluD3DOj67jq7X6ACdfPBsU5QzCdjIwpBiYMDzr4zphNzl11Zuq?= =?us-ascii?Q?4l7v6ZFDVQe+VffgUV/YuX2dL4QtQAkjlr4t4hn9EjvqbLW0GYyJ3D+xFTZj?= =?us-ascii?Q?nCOW4aT+jcy07F1lS+XiKKpOU9RKpH7NzdNLjMUOqCc5+pinhjjrhWH3DDua?= =?us-ascii?Q?HKrSWoagC5RpMfOqYg53An7iZhS/m4EkP7rluvu91xYrJKIoVxKrKsWwmnyA?= =?us-ascii?Q?MCkUTwP9ZsCc7cJLzcvM4EJAe1nbH2+/fd3Z+EhVJdsbMB1kmDUw+Su7X7yF?= =?us-ascii?Q?kzDRvx8hJSNeR7B04Q5/T3uwVwMuQR3qAD+uTkKWf1fo5WOyG8GZdDLZ0tFs?= =?us-ascii?Q?L9XvMCnbCrRQLTUo3RvLGK6fsYNvw7UnRkJ17ADxMSNuSwbsAhnJzP5tcwAl?= =?us-ascii?Q?ohIEKqSs+7+af+OlCY/2crxFJQqR3uU2H/+2GvpkU4lOy+TqDTAVEVuQEiZm?= =?us-ascii?Q?eZecRU6DUm8iHAisAPY2VMUgaC1GxGMSA3pFzu9NdQ2n1CE1lcEaAejK3kCE?= =?us-ascii?Q?O0hdnef1fbEfPUKhwnYh7l+2HMyV21mbAQHHp9BK2jr8SPtB1VznPBlwQ7O6?= =?us-ascii?Q?VRtGHWPwAZOYLZWFP9fuNOwdvdkNVg3oNvJqr7Ct3ozsNAshSWX0HhwkfQ/7?= =?us-ascii?Q?n8kzDz3Yzct0dC2ehTrNT/ZSRL5iM8iZ1cp3tRqugaSCNrd4MVtFqjQcXYmf?= =?us-ascii?Q?9XmeobTudL00fC4BnVonVvO8u5JHF9lDXtSsl4eR1HomKLQtdAcnzJd7OOYy?= =?us-ascii?Q?zfu+4HH57FJxyqnqP+pj+uhW4FZwrDt0xAPtKbJj5ZH54aq7jU2GWfLNWXTr?= =?us-ascii?Q?4XOK+8Fo1BRBCmS05Y+YYMYnKX56qqJYDMPq0RadI4V8KhEFfskn1h1tsPI5?= =?us-ascii?Q?weydMFy1vGHPJFd34VU42+Q0brZBghdwv2v5Ru9mS8kO2OFGkLapsLraiOht?= =?us-ascii?Q?3W5kK7RqKY1B4hCW0v0VK7JQbY0qtSsTvRC0xx4b6VfwFL3GuwPVB9vLE/Za?= =?us-ascii?Q?bIeAANH5twVsrad5lk91a8HwfXi7a4U5pLyBiFpcDcix6nchCJarAMtpCW0c?= =?us-ascii?Q?9ml0sH5GtyWHiYjvK/hKUJBbwsbbod9R1vVQAvCuZjNf/v7cySb1PxpNHmLr?= =?us-ascii?Q?GbxGmhRr/sg0mRQfBxqf/y4zDnuenNTFR7NgaGldA9PhxgHAWHQI3KHx2PEp?= =?us-ascii?Q?vM2RmAgL65pZGPwj9qThvw=3D?= X-Microsoft-Antispam-Message-Info: Hjti1zw3AvjGBze1kHlKL8D1zZFs4kconSc4/cA4PUJeTSemshkD+GYpy2CauJ0NYO+4RBfHYVT2PaKfrQFwSCixGZcjYuBW9gxKWcLtn/09MJKjTY/udMFlRUbCQbvEBCG46gDvzX0rfihuhI3O12VpRiRA0QGaUo6wE0tZMuGSFCkq22lUMN9rqHyE+pUq X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0756; 6:FRw8qrowp/BaUd5S9z+HeHTTyt5bCBrP0ZU0CS3IVpbh5HLfLazJEY21oGy3/LU4gszumj8RXbCDPaeFbDWSSO/9+tVAtSO2dXKmv2q0N4MAFuuaWvYXGGZZoGA6WQojh/XM1n8Wm0LCLiBtpYVItjThAiacJU8BodadurzYVmhku2NLt2RwGjfWNqOGshTNdaVI/eWQcpHB8A/qNOrHzY9RaCFClpFwll6Y3bLK6eMsQpGaScLuANDnBFgBQdUcvYIVCgq63F8NzXnxAOpZBPpS9RO6hjHP09L1tCyFrYCqs6FwA7kzW2Ns68sppuUt3mcEu5nF2kNmXXVh/mtT26OToq5mbyQEUxWWrBtBw7ly5qGJYtgaBVFxofs/dMV8HddFGVbQhCQvIufnnREnR6w8ODEa2+2gKtulyf163dW70M80toTNxVFnJzO1/H2xir77YF03nFZBg8ZKPkQzzg==; 5:lxBMVXCPwpGQNwODudp78AqKNJTM3PZ5ScMlakxNb/eNByBM2lolJ49599W8bCQMBLGqQMFMD3eKLkx48F1nzhkZ7ypuKKngkGBcNVV+pXQ0kKrrIIYvrWmuO/MJtIwscVTqlbdmdPbh1pzVD6gnfeB90b5CKMrQg30DyaS20Us=; 24:XDQcVOG60by+3QZ1M2eiM1vNNVJyYALrnFpgGpOecG5oN1+fBL7E1nh497ohZ+7Ci2XYwGEU4d8Eq745n13THFizQcKg7dsvIoRJ1nTXzRU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0756; 7:DoPs6Hab4A1tkOBHWKGMKY0tMUqQYQWFY2appleUv8crwQnDFAGFF0ov60A3IJf1KvCPCaP5domuqS3UsSLWgszTc4QmnbAvlBhSQy16JhmhOIneBbYZmtD50W3f5U9TAZxyDBlCPf4o6oHRpqczHpvSg0anAGtwTQnPClnW8dOtg5cvbyU9SX0Z9KXFbjOTFfcmV1IRam+HJJY620+1g55Nxlr5FXN3utZOEPt1x8YfMuJOVUvMxxJgu+DPvDME X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2018 10:25:56.2547 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c844fcd3-dbce-4186-e75c-08d59e044826 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR04MB0756 Subject: [dpdk-stable] [PATCH v2 7/8] net/dpaa2: fix the implementation of xstats X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2018 10:25:58 -0000 Fixes: 1d6329b2fc1f ("net/dpaa2: support extra stats") Cc: stable@dpdk.org Signed-off-by: Hemant Agrawal --- drivers/net/dpaa2/dpaa2_ethdev.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 281483d..eed6dc9 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -1115,12 +1115,12 @@ dpaa2_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats, 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; + if (xstats == NULL) + return 0; + /* Get Counters from page_0*/ retcode = dpni_get_statistics(dpni, CMD_PRI_LOW, priv->token, 0, 0, &value[0]); @@ -1153,10 +1153,13 @@ dpaa2_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats, 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 limit) { unsigned int i, stat_cnt = RTE_DIM(dpaa2_xstats_strings); + if (limit < stat_cnt) + return stat_cnt; + if (xstats_names != NULL) for (i = 0; i < stat_cnt; i++) snprintf(xstats_names[i].name, -- 2.7.4