From patchwork Mon Nov 26 16:27:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Radulescu X-Patchwork-Id: 1003321 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="xalwFq35"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 433XQF28mwz9s3q for ; Tue, 27 Nov 2018 03:27:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726948AbeK0DWX (ORCPT ); Mon, 26 Nov 2018 22:22:23 -0500 Received: from mail-eopbgr80043.outbound.protection.outlook.com ([40.107.8.43]:53815 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726771AbeK0DWX (ORCPT ); Mon, 26 Nov 2018 22:22:23 -0500 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:X-MS-Exchange-SenderADCheck; bh=Z0upwhUz2UX5qoL2+AtpOd8mK047nEkiw65B8KKkYKs=; b=xalwFq358NNI3MHZCRhWwuPFgJrIdGJHMXampPRKBXrKAv+QqU3T+aN6alYHtkSwvT+wcPFDXrpOcVp1loiaAeOezg1XKnTTcll8VgVEoqva45Ud5helz6z1saeFZIQbOaAK2pFq+tActvTo7ZVq0ttO7/BBAtgvsCMFr+20CBU= Received: from AM6PR04MB5000.eurprd04.prod.outlook.com (20.177.33.219) by AM6PR04MB4518.eurprd04.prod.outlook.com (20.176.242.225) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1361.19; Mon, 26 Nov 2018 16:27:37 +0000 Received: from AM6PR04MB5000.eurprd04.prod.outlook.com ([fe80::298c:e496:4be4:3244]) by AM6PR04MB5000.eurprd04.prod.outlook.com ([fe80::298c:e496:4be4:3244%5]) with mapi id 15.20.1361.019; Mon, 26 Nov 2018 16:27:37 +0000 From: Ioana Ciocoi Radulescu To: "netdev@vger.kernel.org" , "davem@davemloft.net" CC: Ioana Ciornei , "dsahern@gmail.com" , Camelia Alexandra Groza Subject: [PATCH v2 net-next 7/8] dpaa2-eth: Cleanup channel stats Thread-Topic: [PATCH v2 net-next 7/8] dpaa2-eth: Cleanup channel stats Thread-Index: AQHUhaTv1lDGTgCvG0uKXn7XVb00/w== Date: Mon, 26 Nov 2018 16:27:33 +0000 Message-ID: <1543249591-14563-8-git-send-email-ruxandra.radulescu@nxp.com> References: <1543249591-14563-1-git-send-email-ruxandra.radulescu@nxp.com> In-Reply-To: <1543249591-14563-1-git-send-email-ruxandra.radulescu@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR0302CA0012.eurprd03.prod.outlook.com (2603:10a6:800:e9::22) To AM6PR04MB5000.eurprd04.prod.outlook.com (2603:10a6:20b:7::27) authentication-results: spf=none (sender IP is ) smtp.mailfrom=ruxandra.radulescu@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [86.34.165.90] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM6PR04MB4518; 6:Bvl2Gx4jNNc4s3TCJv+O9XjT6vpl9/KaAyp0OnY/V3MaPMoAdHu7jmOT2FrQgtmXdrVK6UPSQfZ3mAM4qF1hotkaSs83E1rOkORmQ1iStwOrL9pgYDPhK+2vUz42SLwI8b8aDFKjFUrIj1OeMLsUSK+c3wwGIRsSjTEmem9lKixlB4FDuY0xIf9QRPeJ02YH3VXCEgIFtCXG1UlIaEuDQodvecjZjc6l0i4jz3Vzas9l58Mac602ktfXQ7aughRXnOuE9vDTz3H4BuiInAm76ls6w2uiL5cpT+aSyTAduz+yZ31Vpd6xWH5QSkD2x/x5TNCHofb9QUeIs8tmw0aUnWIl/skd4Ru0evmq2Cf3X9iETAKoR05aaoaz0OW0Ap2HKRQx8VHo2XyEl10kUBBAUNuCBGiqCh/9nTv38WHFfixQvu06x1MhZYK55L4r9Xbuiw/3XDcq55oCNYA5z1x9cg==; 5:9Jadavutmv8pe9LADlAyqgH4BIyB+tKoJKC4DAtfWcwFguZW57UNXrKf842usC4ySobk98txfSuV755UX6+gNz//S1ZTgX8c86AplUSox0QNdzsswftgDDIgp94GO9A3/kWPEkUpP6uoq1pjrENoZs5KNedT5IMqOdNODBanElU=; 7:c+Z8aVIzeZFZY+idi2e4nkDawmZou2xNrFtLF6TWuZiRg3w/WfOVkNCCGOAjNHqeXLUG/tOcJx1+5Tq5QHTV/YnneVMYiuxytwxfMCm/lc2PCs4uCsDU/kFF4p3Qib85O76/7pNL7mn51pzbMFF4sg== x-ms-office365-filtering-correlation-id: db49649f-5f72-4a3f-a46b-08d653bc11d8 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4518; x-ms-traffictypediagnostic: AM6PR04MB4518: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(3231443)(944501410)(52105112)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201708071742011)(7699051)(76991095); SRVR:AM6PR04MB4518; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4518; x-forefront-prvs: 086831DFB4 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(366004)(376002)(346002)(136003)(39860400002)(199004)(189003)(86362001)(71200400001)(316002)(54906003)(478600001)(6666004)(110136005)(66066001)(186003)(2906002)(71190400001)(5660300001)(386003)(7736002)(575784001)(102836004)(26005)(76176011)(6512007)(256004)(14444005)(52116002)(2501003)(99286004)(11346002)(446003)(476003)(486006)(2616005)(6436002)(81156014)(305945005)(105586002)(106356001)(68736007)(14454004)(39060400002)(8676002)(8936002)(81166006)(6486002)(4326008)(6506007)(25786009)(97736004)(6116002)(3846002)(36756003)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4518; H:AM6PR04MB5000.eurprd04.prod.outlook.com; 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-antispam-message-info: iLv9vp0pRXMI3fS3tiTt/NNXRlrs0W6p3UnGfe42hc3cwckzaS0NPhlCYaPFOcs8Z3Ckogf2fheqh7C/CokCFI/2dcn001asGwVHNLBVZJdRnfKb51r83tpYwhn9sJ0WD1Gc7CKFZtwQStsnCTVVUUQh3KMHv+Om9+z7CI979OnEv1KtQcc6KPhX5tHSXQQKswiWW48qPes+erUbLjrc6yrw8907VTXvQSamo/flo8kiNYiXWwgaUufSoHOb6yjs6OJTQxkw0gCYZW51QwwZtqDvRiiA9+9RSVI9A/VT556lOSnflrvXtO8SZPpE8CdKncYBy/tVxKeyOW2h/DpfilnypEkjb5onKADloK1xiRE= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: db49649f-5f72-4a3f-a46b-08d653bc11d8 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Nov 2018 16:27:34.0193 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4518 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove unused counter. Reorder fields in channel stats structure to match the ethtool strings order and make it easier to print them with ethtool -S. Signed-off-by: Ioana Radulescu --- v2: no changes drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 1 - drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 6 ++---- drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 16 +++++----------- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c index bc582c4..d2bc5da 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c @@ -467,7 +467,6 @@ static int consume_frames(struct dpaa2_eth_channel *ch, return 0; fq->stats.frames += cleaned; - ch->stats.frames += cleaned; /* A dequeue operation only pulls frames from a single queue * into the store. Return the frame queue as an out param. diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h index 5530a0e..41a2a0d 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h @@ -245,12 +245,10 @@ struct dpaa2_eth_fq_stats { struct dpaa2_eth_ch_stats { /* Volatile dequeues retried due to portal busy */ __u64 dequeue_portal_busy; - /* Number of CDANs; useful to estimate avg NAPI len */ - __u64 cdan; - /* Number of frames received on queues from this channel */ - __u64 frames; /* Pull errors */ __u64 pull_err; + /* Number of CDANs; useful to estimate avg NAPI len */ + __u64 cdan; }; /* Maximum number of queues associated with a DPNI */ diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c index 26bd5a2..79eeebe 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c @@ -174,8 +174,6 @@ static void dpaa2_eth_get_ethtool_stats(struct net_device *net_dev, int j, k, err; int num_cnt; union dpni_statistics dpni_stats; - u64 cdan = 0; - u64 portal_busy = 0, pull_err = 0; struct dpaa2_eth_priv *priv = netdev_priv(net_dev); struct dpaa2_eth_drv_stats *extras; struct dpaa2_eth_ch_stats *ch_stats; @@ -212,16 +210,12 @@ static void dpaa2_eth_get_ethtool_stats(struct net_device *net_dev, } i += j; - for (j = 0; j < priv->num_channels; j++) { - ch_stats = &priv->channel[j]->stats; - cdan += ch_stats->cdan; - portal_busy += ch_stats->dequeue_portal_busy; - pull_err += ch_stats->pull_err; + /* Per-channel stats */ + for (k = 0; k < priv->num_channels; k++) { + ch_stats = &priv->channel[k]->stats; + for (j = 0; j < sizeof(*ch_stats) / sizeof(__u64); j++) + *((__u64 *)data + i + j) += *((__u64 *)ch_stats + j); } - - *(data + i++) = portal_busy; - *(data + i++) = pull_err; - *(data + i++) = cdan; } static int prep_eth_rule(struct ethhdr *eth_value, struct ethhdr *eth_mask,