From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372482-1517181044-2-6872483430563596147 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517181043; b=OWGKUDvglLeykhsVKbzxEBQfa7wqwuO5nun9unczcZZY82H 1/R4IgKfCyaIX34y0JM2Gc6cPe95yQCTrjIJ0aXLAaiPykZLFxMHRlr/VsJhgEXN sHvDMcODldr4ap80cFZsfs+NrR8Ngg1YV1Kaow4hV9fYR+NEvsqlf/njcc7XVgvL c5wCn3xcFnC/W9C7feZoKmjL87qOPF8cPIDt9efpoamf1WwKk8wMRAODLWEWTkoU N5nhUUhyrF9cgCInkYXEKaFNJJhw7bHPPL7c+fjMhLTwCj0r6sCx1WuwgvU9U7/n jMUQzT7ln02kr2NRN3cXWLTU706Oswm0hZ/J7WA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517181043; bh=6oUzdI ZFDwyeObc15UkLySEqeeJHK9fSBiCsWjT3Kqc=; b=myOIXHXo/Hl/qGb6RYpMx6 OKkYIrfK83Y786AwOIOtlCU7EN2h1PmhMvIMLMavgbi6L/6Hlw/hPLGfoiIFqtZN xjV7l+FfmeKZuxsn18LjXEioCY1EPk4ODaPcULDueyM6q/Tvt1j7jOk+I7hcv9uv NXYgspvjwGD091C7gyNV61biOj+upt5d+FTxSFFTS747sOo59lzdd/TDAAMGPEPq QmSHduFDcuefXkQSkeK/NdXnVD5V3mPM7q1R24uQPmArBKeL3Yix9gDn1Xbirboy O6ElTu5gN8MvQKpzakjGoNvTzg+ouXQ8aQARQMBt64Xgohb5Fn+itzcse8QkXXHA == ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=GOzZY6dW x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=GOzZY6dW x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753324AbeA1XJN (ORCPT ); Sun, 28 Jan 2018 18:09:13 -0500 Received: from mail-co1nam03on0111.outbound.protection.outlook.com ([104.47.40.111]:36928 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753323AbeA1W1A (ORCPT ); Sun, 28 Jan 2018 17:27:00 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Pieter Jansen van Vuuren , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 052/100] nfp: fix port stats for mac representors Thread-Topic: [PATCH AUTOSEL for 4.14 052/100] nfp: fix port stats for mac representors Thread-Index: AQHTmIcM9GwNjthEIkCYTARWaUfweA== Date: Sun, 28 Jan 2018 22:26:32 +0000 Message-ID: <20180128222547.7398-52-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1034;7:w8nzUSqRNQpv8y0BY4x6d+d5t6yfLCL+WRZguy/l/vBil5jotDao2dl9ZvXQI5Le7XTCXJcV2dff9h2tN+StLz5bK7A3MdT5gpuGSwTE4Glocy2OooeKzdiEbtQckR2BiOQed7wLvK82q+FptUY2RxF3BwkaUmb/1xE6i+SCafif7uzASwEroTI4aJ32BDwmpF8h/TbFeEtotszVbtFCV7QENRXKS7/lbZz77PXeo4++W/m2rhH9os8Fu09f0KpJ x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 0c7403f9-66c3-4270-6c6f-08d5669e3ed2 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1034; x-ms-traffictypediagnostic: MW2PR2101MB1034: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1034;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1034; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39860400002)(346002)(376002)(396003)(366004)(39380400002)(199004)(189003)(2906002)(2950100002)(26005)(1076002)(66066001)(6116002)(5660300001)(3846002)(186003)(316002)(22452003)(54906003)(110136005)(6666003)(86612001)(36756003)(6486002)(86362001)(53936002)(6436002)(6512007)(106356001)(8676002)(105586002)(305945005)(7736002)(39060400002)(68736007)(478600001)(81166006)(102836004)(76176011)(6506007)(72206003)(10290500003)(14454004)(2900100001)(3660700001)(99286004)(97736004)(81156014)(25786009)(8936002)(4326008)(5250100002)(3280700002)(2501003)(10090500001)(107886003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1034;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: KOCtgEt9emIe9bxIBNioMcEvrKkJJApxn7TDYZYMMFgMwSgNw75lNc7MYL9jmu0Nk+W2vr0szBCK0fl1alPScQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0c7403f9-66c3-4270-6c6f-08d5669e3ed2 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:32.6709 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1034 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Pieter Jansen van Vuuren [ Upstream commit 42d779ffc186f6dd26271fc60a7417cb51aca93e ] Previously we swapped the tx_packets, tx_bytes and tx_dropped counters with rx_packets, rx_bytes and rx_dropped counters, respectively. This behaviour is correct and expected for VF representors but it should not be swapped for physical port mac representors. Fixes: eadfa4c3be99 ("nfp: add stats and xmit helpers for representors") Signed-off-by: Pieter Jansen van Vuuren Reviewed-by: Simon Horman Reviewed-by: Jakub Kicinski Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c b/drivers/ne= t/ethernet/netronome/nfp/nfp_net_repr.c index 1c43aca8162d..9a7655560629 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c @@ -84,16 +84,13 @@ nfp_repr_phy_port_get_stats64(struct nfp_port *port, { u8 __iomem *mem =3D port->eth_stats; =20 - /* TX and RX stats are flipped as we are returning the stats as seen - * at the switch port corresponding to the phys port. - */ - stats->tx_packets =3D readq(mem + NFP_MAC_STATS_RX_FRAMES_RECEIVED_OK); - stats->tx_bytes =3D readq(mem + NFP_MAC_STATS_RX_IN_OCTETS); - stats->tx_dropped =3D readq(mem + NFP_MAC_STATS_RX_IN_ERRORS); + stats->tx_packets =3D readq(mem + NFP_MAC_STATS_TX_FRAMES_TRANSMITTED_OK)= ; + stats->tx_bytes =3D readq(mem + NFP_MAC_STATS_TX_OUT_OCTETS); + stats->tx_dropped =3D readq(mem + NFP_MAC_STATS_TX_OUT_ERRORS); =20 - stats->rx_packets =3D readq(mem + NFP_MAC_STATS_TX_FRAMES_TRANSMITTED_OK)= ; - stats->rx_bytes =3D readq(mem + NFP_MAC_STATS_TX_OUT_OCTETS); - stats->rx_dropped =3D readq(mem + NFP_MAC_STATS_TX_OUT_ERRORS); + stats->rx_packets =3D readq(mem + NFP_MAC_STATS_RX_FRAMES_RECEIVED_OK); + stats->rx_bytes =3D readq(mem + NFP_MAC_STATS_RX_IN_OCTETS); + stats->rx_dropped =3D readq(mem + NFP_MAC_STATS_RX_IN_ERRORS); } =20 static void --=20 2.11.0