From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B6108A04B6 for ; Thu, 10 Sep 2020 07:58:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A50A01C0CA; Thu, 10 Sep 2020 07:58:39 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id E12B91B9B7; Thu, 10 Sep 2020 07:58:36 +0200 (CEST) IronPort-SDR: PmIHl7n7TRidSVI06kny8H3BHsWPMGrkzkIeR2oGTne1MRdzxygfWLKiJkC71UjPxQSAnUQfbH +D11+dXPYhgg== X-IronPort-AV: E=McAfee;i="6000,8403,9739"; a="220033045" X-IronPort-AV: E=Sophos;i="5.76,411,1592895600"; d="scan'208";a="220033045" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Sep 2020 22:58:35 -0700 IronPort-SDR: 5/IHzjEpUba1/TiDlR+8iNVgZ6nqoI3E2wLNHt1Xzcd+lI9AYEVTyrJse0eg+1DHl1Oq6tk1XN AuYgyuWt6TAA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,411,1592895600"; d="scan'208";a="344141007" Received: from fmsmsx605.amr.corp.intel.com ([10.18.126.85]) by orsmga007.jf.intel.com with ESMTP; 09 Sep 2020 22:58:35 -0700 Received: from shsmsx603.ccr.corp.intel.com (10.109.6.143) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 9 Sep 2020 22:58:34 -0700 Received: from shsmsx601.ccr.corp.intel.com (10.109.6.141) by SHSMSX603.ccr.corp.intel.com (10.109.6.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 10 Sep 2020 13:58:33 +0800 Received: from shsmsx601.ccr.corp.intel.com ([10.109.6.141]) by SHSMSX601.ccr.corp.intel.com ([10.109.6.141]) with mapi id 15.01.1713.004; Thu, 10 Sep 2020 13:58:32 +0800 From: "Guo, Jia" To: "Han, YingyaX" , "Jiang, JunyuX" , "dev@dpdk.org" CC: "Xing, Beilei" , "Jiang, JunyuX" , "stable@dpdk.org" Thread-Topic: [dpdk-stable] [PATCH] net/i40e: fix incorrect byte counters Thread-Index: AQHWhxai/8q66owsUkOdCIloKYTvvalgnQmAgADC93A= Date: Thu, 10 Sep 2020 05:58:32 +0000 Message-ID: <2c0b8b4ff5ce41d6868c5889e5a0c379@intel.com> References: <20200910015426.3140-1-junyux.jiang@intel.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 x-originating-ip: [10.239.127.36] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-stable] [PATCH] net/i40e: fix incorrect byte counters 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, junyu > -----Original Message----- > From: Han, YingyaX > Sent: Thursday, September 10, 2020 10:18 AM > To: Jiang, JunyuX ; dev@dpdk.org > Cc: Guo, Jia ; Xing, Beilei ; J= iang, > JunyuX ; stable@dpdk.org > Subject: RE: [dpdk-stable] [PATCH] net/i40e: fix incorrect byte counters >=20 > Tested-by: Yingya Han >=20 > -----Original Message----- > From: stable On Behalf Of Junyu Jiang > Sent: Thursday, September 10, 2020 9:54 AM > To: dev@dpdk.org > Cc: Guo, Jia ; Xing, Beilei ; J= iang, > JunyuX ; stable@dpdk.org > Subject: [dpdk-stable] [PATCH] net/i40e: fix incorrect byte counters >=20 > This patch fixed the issue that rx/tx bytes overflowed on 48 bit limitati= on by > enlarging the limitation. >=20 > Fixes: 4861cde46116 ("i40e: new poll mode driver") > Cc: stable@dpdk.org >=20 > Signed-off-by: Junyu Jiang > --- > drivers/net/i40e/i40e_ethdev.c | 47 > ++++++++++++++++++++++++++++++++++ > drivers/net/i40e/i40e_ethdev.h | 9 +++++++ > 2 files changed, 56 insertions(+) >=20 > diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethde= v.c > index 11c02b188..e3d4b7f4f 100644 > --- a/drivers/net/i40e/i40e_ethdev.c > +++ b/drivers/net/i40e/i40e_ethdev.c > @@ -3070,6 +3070,13 @@ i40e_update_vsi_stats(struct i40e_vsi *vsi) > i40e_stat_update_48(hw, I40E_GLV_BPRCH(idx), I40E_GLV_BPRCL(idx), > vsi->offset_loaded, &oes->rx_broadcast, > &nes->rx_broadcast); > +/* enlarge the limitation when rx_bytes overflowed */ if > +(vsi->offset_loaded) { if (I40E_RXTX_BYTES_LOW(vsi->old_rx_bytes) > > +nes->rx_bytes) > +nes->rx_bytes +=3D (uint64_t)1 << I40E_48_BIT_WIDTH; rx_bytes +=3D > +nes->I40E_RXTX_BYTES_HIGH(vsi->old_rx_bytes); > +} > +vsi->old_rx_bytes =3D nes->rx_bytes; > /* exclude CRC bytes */ > nes->rx_bytes -=3D (nes->rx_unicast + nes->rx_multicast + > nes->rx_broadcast) * RTE_ETHER_CRC_LEN; @@ -3096,6 +3103,13 @@ > i40e_update_vsi_stats(struct i40e_vsi *vsi) > /* GLV_TDPC not supported */ > i40e_stat_update_32(hw, I40E_GLV_TEPC(idx), vsi->offset_loaded, > &oes->tx_errors, &nes->tx_errors); > +/* enlarge the limitation when tx_bytes overflowed */ if > +(vsi->offset_loaded) { if (I40E_RXTX_BYTES_LOW(vsi->old_tx_bytes) > > +nes->tx_bytes) > +nes->tx_bytes +=3D (uint64_t)1 << I40E_48_BIT_WIDTH; tx_bytes +=3D > +nes->I40E_RXTX_BYTES_HIGH(vsi->old_tx_bytes); > +} > +vsi->old_rx_bytes =3D nes->rx_bytes; It should be tx, right? > vsi->offset_loaded =3D true; >=20 > PMD_DRV_LOG(DEBUG, "***************** VSI[%u] stats start > *******************", @@ -3168,6 +3182,24 @@ > i40e_read_stats_registers(struct i40e_pf *pf, struct i40e_hw *hw) > pf->offset_loaded, > &pf->internal_stats_offset.tx_broadcast, > &pf->internal_stats.tx_broadcast); > +/* enlarge the limitation when internal rx/tx bytes overflowed */ if > +(pf->offset_loaded) { if > +(I40E_RXTX_BYTES_LOW(pf->internal_old_rx_bytes) > > + pf->internal_stats.rx_bytes) > +pf->internal_stats.rx_bytes +=3D > +(uint64_t)1 << I40E_48_BIT_WIDTH; > +pf->internal_stats.rx_bytes +=3D > +I40E_RXTX_BYTES_HIGH(pf->internal_old_rx_bytes); > + > +if (I40E_RXTX_BYTES_LOW(pf->internal_old_tx_bytes) > > + pf->internal_stats.tx_bytes) > +pf->internal_stats.tx_bytes +=3D > +(uint64_t)1 << I40E_48_BIT_WIDTH; > +pf->internal_stats.tx_bytes +=3D > +I40E_RXTX_BYTES_HIGH(pf->internal_old_tx_bytes); > +} > +pf->internal_old_rx_bytes =3D pf->internal_stats.rx_bytes; > +pf->internal_old_tx_bytes =3D pf->internal_stats.tx_bytes; >=20 > /* exclude CRC size */ > pf->internal_stats.rx_bytes -=3D (pf->internal_stats.rx_unicast + @@ -31= 91,6 > +3223,14 @@ i40e_read_stats_registers(struct i40e_pf *pf, struct i40e_hw > *hw) > I40E_GLPRT_BPRCL(hw->port), > pf->offset_loaded, &os->eth.rx_broadcast, > &ns->eth.rx_broadcast); > +/* enlarge the limitation when rx_bytes overflowed */ if > +(pf->offset_loaded) { if (I40E_RXTX_BYTES_LOW(pf->old_rx_bytes) > > +ns->eth.rx_bytes) > +ns->eth.rx_bytes +=3D (uint64_t)1 << I40E_48_BIT_WIDTH; eth.rx_bytes += =3D > +ns->I40E_RXTX_BYTES_HIGH(pf->old_rx_bytes); > +} > +pf->old_rx_bytes =3D ns->eth.rx_bytes; > + > /* Workaround: CRC size should not be included in byte statistics, > * so subtract RTE_ETHER_CRC_LEN from the byte counter for each rx > * packet. > @@ -3249,6 +3289,13 @@ i40e_read_stats_registers(struct i40e_pf *pf, > struct i40e_hw *hw) > I40E_GLPRT_BPTCL(hw->port), > pf->offset_loaded, &os->eth.tx_broadcast, > &ns->eth.tx_broadcast); > +/* enlarge the limitation when tx_bytes overflowed */ if > +(pf->offset_loaded) { if (I40E_RXTX_BYTES_LOW(pf->old_tx_bytes) > > +ns->eth.tx_bytes) > +ns->eth.tx_bytes +=3D (uint64_t)1 << I40E_48_BIT_WIDTH; eth.tx_bytes += =3D > +ns->I40E_RXTX_BYTES_HIGH(pf->old_tx_bytes); > +} > +pf->old_tx_bytes =3D ns->eth.tx_bytes; > ns->eth.tx_bytes -=3D (ns->eth.tx_unicast + ns->eth.tx_multicast + > ns->eth.tx_broadcast) * RTE_ETHER_CRC_LEN; >=20 > diff --git a/drivers/net/i40e/i40e_ethdev.h > b/drivers/net/i40e/i40e_ethdev.h index 19f821829..5d17be1f0 100644 > --- a/drivers/net/i40e/i40e_ethdev.h > +++ b/drivers/net/i40e/i40e_ethdev.h > @@ -282,6 +282,9 @@ struct rte_flow { > #define I40E_ETH_OVERHEAD \ > (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + I40E_VLAN_TAG_SIZE * 2) >=20 > +#define I40E_RXTX_BYTES_HIGH(bytes) ((bytes) & ~I40E_48_BIT_MASK) > +#define I40E_RXTX_BYTES_LOW(bytes) ((bytes) & I40E_48_BIT_MASK) > + > struct i40e_adapter; > struct rte_pci_driver; >=20 > @@ -399,6 +402,8 @@ struct i40e_vsi { > uint8_t vlan_anti_spoof_on; /* The VLAN anti-spoofing enabled */ uint8_= t > vlan_filter_on; /* The VLAN filter enabled */ struct i40e_bw_info bw_inf= o; > /* VSI bandwidth information */ > +uint64_t old_rx_bytes; > +uint64_t old_tx_bytes; > }; >=20 > struct pool_entry { > @@ -1156,6 +1161,10 @@ struct i40e_pf { > uint16_t switch_domain_id; >=20 > struct i40e_vf_msg_cfg vf_msg_cfg; > +uint64_t old_rx_bytes; > +uint64_t old_tx_bytes; > +uint64_t internal_old_rx_bytes; > +uint64_t internal_old_tx_bytes; > }; >=20 > enum pending_msg { > -- > 2.17.1 >=20