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 294FBA00C5 for ; Fri, 8 May 2020 06:58:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B818C1DC62; Fri, 8 May 2020 06:58:40 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 6EEAD1DC3E; Fri, 8 May 2020 06:58:37 +0200 (CEST) IronPort-SDR: af335Jt610m7oI3psDSYuRNuWw4Kb9K06ElbNIMo/Asl+/2XJ4HqeqL89j5QWsmWnHYBNgM9xL nSLocTtUr58A== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 May 2020 21:58:37 -0700 IronPort-SDR: LBwBK5gyuZUf/V5Q+eJZMRKb+aGcqpMm2/S0SZNIYjUvSxIAb/yY7OTrgUbDdLVQTP/lGmjPVf QOXEaIBZ5knQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,366,1583222400"; d="scan'208";a="370336322" Received: from dpdk.sh.intel.com ([10.239.255.59]) by fmsmga001.fm.intel.com with ESMTP; 07 May 2020 21:58:35 -0700 From: Guinan Sun To: dev@dpdk.org Cc: Guinan Sun , stable@dpdk.org Date: Fri, 8 May 2020 04:46:18 +0000 Message-Id: <20200508044618.70535-3-guinanx.sun@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200508044618.70535-1-guinanx.sun@intel.com> References: <20200508015913.48764-1-guinanx.sun@intel.com> <20200508044618.70535-1-guinanx.sun@intel.com> Subject: [dpdk-stable] [PATCH v2 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 --- v2 changes: * Aligned line-continuation character "\". --- drivers/net/e1000/igb_ethdev.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index 520fba8fa..4cd4e55c0 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 @@ -261,11 +263,17 @@ static int igb_filter_restore(struct rte_eth_dev *dev); /* * Define VF Stats MACRO for Non "cleared on read" register */ -#define UPDATE_VF_STAT(reg, last, cur) \ -{ \ - u32 latest = E1000_READ_REG(hw, reg); \ - cur += (latest - last) & UINT_MAX; \ - last = latest; \ +#define UPDATE_VF_STAT(reg, last, cur) \ +{ \ + 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