From patchwork Fri Apr 26 09:48:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 1091452 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=none (p=none dis=none) header.from=aquantia.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=AQUANTIA1COM.onmicrosoft.com header.i=@AQUANTIA1COM.onmicrosoft.com header.b="aM9qA/om"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44r8PX19Sqz9s3Z for ; Fri, 26 Apr 2019 19:48:16 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727334AbfDZJsO (ORCPT ); Fri, 26 Apr 2019 05:48:14 -0400 Received: from mail-eopbgr720055.outbound.protection.outlook.com ([40.107.72.55]:45888 "EHLO NAM05-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727032AbfDZJsM (ORCPT ); Fri, 26 Apr 2019 05:48:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gNEJkRadedwTlRFmpQYmkhJzyFPO44i9V55/gbUumnI=; b=aM9qA/ompDMklQLfugIz73mJJcM4pof1/uC7zhZadjCUL0ZWoCY0W5Sv11Wv3BAvRvaDZWCdsW/u5IcpSx6ACZze0qwutFlPA/7ENUuRwWSCUJM7GZ3jC6rNJEppVuX0hl/LJei9KhRPNdQniLFdnsvmYlPiAtNKknCoxfj4A9M= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB4154.namprd11.prod.outlook.com (20.176.126.215) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1835.12; Fri, 26 Apr 2019 09:48:10 +0000 Received: from DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::f035:2c20:5a61:7653]) by DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::f035:2c20:5a61:7653%3]) with mapi id 15.20.1835.010; Fri, 26 Apr 2019 09:48:10 +0000 From: Igor Russkikh To: "David S . Miller" CC: "netdev@vger.kernel.org" , Nikita Danilov , Dmitry Bogdanov , Igor Russkikh , Nikita Danilov Subject: [PATCH v3 net-next 13/15] net: aquantia: get total counters from DMA block Thread-Topic: [PATCH v3 net-next 13/15] net: aquantia: get total counters from DMA block Thread-Index: AQHU/BUorFBqyYdtXUOzsEzBQ3Wqew== Date: Fri, 26 Apr 2019 09:48:10 +0000 Message-ID: <1bff161b3cb3659f3f99a769648c2b3939f6739c.1556270198.git.igor.russkikh@aquantia.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR08CA0030.namprd08.prod.outlook.com (2603:10b6:a03:100::43) To DM6PR11MB3625.namprd11.prod.outlook.com (2603:10b6:5:13a::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Igor.Russkikh@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1d848b4d-4acf-4e0e-1ac7-08d6ca2c4a8d x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(2017052603328)(7193020); SRVR:DM6PR11MB4154; x-ms-traffictypediagnostic: DM6PR11MB4154: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:233; x-forefront-prvs: 001968DD50 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(396003)(39850400004)(366004)(136003)(346002)(199004)(189003)(73956011)(54906003)(478600001)(6486002)(316002)(97736004)(64756008)(256004)(66446008)(107886003)(66556008)(36756003)(14444005)(118296001)(66946007)(76176011)(6436002)(446003)(26005)(305945005)(66476007)(486006)(2906002)(186003)(386003)(6506007)(2616005)(11346002)(476003)(4326008)(53936002)(102836004)(14454004)(81156014)(81166006)(66066001)(8676002)(86362001)(8936002)(25786009)(99286004)(44832011)(71200400001)(71190400001)(6916009)(5660300002)(52116002)(6512007)(72206003)(7736002)(3846002)(6116002)(68736007)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB4154; H:DM6PR11MB3625.namprd11.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: aquantia.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: lGMcFSFtKjnKIrtwseBDAdVmSr90QJcfLUfA3QqJwVc0bIFJEqoSm+Hkw6L3JIluFTzeSm3ua5zwDHKTtZBYQMmfhDlslFz8ssWQvNu/iJo+LfAVlRUpja8XqLOGkBwZjuX0mdVrAbCkeFvCdwP00gh6GZPT/cHJ/vLuqC485PQ7TdzSvKePoNMwJDv/+lPpmBVqOJ+Ym+ExG89CfV60G4GbclaH/qi9KnWGIVRdsVjHIzRAwHIwDIvY7qmQeDN6aG14+m57U087GfIciQJ7LAnBskdblqZLUu1CdWi254URtlys7u6gopBx3mVwEBviJw+wj0JwPMJtq8WX33zbexNWrSVjK3wtMKTFYpHKVCv2eTAwQ3EiCTLUQ3b68EGJ3vbdh7UBmAZ7HLfwtuu1bZqKvgvaiJJv5pKYEAty3Do= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1d848b4d-4acf-4e0e-1ac7-08d6ca2c4a8d X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Apr 2019 09:48:10.0689 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4154 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Dmitry Bogdanov aq_nic_update_ndev_stats pushes statistics to ndev->stats from system interface. This is not always good because it counts packets/bytes before any of rx filters (including mac filter). Its better to report the packet/bytes statistics from DMA counters which gives actual values of data transferred over pci. System level stats is still available via ethtool. Signed-off-by: Nikita Danilov Signed-off-by: Igor Russkikh Signed-off-by: Dmitry Bogdanov --- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c index 1893ba7fcd2b..b94c58bf1d2f 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c @@ -754,11 +754,12 @@ static void aq_nic_update_ndev_stats(struct aq_nic_s *self) struct net_device *ndev = self->ndev; struct aq_stats_s *stats = self->aq_hw_ops->hw_get_hw_stats(self->aq_hw); - ndev->stats.rx_packets = stats->uprc + stats->mprc + stats->bprc; - ndev->stats.rx_bytes = stats->ubrc + stats->mbrc + stats->bbrc; + ndev->stats.rx_packets = stats->dma_pkt_rc; + ndev->stats.rx_bytes = stats->dma_oct_rc; ndev->stats.rx_errors = stats->erpr; - ndev->stats.tx_packets = stats->uptc + stats->mptc + stats->bptc; - ndev->stats.tx_bytes = stats->ubtc + stats->mbtc + stats->bbtc; + ndev->stats.rx_dropped = stats->dpc; + ndev->stats.tx_packets = stats->dma_pkt_tc; + ndev->stats.tx_bytes = stats->dma_oct_tc; ndev->stats.tx_errors = stats->erpt; ndev->stats.multicast = stats->mprc; }