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 A96DBA00C5 for ; Thu, 7 May 2020 08:37:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9E3A11DA54; Thu, 7 May 2020 08:37:36 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id EB83F1DA25; Thu, 7 May 2020 08:37:32 +0200 (CEST) IronPort-SDR: iy3hctuj66l44gxi1EFB8pYXdAJ2kNughakhE0z6vaGnLRxcFpOl1C8hErcyvZyZLCmIa6+iim 3WdA6IpstTNg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 May 2020 23:37:32 -0700 IronPort-SDR: NLuaTtfZxupi3GSCBa1p9xxJOPzXlp6w5Ua5fUW50oG+zeCMmFuXKc0rWaff+QLqWYbAlK5ZbG deqqJx1u/eMA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,362,1583222400"; d="scan'208";a="278497158" Received: from dpdk.sh.intel.com ([10.239.255.59]) by orsmga002.jf.intel.com with ESMTP; 06 May 2020 23:37:30 -0700 From: Guinan Sun To: dev@dpdk.org Cc: Guinan Sun , stable@dpdk.org Date: Thu, 7 May 2020 06:16:42 +0000 Message-Id: <20200507061642.64969-3-guinanx.sun@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200507061642.64969-1-guinanx.sun@intel.com> References: <20200507061642.64969-1-guinanx.sun@intel.com> Subject: [dpdk-stable] [PATCH 2/2] net/e1000: fix defects of macro in VF 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" The defects in the macros UPDATE_VF_STAT and UPDATE_VF_STAT_36BIT exist. If latest is less than last, we will get wrong result. The patch fixes the defect. Fixes: d15fcf76c8b7 ("e1000: move to drivers/net/") Cc: stable@dpdk.org Signed-off-by: Guinan Sun --- drivers/net/e1000/igb_ethdev.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index 520fba8fa..d6032fd65 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -47,6 +47,8 @@ #define IGB_4_BIT_MASK RTE_LEN2MASK(IGB_4_BIT_WIDTH, uint8_t) #define IGB_8_BIT_WIDTH CHAR_BIT #define IGB_8_BIT_MASK UINT8_MAX +#define IGB_32_BIT_WIDTH (CHAR_BIT * 4) +#define IGB_32_BIT_MASK RTE_LEN2MASK(IGB_32_BIT_WIDTH, uint32_t) /* Additional timesync values. */ #define E1000_CYCLECOUNTER_MASK 0xffffffffffffffffULL @@ -263,9 +265,15 @@ static int igb_filter_restore(struct rte_eth_dev *dev); */ #define UPDATE_VF_STAT(reg, last, cur) \ { \ - u32 latest = E1000_READ_REG(hw, reg); \ - cur += (latest - last) & UINT_MAX; \ - last = latest; \ + uint64_t latest = E1000_READ_REG(hw, reg); \ + uint64_t stat = 0; \ + if (latest >= last) \ + stat = latest - last; \ + else \ + stat = (uint64_t)((latest + \ + ((uint64_t)1 << IGB_32_BIT_WIDTH)) - last);\ + cur += stat & IGB_32_BIT_MASK; \ + last = latest; \ } #define IGB_FC_PAUSE_TIME 0x0680 -- 2.17.1