From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ioana Ciocoi Radulescu Subject: [PATCH v2 net-next 7/8] dpaa2-eth: Cleanup channel stats 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> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Cc: Ioana Ciornei , "dsahern@gmail.com" , Camelia Alexandra Groza To: "netdev@vger.kernel.org" , "davem@davemloft.net" Return-path: 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 In-Reply-To: <1543249591-14563-1-git-send-email-ruxandra.radulescu@nxp.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: 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; =20 fq->stats.frames +=3D cleaned; - ch->stats.frames +=3D cleaned; =20 /* 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; }; =20 /* 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_devi= ce *net_dev, int j, k, err; int num_cnt; union dpni_statistics dpni_stats; - u64 cdan =3D 0; - u64 portal_busy =3D 0, pull_err =3D 0; struct dpaa2_eth_priv *priv =3D 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_de= vice *net_dev, } i +=3D j; =20 - for (j =3D 0; j < priv->num_channels; j++) { - ch_stats =3D &priv->channel[j]->stats; - cdan +=3D ch_stats->cdan; - portal_busy +=3D ch_stats->dequeue_portal_busy; - pull_err +=3D ch_stats->pull_err; + /* Per-channel stats */ + for (k =3D 0; k < priv->num_channels; k++) { + ch_stats =3D &priv->channel[k]->stats; + for (j =3D 0; j < sizeof(*ch_stats) / sizeof(__u64); j++) + *((__u64 *)data + i + j) +=3D *((__u64 *)ch_stats + j); } - - *(data + i++) =3D portal_busy; - *(data + i++) =3D pull_err; - *(data + i++) =3D cdan; } =20 static int prep_eth_rule(struct ethhdr *eth_value, struct ethhdr *eth_mask= , --=20 2.7.4